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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5a6d66e6a12
branches:  trunk
changeset: 395212:e5a6d66e6a12
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:25:56 2009 +0000

description:
user-destdir support

diffstat:

 x11/dtx11session/Makefile |  14 ++++++++------
 x11/dxpc/Makefile         |  10 +++++-----
 x11/fbdesk/Makefile       |   9 ++++++---
 x11/filerunner/Makefile   |  17 +++++++++--------
 4 files changed, 28 insertions(+), 22 deletions(-)

diffs (135 lines):

diff -r 4fed52731a79 -r e5a6d66e6a12 x11/dtx11session/Makefile
--- a/x11/dtx11session/Makefile Tue Jul 07 18:25:25 2009 +0000
+++ b/x11/dtx11session/Makefile Tue Jul 07 18:25:56 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/09 00:48:18 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 18:28:48 joerg Exp $
 
 DISTNAME=      dtxsession-1.0
 CATEGORIES=    x11
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.sun.com/software/solaris/cde/
 COMMENT=       Launch a X11 session from CDE login service
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 ONLY_FOR_PLATFORM=     SunOS-*-*
 
 .include "../../mk/bsd.prefs.mk"
@@ -20,11 +22,11 @@
 
 CONFIG_DIR=    ${PREFIX}/config
 
+INSTALLATION_DIRS=     ${CONFIG_DIR}/C/Xresources.d appconfig/icons/C
+
 do-install:
-       ${INSTALL_DATA_DIR} ${CONFIG_DIR}/C/Xresources.d
-       ${INSTALL_DATA} ${FILESDIR}/Xresources.X11 ${CONFIG_DIR}/C/Xresources.d
-       ${INSTALL_SCRIPT} ${FILESDIR}/Xsession.X11 ${CONFIG_DIR}
-       ${INSTALL_DATA_DIR} ${PREFIX}/appconfig/icons/C
-       ${INSTALL_DATA} ${FILESDIR}/X11.?m ${PREFIX}/appconfig/icons/C
+       ${INSTALL_DATA} ${FILESDIR}/Xresources.X11 ${DESTDIR}${CONFIG_DIR}/C/Xresources.d
+       ${INSTALL_SCRIPT} ${FILESDIR}/Xsession.X11 ${DESTDIR}${CONFIG_DIR}
+       ${INSTALL_DATA} ${FILESDIR}/X11.?m ${DESTDIR}${PREFIX}/appconfig/icons/C
 
 .include "../../mk/bsd.pkg.mk"
diff -r 4fed52731a79 -r e5a6d66e6a12 x11/dxpc/Makefile
--- a/x11/dxpc/Makefile Tue Jul 07 18:25:25 2009 +0000
+++ b/x11/dxpc/Makefile Tue Jul 07 18:25:56 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/09/20 08:04:17 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/07 18:30:27 joerg Exp $
 
 DISTNAME=      dxpc-3.8.2
 PKGREVISION=   1
@@ -9,13 +9,13 @@
 HOMEPAGE=      http://www.vigor.nu/dxpc/
 COMMENT=       Differential X Protocol Compressor
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 
-.include "../../mk/bsd.prefs.mk"
-
-post-install:
-       strip ${PREFIX}/bin/dxpc
+INSTALL_MAKE_FLAGS+=   bindir=${DESTDIR}${PREFIX}/bin \
+                       man1dir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
diff -r 4fed52731a79 -r e5a6d66e6a12 x11/fbdesk/Makefile
--- a/x11/fbdesk/Makefile       Tue Jul 07 18:25:25 2009 +0000
+++ b/x11/fbdesk/Makefile       Tue Jul 07 18:25:56 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2008/05/10 16:19:16 obache Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/07 18:29:04 joerg Exp $
 #
 
 DISTNAME=      fbdesk-1.4.1
@@ -9,14 +9,17 @@
 HOMEPAGE=      http://fluxbox.sourceforge.net/fbdesk/
 COMMENT=       Application that creates and manage icons on your desktop
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
+INSTALLATION_DIRS=     share/doc/fbdesk
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fbdesk
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/fbdesk/
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fbdesk/
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r 4fed52731a79 -r e5a6d66e6a12 x11/filerunner/Makefile
--- a/x11/filerunner/Makefile   Tue Jul 07 18:25:25 2009 +0000
+++ b/x11/filerunner/Makefile   Tue Jul 07 18:25:56 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:31:08 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/07 18:25:56 joerg Exp $
 
 DISTNAME=      FileRunner-2.5.1
 PKGNAME=       ${DISTNAME:S/FileRunner/filerunner/}
@@ -10,26 +10,27 @@
 HOMEPAGE=      http://www.cd.chalmers.se/~hch/filerunner.html
 COMMENT=       Filemanager with FTP capabilities. Uses Tcl/Tk
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_X11BASE=   yes
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin lib/FileRunner/bitmaps
 
 post-extract:
        ${RM} ${WRKSRC}/ext.so
        ${CP} ${WRKSRC}/Makefiles/Makefile.netbsd_gcc ${WRKSRC}/Makefile
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/FileRunner/bitmaps
-       ${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
-       ${LN} -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/fr ${DESTDIR}${PREFIX}/lib/FileRunner
+       ${LN} -sf ${PREFIX}/lib/FileRunner/fr ${DESTDIR}${PREFIX}/bin
 .for FILE in FAQ HISTORY QuickStart.txt Tips.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
-               ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/lib/FileRunner
+               ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DESTDIR}${PREFIX}/lib/FileRunner
 .endfor
 .for FILE in frcolor frftp
-               ${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${PREFIX}/lib/FileRunner
+               ${INSTALL_SCRIPT} ${WRKSRC}/${FILE} ${DESTDIR}${PREFIX}/lib/FileRunner
 .endfor
 .for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit tree.bit up.bit update.bit xterm.bit
-               ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
+               ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps
 .endfor
 
 .include "../../x11/tk/buildlink3.mk"