diff options
48 files changed, 93 insertions, 146 deletions
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile index f94426c72a7..6583f20163f 100644 --- a/archivers/makeself/Makefile +++ b/archivers/makeself/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/03/24 21:12:50 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:40 jlam Exp $ DISTNAME= makeself-1.5.3 CATEGORIES= archivers @@ -11,7 +11,6 @@ COMMENT= Neat script to make self-extracting archives PKG_INSTALLATION_TYPES= overwrite pkgviews -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR} NO_BUILD= yes INSTALLATION_DIRS= bin diff --git a/audio/flac2mp3/Makefile b/audio/flac2mp3/Makefile index 6715c120e97..bf4b4a95e82 100644 --- a/audio/flac2mp3/Makefile +++ b/audio/flac2mp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/15 20:14:03 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/01/21 18:57:40 jlam Exp $ DISTNAME= flac2mp3 PKGNAME= flac2mp3-20041223 @@ -13,8 +13,6 @@ COMMENT= Script to convert flac to mp3 DEPENDS+= lame-[0-9]*:../../audio/lame DEPENDS+= p5-MP3-Info-[0-9]*:../../audio/p5-MP3-Info -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} - PKG_INSTALLATION_TYPES= overwrite pkgviews REPLACE_PERL= flac2mp3.pl diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile index bc9703aca0f..285e91761cd 100644 --- a/benchmarks/paranoia/Makefile +++ b/benchmarks/paranoia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/07/30 15:50:38 minskim Exp $ +# $NetBSD: Makefile,v 1.16 2006/01/21 18:57:40 jlam Exp $ DISTNAME= paranoia PKGNAME= paranoia-960101 @@ -9,8 +9,6 @@ EXTRACT_SUFX= .c MAINTAINER= root@garbled.net COMMENT= Highly paranoid test of IEEE 754 conformance -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} - PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile index 4ecde8903bd..a1c251cdcca 100644 --- a/benchmarks/whetstone/Makefile +++ b/benchmarks/whetstone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/07/30 15:50:38 minskim Exp $ +# $NetBSD: Makefile,v 1.15 2006/01/21 18:57:40 jlam Exp $ DISTNAME= whetstone PKGNAME= whetstone-1.2 @@ -11,7 +11,6 @@ COMMENT= Benchmark for processors that gives you a MIPS rating PKG_INSTALLATION_TYPES= overwrite pkgviews -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin diff --git a/converters/p5-chkjis/Makefile b/converters/p5-chkjis/Makefile index 4d75252d1f6..f7a43212f46 100644 --- a/converters/p5-chkjis/Makefile +++ b/converters/p5-chkjis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:55 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= chkjis @@ -14,8 +14,6 @@ COMMENT= Filter library substituting vendor's own characters WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} - VERSION= 0.18 DIST_SUBDIR= chkjis-${VERSION} WRKSRC= ${WRKDIR} diff --git a/converters/p5-jcode/Makefile b/converters/p5-jcode/Makefile index 3fe59f25184..31185a13077 100644 --- a/converters/p5-jcode/Makefile +++ b/converters/p5-jcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:18 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/21 18:57:40 jlam Exp $ DISTNAME= jcode.pl-2.13 PKGNAME= p5-jcode-2.13 @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR} NO_BUILD= yes NO_CONFIGURE= yes PERL5_CONFIGURE= NO -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . do-install: ${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB} diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile index 86e47576dd0..360cb2883e2 100644 --- a/converters/rpm2cpio/Makefile +++ b/converters/rpm2cpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/01/21 18:57:40 jlam Exp $ DISTNAME= rpm2cpio PKGNAME= rpm2cpio-1.1 @@ -17,8 +17,6 @@ DIST_SUBDIR= ${PKGNAME_NOREV} USE_TOOLS+= perl:run REPLACE_PERL= rpm2cpio -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . - INSTALLATION_DIRS= bin # There is nothing to build diff --git a/databases/gdbm_primitive/Makefile b/databases/gdbm_primitive/Makefile index 31e478517f5..89e01c8209d 100644 --- a/databases/gdbm_primitive/Makefile +++ b/databases/gdbm_primitive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= gdbm-prim-1.15 @@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://homepage.mac.com/leffert/FileSharing.html COMMENT= Shell primitives for working with GDBMs -EXTRACT_CMD= ${_DFLT_EXTRACT_CMD} +EXTRACT_OPTS= -f tar MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q} WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/devel/as31/Makefile b/devel/as31/Makefile index 595972f50eb..e667f72adce 100644 --- a/devel/as31/Makefile +++ b/devel/as31/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/01 04:16:58 tv Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $ DISTNAME= asm.8051 PKGNAME= as31-19900126 @@ -12,7 +12,7 @@ MAINTAINER= bjh21@NetBSD.org COMMENT= 8031/8051 assembler WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \ +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | \ ${SED} '1,/^.! \/bin\/sh/d' | ${SH} MAKEFILE= makefile BUILD_TARGET= as31 diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile index a892fc3eb94..38338a867c2 100644 --- a/devel/gobo-eiffel/Makefile +++ b/devel/gobo-eiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= gobo15 @@ -15,10 +15,9 @@ COMMENT= Portable Eiffel structure libraries and tools BUILD_DEPENDS+= smalleiffel-0.77:../../lang/smalleiffel -WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${LOCALBASE}/bin/unzip -uLa \ - ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +EXTRACT_OPTS_ZIP= -uLa +WRKSRC= ${WRKDIR} GOBO= ${PREFIX}/share/gobo-eiffel INSTALLATION_DIRS= bin diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile index 916a4c23dd2..389d67679cb 100644 --- a/devel/p4-docs/Makefile +++ b/devel/p4-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= p4-docs @@ -35,8 +35,8 @@ SITES_p4sag_html.zip= ${P4_DOCURL_PREFIX}/manuals/p4sag/ EXTRACT_ONLY= cmdref_html.zip p4ftp_html.zip EXTRACT_ONLY+= p4guide_html.zip p4sag_html.zip -EXTRACT_CMD.zip= ${LOCALBASE}/bin/unzip -Laq $${extract_file} \ - -d `${BASENAME} $${extract_file} _html.zip` +EXTRACT_OPTS+= -d `${BASENAME} ${DOWNLOADED_DISTFILE} _html.zip` +EXTRACT_OPTS_ZIP= -Laq DOCDIR= share/doc/p4 HTMLDIR= share/doc/html/p4 diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile index ac435b62f53..c9ee33f6186 100644 --- a/devel/unidiff/Makefile +++ b/devel/unidiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= part01 @@ -15,7 +15,7 @@ COMMENT= Converts between uni-diffs and context diffs BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils WRKSRC= ${WRKDIR} -EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar INSTALLATION_DIRS= bin man/man1 diff --git a/editors/matlab-mode/Makefile b/editors/matlab-mode/Makefile index 343b453b782..c0d7f9ba208 100644 --- a/editors/matlab-mode/Makefile +++ b/editors/matlab-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $ +# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= matlab.el @@ -15,7 +15,6 @@ HOMEPAGE= http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objec COMMENT= Matlab mode for Emacs WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR} DIST_SUBDIR= ${BASEPKGNAME} .include "../../mk/emacs.mk" diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index fe4f21b4eaf..d5151fc1a14 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:51 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2006/01/21 18:57:40 jlam Exp $ # DISTNAME= simhv33-0 @@ -14,8 +14,8 @@ COMMENT= Bob Supnik's historical computer simulator BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6 -EXTRACT_CMD= unzip -aoq ${DOWNLOADED_DISTFILE} -WRKSRC= ${WRKDIR} +EXTRACT_OPTS_ZIP= -aoq +WRKSRC= ${WRKDIR} .include "../../mk/bsd.prefs.mk" diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile index b490d6c2a27..098d63e9764 100644 --- a/emulators/xm7/Makefile +++ b/emulators/xm7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/01/19 18:13:38 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= xm71010s @@ -18,8 +18,7 @@ RESTRICTED+= no-commercial-use NO_SRC_ON_CDROM= ${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -# convert CRLF to LF -EXTRACT_CMD= lha xqt ${DOWNLOADED_DISTFILE} +EXTRACT_OPTS_LHA= qt # convert CRLF to LF WRKSRC= ${WRKDIR}/vm NO_CONFIGURE= yes diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common index 6e52a284e1e..b7d48d81814 100644 --- a/fonts/cyberbit-ttf/Makefile.common +++ b/fonts/cyberbit-ttf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2005/12/29 07:04:27 jlam Exp $ +# $NetBSD: Makefile.common,v 1.15 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= # empty @@ -23,8 +23,8 @@ NO_BIN_ON_FTP= ${RESTRICTED} DIST_SUBDIR= cyberbit-ttf -EXTRACT_CMD= ${LOCALBASE}/bin/unzip -Laq $${extract_file} -EXTRACT_ONLY= ${FONT_FILE} +EXTRACT_ONLY= ${FONT_FILE} +EXTRACT_OPTS_ZIP= -Laq USE_X11BASE= YES NO_CONFIGURE= YES diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index 7ac2ddd2976..7c8847b0b3b 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:41 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -12,7 +12,7 @@ MAINTAINER= ben@NetBSD.org HOMEPAGE= http://falconseye.sourceforge.net/ COMMENT= Falcon's Eye NetHack -EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE} +EXTRACT_OPTS_ZIP= -aq HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2 diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile index a85fd05e36a..dd573333fe8 100644 --- a/games/quakedata/Makefile +++ b/games/quakedata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/07/19 15:30:15 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2006/01/21 18:57:41 jlam Exp $ DISTNAME= quake106 PKGNAME= quakedata-1.0 @@ -19,8 +19,10 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} +EXTRACT_ELEMENTS= resource.* +EXTRACT_OPTS_ZIP= -qo + WRKSRC= ${WRKDIR} -EXTRACT_CMD= unzip -q -o ${DOWNLOADED_DISTFILE} -d ${WRKDIR} resource.* NO_BUILD= YES post-extract: diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index f06b7f7c1c1..5c1a7f16701 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:18 rillig Exp $ +# $NetBSD: Makefile,v 1.36 2006/01/21 18:57:41 jlam Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -16,9 +16,10 @@ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip LICENSE= xdoom-license +EXTRACT_ONLY= doomsrc.zip +EXTRACT_OPTX_ZIP= -qo + WRKSRC= ${WRKDIR} -EXTRACT_ONLY= doomsrc.zip -EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY} USE_X11BASE= yes USE_TOOLS+= gmake gunzip MAKE_ENV+= X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q} diff --git a/graphics/gimp-warp-sharp/Makefile b/graphics/gimp-warp-sharp/Makefile index 766cfe312b4..c9bc97f002c 100644 --- a/graphics/gimp-warp-sharp/Makefile +++ b/graphics/gimp-warp-sharp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/31 12:32:37 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2006/01/21 18:57:41 jlam Exp $ DISTNAME= warp-sharp PKGNAME= gimp-${DISTNAME}-1.4 @@ -18,7 +18,6 @@ NO_CONFIGURE= yes NO_BUILD= yes DIST_SUBDIR= ${PKGNAME_NOREV} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} INSTALLATION_DIRS= share/gimp/2.0/scripts diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile index 4ed9c8f8ac7..b463ba751b4 100644 --- a/graphics/gimp2-wideangle/Makefile +++ b/graphics/gimp2-wideangle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/31 12:32:37 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= wideangle @@ -14,7 +14,6 @@ COMMENT= GIMP plugin for wideangle lens distortions DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} do-build: (cd ${WRKSRC} && gimptool-2.0 --build wideangle.c) diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index d7c04b423f8..5cbe5914cfc 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:08 tv Exp $ +# $NetBSD: Makefile,v 1.25 2006/01/21 18:57:41 jlam Exp $ DISTNAME= gdmodule.c PKGNAME= ${PYPKGPREFIX}-gd-1.3 @@ -11,8 +11,6 @@ MAINTAINER= darcy@NetBSD.org HOMEPAGE= http://starship.python.net/~richard/gdmodule/ COMMENT= Python interface to gd graphics library -EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} - WRKSRC= ${WRKDIR} BUILD_TARGET= default diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index 2df3c8c81a2..7aa1eb0bd8d 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:24 rillig Exp $ +# $NetBSD: Makefile.common,v 1.22 2006/01/21 18:57:41 jlam Exp $ # RELVERSION= 1.3.1 @@ -52,7 +52,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc .if ${EXTRACT_SUFX} == ".bin" -EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTFILES} --nox11 > /dev/null +EXTRACT_OPTS_BIN= --nox11 post-fetch: @if [ ! -x ${DISTDIR}/${DISTFILES} ]; then \ ${CHMOD} +x ${DISTDIR}/${DISTFILES}; \ diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index c62e29b6ce7..e6859c73035 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2005/12/12 14:43:25 joerg Exp $ +# $NetBSD: Makefile.common,v 1.27 2006/01/21 18:57:41 jlam Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang java @@ -9,8 +9,6 @@ HOMEPAGE= http://java.sun.com/ DOWNLOAD= http://java.sun.com/j2se/1.3/download.html ARCHIVE= http://java.sun.com/products/archive/index.html -EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null - LICENSE= jdk13-license RESTRICTED= "Redistribution of repackaged binaries not permitted" NO_SRC_ON_CDROM=${RESTRICTED} diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile index c8d476c2f43..71ac1e01e07 100644 --- a/mail/mdfrm/Makefile +++ b/mail/mdfrm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= mdfrm.pl @@ -12,8 +12,6 @@ COMMENT= Print a summary of mail in a Maildir waiting to be read DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} - WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run NO_BUILD= yes diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile index 2fae28da80a..e212f98c63d 100644 --- a/mail/qmail-lint/Makefile +++ b/mail/qmail-lint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= qmail-lint-0.55 @@ -11,8 +11,6 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://www.qmail.org/ COMMENT= Examine the qmail configuration for common errors -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} - WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run REPLACE_PERL= ${DISTNAME} diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 576d27ffc86..cdf77ed73ce 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/01/21 18:57:41 jlam Exp $ DISTNAME= ast54unx PKGNAME= astrolog-5.40 @@ -20,12 +20,11 @@ NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR} EPHEM= LRZ5_24 CHI_24 CPJV_24 EXTRACT_ONLY= ${DISTNAME}.shr -EXTRACT_CMD= ${EXTRACT_CMD.shar} USE_X11BASE= yes DIST_SUBDIR= astrolog -BUILD_TARGET= astrolog +BUILD_TARGET= astrolog INSTALLATION_DIRS= bin diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile index 004e069f558..2a80f55bcfa 100644 --- a/net/ipcheck/Makefile +++ b/net/ipcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:25 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= ipcheck.217 @@ -13,7 +13,7 @@ COMMENT= Python client for the dyndns service WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_SUFX= #none -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/ipcheck.py +EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ipcheck.py NO_BUILD= yes PYTHON_PATCH_SCRIPTS= ipcheck.py diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile index c3539c31e2f..e35a422256c 100644 --- a/net/lambdamoo-core/Makefile +++ b/net/lambdamoo-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:52 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:41 jlam Exp $ DISTNAME= LambdaCore-12Apr99.db PKGNAME= lambdamoo-core-990412 @@ -11,15 +11,10 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html COMMENT= Generic core classes for lambdamoo -EXTRACT_CMD= : USE_TOOLS+= gunzip WRKSRC= ${WRKDIR} -post-extract: - ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} - ${GUNZIP_CMD} ${WRKSRC}/${DISTFILES} - do-build: do-install: diff --git a/net/lambdamoo-doc/Makefile b/net/lambdamoo-doc/Makefile index f42d3813958..509b4da4a63 100644 --- a/net/lambdamoo-doc/Makefile +++ b/net/lambdamoo-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/02 22:17:03 kristerw Exp $ +# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:41 jlam Exp $ DISTNAME= lambdamoo-doc-1.8.0p6 CATEGORIES= net @@ -11,14 +11,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html COMMENT= Documentation for lambdamoo -EXTRACT_CMD= : +EXTRACT_ONLY= ProgrammersManual.texinfo WRKSRC= ${WRKDIR} USE_MAKEINFO= yes -post-extract: - ${CP} ${DISTDIR}/ProgrammersManual.texinfo ${WRKSRC} - do-build: makeinfo --no-split --no-headers \ ${WRKSRC}/ProgrammersManual.texinfo \ diff --git a/net/netsaint-plugin-cluster/Makefile b/net/netsaint-plugin-cluster/Makefile index 027b9f50bb9..d05c8ce733d 100644 --- a/net/netsaint-plugin-cluster/Makefile +++ b/net/netsaint-plugin-cluster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:26 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= check_cluster @@ -15,7 +15,6 @@ COMMENT= Host and service cluster plugin for NetSaint DEPENDS+= netsaint-base-[0-9]*:../../net/netsaint-base WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC} INSTALLATION_DIRS= libexec/netsaint diff --git a/pkgtools/createbuildlink/Makefile b/pkgtools/createbuildlink/Makefile index 6f0ed80acec..2108e9b7aca 100644 --- a/pkgtools/createbuildlink/Makefile +++ b/pkgtools/createbuildlink/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/07/21 16:25:05 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2006/01/21 18:57:41 jlam Exp $ DISTNAME= createbuildlink-3.9 CATEGORIES= pkgtools sysutils @@ -15,7 +15,6 @@ EXTRACT_ONLY= # empty USE_LANGUAGES= # empty NO_CHECKSUM= yes NO_BUILD= yes -EXTRACT_CMD= ${ECHO} SCRIPT= ${DISTNAME:C/-.*$//} SCRIPTS= ${SCRIPT} substplistbasedirs diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 134de70381b..a8aefa0c097 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/01/05 17:26:54 xtraeme Exp $ +# $NetBSD: Makefile,v 1.40 2006/01/21 18:57:41 jlam Exp $ # DISTNAME= url2pkg-1.32 @@ -17,7 +17,6 @@ EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_CONFIGURE= yes USE_LANGUAGES= # empty -EXTRACT_CMD= ${ECHO} INSTALLATION_DIRS= bin man/man8 diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile index 4cd7399325f..0dd8310a74e 100644 --- a/print/ja-a2ps/Makefile +++ b/print/ja-a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:42 jlam Exp $ DISTNAME= a2ps.pl-1.45 PKGNAME= ja-a2ps-1.45 @@ -13,7 +13,6 @@ COMMENT= Text file to postscript converter (with Japanese support) WRKSRC= ${WRKDIR} USE_TOOLS+= perl:run -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . NO_BUILD= yes REPLACE_PERL= a2ps.pl-1.45 diff --git a/print/psjoin/Makefile b/print/psjoin/Makefile index 121846ba612..52333705274 100644 --- a/print/psjoin/Makefile +++ b/print/psjoin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/10 05:19:39 reed Exp $ +# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= psjoin @@ -12,7 +12,6 @@ HOMEPAGE= http://homepage3.nifty.com/tsato/tools/psjoin.html COMMENT= Concatenate PostScript files DIST_SUBDIR= ${PKGNAME_NOREV} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . NO_BUILD= yes REPLACE_PERL= psjoin USE_TOOLS+= perl:run diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile index b353f133092..d73bb01f00e 100644 --- a/print/teTeX-share/Makefile +++ b/print/teTeX-share/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/01/20 23:41:30 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= tetex-texmf-2.0.2 @@ -24,25 +24,20 @@ EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes -USE_TOOLS+= patch - -.include "../../mk/bsd.prefs.mk" +USE_TOOLS+= patch # Don't extract the files listed in ${FILESDIR}/exclude, and preserve # permissions. # -.if !empty(EXTRACT_USING:M*tar) -EXTRACT_OPTS_TAR= -X ${FILESDIR}/exclude -p -.elif !empty(EXTRACT_USING:Mpax) -EXTRACT_OPTS_PAX= -c `${CAT} ${FILESDIR}/exclude` -.endif +EXTRACT_OPTS= -X ${FILESDIR}/exclude +EXTRACT_OPTS_TAR= -p do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf distfiles=${DISTFILES:Q}; \ for i in $$distfiles; do \ extract_file=${_DISTDIR:Q}"/$$i"; \ - cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}}; \ + cd ${PREFIX}/share/texmf; ${EXTRACT_CMD}; \ done cd ${PREFIX}/share/texmf/dvipdfm/config && \ ${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \ diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index f72dc90c28f..ed5ca8222d2 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:30 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= tetex-texmf-3.0 @@ -21,18 +21,13 @@ NO_CONFIGURE= yes NO_BUILD= yes USE_TOOLS+= patch -.include "../../mk/bsd.prefs.mk" - -.if !empty(EXTRACT_USING:M*tar) -EXTRACT_OPTS_TAR= -X ${FILESDIR}/exclude -p -.elif !empty(EXTRACT_USING:Mpax) -EXTRACT_OPTS_PAX= -c `${CAT} ${FILESDIR}/exclude` -.endif +EXTRACT_OPTS= -X ${FILESDIR}/exclude +EXTRACT_OPTS_TAR= -p do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf extract_file=${_DISTDIR:Q}/${DISTFILES:Q}; \ - cd ${PREFIX}/share/texmf; ${EXTRACT_CMD${EXTRACT_SUFX}} + cd ${PREFIX}/share/texmf; ${EXTRACT_CMD} cd ${PREFIX}/share/texmf/dvipdfm/config && \ ${PATCH} ${_PATCH_BACKUP_ARG} .orig < ${FILESDIR}/dvipdfm-config.diff && \ ${RM} config.orig diff --git a/security/md4-collision/Makefile b/security/md4-collision/Makefile index 0e20ae2ccac..db3ffefa93c 100644 --- a/security/md4-collision/Makefile +++ b/security/md4-collision/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/11/18 23:43:05 agc Exp $ +# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $ DISTNAME= md4coll PKGNAME= md4-collision-20051118 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.stachliu.com/collisions.html COMMENT= MD5 Collision generator -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin diff --git a/security/md5-collision/Makefile b/security/md5-collision/Makefile index d735133e198..5c42d68cddb 100644 --- a/security/md5-collision/Makefile +++ b/security/md5-collision/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/11/18 23:42:03 agc Exp $ +# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $ DISTNAME= md5coll PKGNAME= md5-collision-20051118 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.stachliu.com/collisions.html COMMENT= MD5 Collision generator -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile index 99cabb62757..a786a5d9aec 100644 --- a/shells/mudsh/Makefile +++ b/shells/mudsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:40 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= mudsh @@ -12,7 +12,6 @@ HOMEPAGE= http://www.xirium.com/tech/mud-shell/index.html COMMENT= M.U.D. game-like shell WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} USE_TOOLS+= perl:run INSTALLATION_DIRS= bin diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile index ea6da1bb1b6..a3af3400344 100644 --- a/sysutils/cpuburn/Makefile +++ b/sysutils/cpuburn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:53 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= cpuburn_1_4 @@ -13,7 +13,6 @@ HOMEPAGE= http://pages.sbcglobal.net/redelm/ COMMENT= CPU load testing utilities for Pentium pro and later ONLY_FOR_PLATFORM= *-*-i[3456]86 -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${GTAR} -xf - USE_TOOLS+= gtar diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile index c113fcc4fcf..3d4a978e4ca 100644 --- a/sysutils/crashme/Makefile +++ b/sysutils/crashme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.16 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= crashme-2.4 @@ -12,7 +12,7 @@ COMMENT= Try to crash machine with random arguments to random system calls PKG_INSTALLATION_TYPES= overwrite pkgviews -EXTRACT_CMD= ${EXTRACT_CMD.shar} +EXTRACT_OPTS= -f shar MAKEFILE= makefile WRKSRC= ${WRKDIR} diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile index f8694dc15e5..4f59818138e 100644 --- a/sysutils/fix4SA110rev2/Makefile +++ b/sysutils/fix4SA110rev2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:34 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= fix4SA110rev2-1.0 @@ -12,7 +12,6 @@ HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/arch/arm32/misc/fix4SA110rev2.README COMMENT= Modify arm32 binaries to work around SA rev2 problems ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32 -EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC} WRKSRC= ${WRKDIR} diff --git a/textproc/awf/Makefile b/textproc/awf/Makefile index aa6abd44460..623ae7d8b06 100644 --- a/textproc/awf/Makefile +++ b/textproc/awf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/10/23 23:32:47 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= nroff-clone @@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.scn.rain.com/pub/text/ COMMENT= Text formatter (nroff-clone) written in awk -EXTRACT_CMD= ${DECOMPRESS_CMD.shar.Z} ${DOWNLOADED_DISTFILE} | ${SED} -e '1,/^\#!/d' | ${SH} +EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SED} -e '1,/^\#!/d' | ${SH} WRKSRC= ${WRKDIR} SUBST_CLASSES+= awflib diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile index 7365a35b56c..0e5d75a7e03 100644 --- a/www/apache-tomcat55/Makefile +++ b/www/apache-tomcat55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/01/03 18:12:37 abs Exp $ +# $NetBSD: Makefile,v 1.2 2006/01/21 18:57:42 jlam Exp $ DISTNAME= apache-tomcat-${TOMCAT_VERSION} CATEGORIES= www java @@ -21,11 +21,12 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat EGDIR2= ${EGDIR}/${CATALINA_DIR} -USE_TOOLS+= gunzip tar +.include "../../mk/bsd.prefs.mk" -# 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 && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar +# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228) +.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*) +EXTRACT_USING= gtar +.endif PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf MAKE_DIRS= ${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR} diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 2626d273a8f..027f4826589 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:23 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/01/21 18:57:42 jlam Exp $ # DISTNAME= hiawatha @@ -24,7 +24,7 @@ USE_JAVA= run DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE} +EXTRACT_OPTS_ZIP= -aq RCD_SCRIPTS= hiawatha diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 246c36eee2c..b1bab5e81d7 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/01/20 23:41:30 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/01/21 18:57:42 jlam Exp $ DISTNAME= htdig-3.1.6 PKGREVISION= 3 @@ -40,13 +40,8 @@ OWN_DIRS+= ${DBDIR} CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \ ${PKG_SYSCONFDIR}/htdig.conf -.include "../../mk/bsd.prefs.mk" - -.if !empty(EXTRACT_USING:M*tar) -EXTRACT_OPTS_TAR= --exclude ${DISTNAME}/db* -.elif !empty(EXTRACT_USING:Mpax) -EXTRACT_OPTS_PAX= -c ${DISTNAME}/db* -.endif +EXTRACT_OPTS+= -x +EXTRACT_ELEMENTS= ${DISTNAME}/db* .include "../../databases/db/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index f9d5e730b12..dc5cf040e55 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:23 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2006/01/21 18:57:42 jlam Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -23,11 +23,12 @@ CATALINA_DIR= Catalina/localhost EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat EGDIR2= ${EGDIR}/${CATALINA_DIR} -USE_TOOLS+= gunzip tar +.include "../../mk/bsd.prefs.mk" -# 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 && ${GUNZIP_CMD} ${WRKDIR}/tar.gz && ${TAR} xf ${WRKDIR}/tar +# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228) +.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*) +EXTRACT_USING= gtar +.endif PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR} |