diff options
| author | joerg <joerg@pkgsrc.org> | 2008-05-26 02:13:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-05-26 02:13:14 +0000 |
| commit | 3d8ef5a52d6570c7a88c64337bb6c476b78c810c (patch) | |
| tree | b711f279533efa082bd9211a7161438542a8810d /www | |
| parent | 7f7f5ce9170554e6c0c04606c5c2c0548ffab031 (diff) | |
| download | pkgsrc-3d8ef5a52d6570c7a88c64337bb6c476b78c810c.tar.gz | |
Second round of explicit pax dependencies. As reminded by tnn@,
many packages used to use ${PAX}. Use the common way of directly calling
pax, it is created as tool after all.
Diffstat (limited to 'www')
32 files changed, 125 insertions, 83 deletions
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile index 0685ef781da..b025c13281f 100644 --- a/www/ap-layout/Makefile +++ b/www/ap-layout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/10/04 22:04:09 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= mod_layout-3.2 @@ -11,6 +11,8 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://tangent.org/ COMMENT= Apache module to wrap static or dynamic content +USE_TOOLS+= pax + CONFLICTS= ap-layout-[0-9]* APACHE_MODULE_NAME= mod_layout.so @@ -21,7 +23,7 @@ post-install: ${INSTALL_DATA_DIR} ${LAYOUT_DIR} ${INSTALL_DATA} ${WRKSRC}/faq.html ${LAYOUT_DIR} ${INSTALL_DATA_DIR} ${LAYOUT_DIR}/directives - cd ${WRKSRC}/directives && ${PAX} -rw . ${LAYOUT_DIR}/directives + cd ${WRKSRC}/directives && pax -rw . ${LAYOUT_DIR}/directives .include "../../www/apache/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 51d34deb36d..388cfec2123 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2008/04/25 20:39:13 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= mod_python-2.7.10 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.modpython.org/ COMMENT= Python interpreter embedded into Apache +USE_TOOLS+= pax + CONFLICTS= ap-python-[0-9]* PLIST_SRC= ${WRKDIR}/.PLIST_SRC @@ -22,7 +24,7 @@ PYTHON_VERSIONS_ACCEPTED= 23 21 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python - cd ${WRKSRC} && ${PAX} -rw -s /doc-html/ap-mod_python/ \ + cd ${WRKSRC} && pax -rw -s /doc-html/ap-mod_python/ \ -pe doc-html ${PREFIX}/share/doc/html ${ECHO} lib/httpd/mod_python.so >${PLIST_SRC} cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \ diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile index 7844d91a56c..cb74ffb4884 100644 --- a/www/apache-tomcat55/Makefile +++ b/www/apache-tomcat55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/05/25 21:42:22 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2008/05/26 02:13:25 joerg Exp $ DISTNAME= apache-tomcat-${TOMCAT_VERSION} CATEGORIES= www java @@ -15,6 +15,8 @@ USE_JAVA= run # This needs java 1.5 or higher. USE_JAVA2= 1.5 +USE_TOOLS+= pax + TOMCAT_LIB= ${PREFIX}/tomcat CATALINA_DIR= Catalina/localhost @@ -68,7 +70,7 @@ do-install: .endfor ${INSTALL_DATA_DIR} ${TOMCAT_LIB} ${RM} -rf ${WRKSRC}/temp/* - @cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB} + @cd ${WRKSRC} && pax -rw -pm . ${TOMCAT_LIB} ${FIND} ${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f ${FIND} ${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} diff --git a/www/apache2/Makefile b/www/apache2/Makefile index ae477a0a82b..62419f8cb8b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.122 2008/04/12 22:43:13 jlam Exp $ +# $NetBSD: Makefile,v 1.123 2008/05/26 02:13:25 joerg Exp $ .include "Makefile.common" @@ -13,7 +13,7 @@ CONFLICTS= apache-*ssl-[0-9]* apache6-[0-9]* BUILD_DEFS+= IPV6_READY BUILD_DEFS+= VARBASE -USE_TOOLS+= perl perl:run pkg-config +USE_TOOLS+= pax perl perl:run pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD @@ -216,7 +216,7 @@ post-install: done ${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/manual - cd ${WRKSRC}/docs/manual && ${PAX} -rw . ${PREFIX}/share/httpd/manual + cd ${WRKSRC}/docs/manual && pax -rw . ${PREFIX}/share/httpd/manual ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${PREFIX}/sbin diff --git a/www/apache22/Makefile b/www/apache22/Makefile index f19786581cc..015dca44aeb 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/01/21 15:07:10 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:25 joerg Exp $ .include "Makefile.common" @@ -14,7 +14,7 @@ CONFLICTS= apache-{,*ssl}-[0-9]* apache6-[0-9]* BUILD_DEFS+= IPV6_READY BUILD_DEFS+= VARBASE -USE_TOOLS+= perl perl:run pkg-config +USE_TOOLS+= pax perl perl:run pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile index d079479b6cf..3222eeb2154 100644 --- a/www/blur6ex/Makefile +++ b/www/blur6ex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= blur6ex-0.1.198 @@ -14,6 +14,8 @@ DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.0:../../www/ap-php DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql DEPENDS+= mysql-server>=4.1:../../databases/mysql5-server +USE_TOOLS+= pax + NO_CONFIGURE= yes NO_BUILD= yes @@ -46,7 +48,7 @@ do-install: ${WRKSRC}/install/INSTALL.txt \ ${WRKSRC}/install/blur6ex_tables.sql \ ${PREFIX}/share/doc/${PKGBASE} - cd ${WRKSRC} && ${PAX} -rwppm '-s|.*/install.*$$||' \ + cd ${WRKSRC} && pax -rwppm '-s|.*/install.*$$||' \ '-s|./index.php$$||' \ '-s|./engine/core/db.php$$||' . \ ${PREFIX}/${HTTPD_ROOT}/blog diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 12a2aca54bd..e74bf8cbd97 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2007/01/31 00:04:12 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2008/05/26 02:13:25 joerg Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 @@ -36,6 +36,8 @@ NO_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +USE_TOOLS+= pax + post-extract: ${RM} ${WRKSRC}/lib/fop_0_15_0.jar ${WRKSRC}/lib/servlet_2_2.jar \ ${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \ @@ -57,11 +59,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/turbine-pool.jar ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/sax-bugfix.jar ${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/cocoon - cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/cocoon + cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/cocoon ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${FILESDIR}/web.xml ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${WRKSRC}/conf/cocoon.properties ${PREFIX}/share/examples/java/cocoon/WEB-INF - cd ${WRKSRC}/samples && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/cocoon + cd ${WRKSRC}/samples && pax -rw -pp . ${PREFIX}/share/examples/java/cocoon .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/drupal/Makefile b/www/drupal/Makefile index e8d294877ec..b3117c178c8 100644 --- a/www/drupal/Makefile +++ b/www/drupal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/04/06 10:12:35 adrianp Exp $ +# $NetBSD: Makefile,v 1.29 2008/05/26 02:13:25 joerg Exp $ DISTNAME= drupal-5.7 CATEGORIES= www @@ -21,7 +21,7 @@ PKG_GROUPS_VARS+= APACHE_GROUP PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= APACHE_USER APACHE_GROUP -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run pax REPLACE_PERL= scripts/code-style.pl OWN_DIRS+= ${DRUPAL}/sites/default @@ -81,7 +81,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL} . for i in ${PAX_DIRS} - cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i} + cd ${WRKSRC}/${i} && pax -rw . ${DRUPAL}/${i} . endfor ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${DRUPAL}/files diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile index f7cae38d3e6..4d772a9fb75 100644 --- a/www/drupal6/Makefile +++ b/www/drupal6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/04/09 22:02:11 adrianp Exp $ +# $NetBSD: Makefile,v 1.4 2008/05/26 02:13:25 joerg Exp $ DISTNAME= drupal-6.2 CATEGORIES= www @@ -24,7 +24,7 @@ PKG_GROUPS_VARS+= APACHE_GROUP PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= APACHE_USER APACHE_GROUP -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run pax REPLACE_PERL= scripts/code-style.pl OWN_DIRS_PERMS+= ${DRUPAL}/sites/default \ @@ -87,7 +87,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.php ${DRUPAL} . for i in ${PAX_DIRS} - cd ${WRKSRC}/${i} && ${PAX} -rw . ${DRUPAL}/${i} + cd ${WRKSRC}/${i} && pax -rw . ${DRUPAL}/${i} . endfor . for i in ${DOCS} diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile index ec6ff0bce67..b5c91abd9aa 100644 --- a/www/ganglia-webfrontend/Makefile +++ b/www/ganglia-webfrontend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/06/02 18:28:00 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= ganglia-3.0.1 @@ -15,6 +15,8 @@ COMMENT= PHP based frontend for the Ganglia Cluster Monitor DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.1:../../www/ap-php DEPENDS+= ganglia-monitor-core>=3.0.1:../../parallel/ganglia-monitor-core +USE_TOOLS+= pax + NO_BUILD= YES WRKSRC= ${WRKDIR}/${DISTNAME}/web/ @@ -29,7 +31,7 @@ do-configure: do-install: ${INSTALL_DATA_DIR} ${DOCROOT} - cd ${WRKSRC} && ${PAX} -rw . ${DOCROOT}/ + cd ${WRKSRC} && pax -rw . ${DOCROOT}/ .include "../../mk/apachever.mk" .include "../../lang/php/phpversion.mk" diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index c924cbec821..6d4af3734fa 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:24 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= hiawatha @@ -21,6 +21,7 @@ NO_BUILD= yes WRKSRC= ${WRKDIR} USE_JAVA= run +USE_TOOLS+= pax DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -46,7 +47,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/simple.cfg ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/SeeAlso/pault_com.cfg ${EGDIR} ${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${EGDIR} - cd ${WRKSRC} && ${PAX} -s '/^WEBROOT/pault.com/' -rw WEBROOT ${EGDIR} + cd ${WRKSRC} && pax -s '/^WEBROOT/pault.com/' -rw WEBROOT ${EGDIR} ${INSTALL_DATA_DIR} ${EGDIR}/WEBROOT ${INSTALL_DATA} ${FILESDIR}/index.xml ${EGDIR}/WEBROOT ${INSTALL_DATA} ${FILESDIR}/index.xsl ${EGDIR}/WEBROOT diff --git a/www/horde/Makefile b/www/horde/Makefile index baf98ed5af8..44a18a86d2d 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/03/08 17:36:53 adrianp Exp $ +# $NetBSD: Makefile,v 1.54 2008/05/26 02:13:25 joerg Exp $ DISTNAME= horde-3.1.7 CATEGORIES= www @@ -28,6 +28,8 @@ DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom .endif DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib +USE_TOOLS+= pax + .include "../../mk/bsd.prefs.mk" DOCDIR= ${PREFIX}/share/doc/horde @@ -127,7 +129,7 @@ do-install: . endfor . for d in ${PAXDIRS} - cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${HORDEDIR}/${d} + cd ${WRKSRC}/${d} && pax -rwpam . ${HORDEDIR}/${d} . endfor ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${HORDEDIR}/config diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile index e102b8c6575..061bc7d2712 100644 --- a/www/jakarta-servletapi/Makefile +++ b/www/jakarta-servletapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/09/09 02:46:09 obache Exp $ +# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:25 joerg Exp $ DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src PKGNAME= ${DISTNAME:S/-src$//} @@ -15,6 +15,7 @@ BUILD_DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant WRKSRC= ${WRKDIR}/${DISTNAME} USE_JAVA2= yes +USE_TOOLS+= pax MAKE_FILE= build.xml PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.javadoc @@ -38,7 +39,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/${DOCDIR} - cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rw -pp . ${PREFIX}/${DOCDIR} + cd ${WRKDIR}/dist/servletapi/docs && pax -rw -pp . ${PREFIX}/${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/java-env.mk" diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile index 68738fd5234..11fe72e2794 100644 --- a/www/jakarta-tomcat4/Makefile +++ b/www/jakarta-tomcat4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:20 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2008/05/26 02:13:25 joerg Exp $ PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -18,6 +18,8 @@ TOMCAT_VERSION= 4.1.30 USE_JAVA=run USE_JAVA2=yes +USE_TOOLS+= pax + TOMCAT_LIB= ${PREFIX}/tomcat4 SAMPLECONFDIR= ${TOMCAT_LIB}/conf @@ -43,7 +45,7 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${TOMCAT_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${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 \ diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index 3af12e97123..1e0a1e801f3 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/05/25 21:42:22 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:25 joerg Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -17,6 +17,8 @@ USE_JAVA= run # This needs java 1.4 or higher. USE_JAVA2= yes +USE_TOOLS+= pax + TOMCAT_LIB= ${PREFIX}/tomcat5 CATALINA_DIR= Catalina/localhost @@ -59,7 +61,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2} .endfor ${INSTALL_DATA_DIR} ${TOMCAT_LIB} - @(cd ${WRKSRC} && ${PAX} -rw -pm . ${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 \ | ${XARGS} ${CHMOD} a+rx; \ diff --git a/www/jssi/Makefile b/www/jssi/Makefile index 0d53667b72b..9db186a506a 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/03/21 19:24:11 jwise Exp $ +# $NetBSD: Makefile,v 1.33 2008/05/26 02:13:25 joerg Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -20,7 +20,7 @@ BUILD_DIRS= src/java .include "../../mk/bsd.prefs.mk" -USE_TOOLS+= gmake +USE_TOOLS+= gmake pax NO_CONFIGURE= yes MAKE_ENV+= CLASSPATH=${CLASSPATH:Q} @@ -32,7 +32,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/java/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi ${RM} -f ${WRKSRC}/docs/*.orig - cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi + cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/jssi .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index d892742ade2..9628dc3e52f 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.89 2007/10/31 21:44:19 gdt Exp $ +# $NetBSD: Makefile.common,v 1.90 2008/05/26 02:13:25 joerg Exp $ # # Common include file for communicator and navigator packages @@ -132,6 +132,8 @@ RPM2PKG_PREFIX= ${PREFIX} RPM2PKG_SUBPREFIX= ${EMULSUBDIR} RPM2PKG_STAGE= do-install +USE_TOOLS+= pax + do-install: ${CP} ${PKGDIR}/DESCR.linux-powerpc ${WRKDIR} ${SED} -e 's#@BINNAME@#${BINNAME}#g' \ @@ -176,9 +178,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes . endfor cd ${MOZILLA_HOME} && ${GZCAT} \ - ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif | ${PAX} -r + ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif | pax -r cd ${MOZILLA_HOME} && ${GZCAT} \ - ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif | ${PAX} -cr \ + ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif | pax -cr \ '*libflashplayer.so' '*ShockwaveFlash.class' '*dynMotif*' \ || ${TRUE} . if ${BINNAME} == "communicator" diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index dd9ef0093fa..55a28f39932 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/02/15 14:07:44 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= Apache-Gallery-0.9.1 @@ -57,6 +57,8 @@ SUBST_SED.paths+= -e 's,@AG@,${AG},g' SUBST_SED.paths+= -e 's,@AG_SHAREDIR@,${AG_SHAREDIR},g' SUBST_STAGE.paths= post-patch +USE_TOOLS+= pax + post-extract: ${CP} ${FILESDIR}/ag.conf ${WRKSRC} @@ -89,7 +91,7 @@ post-install: for i in htdocs templates; \ do \ ${INSTALL_DATA_DIR} ${AG_SHAREDIR}/$$i; \ - cd ${WRKSRC}/$$i && ${PAX} -rw . ${AG_SHAREDIR}/$$i; \ + cd ${WRKSRC}/$$i && pax -rw . ${AG_SHAREDIR}/$$i; \ done; \ ${INSTALL_DATA_DIR} ${AG_DOCDIR}; \ for i in Changes INSTALL LICENSE README UPGRADE; \ diff --git a/www/paros/Makefile b/www/paros/Makefile index 63237a323a7..d220e184131 100644 --- a/www/paros/Makefile +++ b/www/paros/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/02/28 13:08:08 salo Exp $ +# $NetBSD: Makefile,v 1.10 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= paros-3.2.13-unix @@ -14,6 +14,7 @@ COMMENT= HTTP/HTTPS proxy for assessing web application vulnerabilities NO_BUILD= yes USE_JAVA2= yes USE_JAVA= run +USE_TOOLS+= pax WRKSRC= ${WRKDIR}/${PKGBASE} @@ -32,7 +33,7 @@ do-configure: ${WRKSRC}/license/TheClarifiedArtisticLicense.htm do-install: - @cd ${WRKDIR} && ${PAX} -rw -pm ${PKGBASE} ${PREFIX}/lib/ + @cd ${WRKDIR} && pax -rw -pm ${PKGBASE} ${PREFIX}/lib/ ${INSTALL_SCRIPT} ${WRKDIR}/paros.sh ${PREFIX}/bin/paros .include "../../mk/java-vm.mk" diff --git a/www/plone3/Makefile b/www/plone3/Makefile index c645c111e44..f454eb5dfda 100644 --- a/www/plone3/Makefile +++ b/www/plone3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/05/10 09:06:00 taca Exp $ +# $NetBSD: Makefile,v 1.5 2008/05/26 02:13:25 joerg Exp $ # FreeBSD: ports/www/plone/Makefile,v 1.25 2007/02/17 08:32:54 rafan Exp # @@ -20,7 +20,7 @@ ZOPE_PRODUCT_VER= ${PLONE3_VERSION} ZOPE_BUILD_METHOD= zope-force-build ZOPE_PRODUCT_SRCDIR= ${WRKSRC}/Products -USE_TOOLS+= msgfmt +USE_TOOLS+= msgfmt pax PRIVILEGED_STAGES+= clean CONFLICTS= zope25-BTreeFolder2-[0-9]* zope25-CMF-[0-9]* \ zope25-CMFPlone-[0-9]* @@ -47,7 +47,7 @@ post-build: ${CAT} ${PKGDIR}/PLIST.common_end >> ${WRKDIR}/PLIST post-install: - cd ${WRKSRC}/lib; ${PAX} -rw . ${ZOPE_DIR}/lib + cd ${WRKSRC}/lib; pax -rw . ${ZOPE_DIR}/lib .include "../../www/plone/ploneversion.mk" .include "../../www/zope/replace.mk" diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common index fad941766ca..5024d7bbcfb 100644 --- a/www/seamonkey-bin/Makefile.common +++ b/www/seamonkey-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2008/03/07 05:06:16 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2008/05/26 02:13:25 joerg Exp $ DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} @@ -10,6 +10,7 @@ HOMEPAGE?= http://www.mozilla.org/ WRKSRC?= ${WRKDIR}/${MOZILLA} BUILD_DIRS?= # empty USE_LANGUAGES= # empty +USE_TOOLS+= pax FILESDIR= ${.CURDIR}/../../www/seamonkey-bin/files MOZILLA_SCRIPT?= ${FILESDIR}/mozilla.sh @@ -67,7 +68,7 @@ post-extract: do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${MOZILLA_LIB} - cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${MOZILLA_LIB} + cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${MOZILLA_LIB} ${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA}.sh \ ${DESTDIR}${PREFIX}/bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} @${FIND} ${DESTDIR}${MOZILLA_LIB} -type f -print \ diff --git a/www/spfc/Makefile b/www/spfc/Makefile index 83a3157643f..7e2307c39c6 100644 --- a/www/spfc/Makefile +++ b/www/spfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/03/21 19:24:11 jwise Exp $ +# $NetBSD: Makefile,v 1.24 2008/05/26 02:13:25 joerg Exp $ DISTNAME= spfc-0.2.0 PKGREVISION= 1 @@ -18,7 +18,7 @@ DEPENDS+= jsdk-2.0nb1:../../www/jsdk20 .include "../../mk/bsd.prefs.mk" WRKSRC= ${WRKDIR}/spfc-0.2.0/src/ -USE_TOOLS+= gmake +USE_TOOLS+= gmake pax NO_CONFIGURE= yes MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar @@ -26,7 +26,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc - cd ${WRKSRC}/../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/spfc + cd ${WRKSRC}/../docs && pax -rw -pp . ${PREFIX}/share/doc/java/spfc .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index 9ad9f0c7464..19f62833453 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.48 2008/03/05 18:01:50 jlam Exp $ +# $NetBSD: Makefile.common,v 1.49 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= yes W3M_VERS= 0.5.2 # For w3mman, xface2xpm, cgi scripts. -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run pax DOCDIR= share/doc/w3m @@ -63,10 +63,10 @@ post-patch: post-install: # Install help files. @cd ${WRKSRC}; ${MAKE_PROGRAM} install-helpfile - # Use ${PAX} to discard uid/gid. Exclude manuals (*.1). + # Use pax to discard uid/gid. Exclude manuals (*.1). ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} - @cd ${WRKSRC}; ${PAX} -w -s ',.*\.1$$,,' doc doc-jp | \ - ( cd ${PREFIX}/${DOCDIR}; ${PAX} -r ) + @cd ${WRKSRC}; pax -w -s ',.*\.1$$,,' doc doc-jp | \ + ( cd ${PREFIX}/${DOCDIR}; pax -r ) .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile index 597b2f9a311..8019cf55c75 100644 --- a/www/wdg-validate/Makefile +++ b/www/wdg-validate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/07/27 18:48:04 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:25 joerg Exp $ # DISTNAME= validate-1.2.2 @@ -20,7 +20,7 @@ DIST_SUBDIR= validate EXTRACT_ONLY= wdg-sgml-lib-1.1.4.tar.gz SITES.wdg-sgml-lib-1.1.4.tar.gz= http://www.htmlhelp.com/tools/validator/src/ -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run pax REPLACE_PERL= validate NO_BUILD= YES @@ -41,6 +41,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/wdg/sgml-lib ${INSTALL_SCRIPT} ${WRKSRC}/validate ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README - cd ${WRKSRC}/wdg/sgml-lib && ${PAX} -rw * ${PREFIX}/share/wdg/sgml-lib/ + cd ${WRKSRC}/wdg/sgml-lib && pax -rw * ${PREFIX}/share/wdg/sgml-lib/ .include "../../mk/bsd.pkg.mk" diff --git a/www/websvn/Makefile b/www/websvn/Makefile index 2dc639d51bc..798abb706fb 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/10/15 19:37:26 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2008/05/26 02:13:26 joerg Exp $ # DISTNAME= WebSVN_161 @@ -17,6 +17,8 @@ DEPENDS+= ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib WRKSRC= ${WRKDIR}/WebSVN NO_BUILD= yes +USE_TOOLS+= pax + PKG_SYSCONFDIR.websvn= ${PREFIX}/${HTTPD_ROOT}/websvn/include MESSAGE_SUBST+= PKGBASE=${PKGBASE} @@ -38,7 +40,7 @@ post-extract: do-install: ${INSTALL_DATA} ${WRKSRC}/include/distconfig.inc ${EGDIR} - cd ${WRKSRC} && ${PAX} -rwppm . ${PREFIX}/${HTTPD_ROOT}/websvn + cd ${WRKSRC} && pax -rwppm . ${PREFIX}/${HTTPD_ROOT}/websvn post-install: ${RM} ${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc diff --git a/www/zope/product.mk b/www/zope/product.mk index faf3db9f13b..9a623cda697 100644 --- a/www/zope/product.mk +++ b/www/zope/product.mk @@ -1,4 +1,4 @@ -# $NetBSD: product.mk,v 1.3 2008/01/16 14:54:41 taca Exp $ +# $NetBSD: product.mk,v 1.4 2008/05/26 02:13:26 joerg Exp $ # .if !defined(_ZOPE_PRODUCT_MK) @@ -20,6 +20,8 @@ _ZOPE_PRODUCT_MK= # defined .include "../../www/zope/zopeversion.mk" +USE_TOOLS+= pax + DEPENDS+= ${ZOPE_DEPENDENCY} ZOPE_PKG_PRODUCT?= ${ZOPE_PRODUCTS_BASE}/${ZOPE_PRODUCT_NAME} @@ -68,7 +70,7 @@ zope-force-build: .PHONY: zope-install-product zope-install-product: - cd ${ZOPE_PRODUCT_SRCDIR:Q} && ${PAX} -rw \ + cd ${ZOPE_PRODUCT_SRCDIR:Q} && pax -rw \ -s ',.*/CVS/.*,,' \ -s ',.*/CVS$$,,' \ -s ',.*/\.cvsignore$$,,' \ diff --git a/www/zope210/Makefile b/www/zope210/Makefile index 068282f59ca..87844557b7b 100644 --- a/www/zope210/Makefile +++ b/www/zope210/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/05/11 16:28:03 taca Exp $ +# $NetBSD: Makefile,v 1.6 2008/05/26 02:13:26 joerg Exp $ # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp DISTNAME= Zope-${ZOPE210_VERSION}-final @@ -41,6 +41,8 @@ REPLACE_PYTHON= test.py lib/python/Zope2/Startup/zopectl.py \ lib/python/zdaemon/zdctl.py lib/python/zdaemon/zdrun.py REPLACE_PYTHON_DIRS+= ${WRKSRC}/lib/python/ZEO/scripts ${WRKSRC}/utilities +USE_TOOLS+= pax + post-extract: cd ${WRKSRC}; ${FIND} doc lib skel/import -type f -print | \ ${XARGS} ${CHMOD} -x @@ -57,8 +59,8 @@ pre-install: -print0 | ${XARGS} -0 -- ${RM} post-install: - cd ${WRKSRC}/doc/ZEO; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zeo - cd ${WRKSRC}/doc; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zope + cd ${WRKSRC}/doc/ZEO; pax -rw *.txt ${ZOPE_DOC_DIR}/zeo + cd ${WRKSRC}/doc; pax -rw *.txt ${ZOPE_DOC_DIR}/zope ${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \ | ${XARGS} -0 -- ${CHMOD} a-w+r ${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \ diff --git a/www/zope25-zopebook/Makefile b/www/zope25-zopebook/Makefile index 5776dd37335..a57854051f8 100644 --- a/www/zope25-zopebook/Makefile +++ b/www/zope25-zopebook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:31:06 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:26 joerg Exp $ # DISTNAME= ZopeBook @@ -13,10 +13,12 @@ COMMENT= Documentation for Zope-2.5 NO_BUILD= yes +USE_TOOLS+= pax + ZBDIR= ${PREFIX}/share/doc/html/ZopeBook-2.5 do-install: ${INSTALL_DATA_DIR} ${ZBDIR} - cd ${WRKSRC} && ${PAX} -rw . ${ZBDIR} + cd ${WRKSRC} && pax -rw . ${ZBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/www/zope25/Makefile b/www/zope25/Makefile index b754deb53b2..31ab8ecd177 100644 --- a/www/zope25/Makefile +++ b/www/zope25/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:06 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2008/05/26 02:13:26 joerg Exp $ # DISTNAME= Zope-2.6.2-src @@ -13,6 +13,8 @@ COMMENT= Zope, the Z Object Publishing Environment DIST_SUBDIR= zope +USE_TOOLS+= pax + PYTHON_VERSIONS_ACCEPTED= 21 ZOPEDIR= ${PREFIX}/lib/zope @@ -44,9 +46,9 @@ do-install: cd ${WRKSRC} && ${FIND} ${ZOPEPY} -type f -a \! \( -name "*.[cho]" \ -o -name "sedscript" -o -name "Makefile*" \ -o -name "Setup*" -o -name ".cvsignore" \) \ - -print | ${PAX} -rw ${ZOPEDIR} + -print | pax -rw ${ZOPEDIR} cd ${ZOPEDIR} && ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py - cd ${WRKSRC} && ${PAX} -rw ${ZOPEDATA} ${ZOPEDIR} + cd ${WRKSRC} && pax -rw ${ZOPEDATA} ${ZOPEDIR} ${INSTALL_SCRIPT} ${WRKSRC}/zope25-create ${PREFIX}/bin .include "../../lang/python/application.mk" diff --git a/www/zope25/product.mk b/www/zope25/product.mk index 7d1dbff7610..38cb19a01bc 100644 --- a/www/zope25/product.mk +++ b/www/zope25/product.mk @@ -1,4 +1,4 @@ -# $NetBSD: product.mk,v 1.12 2007/11/22 10:04:31 rillig Exp $ +# $NetBSD: product.mk,v 1.13 2008/05/26 02:13:26 joerg Exp $ DIST_SUBDIR= zope BUILDLINK_API_DEPENDS.zope?= zope>=2.5<2.7:../../www/zope25 @@ -8,6 +8,8 @@ BUILDLINK_PREFIX.zope_DEFAULT= ${LOCALBASE} WRKSRC?= ${WRKDIR} NO_BUILD= yes +USE_TOOLS+= pax + PYTHON_VERSIONS_ACCEPTED= 21 ZOPEDIR= ${BUILDLINK_PREFIX.zope}/lib/zope @@ -18,7 +20,7 @@ PRODSUBDIR= lib/python/Products/${PRODNAME} .PHONY: zope-std-copyproduct-long-nogarbage zope-std-copyproduct-long-nogarbage: - cd ${WRKSRC:Q} && ${PAX} -rw \ + cd ${WRKSRC:Q} && pax -rw \ -s ',.*/CVS/.*,,' \ -s ',.*/CVS$$,,' \ -s ',.*/\.cvsignore$$,,' \ @@ -27,12 +29,12 @@ zope-std-copyproduct-long-nogarbage: .PHONY: zope-std-copyproduct-long zope-std-copyproduct-long: - (cd ${WRKSRC}; ${PAX} -r -w lib ${ZOPEDIR}) + (cd ${WRKSRC}; pax -r -w lib ${ZOPEDIR}) .PHONY: zope-std-copyproduct-short zope-std-copyproduct-short: .for i in ${PRODNAMES} - (cd ${WRKSRC}; ${PAX} -r -w ${i} ${ZOPEDIR}/lib/python/Products) + (cd ${WRKSRC}; pax -r -w ${i} ${ZOPEDIR}/lib/python/Products) .endfor do-install: ${ZOPE_COPYPRODUCT} diff --git a/www/zope29/Makefile b/www/zope29/Makefile index 03cb6489c6c..f9b2d5e6503 100644 --- a/www/zope29/Makefile +++ b/www/zope29/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2008/05/11 16:27:16 taca Exp $ +# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:26 joerg Exp $ # FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp DISTNAME= Zope-${ZOPE29_VERSION}-final @@ -13,6 +13,8 @@ COMMENT= Zope ${ZOPE29_VERSION}, the Z Object Publishing Environment DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat +USE_TOOLS+= pax + PYTHON_VERSIONS_ACCEPTED= 24 ZOPE_VERSION= 29 @@ -54,8 +56,8 @@ pre-install: ${FIND} ${WRKSRC} -name '*.orig' -print0 | ${XARGS} -0 -- ${RM} post-install: - cd ${WRKSRC}/doc/ZEO; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zeo - cd ${WRKSRC}/doc; ${PAX} -rw *.txt ${ZOPE_DOC_DIR}/zope + cd ${WRKSRC}/doc/ZEO; pax -rw *.txt ${ZOPE_DOC_DIR}/zeo + cd ${WRKSRC}/doc; pax -rw *.txt ${ZOPE_DOC_DIR}/zope ${FIND} ${ZOPE_DIR} ${ZOPE_DOC_DIR} -type f -print0 \ | ${XARGS} -0 -- ${CHMOD} a-w+r ${FIND} ${ZOPE_DIR} -type f -name '*.pyc' -print0 | \ diff --git a/www/zope3/Makefile b/www/zope3/Makefile index e9824260981..e964ea236bc 100644 --- a/www/zope3/Makefile +++ b/www/zope3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/12/21 16:18:35 taca Exp $ +# $NetBSD: Makefile,v 1.19 2008/05/26 02:13:26 joerg Exp $ # DISTNAME= Zope-3.3.1 @@ -45,9 +45,11 @@ MESSAGE_SUBST+= ZOPE3_USER=${ZOPE3_USER:Q} \ .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*) -EXTRACT_USING= gtar +EXTRACT_USING= bsdtar .endif +USE_TOOLS+= pax + pre-install: ${FIND} ${WRKSRC} -name "*.orig" -type f -print | ${XARGS} ${RM} -f @@ -56,9 +58,9 @@ post-install: ${LN} -s ${ZOPE3_DIR}/bin/mkzopeinstance ${PREFIX}/bin ${LN} -s ${ZOPE3_DIR}/bin/zopetest ${PREFIX}/bin ${INSTALL_DATA_DIR} ${ZOPE3_DOCDIR} - cd ${WRKSRC}/Zope && ${PAX} -r -w LICENSES.txt ZopePublicLicense.txt \ + cd ${WRKSRC}/Zope && pax -r -w LICENSES.txt ZopePublicLicense.txt \ ${ZOPE3_DOCDIR} - cd ${WRKSRC}/Zope/doc && ${PAX} -r -w *.txt ${ZOPE3_DOCDIR} + cd ${WRKSRC}/Zope/doc && pax -r -w *.txt ${ZOPE3_DOCDIR} .include "Makefile.common" .include "../../devel/zlib/buildlink3.mk" |