diff options
| author | joerg <joerg> | 2009-07-07 18:16:00 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-07-07 18:16:00 +0000 |
| commit | f70399eaddf232ffbd85d6c42322cbf3cd8984b4 (patch) | |
| tree | 47e05aabd38b2d14ed573faf69cc216dc036b38d | |
| parent | 621ccec2302f3197aab3942a6313f04587db333e (diff) | |
| download | pkgsrc-f70399eaddf232ffbd85d6c42322cbf3cd8984b4.tar.gz | |
user-destdir support
| -rw-r--r-- | x11/rxvt/Makefile | 8 | ||||
| -rw-r--r-- | x11/ssystem/Makefile | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index bb00e183322..20edb019cc7 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/04/03 22:33:00 tonnerre Exp $ +# $NetBSD: Makefile,v 1.54 2009/07/07 18:16:00 joerg Exp $ DISTNAME= rxvt-2.7.10 PKGREVISION= 6 @@ -12,6 +12,7 @@ HOMEPAGE= http://sourceforge.net/projects/rxvt COMMENT= Low memory usage xterm replacement that supports color PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_X11BASE= YES GNU_CONFIGURE= YES @@ -59,10 +60,11 @@ post-patch: ${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \ -e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:" +INSTALLATION_DIRS= lib/X11/app-defaults + pre-install: if [ ! -f ${PREFIX}/lib/X11/app-defaults/Rxvt ]; then \ - ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults; \ - ${INSTALL_DATA} ${FILESDIR}/Rxvt ${PREFIX}/lib/X11/app-defaults; \ + ${INSTALL_DATA} ${FILESDIR}/Rxvt ${DESTDIR}${PREFIX}/lib/X11/app-defaults; \ fi .include "../../x11/libXpm/buildlink3.mk" diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index e41ebe89de9..27a483e9f08 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/06/30 00:07:25 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2009/07/07 18:16:43 joerg Exp $ # DISTNAME= ssystem-1.6 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www1.las.es/~amil/ssystem/ COMMENT= Solar System Flyby Simulator +PKG_DESTDIR_SUPPORT= user-destdir + MAKE_JOBS_SAFE= no BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison @@ -22,17 +24,14 @@ MAKE_FILE= Makefile.FreeBSD DATA_FILES= *.jpg *.dat ssystem.conf DOC_FILES= LICENSE README -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/ssystem/hires share/doc/ssystem do-install: cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} ssystem ${PREFIX}/bin; \ - ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem; \ - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssystem; \ - ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem/hires; \ - ${INSTALL_DATA} ${DATA_FILES} ${PREFIX}/share/ssystem; \ - ${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/ssystem; \ - ${INSTALL_DATA} hires/README ${PREFIX}/share/ssystem/hires + ${INSTALL_PROGRAM} ssystem ${DESTDIR}${PREFIX}/bin; \ + ${INSTALL_DATA} ${DATA_FILES} ${DESTDIR}${PREFIX}/share/ssystem; \ + ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/ssystem; \ + ${INSTALL_DATA} hires/README ${DESTDIR}${PREFIX}/share/ssystem/hires .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" |