pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc user-destdir support
details: https://anonhg.NetBSD.org/pkgsrc/rev/a34602f9ff62
branches: trunk
changeset: 561018:a34602f9ff62
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jul 07 16:49:05 2009 +0000
description:
user-destdir support
diffstat:
audio/splay/Makefile | 3 ++-
audio/splay/distinfo | 4 +++-
audio/splay/patches/patch-aj | 19 +++++++++++++++++++
audio/splay/patches/patch-ak | 29 +++++++++++++++++++++++++++++
www/drraw/Makefile | 18 +++++++++---------
x11/xpaste/Makefile | 3 ++-
x11/xpns/Makefile | 20 +++++++++-----------
x11/xscribble/Makefile | 9 ++++++---
8 files changed, 79 insertions(+), 26 deletions(-)
diffs (222 lines):
diff -r 6c11b0179289 -r a34602f9ff62 audio/splay/Makefile
--- a/audio/splay/Makefile Tue Jul 07 16:38:39 2009 +0000
+++ b/audio/splay/Makefile Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/07/22 05:54:52 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 16:49:05 joerg Exp $
#
DISTNAME= splay-0.8.2
@@ -10,6 +10,7 @@
COMMENT= Audio player/decoder that decodes MPEG Layer I,II,III and WAV files
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff -r 6c11b0179289 -r a34602f9ff62 audio/splay/distinfo
--- a/audio/splay/distinfo Tue Jul 07 16:38:39 2009 +0000
+++ b/audio/splay/distinfo Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/08/08 21:11:20 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/07/07 16:49:05 joerg Exp $
SHA1 (splay-0.8.2.tar.gz) = 25288afa1b52bf25be8f9c4ceb44325c50fa00c8
RMD160 (splay-0.8.2.tar.gz) = f1a99ad9e7e70f5e0000aede05966cc5a0b36ad3
@@ -10,3 +10,5 @@
SHA1 (patch-ae) = 6b343541593d1d6ca8dd641ebb299a95d3bdc067
SHA1 (patch-af) = dfe6c6fba890fb0b413b6b73a42904d3ca6b7d66
SHA1 (patch-ai) = 9ac8c7aa7a7d341585e57dec4ddba4e285db7b34
+SHA1 (patch-aj) = 840793d18ed577dea15108a3c56d9a66e0a8e9e5
+SHA1 (patch-ak) = dd0b54d9323102d92add8cc0e4b020c37b70b615
diff -r 6c11b0179289 -r a34602f9ff62 audio/splay/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/splay/patches/patch-aj Tue Jul 07 16:49:05 2009 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1 2009/07/07 16:49:05 joerg Exp $
+
+--- src/splay/Makefile.in.orig 2009-07-07 18:43:05.000000000 +0200
++++ src/splay/Makefile.in
+@@ -118,11 +118,11 @@ maintainer-clean-binPROGRAMS:
+
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(bindir)
++ $(mkinstalldirs) ${DESTDIR}$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+- echo " $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++ echo " $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`"; \
++ $(INSTALL_PROGRAM) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; \
+ done
+
diff -r 6c11b0179289 -r a34602f9ff62 audio/splay/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/splay/patches/patch-ak Tue Jul 07 16:49:05 2009 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ak,v 1.1 2009/07/07 16:49:05 joerg Exp $
+
+--- Makefile.in.orig 2009-07-07 18:46:23.000000000 +0200
++++ Makefile.in
+@@ -125,19 +125,19 @@ distclean-hdr:
+ maintainer-clean-hdr:
+ install-man: $(MANS)
+ $(NORMAL_INSTALL)
+- $(mkinstalldirs) $(mandir)/man1
++ $(mkinstalldirs) ${DESTDIR}$(mandir)/man1
+ @sect=1; \
+ inst=`echo "splay" | sed '$(transform)'`.1; \
+ if test -f $(srcdir)/splay.1; then file=$(srcdir)/splay.1; \
+ else file=splay.1; fi; \
+- echo " $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst"; \
+- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
++ echo " $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$$sect/$$inst"; \
++ $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$$sect/$$inst
+ @sect=1; \
+ inst=`echo "xsplay" | sed '$(transform)'`.1; \
+ if test -f $(srcdir)/xsplay.1; then file=$(srcdir)/xsplay.1; \
+ else file=xsplay.1; fi; \
+- echo " $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst"; \
+- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
++ echo " $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$$sect/$$inst"; \
++ $(INSTALL_DATA) $$file ${DESTDIR}$(mandir)/man$$sect/$$inst
+
+ uninstall-man:
+ $(NORMAL_UNINSTALL)
diff -r 6c11b0179289 -r a34602f9ff62 www/drraw/Makefile
--- a/www/drraw/Makefile Tue Jul 07 16:38:39 2009 +0000
+++ b/www/drraw/Makefile Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/03/04 13:19:36 kleink Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 16:49:11 joerg Exp $
#
DISTNAME= drraw-2.2b2
@@ -9,6 +9,8 @@
HOMEPAGE= http://web.taranis.org/drraw/
COMMENT= Simple web based presentation front-end for RRDtool
+PKG_DESTDIR_SUPPORT= user-destdir
+
NO_BUILD= yes
USE_TOOLS+= perl:run
@@ -29,20 +31,18 @@
DEPENDS+= rrdtool>=1.2.9:../../databases/rrdtool
+INSTALLATION_DIRS= libexec/cgi-bin ${EGDIR}/icons ${DOCDIR}
+
do-install:
- ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin
- ${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${PREFIX}/libexec/cgi-bin
- ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/drraw.cgi ${DESTDIR}${PREFIX}/libexec/cgi-bin
.for f in ${DRRAW_CONF_FILES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${EGDIR}/${f}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EGDIR}/${f}
.endfor
- ${INSTALL_DATA_DIR} ${EGDIR}/icons
.for f in ${DRRAW_ICONS}
- ${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f}
+ ${INSTALL_DATA} ${WRKSRC}/icons/${f} ${DESTDIR}${EGDIR}/icons/${f}
.endfor
- ${INSTALL_DATA_DIR} ${DOCDIR}
.for f in ${DRRAW_DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
.endfor
SUBST_CLASSES+= prefix
diff -r 6c11b0179289 -r a34602f9ff62 x11/xpaste/Makefile
--- a/x11/xpaste/Makefile Tue Jul 07 16:38:39 2009 +0000
+++ b/x11/xpaste/Makefile Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/07/07 16:58:02 joerg Exp $
#
DISTNAME= xpaste-1.1
@@ -11,6 +11,7 @@
COMMENT= Display the content of the X11 paste buffer in a window
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}
USE_IMAKE= yes
diff -r 6c11b0179289 -r a34602f9ff62 x11/xpns/Makefile
--- a/x11/xpns/Makefile Tue Jul 07 16:38:39 2009 +0000
+++ b/x11/xpns/Makefile Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/11/10 17:21:39 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/07 16:51:09 joerg Exp $
DISTNAME= pns_source
PKGNAME= xpns-1.0
@@ -11,23 +11,21 @@
HOMEPAGE= http://robotics.ee.uwa.edu.au/pns/
COMMENT= Petri-Net Simulator for Xwindows
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
USE_X11BASE= yes
MAKE_FILE= makefile
BUILD_TARGET= pns
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= bin lib/xpns share/doc/xpns
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/xpns
- ${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
- ${INSTALL_DATA} ${WRKSRC}/pns.hlp ${PREFIX}/lib/xpns/
- ${INSTALL_DATA} ${WRKSRC}/pns.shell ${PREFIX}/lib/xpns/
- ${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xpns
- ${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
+ ${INSTALL_PROGRAM} ${WRKSRC}/pns ${DESTDIR}${PREFIX}/lib/xpns/
+ ${INSTALL_DATA} ${WRKSRC}/pns.hlp ${DESTDIR}${PREFIX}/lib/xpns/
+ ${INSTALL_DATA} ${WRKSRC}/pns.shell ${DESTDIR}${PREFIX}/lib/xpns/
+ ${INSTALL_SCRIPT} ${WRKSRC}/xpns ${DESTDIR}${PREFIX}/bin/xpns
+ ${INSTALL_DATA} ${WRKSRC}/*.net ${DESTDIR}${PREFIX}/share/doc/xpns/
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6c11b0179289 -r a34602f9ff62 x11/xscribble/Makefile
--- a/x11/xscribble/Makefile Tue Jul 07 16:38:39 2009 +0000
+++ b/x11/xscribble/Makefile Tue Jul 07 16:49:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/07 16:53:43 joerg Exp $
DISTNAME= xscribble
PKGNAME= xscribble-20000616
@@ -11,6 +11,8 @@
HOMEPAGE= http://www.handhelds.org/projects/xscribble.html
COMMENT= Handwriting recognition (like graffiti)
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
USE_IMAKE= YES
@@ -23,9 +25,10 @@
MAKE_ENV+= SYS_LIBRARIES=${SYS_LIBRARIES:Q}
.endif
+INSTALLATION_DIRS= share/examples/xscribble
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xscribble
- ${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${PREFIX}/share/examples/xscribble
+ ${INSTALL_DATA} ${WRKSRC}/classifiers/*.cl ${DESTDIR}${PREFIX}/share/examples/xscribble
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXp/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index