summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam>2005-05-15 22:02:26 +0000
committerjlam <jlam>2005-05-15 22:02:26 +0000
commitd30eb875816456abc7e5be617dcc8b35e38dea4e (patch)
tree1aa735e6251ac272d7198f63944989a6aed07e6c /www
parentd703b691caa570ce0f4bb08be4e084d9bd4c6d99 (diff)
downloadpkgsrc-d30eb875816456abc7e5be617dcc8b35e38dea4e.tar.gz
Note where gzip or gunzip is required by the package since it isn't
required by default any longer in bsd.pkg.mk under the new tools framework.
Diffstat (limited to 'www')
-rw-r--r--www/jakarta-tomcat5/Makefile6
-rw-r--r--www/jakarta-tomcat55/Makefile6
2 files changed, 8 insertions, 4 deletions
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index f9a1d883ea1..7290529fdc3 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/15 22:02:28 jlam Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@@ -23,9 +23,11 @@ CATALINA_DIR= Catalina/localhost
EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat
EGDIR2= ${EGDIR}/${CATALINA_DIR}
+PKGSRC_USE_TOOLS+= gunzip
+
# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GZIP_CMD} -d ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR}
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 87dea54ffaa..baf1b762147 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/15 22:02:28 jlam Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
@@ -21,9 +21,11 @@ CATALINA_DIR= Catalina/localhost
EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat
EGDIR2= ${EGDIR}/${CATALINA_DIR}
+PKGSRC_USE_TOOLS+= gunzip
+
# Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
# If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GZIP_CMD} -d ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
+EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}/tar.gz && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar
PKG_SYSCONFDIR.jakarta-tomcat55= ${TOMCAT_LIB}/conf
MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat55}/${CATALINA_DIR}