pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Rename the following variables to reduce the number th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/87584f8eaf7e
branches: trunk
changeset: 506713:87584f8eaf7e
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jan 20 23:41:29 2006 +0000
description:
Rename the following variables to reduce the number that we need to track:
EXTRACT_CMD_OPTS.bin -> EXTRACT_OPTS_BIN
EXTRACT_CMD_OPTS.lha -> EXTRACT_OPTS_LHA
EXTRACT_CMD_OPTS.rar -> EXTRACT_OPTS_RAR
EXTRACT_CMD_OPTS.tar -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tar.Z -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tar.bz2 -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tar.gz -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tbz -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tbz2 -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.tgz -> EXTRACT_OPTS_TAR
EXTRACT_CMD_OPTS.zip -> EXTRACT_OPTS_ZIP
EXTRACT_CMD_OPTS.zoo -> EXTRACT_OPTS_ZOO
EXTRACT_CMD_OPTS_tar.gz -> EXTRACT_OPTS_TAR
diffstat:
audio/portaudio/Makefile | 4 ++--
devel/apache-ant15/Makefile | 4 ++--
devel/boaconstructor/Makefile | 4 ++--
devel/nsis/Makefile | 4 ++--
devel/wide/Makefile | 4 ++--
emulators/DatLib/Makefile | 4 ++--
emulators/DatUtil/Makefile | 4 ++--
emulators/MAMEDiff/Makefile | 4 ++--
emulators/ROMBuild/Makefile | 4 ++--
emulators/ROMInfo/Makefile | 4 ++--
emulators/ZIPIdent/Makefile | 4 ++--
emulators/arnold/Makefile | 4 ++--
emulators/sms_sdl/Makefile | 4 ++--
graphics/mng/Makefile | 4 ++--
mk/bsd.pkg.extract.mk | 27 +++++++++++++--------------
net/speedtouch/Makefile | 4 ++--
print/teTeX-share/Makefile | 6 +++---
print/teTeX3-texmf/Makefile | 6 +++---
www/htdig/Makefile | 6 +++---
19 files changed, 52 insertions(+), 53 deletions(-)
diffs (truncated from 385 to 300 lines):
diff -r b36f0fc33013 -r 87584f8eaf7e audio/portaudio/Makefile
--- a/audio/portaudio/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/audio/portaudio/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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_LIBTOOL= yes
GNU_CONFIGURE= yes
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
pre-configure:
${CHMOD} 755 ${WRKSRC}/configure
diff -r b36f0fc33013 -r 87584f8eaf7e devel/apache-ant15/Makefile
--- a/devel/apache-ant15/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/devel/apache-ant15/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_JAVA= run
-EXTRACT_CMD_OPTS.zip= -Caq
+EXTRACT_OPTS_ZIP= -Caq
INSTALLATION_DIRS= bin
do-build:
diff -r b36f0fc33013 -r 87584f8eaf7e devel/boaconstructor/Makefile
--- a/devel/boaconstructor/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/devel/boaconstructor/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e devel/nsis/Makefile
--- a/devel/nsis/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/devel/nsis/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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_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 -r b36f0fc33013 -r 87584f8eaf7e devel/wide/Makefile
--- a/devel/wide/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/devel/wide/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
NO_BUILD= yes
WRKSRC= ${WRKDIR}/WIDE
-EXTRACT_CMD_OPTS.zip= -aqo
+EXTRACT_OPTS_ZIP= -aqo
LICENSE= eclipse-license
diff -r b36f0fc33013 -r 87584f8eaf7e emulators/DatLib/Makefile
--- a/emulators/DatLib/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/DatLib/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e emulators/DatUtil/Makefile
--- a/emulators/DatUtil/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/DatUtil/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= datutil
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
diff -r b36f0fc33013 -r 87584f8eaf7e emulators/MAMEDiff/Makefile
--- a/emulators/MAMEDiff/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/MAMEDiff/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e emulators/ROMBuild/Makefile
--- a/emulators/ROMBuild/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/ROMBuild/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= rombuild
-EXTRACT_CMD_OPTS.zip= -Laaqo
+EXTRACT_OPTS_ZIP= -Laaqo
INSTALLATION_DIRS= bin
post-extract:
diff -r b36f0fc33013 -r 87584f8eaf7e emulators/ROMInfo/Makefile
--- a/emulators/ROMInfo/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/ROMInfo/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e emulators/ZIPIdent/Makefile
--- a/emulators/ZIPIdent/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/ZIPIdent/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e emulators/arnold/Makefile
--- a/emulators/arnold/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/arnold/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e emulators/sms_sdl/Makefile
--- a/emulators/sms_sdl/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/emulators/sms_sdl/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 -r b36f0fc33013 -r 87584f8eaf7e graphics/mng/Makefile
--- a/graphics/mng/Makefile Fri Jan 20 23:38:47 2006 +0000
+++ b/graphics/mng/Makefile Fri Jan 20 23:41:29 2006 +0000
@@ -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_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 -r b36f0fc33013 -r 87584f8eaf7e mk/bsd.pkg.extract.mk
--- a/mk/bsd.pkg.extract.mk Fri Jan 20 23:38:47 2006 +0000
+++ b/mk/bsd.pkg.extract.mk Fri Jan 20 23:41:29 2006 +0000
@@ -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 @@
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 @@
.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}
Home |
Main Index |
Thread Index |
Old Index