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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba8e90053272
branches:  trunk
changeset: 561173:ba8e90053272
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 20:47:53 2009 +0000

description:
user-destdir support

diffstat:

 textproc/rtf-tools/Makefile |  35 ++++++++++++++++++-----------------
 textproc/saxon/Makefile     |  15 ++++++++-------
 2 files changed, 26 insertions(+), 24 deletions(-)

diffs (101 lines):

diff -r 13015f584f59 -r ba8e90053272 textproc/rtf-tools/Makefile
--- a/textproc/rtf-tools/Makefile       Tue Jul 07 20:47:34 2009 +0000
+++ b/textproc/rtf-tools/Makefile       Tue Jul 07 20:47:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/07 20:49:20 joerg Exp $
 #
 
 DISTNAME=              RTF-1.10
@@ -12,9 +12,11 @@
 HOMEPAGE=              ${MASTER_SITES}
 COMMENT=               RTF to troff/groff/text converter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/rtf
 INSTALL_TARGET=                install install.man
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/manl
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/manl lib/rtf-tools
 
 SUBST_CLASSES+=                rtf
 SUBST_STAGE.rtf=       pre-configure
@@ -26,27 +28,26 @@
 SUBST_SED.rtf+=                -e 's|\(LOCALBINDIR =.*\)|\1/bin|'
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/rtf-tools
-       ${INSTALL_DATA} ${WRKSRC}/h/standard-names ${PREFIX}/lib/rtf-tools
+       ${INSTALL_DATA} ${WRKSRC}/h/standard-names ${DESTDIR}${PREFIX}/lib/rtf-tools
        cd ${WRKSRC}/lib && ${INSTALL_DATA} ansi-gen ansi-sym \
                ansicpg1252-gen ansicpg1252-sym \
                mac-gen mac-sym pc-gen pc-sym pca-gen pca-sym \
-               ${PREFIX}/lib/rtf-tools
-       ${INSTALL_DATA} ${WRKSRC}/rtf2text/text-map ${PREFIX}/lib/rtf-tools
+               ${DESTDIR}${PREFIX}/lib/rtf-tools
+       ${INSTALL_DATA} ${WRKSRC}/rtf2text/text-map ${DESTDIR}${PREFIX}/lib/rtf-tools
        cd ${WRKSRC}/rtf2troff && ${INSTALL_DATA} troff-map groff-map \
                xroff-map dwbtroff-map troff-man-map troff-me-map \
-               troff-mm-map troff-ms-map ${PREFIX}/lib/rtf-tools
-       ${INSTALL_SCRIPT} ${WRKSRC}/util/rtfchkmap ${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/util/rtfmaptortf ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2null/rtf2null ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2text/rtf2text ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2troff/rtf2troff ${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/rtf2troff/rtf2groff ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtfdiag/rtfdiag ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtfindent/rtfindent ${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtfwc/rtfwc ${PREFIX}/bin
+               troff-mm-map troff-ms-map ${DESTDIR}${PREFIX}/lib/rtf-tools
+       ${INSTALL_SCRIPT} ${WRKSRC}/util/rtfchkmap ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/util/rtfmaptortf ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2null/rtf2null ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2text/rtf2text ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtf2troff/rtf2troff ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/rtf2troff/rtf2groff ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtfdiag/rtfdiag ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtfindent/rtfindent ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtfwc/rtfwc ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/man/rtf2troff.man \
-               ${PREFIX}/${PKGMANDIR}/manl/rtf2troff.l
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/manl/rtf2troff.l
 
 .include "../../devel/libts/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 13015f584f59 -r ba8e90053272 textproc/saxon/Makefile
--- a/textproc/saxon/Makefile   Tue Jul 07 20:47:34 2009 +0000
+++ b/textproc/saxon/Makefile   Tue Jul 07 20:47:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/07 20:47:53 joerg Exp $
 #
 
 DISTNAME=      saxon
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://users.breathe.com/mhkay/saxon/
 COMMENT=       Michael H. Kay's Java XSLT processor
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 USE_JAVA=      run
@@ -23,13 +25,12 @@
 post-extract:
        chmod -R u+w,go-w ${WRKSRC}
 
+INSTALLATION_DIRS= lib/java share/doc/java share/examples/java/saxon
+
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-       ${INSTALL_DATA} ${WRKSRC}/saxon.jar ${PREFIX}/lib/java
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java
-       cd ${WRKSRC} && pax -rw -s '/^doc/saxon/' doc ${PREFIX}/share/doc/java
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/saxon
-       cd ${WRKSRC} && pax -rw -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java
+       ${INSTALL_DATA} ${WRKSRC}/saxon.jar ${DESTDIR}${PREFIX}/lib/java
+       cd ${WRKSRC} && pax -rw -s '/^doc/saxon/' doc ${DESTDIR}${PREFIX}/share/doc/java
+       cd ${WRKSRC} && pax -rw -s '/^samples/saxon/' samples ${DESTDIR}${PREFIX}/share/examples/java
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"