"Use of DOWNLOADED_DISTFILE is deprecated. Use the shell variable

$$extract_file instead."

17 files changed, 34 insertions, 34 deletions

diff --git a/benchmarks/postmark/Makefile b/benchmarks/postmark/Makefile
index 2feb6e399bb..e52877e22f6 100644
--- a/benchmarks/postmark/Makefile
+++ b/benchmarks/postmark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/09/11 22:37:14 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 12:03:59 rodent Exp $
 
 DISTNAME=	postmark-1_5.c
 PKGNAME=	postmark-1.5
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.netapp.com/tech_library/3022.html
 COMMENT=	NetApps file system benchmark
 
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} postmark.c
+EXTRACT_CMD=	${CP} $$extract_file postmark.c
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 23c7f8927c7..b11674f9bdb 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/31 11:16:38 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/04/06 12:03:59 rodent Exp $
 
 DISTNAME=	asm.8051
 PKGNAME=	as31-19900126
@@ -11,7 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	8031/8051 assembler
 
 WRKSRC=		${WRKDIR}
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | \
+EXTRACT_CMD=	${GZCAT} $$extract_file | \
 		${SED} '1,/^.! \/bin\/sh/d' | ${SH}
 USE_TOOLS+=	yacc
 MAKE_FILE=	makefile
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
index d3949f07cd0..d45451c443c 100644
--- a/devel/unidiff/Makefile
+++ b/devel/unidiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/31 11:19:52 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/04/06 12:04:00 rodent 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=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
+EXTRACT_CMD=	${GZCAT} $$extract_file | ${PREFIX}/bin/gunshar
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 91fe64e8d43..ee3e2eee4f7 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2012/10/03 11:43:42 asau Exp $
+# $NetBSD: Makefile,v 1.40 2013/04/06 12:04:00 rodent Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
@@ -15,7 +15,7 @@ DEPENDS+=		libXgFonts>=1.0nb1:../../fonts/Xg
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=			${WRKDIR}
-EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
+EXTRACT_CMD=		${GZCAT} $$extract_file | ${SH}
 
 MANCOMPRESSED=		yes
 USE_X11BASE=		yes
diff --git a/editors/vilearn/Makefile b/editors/vilearn/Makefile
index 7ef1a3b8a9d..b6bda589f1f 100644
--- a/editors/vilearn/Makefile
+++ b/editors/vilearn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/03 11:43:46 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/04/06 12:04:00 rodent Exp $
 #
 
 DISTNAME=	vilearn-1.0
@@ -10,7 +10,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://vilearn.org/
 COMMENT=	Online vi tutorial, from basic to advanced
 
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${SED} '1,/^wes$$/d' | ${SH}
+EXTRACT_CMD=	${GZCAT} $$extract_file | ${SED} '1,/^wes$$/d' | ${SH}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/games/et/Makefile b/games/et/Makefile
index 547a2c2a937..1299ccaa6de 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:36 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 12:04:00 rodent Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -16,7 +16,7 @@ EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base glx
 
 USE_TOOLS+=	gtar pax
-EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
+EXTRACT_CMD=	${TAIL} +356 $$extract_file | ${GTAR} xzf - \
 		-C ${WRKSRC}
 
 ETDIR=		${PREFIX}/lib/lokigames/et
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index a0bc5e77c72..b8688a37466 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/06 11:54:42 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/04/06 12:04:00 rodent Exp $
 #
 
 DISTNAME=	heretic2-demo-x86
@@ -15,7 +15,7 @@ HOMEPAGE=	http://www.lokigames.com/products/heretic2/
 COMMENT=	Heretic2 - first person Quake 3D engine based (linux demo)
 
 NO_CONFIGURE=	yes
-EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
+EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' $$extract_file | \
 								${GTAR} xzf -
 USE_TOOLS+=	gtar pax
 
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index 84650bf78f5..63681365bd4 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 11:54:46 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 12:04:00 rodent Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.linuxgamepublishing.com/info.php?id=majesty
 COMMENT=	Fantasy kingdom simulation (demo)
 
-EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
+EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' $$extract_file | \
 			${GZCAT} | pax -O -r
 USE_TOOLS+=	gzcat pax
 
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index eb94aa045cf..3f8c774e189 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.38 2013/04/06 12:04:01 rodent Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	3
@@ -18,7 +18,7 @@ EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base x11 glx
 
 USE_TOOLS+=	gtar pax find xargs
-EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} |	\
+EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' $$extract_file |	\
 		${GTAR} xzf -
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index 5ea53ae6fc8..d4b8c677ee7 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/06 11:54:51 asau Exp $
+# $NetBSD: Makefile,v 1.38 2013/04/06 12:04:00 rodent Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	3
@@ -29,7 +29,7 @@ USE_TOOLS+=	gtar gunzip pax tail
 # The distfile is a self-extracting shell script.  "266" is a magic
 # number that's taken from the distfile itself.
 #
