20 files changed, 21 insertions, 31 deletions

diff --git a/lang/angelscript/Makefile b/lang/angelscript/Makefile
index a47f103e9eab..91bac9717521 100644
--- a/lang/angelscript/Makefile
+++ b/lang/angelscript/Makefile
@@ -14,9 +14,8 @@ LICENSE=	ZLIB
 
 MAKEFILE=	makefile
 MAKE_ARGS=	LOCAL=${PREFIX}
-USE_GMAKE=	yes
+USES=		gmake zip
 USE_LDCONFIG=	yes
-USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/sdk/angelscript/projects/gnuc/
 
diff --git a/lang/bas2tap/Makefile b/lang/bas2tap/Makefile
index 2da027ae5837..a3bf3318c336 100644
--- a/lang/bas2tap/Makefile
+++ b/lang/bas2tap/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convert 48k/128k ZX Spectrum BASIC text files to TAP files
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		zip
 
 NO_WRKSUBDIR=	yes
 PORTDOCS=	${PORTNAME}.doc
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index a91618b848cf..7ae3bf6c6928 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -11,8 +11,7 @@ COMMENT=	The Bywater Basic interpreter
 
 NO_WRKSUBDIR=	yes
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	CFLAGS="${CFLAGS} -ansi"
 ALL_TARGET=	${PORTNAME}
diff --git a/lang/clojure-contrib/Makefile b/lang/clojure-contrib/Makefile
index 6e87f080f5a9..042a412cd2dc 100644
--- a/lang/clojure-contrib/Makefile
+++ b/lang/clojure-contrib/Makefile
@@ -12,7 +12,7 @@ LICENSE=	EPL
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/clojure:${PORTSDIR}/lang/clojure
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	1.6+
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 6f9e846ab8e1..3b3160f96f43 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Dynamic programming language for the JVM
 
 LICENSE=	EPL
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/lang/diveintopython/Makefile b/lang/diveintopython/Makefile
index 439cc797a868..6e83a62cea47 100644
--- a/lang/diveintopython/Makefile
+++ b/lang/diveintopython/Makefile
@@ -26,7 +26,7 @@ LICENSE=	GFDL
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSIONSTR}/html
 NO_BUILD=	yes
 
-USE_ZIP=	yes
+USES=		zip
 
 PLIST_SUB=	VERSION="${VERSIONSTR}"
 
diff --git a/lang/dmd/Makefile b/lang/dmd/Makefile
index 4d0816669f33..99ff9b4951f1 100644
--- a/lang/dmd/Makefile
+++ b/lang/dmd/Makefile
@@ -11,8 +11,7 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Official compiler for the D 1.0 programming language
 
 NO_PACKAGE=	Packages are not validation-tested by the developer
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 MAN1=		dmd.1
 MAN5=		dmd.conf.5
 PORTDOCS=	*.txt html/ phobos/
diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile
index 2dbe08cad8c3..220d4c9713bd 100644
--- a/lang/dmd2/Makefile
+++ b/lang/dmd2/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	dmd.${PORTVERSION}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	D 2.0 compiler, not officially validated for FreeBSD
 
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 MAKEFILE=	posix.mak
 EXAMPLESDIR=	${PREFIX}/share/examples/dmd2
 DOCSDIR=	${PREFIX}/share/doc/dmd2
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index 7e8e09b0784e..ae32a4a5a729 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -14,7 +14,7 @@ LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
 
-USE_ZIP=yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 NO_BUILD=	yes
diff --git a/lang/hla/Makefile b/lang/hla/Makefile
index e45441347699..9944ad854ed2 100644
--- a/lang/hla/Makefile
+++ b/lang/hla/Makefile
@@ -18,8 +18,7 @@ EXTRACT_ONLY=	${PORTNAME}src${EXTRACT_SUFX}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	High Level Assembly
 
-USE_ZIP=	yes
-USES=		bison
+USES=		bison zip:infozip
 
 WRKSRC=		${WRKDIR}/hlasrc/trunk/trunk
 MAKEFILE=	makefile.bsd
diff --git a/lang/huc/Makefile b/lang/huc/Makefile
index c2ba9bf92700..32b9e91eacf7 100644
--- a/lang/huc/Makefile
+++ b/lang/huc/Makefile
@@ -14,8 +14,7 @@ OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=	yes
 
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 MAKE_ARGS=	CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 NO_STAGE=	yes
diff --git a/lang/nesasm/Makefile b/lang/nesasm/Makefile
index c4e44defeb3a..69c339f38395 100644
--- a/lang/nesasm/Makefile
+++ b/lang/nesasm/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ninjin@kth.se
 COMMENT=	The nesasm assembler is a 6502 assembler with specific NES support
 
 WRKSRC=	${WRKDIR}/nbasic_2004_03_14/source/${PORTNAME}/source/
-USE_ZIP=	yes
+USES=		zip
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^CC/s/=/?=/' \
diff --git a/lang/nimrod/Makefile b/lang/nimrod/Makefile
index 3436b3c195aa..cf0037b57610 100644
--- a/lang/nimrod/Makefile
+++ b/lang/nimrod/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.9.2
 CATEGORIES=	lang
 MASTER_SITES=	http://nimrod-code.org/download/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	The Nimrod programming language
@@ -16,7 +15,7 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	DOCS
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		compiler
+USES=		compiler zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index edc4f97ed5c8..763ad8e783d1 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 PROJECTHOST=	phantomjs
-USES=		gmake dos2unix pkgconfig
+USES=		gmake dos2unix pkgconfig zip
 USE_GCC=	any
-USE_ZIP=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index 94f93904800b..ab9515e64508 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	squeak:${PORTSDIR}/lang/squeak
 SVNVERSION=	14438
 
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 
 SHAREMODE=	644
 
diff --git a/lang/rexx-regutil/Makefile b/lang/rexx-regutil/Makefile
index 102ffb158275..0fa23a7d8dde 100644
--- a/lang/rexx-regutil/Makefile
+++ b/lang/rexx-regutil/Makefile
@@ -13,7 +13,7 @@ COMMENT=	An implementation of IBM's RexxUtil function library for Regina
 
 BUILD_DEPENDS=	${LOCALBASE}/include/rexxsaa.h:${PORTSDIR}/lang/rexx-regina
 
-USE_ZIP=	yes
+USES=		zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_LDCONFIG=	yes
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 28cdeb2041fe..2136c4fc2a14 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -33,6 +33,8 @@ LINEDIT_DESC=	Enable line editing in the Rhino shell
 
 OPTIONS_DEFAULT=	LINEDIT
 
+USES=		zip
+
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
@@ -43,7 +45,6 @@ SUB_LIST=	RHINOJAR=${RHINOJAR} JLINEJAR="${JLINEJAR}"
 
 USE_ANT=	yes
 USE_JAVA=	yes
-USE_ZIP=	yes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}${DISTVERSION}
 
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index bce07592ebc4..497c773ccc28 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -18,10 +18,8 @@ OPTIONS_DEFINE=	X11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
-USES=		readline
+USES=		gmake readline zip
 USE_GCC=	any
-USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	require.scm
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 1586fddb2aa9..87d8559c89c3 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	${PORTNAME}-2.0
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Specialized version of the Logo programming language written in Java
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/lang/ucc/Makefile b/lang/ucc/Makefile
index 78ee15369304..16a9e66dd613 100644
--- a/lang/ucc/Makefile
+++ b/lang/ucc/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	ucc160
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	C Compiler Which Implements the ANSI C89 Standard
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_LDCONFIG=	yes