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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d6aa46cdc24
branches:  trunk
changeset: 561095:7d6aa46cdc24
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 19:07:35 2009 +0000

description:
user-destdir support

diffstat:

 www/jakarta-tomcat4/Makefile |  15 +++++++++------
 www/jakarta-tomcat5/Makefile |  23 +++++++++++++----------
 www/jalbum/Makefile          |   8 +++++---
 3 files changed, 27 insertions(+), 19 deletions(-)

diffs (118 lines):

diff -r 324dce959d75 -r 7d6aa46cdc24 www/jakarta-tomcat4/Makefile
--- a/www/jakarta-tomcat4/Makefile      Tue Jul 07 19:06:59 2009 +0000
+++ b/www/jakarta-tomcat4/Makefile      Tue Jul 07 19:07:35 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/07 19:09:45 joerg Exp $
 
 PKGNAME=       jakarta-tomcat4-${TOMCAT_VERSION}
 DISTNAME=      jakarta-tomcat-${TOMCAT_VERSION}
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://tomcat.apache.org/
 COMMENT=       The Apache Project's Java Servlet 2.3 and JSP 1.2 server
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 TOMCAT_VERSION=        4.1.30
 
 # This needs java 1.4 or higher.
@@ -43,14 +45,15 @@
        ${MV} -f ${WRKSRC}/conf/${FILE} ${WRKSRC}/conf/${FILE}.default
 .endfor
 
+INSTALLATION_DIRS=     ${TOMCAT_LIB}
+
 do-install:
-       ${INSTALL_DATA_DIR} ${TOMCAT_LIB}
-       cd ${WRKSRC} && pax -rw -pm . ${TOMCAT_LIB}
-       @${FIND} ${TOMCAT_LIB} -type f -print \
+       cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}
+       @${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print \
                | ${XARGS} ${CHMOD} a+r
-       @${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
+       @${FIND} ${DESTDIR}${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
                | ${XARGS} ${CHMOD} a+rx
-       @${FIND} ${TOMCAT_LIB} -type d -print \
+       @${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print \
                | ${XARGS} ${CHMOD} a+rx
 
 .include "../../mk/bsd.pkg.mk"
diff -r 324dce959d75 -r 7d6aa46cdc24 www/jakarta-tomcat5/Makefile
--- a/www/jakarta-tomcat5/Makefile      Tue Jul 07 19:06:59 2009 +0000
+++ b/www/jakarta-tomcat5/Makefile      Tue Jul 07 19:07:35 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:25 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 19:09:09 joerg Exp $
 
 PKGNAME=       jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=      jakarta-tomcat-${TOMCAT_VERSION}
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://tomcat.apache.org/
 COMMENT=       The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 TOMCAT_VERSION= 5.0.30
 
 USE_JAVA=      run
@@ -52,21 +54,22 @@
 
 do-build:
        @${MV} ${WRKSRC}/conf ${WRKDIR}
+
+INSTALLATION_DIRS=     ${EGDIR} ${EGDIR2} ${TOMCAT_LIB}
+
 do-install:
-       ${INSTALL_DATA_DIR} ${EGDIR2}
 .for f in ${CFILES}
-       ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
+       ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR}
 .endfor
 .for f in ${CF2FILES}
-       ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
+       ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2}
 .endfor
-       ${INSTALL_DATA_DIR} ${TOMCAT_LIB}
-       @(cd ${WRKSRC} && pax -rw -pm . ${TOMCAT_LIB};          \
-       ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r;   \
-       ${FIND} ${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print        \
+       @(cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB};                \
+       ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \
+       ${FIND} ${DESTDIR}${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print      \
                | ${XARGS} ${CHMOD} a+rx;                               \
-       ${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx;  \
-       ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print |             \
+       ${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx;        \
+       ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.bat -print |           \
                ${XARGS} ${RM} -f)
 
 .include "../../mk/java-vm.mk"
diff -r 324dce959d75 -r 7d6aa46cdc24 www/jalbum/Makefile
--- a/www/jalbum/Makefile       Tue Jul 07 19:06:59 2009 +0000
+++ b/www/jalbum/Makefile       Tue Jul 07 19:07:35 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/05/12 12:27:20 martti Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/07 19:07:35 joerg Exp $
 
 DISTNAME=              JAlbum${VERSION}
 PKGNAME=               jalbum-${VERSION}
@@ -13,6 +13,8 @@
 COMMENT=               Web photo album generator
 LICENSE=               gnu-lgpl-v2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 VERSION=               7.1
 
 USE_JAVA=              run
@@ -30,8 +32,8 @@
                < ${FILESDIR:Q}/jalbum > ${WRKDIR:Q}/jalbum
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jalbum ${PREFIX:Q}/bin
-       (cd ${WRKDIR:Q}/JAlbum && pax -rw * ${PREFIX:Q}/share/jalbum)
+       ${INSTALL_SCRIPT} ${WRKDIR:Q}/jalbum ${DESTDIR}${PREFIX}/bin
+       (cd ${WRKDIR:Q}/JAlbum && pax -rw * ${DESTDIR}${PREFIX}/share/jalbum)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"