- Don't use UNZIP_CMD in a DEPENDS line. A user may redefine UNZIP_CMD to be

  "unzip -v" or similar which would break. Instead rely upon the unzip binary.

  http://lists.freebsd.org/pipermail/freebsd-ports/2009-September/056882.html

Noticed by:	Dag-Erling Smørgrav <des@des.no>

6 files changed, 7 insertions, 7 deletions

diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 80bafaadfeb0..7edc185d122b 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP floating-point Adaptive Multi-Rate (AMR) Speech Codec
 
-BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index ec3d13202b69..a29660310d2f 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
 
-BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 1491de09221d..ef31309a10f1 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -26,7 +26,7 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 EXTRACT_ONLY=	${_DISTFILES:M*tar.gz}
 DISTFILES+=	pgtcldocs-20070115.zip:doc
 MASTER_SITES+=	http://pgfoundry.org/frs/download.php/1228/:doc
-BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 
 post-configure:
diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile
index bec65ef387a3..667770e4cf1b 100644
--- a/emulators/xgs/Makefile
+++ b/emulators/xgs/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	xgs050.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apple IIGS emulator stable release
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 DIST_SUBDIR=	xgs
 RESTRICTED=	"xgs.rom copyright is owned by Apple and cannot be distributed"
@@ -39,7 +39,7 @@ MYPORTDOCS=	CHANGES.TXT COMPAT.TXT INSTALL.TXT IWM-DOC.TXT TODO.TXT \
 		XGS-FAQ.TXT
 
 post-extract:
-	unzip -L -qq ${_DISTDIR}/ROM01.ZIP -d ${WRKSRC}
+	${UNZIP_CMD} -L -qq ${_DISTDIR}/ROM01.ZIP -d ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/xgs.rom ${XGS_DIR}
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index 75803b727c44..92240563a56f 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	kawari-${PORTVERSION:S/.//g}
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	A real kawari8 module for ninix-aya
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	ninix:${PORTSDIR}/games/ninix-aya
 
 EXTRACT_CMD=	${UNZIP_CMD}
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 66fb7aa7078a..8a2aefe6ad92 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Fortran-to-C converter and its run-time libraries
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 
 GUNZIP_CMD=	minigzip -d
 USE_GMAKE=	yes