pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f24780a5a7a9
branches:  trunk
changeset: 561241:f24780a5a7a9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 22:08:13 2009 +0000

description:
user-destdir support

diffstat:

 textproc/dtdparse/Makefile |  23 +++++++++++------------
 textproc/fop/Makefile      |  10 ++++++----
 textproc/helpdeco/Makefile |   6 ++++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diffs (112 lines):

diff -r b6f00e29670e -r f24780a5a7a9 textproc/dtdparse/Makefile
--- a/textproc/dtdparse/Makefile        Tue Jul 07 22:07:23 2009 +0000
+++ b/textproc/dtdparse/Makefile        Tue Jul 07 22:08:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/19 19:18:47 he Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 22:10:29 joerg Exp $
 #
 
 DISTNAME=      dtdparse-2.0beta6
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://dtdparse.sourceforge.net/
 COMMENT=       Reads an SGML or XML DTD and constructs an XML database
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 DEPENDS+=      p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
 DEPENDS+=      p5-Text-DelimMatch-[0-9]*:../../textproc/p5-Text-DelimMatch
@@ -21,7 +23,8 @@
 SCRIPTS=       dtdflatten dtdformat dtdparse \
                tools/contentmodel tools/dtdstats tools/elements
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin ${PERL5_INSTALLVENDORLIB}/XML/DTDParse \
+                       ${DOCDIR} ${EGDIR} ${XMLDIR}
 
 do-build:
        cd ${WRKSRC}; \
@@ -29,20 +32,16 @@
        ${PERL5} -pi -e 's,modules/,XML/DTDParse/,' ${WRKSRC}/dtdformat
 
 do-install:
-       cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-       ${MKDIR} ${PERL5_INSTALLVENDORLIB}/XML/DTDParse
+       cd ${WRKSRC}; ${INSTALL_SCRIPT} ${SCRIPTS} ${{DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/XML/DTDParse/*.pm ${WRKSRC}/modules/*.pl \
-               ${PERL5_INSTALLVENDORLIB}/XML/DTDParse
-       ${MKDIR} ${XMLDIR}
-       ${INSTALL_DATA} ${WRKSRC}/dtd.dtd ${XMLDIR}
-       ${INSTALL_DATA} ${FILESDIR}/catalog ${XMLDIR}/catalog
+               ${DESTDIR}${PERL5_INSTALLVENDORLIB}/XML/DTDParse
+       ${INSTALL_DATA} ${WRKSRC}/dtd.dtd ${DESTDIR}${XMLDIR}
+       ${INSTALL_DATA} ${FILESDIR}/catalog ${DESTDIR}${XMLDIR}/catalog
 
 post-install:
-       ${MKDIR} ${EGDIR}
        cd ${WRKSRC}/sample; \
-               ${INSTALL_DATA} sample* simple* ${EGDIR}
-       ${MKDIR} ${DOCDIR}
-       cd ${WRKSRC}; ${INSTALL_DATA} README WhatsNew ${DOCDIR}
+               ${INSTALL_DATA} sample* simple* ${DESTDIR}${EGDIR}
+       cd ${WRKSRC}; ${INSTALL_DATA} README WhatsNew ${DESTDIR}${DOCDIR}
 
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
diff -r b6f00e29670e -r f24780a5a7a9 textproc/fop/Makefile
--- a/textproc/fop/Makefile     Tue Jul 07 22:07:23 2009 +0000
+++ b/textproc/fop/Makefile     Tue Jul 07 22:08:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/05/25 21:42:22 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/07/07 22:08:46 joerg Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -21,6 +21,8 @@
 HOMEPAGE=      http://xmlgraphics.apache.org/fop/
 COMMENT=       The Apache Project's XSL Formatting Objects implementation
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}
 USE_JAVA=      run
 USE_TOOLS+=    pax
@@ -39,9 +41,9 @@
        cd ${WRKSRC} && chmod -R go-w .
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/build/fop.jar ${PREFIX}/lib/java/fop.jar
-       ${INSTALL_DATA} ${WRKSRC}/lib/w3c.jar ${PREFIX}/lib/java/fop-w3c.jar
-       cd ${WRKSRC}/docs && pax -rw . ${PREFIX}/share/doc/java/fop
+       ${INSTALL_DATA} ${WRKSRC}/build/fop.jar ${DESTDIR}${PREFIX}/lib/java/fop.jar
+       ${INSTALL_DATA} ${WRKSRC}/lib/w3c.jar ${DESTDIR}${PREFIX}/lib/java/fop-w3c.jar
+       cd ${WRKSRC}/docs && pax -rw . ${DESTDIR}${PREFIX}/share/doc/java/fop
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b6f00e29670e -r f24780a5a7a9 textproc/helpdeco/Makefile
--- a/textproc/helpdeco/Makefile        Tue Jul 07 22:07:23 2009 +0000
+++ b/textproc/helpdeco/Makefile        Tue Jul 07 22:08:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/15 14:34:21 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 22:08:13 joerg Exp $
 #
 
 DISTNAME=              helpdeco-2.1.3
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://sourceforge.net/projects/helpdeco/
 COMMENT=               Windows .hlp to .rtf converter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
@@ -24,6 +26,6 @@
 SUBST_MESSAGE.prefix=  Configuring to use PREFIX.
 SUBST_STAGE.prefix=    post-patch
 SUBST_FILES.prefix=    Makefile
-SUBST_SED.prefix=      -e "s,/usr/local,${PREFIX},g"
+SUBST_SED.prefix=      -e "s,/usr/local,${DESTDIR}${PREFIX},g"
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index