summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/portaudio/Makefile4
-rw-r--r--devel/apache-ant15/Makefile4
-rw-r--r--devel/boaconstructor/Makefile4
-rw-r--r--devel/nsis/Makefile4
-rw-r--r--devel/wide/Makefile4
-rw-r--r--emulators/DatLib/Makefile4
-rw-r--r--emulators/DatUtil/Makefile4
-rw-r--r--emulators/MAMEDiff/Makefile4
-rw-r--r--emulators/ROMBuild/Makefile4
-rw-r--r--emulators/ROMInfo/Makefile4
-rw-r--r--emulators/ZIPIdent/Makefile4
-rw-r--r--emulators/arnold/Makefile4
-rw-r--r--emulators/sms_sdl/Makefile4
-rw-r--r--graphics/mng/Makefile4
-rw-r--r--mk/bsd.pkg.extract.mk27
-rw-r--r--net/speedtouch/Makefile4
-rw-r--r--print/teTeX-share/Makefile6
-rw-r--r--print/teTeX3-texmf/Makefile6
-rw-r--r--www/htdig/Makefile6
19 files changed, 52 insertions, 53 deletions
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index c5f78c298f8..b3cda5521f4 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:29 jlam Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
pre-configure:
${CHMOD} 755 ${WRKSRC}/configure
diff --git a/devel/apache-ant15/Makefile b/devel/apache-ant15/Makefile
index 8845488e020..cc2f6fddffd 100644
--- a/devel/apache-ant15/Makefile
+++ b/devel/apache-ant15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/20 23:41:29 jlam Exp $
#
# NOTE: if you are depending on ant from another package, please be aware that
# the ant team has CHANGED the version numbering scheme. A previous version
@@ -24,7 +24,7 @@ CONFLICTS= jakarta-ant*
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_JAVA= run
-EXTRACT_CMD_OPTS.zip= -Caq
+EXTRACT_OPTS_ZIP= -Caq
INSTALLATION_DIRS= bin
do-build:
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index cb1459ba48c..e6227132438 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/01/14 10:48:13 wulf Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/20 23:41:29 jlam Exp $
#
VERSION= 0.4.4
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://boa-constructor.sourceforge.net/
COMMENT= Python IDE
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
PYTHON_VERSIONS_ACCEPTED= 23 24
BOADIR= ${PREFIX}/share/boa-constructor-${VERSION}
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index cebe1c8e43d..31a552aa454 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/01/04 22:36:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= nsis-${NSIS_VER}
@@ -19,7 +19,7 @@ NSIS_SRC= ${DISTNAME:=-src}
NSIS_VER= 2.12
WRKSRC= ${WRKDIR}/${NSIS_SRC}
NO_CONFIGURE= yes
-EXTRACT_CMD_OPTS.zip= -qo
+EXTRACT_OPTS_ZIP= -qo
EVAL_PREFIX+= SCONS_PREFIX=scons
SCONS_BIN= ${SCONS_PREFIX}/bin/scons
diff --git a/devel/wide/Makefile b/devel/wide/Makefile
index 6e1d7e090a1..93b6fa65370 100644
--- a/devel/wide/Makefile
+++ b/devel/wide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/20 12:52:39 grant Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= wide
@@ -13,7 +13,7 @@ COMMENT= IDE for the While programming language
NO_BUILD= yes
WRKSRC= ${WRKDIR}/WIDE
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
LICENSE= eclipse-license
diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
index 5a484757b65..17b0e5377b2 100644
--- a/emulators/DatLib/Makefile
+++ b/emulators/DatLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/01/19 21:42:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= datlib215
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= datlib
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
MAKE_ENV+= RANLIB=${RANLIB:Q}
INSTALLATION_DIRS= lib
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index 6841387b50b..8a2fb822887 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/01/19 21:43:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= dutil227
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= datutil
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index cfed7fb2965..c90bee46a0e 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/01/11 18:55:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= mdiff224
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= mamediff
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index ef9e3ebffea..c02722037df 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/17 18:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= rbuild27
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= rombuild
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
post-extract:
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index 2ca578ef204..429f5e9a9e9 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/01 19:37:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/20 23:41:29 jlam Exp $
#
DISTNAME= rinfo26
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= rominfo
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 3ff4afc241c..1027c2427b3 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/01 19:37:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/20 23:41:30 jlam Exp $
#
DISTNAME= zident27
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= zipident
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
BUILDLINK_DEPENDS.DatLib+= DatLib>=2.13
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index bde1580b611..8068804cd30 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/11 09:40:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/20 23:41:30 jlam Exp $
#
DISTNAME= arnsrc27012002
@@ -13,7 +13,7 @@ HOMEPAGE= http://arnold.emuunlim.com/
COMMENT= Amstrad CPC, Amstrad CPC+ and KC Compact emulator
# we want case sensitive file names.
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
WRKSRC= ${WRKDIR}/arnold
GNU_CONFIGURE= yes
diff --git a/emulators/sms_sdl/Makefile b/emulators/sms_sdl/Makefile
index 3be23551c54..66bfefadc4c 100644
--- a/emulators/sms_sdl/Makefile
+++ b/emulators/sms_sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/11 09:40:39 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/20 23:41:30 jlam Exp $
#
DISTNAME= sms_sdl-0.9.4a-r7.1-src
@@ -14,7 +14,7 @@ COMMENT= SMS Plus emulator port to SDL
WRKSRC= ${WRKDIR}/sms_sdl-0.9.4a-r7.1
BUILD_DIRS= sdl
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sdl/sms_sdl ${PREFIX}/bin
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index afd99454840..eed457591c7 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/12/28 04:54:17 reed Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/20 23:41:30 jlam Exp $
DISTNAME= lm1009
PKGNAME= mng-1.0.9
@@ -21,7 +21,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= automake
# only needed as long as we use the zip distfile
-EXTRACT_CMD_OPTS.zip?= -aqo
+EXTRACT_OPTS_ZIP?= -aqo
WRKSRC= ${WRKDIR}/libmng
CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg}
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk
index d67e35afcae..f3e37c97842 100644
--- a/mk/bsd.pkg.extract.mk
+++ b/mk/bsd.pkg.extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.14 2006/01/19 19:35:25 jlam Exp $
+# $NetBSD: bsd.pkg.extract.mk,v 1.15 2006/01/20 23:41:30 jlam Exp $
#
# This Makefile fragment is included to bsd.pkg.mk and defines the
# relevant variables and targets for the "extract" phase.
@@ -126,18 +126,17 @@ EXTRACT_ELEMENTS?= # empty
DOWNLOADED_DISTFILE= $${extract_file}
-EXTRACT_CMD.zip?= ${UNZIP} ${EXTRACT_CMD_OPTS.zip} $${extract_file}
-EXTRACT_CMD_OPTS.zip?= -Laqo
-EXTRACT_CMD.lha?= ${LHA} ${EXTRACT_CMD_OPTS.lha} $${extract_file}
-EXTRACT_CMD_OPTS.lha?= xq
+EXTRACT_CMD.zip?= ${UNZIP} ${EXTRACT_OPTS_ZIP} $${extract_file}
+EXTRACT_OPTS_ZIP?= -Laqo
+EXTRACT_CMD.lha?= ${LHA} ${EXTRACT_OPTS_LHA} $${extract_file}
+EXTRACT_OPTS_LHA?= xq
EXTRACT_CMD.lzh?= ${EXTRACT_CMD.lha}
-EXTRACT_CMD_OPTS.lzh?= ${EXTRACT_CMD_OPTS.lha}
-EXTRACT_CMD.zoo?= ${UNZOO} ${EXTRACT_CMD_OPTS.zoo} $${extract_file}
-EXTRACT_CMD_OPTS.zoo?= -x
-EXTRACT_CMD.rar?= ${UNRAR} ${EXTRACT_CMD_OPTS.rar} $${extract_file}
-EXTRACT_CMD_OPTS.rar?= x -inul
+EXTRACT_CMD.zoo?= ${UNZOO} ${EXTRACT_OPTS_ZOO} $${extract_file}
+EXTRACT_OPTS_ZOO?= -x
+EXTRACT_CMD.rar?= ${UNRAR} ${EXTRACT_OPTS_RAR} $${extract_file}
+EXTRACT_OPTS_RAR?= x -inul
EXTRACT_ENV.bin?= # empty
-EXTRACT_CMD.bin?= ${ECHO} yes | ${SETENV} ${EXTRACT_ENV.bin} $${extract_file} ${EXTRACT_CMD_OPTS.bin} >/dev/null
+EXTRACT_CMD.bin?= ${ECHO} yes | ${SETENV} ${EXTRACT_ENV.bin} $${extract_file} ${EXTRACT_OPTS_BIN} >/dev/null
.for __suffix__ in .gz .bz2 .Z
EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} > `${BASENAME} $${extract_file} ${__suffix__}`
@@ -158,11 +157,11 @@ _DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_
.for __suffix__ in ${_EXTRACT_SUFFIXES}
. if !defined(EXTRACT_CMD${__suffix__})
. if !empty(EXTRACT_USING:Mgtar)
-EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} ${EXTRACT_CMD_OPTS${__suffix__}} -xf - ${EXTRACT_ELEMENTS}
+EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} ${EXTRACT_OPTS_TAR} -xf - ${EXTRACT_ELEMENTS}
. elif !empty(EXTRACT_USING:Mnbtar)
-EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${TAR} ${EXTRACT_CMD_OPTS${__suffix__}} -xf - ${EXTRACT_ELEMENTS}
+EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${TAR} ${EXTRACT_OPTS_TAR} -xf - ${EXTRACT_ELEMENTS}
. else
-EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} ${EXTRACT_CMD_OPTS${__suffix__}} -O -r ${EXTRACT_ELEMENTS}
+EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} ${EXTRACT_OPTS_PAX} -O -r ${EXTRACT_ELEMENTS}
. endif
. endif
.endfor
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 459ac0b7973..015b1042d59 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/29 06:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/20 23:41:30 jlam Exp $
DISTNAME= speedtouch-1.3.1
PKGREVISION= 3
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}.tar.bz2
FIRMWARE_SRCS= SpeedTouch330_firmware_3012.zip
SITES_${FIRMWARE_SRCS}= http://www.speedtouch.com/download/drivers/USB/
DISTFILES+= ${FIRMWARE_SRCS}
-EXTRACT_CMD_OPTS.zip= -Laqo -d ${WRKDIR}/firmware
+EXTRACT_OPTS_ZIP= -Laqo -d ${WRKDIR}/firmware
LICENSE= speedtouch-firmware-license
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index eb61548bea1..b353f133092 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/20 23:41:30 jlam Exp $
#
DISTNAME= tetex-texmf-2.0.2
@@ -32,9 +32,9 @@ USE_TOOLS+= patch
# permissions.
#
.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= -X ${FILESDIR}/exclude -p
+EXTRACT_OPTS_TAR= -X ${FILESDIR}/exclude -p
.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= -c `${CAT} ${FILESDIR}/exclude`
+EXTRACT_OPTS_PAX= -c `${CAT} ${FILESDIR}/exclude`
.endif
do-install:
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 4257c99101f..f72dc90c28f 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/09 15:31:30 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:30 jlam Exp $
#
DISTNAME= tetex-texmf-3.0
@@ -24,9 +24,9 @@ USE_TOOLS+= patch
.include "../../mk/bsd.prefs.mk"
.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= -X ${FILESDIR}/exclude -p
+EXTRACT_OPTS_TAR= -X ${FILESDIR}/exclude -p
.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= -c `${CAT} ${FILESDIR}/exclude`
+EXTRACT_OPTS_PAX= -c `${CAT} ${FILESDIR}/exclude`
.endif
do-install:
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 23dfe3c25e2..246c36eee2c 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/29 06:22:23 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/20 23:41:30 jlam Exp $
DISTNAME= htdig-3.1.6
PKGREVISION= 3
@@ -43,9 +43,9 @@ CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \
.include "../../mk/bsd.prefs.mk"
.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= --exclude ${DISTNAME}/db*
+EXTRACT_OPTS_TAR= --exclude ${DISTNAME}/db*
.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}= -c ${DISTNAME}/db*
+EXTRACT_OPTS_PAX= -c ${DISTNAME}/db*
.endif
.include "../../databases/db/buildlink3.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 07:37:05 +0000