-EXTRACT_CMD=	tail +266 ${DOWNLOADED_DISTFILE} | gunzip | gtar -xf -
+EXTRACT_CMD=	tail +266 $$extract_file | gunzip | gtar -xf -
 
 DISTBINNAME=	quake3.x86
 BINNAME=	quake3arena
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index 4aa7dd35021..bb058addf36 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/01/11 00:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 12:04:01 rodent Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGNAME=	quake3server-1.32b
@@ -14,7 +14,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux
 .include "../../games/quake3server/Makefile.common"
 
 USE_TOOLS+=	bsdtar
-EXTRACT_CMD=	${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${TOOLS_PATH.bsdtar} xzf -
+EXTRACT_CMD=	${SED} '1,265d' $$extract_file | ${TOOLS_PATH.bsdtar} xzf -
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index fd7375dce12..5bf5d3a06f2 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:54:53 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 12:04:01 rodent Exp $
 
 DISTNAME=	wolf-linux-1.33.x86
 PKGNAME=	rtcw-1.33
@@ -26,7 +26,7 @@ NOT_FOR_PLATFORM=	NetBSD-*-*
 BUILD_DIRS=	# empty
 RTCWDIR=	${PREFIX}/lib/lokigames/rtcw
 USE_TOOLS+=	gtar pax gzip
-EXTRACT_CMD=	${SED} '1,178d' ${DOWNLOADED_DISTFILE} |		\
+EXTRACT_CMD=	${SED} '1,178d' $$extract_file |		\
 		${GZIP_CMD} -d | ${GTAR} -C ${WRKSRC} -xf -
 
 pre-extract:
diff --git a/math/antixls/Makefile b/math/antixls/Makefile
index d571fca25c3..037a84ee6a8 100644
--- a/math/antixls/Makefile
+++ b/math/antixls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/12/12 10:44:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/06 12:04:01 rodent Exp $
 #
 
 DISTNAME=		antixls-0.2b
@@ -15,7 +15,7 @@ DEPENDS+=	p5-Spreadsheet-ParseExcel-[0-9]*:../../math/p5-Spreadsheet-ParseExcel
 
 USE_TOOLS+=	perl:run
 WRKSRC=		${WRKDIR}
-EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} antixls
+EXTRACT_CMD=	${CP} $$extract_file antixls
 REPLACE_PERL+=	antixls
 NO_BUILD=	YES
 
diff --git a/print/adobeps-win/Makefile b/print/adobeps-win/Makefile
index 41bf2426d4d..f48ea6c55b1 100644
--- a/print/adobeps-win/Makefile
+++ b/print/adobeps-win/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 13:45:35 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/06 12:04:01 rodent Exp $
 
 DISTNAME=	winsteng
 PKGNAME=	adobeps-win-1.0.6
@@ -16,7 +16,7 @@ DEPENDS+=	cups>=1.1.15:../../print/cups
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
-EXTRACT_CMD=	${LOCALBASE}/bin/cabextract ${DOWNLOADED_DISTFILE}
+EXTRACT_CMD=	${LOCALBASE}/bin/cabextract $$extract_file
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile
index 766aa144ef2..eacfb9cf199 100644
--- a/sysutils/tkcron/Makefile
+++ b/sysutils/tkcron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/23 19:51:26 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 12:04:01 rodent Exp $
 #
 
 DISTNAME=	tkcron-2.12
@@ -13,7 +13,7 @@ COMMENT=	Graphical frontend to crontab
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 WRKSRC=		${WRKDIR}
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
+EXTRACT_CMD=	${GZCAT} $$extract_file > tkcron.tcl
 
 INSTALLATION_DIRS=	bin
 
diff --git a/textproc/awf/Makefile b/textproc/awf/Makefile
index 20fadbcb07b..b35e3472a8f 100644
--- a/textproc/awf/Makefile
+++ b/textproc/awf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/25 06:55:42 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/06 12:04:02 rodent Exp $
 #
 
 DISTNAME=	nroff-clone
@@ -12,7 +12,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.scn.rain.com/pub/text/
 COMMENT=	Text formatter (nroff-clone) written in awk
 
-EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${SED} -e '1,/^\#!/d' | ${SH}
+EXTRACT_CMD=	${GZCAT} $$extract_file | ${SED} -e '1,/^\#!/d' | ${SH}
 WRKSRC=		${WRKDIR}
 
 SUBST_CLASSES+=		awflib
diff --git a/time/cardboard-schedule/Makefile b/time/cardboard-schedule/Makefile
index 2d8b48b7bea..78facae895f 100644
--- a/time/cardboard-schedule/Makefile
+++ b/time/cardboard-schedule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/08 13:04:17 asau Exp $
+# $NetBSD: Makefile,v 1.29 2013/04/06 12:04:02 rodent Exp $
 #
 
 DISTNAME=	cs113ins
@@ -33,7 +33,7 @@ USE_TOOLS+=	unzip
 
 WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	cd ${WRKDIR:Q} && {					\
-			${UNZIP_CMD} ${DOWNLOADED_DISTFILE}		\
+			${UNZIP_CMD} $$extract_file		\
 			|| ${TEST} -f InstallerData/Installer.zip;	\
 		}
 NO_BUILD=	yes