[pkgsrc/trunk]: pkgsrc/x11 user-destdir support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b6666cabef3
branches:  trunk
changeset: 395201:9b6666cabef3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:16:00 2009 +0000

description:
user-destdir support

diffstat:

 x11/rxvt/Makefile    |   8 +++++---
 x11/ssystem/Makefile |  17 ++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (72 lines):

diff -r 8cbb724ad59b -r 9b6666cabef3 x11/rxvt/Makefile
--- a/x11/rxvt/Makefile Tue Jul 07 18:15:05 2009 +0000
+++ b/x11/rxvt/Makefile Tue Jul 07 18:16:00 2009 +0000
@@ -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 @@
 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 @@
        ${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 -r 8cbb724ad59b -r 9b6666cabef3 x11/ssystem/Makefile
--- a/x11/ssystem/Makefile      Tue Jul 07 18:15:05 2009 +0000
+++ b/x11/ssystem/Makefile      Tue Jul 07 18:16:00 2009 +0000
@@ -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 @@
 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 @@
 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"