svn commit: r317757 - in head: cad/electric-ng devel/ros-nxt emulators/javatari emulators/vmsbackup games/galaxyhack games/pykawari games/sdb japanese/tomoe java/eclipse sysutils/memtest86

[Bryan Drewery]

Author: bdrewery
Date: Fri May 10 01:46:52 2013
New Revision: 317757
URL: http://svnweb.freebsd.org/changeset/ports/317757

Log:
  - Fix extract on 9+ due to this picking up /usr/bin/unzip instead of
    looking for the proper LOCALBASE/bin/unzip that UNZIP_CMD is set to.
    Will let maintainers decide if archivers/unzip is really still needed.
    Some of these ports/options remain broken due to other issues.
  
  With hat:	portmgr

Modified:
  head/cad/electric-ng/Makefile
  head/devel/ros-nxt/Makefile
  head/emulators/javatari/Makefile
  head/emulators/vmsbackup/Makefile
  head/games/galaxyhack/Makefile
  head/games/pykawari/Makefile
  head/games/sdb/Makefile
  head/japanese/tomoe/Makefile
  head/java/eclipse/Makefile
  head/sysutils/memtest86/Makefile

Modified: head/cad/electric-ng/Makefile
==============================================================================
--- head/cad/electric-ng/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/cad/electric-ng/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -16,7 +16,7 @@ EXTRACT_ONLY=
 MAINTAINER=	danilogondolfo at gmail.com
 COMMENT=	A sophisticated VLSI design system
 
-EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+

Modified: head/devel/ros-nxt/Makefile
==============================================================================
--- head/devel/ros-nxt/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/devel/ros-nxt/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -27,7 +27,7 @@ WRKSRC=		${WRKDIR}/${STACKNAME}-${PORTVE
 
 # TODO port python-bluez for secondary bluetooth interface (no bluetooth here)
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS=	rosmake:${PORTSDIR}/devel/ros \
 		${LOCALBASE}/ros/stacks/ros_comm/stack.xml:${PORTSDIR}/devel/ros_comm \
 		${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \

Modified: head/emulators/javatari/Makefile
==============================================================================
--- head/emulators/javatari/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/emulators/javatari/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -11,7 +11,7 @@ EXTRACT_ONLY=
 MAINTAINER=	danilogondolfo at gmail.com
 COMMENT=	Multiplayer Atari 2600 emulator written in pure Java
 
-EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+

Modified: head/emulators/vmsbackup/Makefile
==============================================================================
--- head/emulators/vmsbackup/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/emulators/vmsbackup/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.ZIP
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Reads VMS BACKUP tapes
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 ALL_TARGET=	vmsbackup
 
 PLIST_FILES=	bin/vmsbackup

Modified: head/games/galaxyhack/Makefile
==============================================================================
--- head/games/galaxyhack/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/games/galaxyhack/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -32,7 +32,7 @@ FLEETS_FILE=	gh_fleets_020906.zip
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLEETS}
-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 DISTFILES+=	${FLEETS_FILE}
 PLIST_SUB+=	FLEETS=""
 .else

Modified: head/games/pykawari/Makefile
==============================================================================
--- head/games/pykawari/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/games/pykawari/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -15,7 +15,7 @@ DISTNAME=	kawari-${PORTVERSION:S/.//g}
 MAINTAINER=	umeno at rr.iij4u.or.jp
 COMMENT=	A real kawari8 module for ninix-aya
 
-EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	ninix:${PORTSDIR}/games/ninix-aya
 
 EXTRACT_CMD=	${UNZIP_CMD}

Modified: head/games/sdb/Makefile
==============================================================================
--- head/games/sdb/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/games/sdb/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -36,7 +36,7 @@ PLIST_SUB+=	MODEL_SUFFIX="md2"
 .else
 # big-endian requires different set of models
 DISTFILES+=	shotgun-debugger-1.0.mac-ppc.zip
-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 PLIST_SUB+=	MODEL_SUFFIX="md2b"
 
 post-extract:

Modified: head/japanese/tomoe/Makefile
==============================================================================
--- head/japanese/tomoe/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/japanese/tomoe/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -97,7 +97,7 @@ BROKEN=	Not buildable with Unihan on spa
 .endif
 MASTER_SITES+=	ftp://ftp.unicode.org/Public/UNIDATA/:unihan
 DISTFILES+=	Unihan.zip:unihan
-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	\
 	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
 	${RUBY_SITELIBDIR}/suikyo/suikyo.rb:${PORTSDIR}/japanese/suikyo

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/java/eclipse/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -30,7 +30,7 @@ PATCH_DEPENDS=	ant:${PORTSDIR}/devel/apa
 		${DEPEND_JAVA}
 BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		rsync:${PORTSDIR}/net/rsync \
-		unzip:${PORTSDIR}/archivers/unzip \
+		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
 		zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2

Modified: head/sysutils/memtest86/Makefile
==============================================================================
--- head/sysutils/memtest86/Makefile	Fri May 10 01:08:37 2013	(r317756)
+++ head/sysutils/memtest86/Makefile	Fri May 10 01:46:52 2013	(r317757)
@@ -14,7 +14,7 @@ DISTFILES=	${DISTNAME:S,b,s,}${EXTRACT_S
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	Stand alone memory test for x86 architecture computers
 
-EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
 ONLY_FOR_ARCHS=	i386