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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d90609ef8783
branches:  trunk
changeset: 395272:d90609ef8783
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 19:41:54 2009 +0000

description:
user-destdir support

diffstat:

 wm/fluxter/Makefile |  14 ++++++++------
 wm/fvwm1/Makefile   |  12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (73 lines):

diff -r ca2389c3d8d6 -r d90609ef8783 wm/fluxter/Makefile
--- a/wm/fluxter/Makefile       Tue Jul 07 19:41:00 2009 +0000
+++ b/wm/fluxter/Makefile       Tue Jul 07 19:41:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/10/23 13:20:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/07 19:44:42 joerg Exp $
 #
 
 DISTNAME=              fluxter-0.1.0
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html
 COMMENT=               Workspace pager dockapp, particularly useful with Fluxbox
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
@@ -17,12 +19,12 @@
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}
 EXDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 
+INSTALLATION_DIRS=     ${DOCDIR} ${EXDIR}
+
 post-install:
-       ${RM} ${FLUXBOX_DATA}/README.fluxter
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/data/README.fluxter ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${EXDIR}
-       ${INSTALL_DATA} ${WRKSRC}/examples/fluxter.bb ${EXDIR}
+       ${RM} ${DESTDIR}${FLUXBOX_DATA}/README.fluxter
+       ${INSTALL_DATA} ${WRKSRC}/data/README.fluxter ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/examples/fluxter.bb ${DESTDIR}${EXDIR}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ca2389c3d8d6 -r d90609ef8783 wm/fvwm1/Makefile
--- a/wm/fvwm1/Makefile Tue Jul 07 19:41:00 2009 +0000
+++ b/wm/fvwm1/Makefile Tue Jul 07 19:41:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 19:41:54 joerg Exp $
 
 DISTNAME=      fvwm-1.24r
 PKGNAME=       ${DISTNAME:S/fvwm/fvwm1/}
@@ -11,6 +11,8 @@
 COMMENT=       Virtual window manager for X
 LICENSE=       gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=     fvwm2-* fvwm>=1
@@ -37,14 +39,14 @@
        ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
          -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h
 
+INSTALLATION_DIRS=     lib/X11/fvwm/pixmaps lib/X11/fvwm/bitmaps
+
 post-install:
-       @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/pixmaps
-       @${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm/bitmaps
        ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \
-         ${PREFIX}/lib/X11/fvwm/pixmaps
+         ${DESTDIR}${PREFIX}/lib/X11/fvwm/pixmaps
        ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \
          ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
-         ${PREFIX}/lib/X11/fvwm/bitmaps
+         ${DESTDIR}${PREFIX}/lib/X11/fvwm/bitmaps
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"