Convert g* to USES=zip

130 files changed, 140 insertions, 197 deletions

diff --git a/games/aestats/Makefile b/games/aestats/Makefile
index a7e3aa2b6f0a..06a50826adc2 100644
--- a/games/aestats/Makefile
+++ b/games/aestats/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://download:download@download.hugelaser.com/aeons.poweredbylasers.com/${PORTNAME}/ \
 		http://freebsd.nsu.ru/distfiles/ LOCAL/danfe
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Advanced HTML statistics generator for various games
@@ -16,6 +15,7 @@ NO_CDROM=	Commercial use is prohibited
 
 ONLY_FOR_ARCHS=	i386
 
+USES=		zip
 WRKSRC=		${WRKDIR}/${DISTNAME}/Linux-o
 LINUXBINDIR=	${WRKSRC}/../Linux-Bin
 MAKEFILE=	makefile
diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index 62412fc66336..a48e28dfb5f4 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Released Marathon data files for the Aleph One port
 
 RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Bungie/Microsoft do not allow charging for Marathon data files
diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile
index 285b6257686c..829a46c409b4 100644
--- a/games/alephone-scenarios/Makefile
+++ b/games/alephone-scenarios/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Free scenarios for the Aleph One engine
 
 RUN_DEPENDS=	alephone:${PORTSDIR}/games/alephone
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/annelid/Makefile b/games/annelid/Makefile
index a8a55ec5869e..0a231483f0dc 100644
--- a/games/annelid/Makefile
+++ b/games/annelid/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Remake of the ubiquitous "Snake" and "Worm" games
 
 RESTRICTED=	No redistribution allowed
 
-USES=	gmake
-USE_ZIP=	yes
+USES=	gmake zip
 USE_SDL=	sdl
 USE_GL=		gl
 NO_WRKSUBDIR=	yes
diff --git a/games/bass/Makefile b/games/bass/Makefile
index 0afc19a5a625..fe981589ca2c 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/games/bombz/Makefile b/games/bombz/Makefile
index d5fbe28d462c..718e970b88c1 100644
--- a/games/bombz/Makefile
+++ b/games/bombz/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/Bombz
 
-USE_ZIP=	yes
-USES= 		dos2unix
+USES= 		dos2unix zip
 DOS2UNIX_FILES=	*.txt
 USE_SDL=	sdl image mixer
 INSTALLS_ICONS=	yes
diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile
index 3909d995b69b..6821304e1958 100644
--- a/games/brainworkshop/Makefile
+++ b/games/brainworkshop/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Free open-source version of the Dual N-Back mental exercise
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyglet/__init__.py:${PORTSDIR}/graphics/py-pyglet
 
-USE_ZIP=	yes
+USES=		dos2unix zip
 NO_BUILD=	yes
-USE_DOS2UNIX=	brainworkshop.pyw
+DOS2UNIX_FILES=	brainworkshop.pyw
 
 USE_PYTHON=	yes
 
diff --git a/games/cake/Makefile b/games/cake/Makefile
index ccfe79f7b92a..283f22cad08a 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -15,10 +15,9 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-USES=		gmake
+USES=		gmake zip
 USE_GL=		glut
 USE_XORG=	x11 xext xmu xt xi sm ice
-USE_ZIP=	yes
 
 # Need to pass `-l', but PATCH_ARGS+= won't work because of PATCH_ARGS?=
 # in bsd.port.mk
diff --git a/games/cleanq3/Makefile b/games/cleanq3/Makefile
index 06cf732720c3..4ea5b483e4bd 100644
--- a/games/cleanq3/Makefile
+++ b/games/cleanq3/Makefile
@@ -11,9 +11,7 @@ DISTNAME=	CleanQ3_v${PORTVERSION}-srcbin
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Cleaned up copy of the original Quake III Arena source code
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
+USES=		dos2unix gmake zip
 WRKSRC=		${WRKDIR}/CleanQ3
 BUILD_WRKSRC=	${WRKSRC}/code/unix
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index 56d8d0cc4982..380a92cb835e 100644
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=		crafty
-USE_ZIP=		yes
+USES=		zip
 NO_WRKSUBDIR=		yes
 NO_PACKAGE=		Package is way too big
 CONFLICTS=		crafty-open-large-* crafty-open-medium-* crafty-open-default-*
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index e163c5fe8cf8..da11be912e68 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=	crafty
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 CONFLICTS=	crafty-open-enormous-* crafty-open-medium-* crafty-open-default-*
 
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index 7ede89db213e..182e97730d01 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty
 
 DIST_SUBDIR=	crafty
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 CONFLICTS=	crafty-open-enormous-* crafty-open-large-* crafty-open-default-*
 
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 5f6ab9f76293..e4831e908523 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -18,8 +18,7 @@ EXTRACT_ONLY=	crafty-${PORTVERSION}.zip
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Chess program for playing and analyzing games
 
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 
 BOOKS=		books.bin
 DISTFILES+=	${BOOKS:S/$/:books/}
diff --git a/games/daimonin-music/Makefile b/games/daimonin-music/Makefile
index c7b8102b4861..e1d5fa23e74b 100644
--- a/games/daimonin-music/Makefile
+++ b/games/daimonin-music/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music for daimonin client
 
 NO_BUILD=	true
-USE_ZIP=	true
+USES=		zip
 
 MYDATADIR=	${PREFIX}/share/daimonin
 
diff --git a/games/dangerdeep-data/Makefile b/games/dangerdeep-data/Makefile
index 65f2484923d1..65717c8bbda8 100644
--- a/games/dangerdeep-data/Makefile
+++ b/games/dangerdeep-data/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	The Danger from the Deep data files
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 DATADIR=	share/${PKGNAMEPREFIX:S/-//}
diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index 6aec214ce6a3..3de9b4950e8c 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -11,10 +11,9 @@ DISTNAME=	${PORTNAME}engine${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Quake engine modification
 
-USES=		gmake
-USE_ZIP=	yes
+USES=		dos2unix gmake zip:infozip
 USE_XORG=	xxf86dga xpm
-USE_DOS2UNIX=	darkplaces.txt
+DOS2UNIX_FILES=	darkplaces.txt
 MAKE_ENV=	DP_FS_BASEDIR="${Q1DIR}"
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/games/dcross/Makefile b/games/dcross/Makefile
index 418bdff16ad7..4367a4398ca1 100644
--- a/games/dcross/Makefile
+++ b/games/dcross/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/
 
-USE_ZIP=	yes
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_REGEX=	.*.[^p][^n][^g]$
 DOS2UNIX_FILES=	*.pyw
 USE_PYTHON=	yes
diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile
index 1c0b6f980291..72179ca492c8 100644
--- a/games/djgame2/Makefile
+++ b/games/djgame2/Makefile
@@ -7,15 +7,13 @@ PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www.bluedj.com/download/src/
 DISTNAME=	source-${PORTVERSION}
-#EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	bluedj contains many popular online games
 
 NO_BUILD=	yes
-USE_ZIP=	yes
 USE_QT4=	gui qt3support qmake_build uic_build rcc_build moc_build svg
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_FILES=	Base/src/DJGraphicsChessTimerItem.cpp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index b2747032803d..cc475d147272 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dungeon Master Java is a remake of the classic Dungeon Master by FTL
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/games/domination/Makefile b/games/domination/Makefile
index ddf74ed1021b..9309c90235ff 100644
--- a/games/domination/Makefile
+++ b/games/domination/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Board game that is a bit like the well known game Risk
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index d57f0beee8e0..3ab413845f2d 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-iwad-${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Complete Doom-based game IWAD that is Free Software
 
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_BUILD=	yes
 
 DATADIR=	${DMDIR}/${PORTNAME}
diff --git a/games/doom-hr/Makefile b/games/doom-hr/Makefile
index cb2b6fd34e11..7e289354b639 100644
--- a/games/doom-hr/Makefile
+++ b/games/doom-hr/Makefile
@@ -17,8 +17,7 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hell Revealed is a megawad, a 32-level replacement for DooM II
 
-USE_ZIP=	yes
-USE_CRLF=	yes
+USES=		zip:infozip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/doom-hr2/Makefile b/games/doom-hr2/Makefile
index 9a40db8a7e2b..2d461e68f9e3 100644
--- a/games/doom-hr2/Makefile
+++ b/games/doom-hr2/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	hr2final
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hell Revealed II is a megawad, a 32-level replacement for DooM II
 
-USE_ZIP=	yes
-USE_CRLF=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/doom/Makefile b/games/doom/Makefile
index 00dc3e930780..69a3a8284bad 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -17,8 +17,7 @@ NO_CDROM=	Redistribution is limited, see license; Requested by id Software
 
 ONLY_FOR_ARCHS=	i386
 
-USE_GMAKE=	yes
-USE_ZIP=	yes
+USES=		gmake zip
 USE_XORG=	x11 sm xextproto xext
 NO_WRKSUBDIR=	yes
 
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 72cd31dc729f..735bac2ceb8c 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -18,9 +18,8 @@ COMMENT=	Improved and extended version of Doom
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		gmake zip
 USE_GL=		glu
-USE_GMAKE=	yes
 USE_SDL=	mixer sdl
 
 CFLAGS+=	-DSVN_REV=\\\"${SVN_REV}\\\"
diff --git a/games/duke3d-data/Makefile b/games/duke3d-data/Makefile
index 4bf08d653bcb..6e644041037d 100644
--- a/games/duke3d-data/Makefile
+++ b/games/duke3d-data/Makefile
@@ -19,7 +19,7 @@ DISTFILES=	#
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Duke Nukem 3D Data
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/egl/Makefile b/games/egl/Makefile
index d43f0c1a9c30..42ff96498144 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -15,9 +15,7 @@ COMMENT=	Enhanced OpenGL-only Quake II engine
 
 LICENSE=	GPLv2
 
-USES=		gmake
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix gmake zip
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
diff --git a/games/el-data/Makefile b/games/el-data/Makefile
index a2152a4d2506..792ee1762901 100644
--- a/games/el-data/Makefile
+++ b/games/el-data/Makefile
@@ -17,9 +17,8 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Eternal Lands data, sound, and music files
 
 NO_ARCH=	yes
-USE_ZIP=	yes
 NO_BUILD=	yes
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_GLOB=	*.ini *.txt
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
diff --git a/games/endgame-singularity-music/Makefile b/games/endgame-singularity-music/Makefile
index 48d8f9e1df9a..331088417635 100644
--- a/games/endgame-singularity-music/Makefile
+++ b/games/endgame-singularity-music/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Music pack for endgame-singularity
 
 PROJECTHOST=	endgame-singularity
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 DATADIR=	${PREFIX}/share/singularity
 
 NO_STAGE=	yes
diff --git a/games/exhaust-ma/Makefile b/games/exhaust-ma/Makefile
index 2e7be1a308cf..cec97cea52e8 100644
--- a/games/exhaust-ma/Makefile
+++ b/games/exhaust-ma/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redcode simulator easy to embed into applications
 
-USE_ZIP=	yes
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 
 NO_WRKSUBDIR=	yes
 
diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile
index 48ed0cb90005..0520c38658a2 100644
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@@ -15,11 +15,10 @@ COMMENT=	Remake of classic F1 Spirit racing game
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USE_ZIP=	yes
-USES=		gmake
+USES=		dos2unix gmake zip
 USE_SDL=	sdl net image mixer sound
 USE_GL=		gl glu
-USE_DOS2UNIX=	*.h *.cpp
+DOS2UNIX_GLOB=	*.h *.cpp
 
 WRKSRC=		"${WRKDIR}/F-1 Spirit"
 BUILD_WRKSRC=	${WRKSRC}/sources
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index e4cea69f5b58..417a4aa5a10b 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -13,13 +13,12 @@ COMMENT=	NetHack derivative
 
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
-USES=		perl5
+USES=		perl5 zip
 NHDIR=		"${PREFIX}/share/falconseyedir"
 MAKE_ENV=	NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
 NETHACKCONFIG=	${FILESDIR}/x-config
 USE_SDL=	sdl
 USE_PERL5=	build
-USE_ZIP=	yes
 USE_XORG=	x11 xpm xaw
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11 \
 		-Wno-return-type
diff --git a/games/fargoal/Makefile b/games/fargoal/Makefile
index 999ae88c85ac..42fa685026be 100644
--- a/games/fargoal/Makefile
+++ b/games/fargoal/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
-USE_ZIP=	yes
-USES=		gmake
+USES=		gmake zip
 
 SUB_FILES=	${PORTNAME}-sh
 
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 48c4cb789691..8dffb3f10536 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -58,7 +58,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip:infozip
 WRKSRC=	${WRKDIR}/fgaircraft
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 DATADIR=	${PREFIX}/share/flightgear/Aircraft
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index 859c33cf6a33..218450593928 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-
 RESTRICTED=	Redistribution prohibited
 
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=	${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 DATADIR=	${PREFIX}/share/flightgear/Aircraft
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 4af2d4e1365b..ccf04c8b02b3 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Flight of the Amazon Queen: a classic graphical adventure
 
 RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/games/freecol/Makefile b/games/freecol/Makefile
index b40c1fe249ce..1190be4f0b8c 100644
--- a/games/freecol/Makefile
+++ b/games/freecol/Makefile
@@ -12,7 +12,7 @@ COMMENT=	An open source version of Colonization
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 SUB_FILES=	freecol
 USE_JAVA=	yes
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index d2d10393135d..e5d047d562c6 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/\.src$//}/src
 
-USE_ZIP=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig zip
 USE_GNOME=	gtkmm24
 MAKE_ENV=	OS="${OPSYS}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
 
diff --git a/games/frikqcc/Makefile b/games/frikqcc/Makefile
index 1350a4a7a329..13d01efcb57f 100644
--- a/games/frikqcc/Makefile
+++ b/games/frikqcc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Advanced QuakeC compiler/decompiler
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		zip
 
 MAKEFILE=	${FILESDIR}/Makefile
 
diff --git a/games/ftjava/Makefile b/games/ftjava/Makefile
index 4b454eb17d7d..b090f057704c 100644
--- a/games/ftjava/Makefile
+++ b/games/ftjava/Makefile
@@ -15,9 +15,9 @@ EXTRACT_ONLY=	FTJavaV${PORTVERSION}.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full Thrust PBEM Client
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile
index 3219f2d29a2e..d6e3ce6d11f7 100644
--- a/games/fuhquake/Makefile
+++ b/games/fuhquake/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \
 		http://www.fuhquake.net/files/misc/:misc
 DISTNAME=	${PORTNAME}-source-v${PORTVERSION}
-EXTRACT_SUFX=	.zip
+EXTRACT_SUFX=	zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index f4673eb5e6ec..62de8f1d0237 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/games/gigalomania/Makefile b/games/gigalomania/Makefile
index 6ba44c661128..6f430ea101a5 100644
--- a/games/gigalomania/Makefile
+++ b/games/gigalomania/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}src
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Open source 2D real time strategy god game
 
-USE_ZIP=	yes
+USES=		zip
 USE_SDL=	image mixer sdl
 
 PORTDOCS=	readme.html
diff --git a/games/glest-data/Makefile b/games/glest-data/Makefile
index ddecfe963167..c58b875f45a6 100644
--- a/games/glest-data/Makefile
+++ b/games/glest-data/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	glest
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Glest data files
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	*.log *.ini *.html *.txt *.lng
+USES=		dos2unix zip
+DOS2UNIX_GLOB=	*.log *.ini *.html *.txt *.lng
 NO_BUILD=	yes
 
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 06b0c5f292cc..a9ced5c8accd 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 RUN_DEPENDS=	${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
 
-USES=		dos2unix openal:al,alut pkgconfig
+USES=		dos2unix openal:al,alut pkgconfig zip
 USE_AUTOTOOLS=	automake:env autoconf:env
-USE_ZIP=	yes
 USE_LUA=	5.1
 USE_SDL=	yes
 USE_GL=		yes
diff --git a/games/gondola/Makefile b/games/gondola/Makefile
index 4a8c19c82a39..dd31128a5ffa 100644
--- a/games/gondola/Makefile
+++ b/games/gondola/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rabbyt>=0.8.1:${PORTSDIR}/graphics/py-rabbyt
 		${PYTHON_PKGNAMEPREFIX}pyglet>=1.1:${PORTSDIR}/graphics/py-pyglet \
 		avbin>=7:${PORTSDIR}/multimedia/avbin
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index 366475a4070c..0d9fbdc14930 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
 		libpng15.so:${PORTSDIR}/graphics/png
 
 SSP_UNSAFE=	yes
-USES=		pkgconfig
-USE_ZIP=	yes
+USES=		pkgconfig zip
 USE_GNOME=	gtk20 libxml2
 USE_PYTHON_BUILD=	yes
 USE_SCONS=	yes
diff --git a/games/gunfudeadlands/Makefile b/games/gunfudeadlands/Makefile
index b61b6dbfe244..d33fe7f0ce7e 100644
--- a/games/gunfudeadlands/Makefile
+++ b/games/gunfudeadlands/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Far West themed 2D shooter featuring bullet time
 
 RUN_DEPENDS=	love07:${PORTSDIR}/devel/love07
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 SUB_FILES=	gunfudeadlands
diff --git a/games/hllib/Makefile b/games/hllib/Makefile
index f25ef84ba4ce..8853af630f06 100644
--- a/games/hllib/Makefile
+++ b/games/hllib/Makefile
@@ -6,14 +6,13 @@ PORTVERSION=	2.4.4
 CATEGORIES=	games devel
 MASTER_SITES=	http://nemesis.thewavelength.net/files/files/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Library to work with various Half-Life file formats
 
 LICENSE=	LGPL21
 
-USES=		dos2unix
+USES=		dos2unix zop
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/HLLib
 CFLAGS+=	-fpic -DUSE_ZLIB
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index 54923c983194..eae5e9917040 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 NO_BUILD=	yes
 USE_APACHE_RUN=	22+
 USE_PHP=	gd mysql
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	run
-USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 HLSTATSX?=	www/${PORTNAME}
diff --git a/games/iceicepenguin/Makefile b/games/iceicepenguin/Makefile
index eef4180561ce..3cd2c7fb7688 100644
--- a/games/iceicepenguin/Makefile
+++ b/games/iceicepenguin/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/"ice ice penguin"
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/games/inform/Makefile b/games/inform/Makefile
index 3f1279b54fd0..c5f4a9195ccd 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 NO_WRKSUBDIR=	yes
 
-USE_ZIP=	yes
+USES=		zip:infozip
 MAKEFILE=	${FILESDIR}/Makefile.inform
 
 post-install:
diff --git a/games/inform7/Makefile b/games/inform7/Makefile
index 0bb30f761fd1..ad910826aa1a 100644
--- a/games/inform7/Makefile
+++ b/games/inform7/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	frotz:${PORTSDIR}/games/frotz
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_ZIP=	yes
+USES=		zip
 SUB_FILES=	i7.sh
 
 MAN6=		i7.6
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 966836bea13c..86faf15096a0 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -7,12 +7,11 @@ PORTREVISION?=	13
 CATEGORIES=	games
 MASTER_SITES?=	http://ioquake3.org/files/${DISTVERSION}/
 # Using zip this way enables slaves to override it.
-EXTRACT_SUFX?=	.zip
 
 MAINTAINER?=	kamikaze@bsdforen.de
 COMMENT?=	Cleaned-up and enhanced version of Quake 3
 
-USES=		pkgconfig gmake
+USES=		pkgconfig gmake zip
 
 NO_STAGE=	yes
 # Port configuration flags:
diff --git a/games/jag/Makefile b/games/jag/Makefile
index a5fc51737e02..7da5aad2c8fd 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -14,9 +14,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	2D arcade-puzzle game like KDiamonds
 
-USE_ZIP=	yes
+USES=		dos2unix zip
 USE_SDL=	sdl mixer
-USE_DOS2UNIX=	Game.pro
+DOS2UNIX_FILES=	Game.pro
 USE_XORG=	x11
 
 USES=		qmake
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 5c08ed0fcf8f..a9be0bcca3d0 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -25,13 +25,12 @@ NO_CDROM=	Must be distributed only through the Internet and free of charge
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses x86 assembly code
 
-USE_ZIP=	yes
 USE_GL=		gl
 USE_GNOME=	gtk20
 USE_SDL=	mixer sdl
 USE_GCC=	any
 
-USES=	dos2unix gmake
+USES=	dos2unix gmake zip
 DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
 
 NO_WRKSUBDIR=	yes
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 3ba92a02b24c..c90cb14a1da3 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/src
 
-USE_GMAKE=	yes
-USE_ZIP=	yes
+USES=		gmake zip
 USE_CSTD=	gnu89
 
 MAKEFILE=	Makefile.linux
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index 3f5074c01658..4c01ff740714 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-mode Infocom game interpreter
 
 NO_WRKSUBDIR=	yes
 
-USE_ZIP=	yes
+USES=		zip
 
 CPPFLAGS+=	-DPOSIX -DHAVE_GETOPT
 
diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index 9721074ccee7..8380ecc337b6 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -19,7 +19,7 @@ COMMENT=	ET Pro - Enemy Territory Competition Mod
 
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 09fc19006bea..dec8f420081d 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -18,7 +18,7 @@ VERSTR=	${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/}
 PKGNAMESUFFIX=	-${VERSTR}
 PLIST_SUB=	VERSTR="${VERSTR}"
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index ff9acfda16a8..e62c6e438892 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index f4fd7968f1ae..30b3294d2ded 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Shrub - An Enemy Territory Modification
 
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index 92a29499a1c6..cae386f6a003 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Modern tactical Enemy Territory modification
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 RESTRICTED=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/enemyterritory
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index fee959b3f444..6be21a1570d8 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Wolfenstein: Enemy Territory (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_CDROM=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/${PORTNAME}
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index 5321657b0d9c..49a77236999c 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
-USE_ZIP=	yes
+USES=		zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index 77c7acab2bcc..da50abc94c22 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
-USE_ZIP=	yes
+USES=		zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index c3e9dbdcbd52..d5b2867b9b17 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake III Arena for Linux
 
-USE_ZIP=	yes
+USES=		zip:infozip
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-spheresofchaos-demo/Makefile b/games/linux-spheresofchaos-demo/Makefile
index ff853fab1405..a8f004952f71 100644
--- a/games/linux-spheresofchaos-demo/Makefile
+++ b/games/linux-spheresofchaos-demo/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An unusual and spectacular shoot-em-up for the PC
 DEPRECATED=	No more public distfiles
 EXPIRATION_DATE=	2014-03-10
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 USE_LINUX_APPS=	sdl12
 
diff --git a/games/lostfeathers/Makefile b/games/lostfeathers/Makefile
index bf14f023229d..9567c18cbe0d 100644
--- a/games/lostfeathers/Makefile
+++ b/games/lostfeathers/Makefile
@@ -18,7 +18,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	avbin>=0:${PORTSDIR}/multimedia/avbin
 
-USE_ZIP=	yes
+USES=		zip
 USE_GNOME=	pygtk2 librsvg2
 USE_PYTHON=	yes
 
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index abbaeef7a0fd..171f49596280 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -22,8 +22,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
 DOS2UNIX_REGEX=	.*.[^j][^a][^r]$
diff --git a/games/megamario/Makefile b/games/megamario/Makefile
index 7f61cfb60d4e..30a133285cdf 100644
--- a/games/megamario/Makefile
+++ b/games/megamario/Makefile
@@ -14,9 +14,8 @@ LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_ZIP=	yes
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-USES=		dos2unix gmake
+USES=		dos2unix gmake zip:infozip
 DOS2UNIX_FILES=	src/*.cpp src/*.h *.ini Makefile* *.txt *.desktop
 USE_SDL=	sdl image mixer ttf
 USE_GL=		glu
diff --git a/games/memonix/Makefile b/games/memonix/Makefile
index 34c37d3317f9..a06a6ba5315c 100644
--- a/games/memonix/Makefile
+++ b/games/memonix/Makefile
@@ -23,8 +23,7 @@ LICENSE_DISTFILE_unknown=	memx16.tar.gz
 LICENSE_DISTFILE_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_FILE_GPLv2=	${WRKSRC}/License.txt
 
-USES=		cmake
-USE_ZIP=	yes
+USES=		cmake zip
 USE_SDL=	sdl mixer image
 USE_GL=		yes
 
diff --git a/games/meqcc/Makefile b/games/meqcc/Makefile
index 529988928c1c..1cf359d11776 100644
--- a/games/meqcc/Makefile
+++ b/games/meqcc/Makefile
@@ -13,8 +13,7 @@ COMMENT=	MrElusive's QuakeC compiler with precompiler support
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix zip
 MAKEFILE=	linux.mak
 NO_WRKSUBDIR=	yes
 
diff --git a/games/moagg/Makefile b/games/moagg/Makefile
index e13763927917..9c9401a39cbd 100644
--- a/games/moagg/Makefile
+++ b/games/moagg/Makefile
@@ -19,7 +19,7 @@ LICENSE=	GPLv2
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/games/mopesnake/Makefile b/games/mopesnake/Makefile
index 18d72f35ef94..3e0a818d6d03 100644
--- a/games/mopesnake/Makefile
+++ b/games/mopesnake/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-pc-${DISTVERSION}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 
 PORTDOCS=	TODO.txt index.html
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index c977d3bac661..9ba7ec54817d 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -20,7 +20,7 @@ LICENSE_NAME_CCbySA=	Creative Commons Attribution-ShareAlike
 LICENSE_PERMS_CCbySA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_CCbySA=	${WRKSRC}/doc/cc-by-sa.txt
 
-USE_ZIP=	yes
+USES=		zip
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	Makefile.lnx
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile
index 77a69da87180..a53f33619d9d 100644
--- a/games/mvdsv/Makefile
+++ b/games/mvdsv/Makefile
@@ -13,7 +13,7 @@ COMMENT?=	Enhanced QuakeWorld server with multi-view demos capability
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=	zip
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${OPSYS} ${ARCH:C/.*(64)/\1/}
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index dc33842bdbfb..0284aec8c2c7 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv2
 
 MANUAL_PACKAGE_BUILD=   huge
 
-USE_ZIP=	yes
+SUES=		zip
 WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
 MAKEFILE=	BSDmakefile
 MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \
diff --git a/games/oneisenough/Makefile b/games/oneisenough/Makefile
index 3c4082f6fdab..eb8b6a4b5ee0 100644
--- a/games/oneisenough/Makefile
+++ b/games/oneisenough/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/"one is enough"
 
-USE_ZIP=	yes
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_FILES=	README.txt bin/*.py
 DOS2UNIX_REGEX= .*.[^pt][^nt][^gf]
 USE_PYTHON=	2
diff --git a/games/openarena-oax/Makefile b/games/openarena-oax/Makefile
index ea4b9da3e8fd..28e4f1345d28 100644
--- a/games/openarena-oax/Makefile
+++ b/games/openarena-oax/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	B50
 CATEGORIES=	games
 MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	OpenArena Mod: OpenArena Xpanded
@@ -14,6 +13,7 @@ COMMENT=	OpenArena Mod: OpenArena Xpanded
 PLIST_SUB+=	DISTNAME="${DISTNAME}" \
 		PORTNAME="${PORTNAME}"
 
+USES=		zip
 NO_BUILD=	yes
 
 OABASE=		${DISTNAME}
diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile
index 401f7ee014c1..e214bd85d2e3 100644
--- a/games/opengfx/Makefile
+++ b/games/opengfx/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Free alternative graphics for OpenTTD game engine
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 LATEST_LINK=	openttd-${PORTNAME}
 
diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index 6dc8eeeafd08..82a118670f3a 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -14,11 +14,10 @@ COMMENT=	Free re-implementation of the Jazz Jackrabbit(tm) game engine
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=	dos2unix gmake
+USES=	dos2unix gmake zip
 DOS2UNIX_REGEX=	.*\.(h|cpp)
 ALL_TARGET=	OpenJazz
 USE_XORG=	x11 xext xrandr xrender xau xdmcp
diff --git a/games/openmsx/Makefile b/games/openmsx/Makefile
index eb54bd393714..a8c601a4296d 100644
--- a/games/openmsx/Makefile
+++ b/games/openmsx/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	http://hu.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVE
 		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 PKGNAMEPREFIX=	openttd-
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	rum1cro@yandex.ru
 COMMENT=	Free alternative music for OpenTTD game engine
 
 LICENSE=	GPLv2
 
+USES=		zip
 NO_BUILD=	yes
 
 do-install:
diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile
index acd376a93732..6b599a60cd40 100644
--- a/games/opensfx/Makefile
+++ b/games/opensfx/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	Creative Commons Public License
 LICENSE_FILE=	${WRKDIR}/opensfx-${PORTVERSION}/license.txt
 LICENSE_PERMS=	auto-accept
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 LATEST_LINK=	openttd-${PORTNAME}
 
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index c62a9193cdb4..cc6bcb9eb17f 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -17,8 +17,7 @@ COMMENT=	A Core War optimizer written in Perl
 
 RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 USE_PERL5=	run
 WRKSRC=		${WRKDIR}/publish_${PORTVERSION:S/.//}
 BUILD_WRKSRC=	${WRKSRC}/optimars/optimars_0.1
diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile
index 75dff811ab8e..2c9919790555 100644
--- a/games/pcgen/Makefile
+++ b/games/pcgen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Java-based RPG character generator and maintenance program
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	YES
+USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}0
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/games/ptools/Makefile b/games/ptools/Makefile
index f99ac989c5e0..b80403206ff1 100644
--- a/games/ptools/Makefile
+++ b/games/ptools/Makefile
@@ -16,8 +16,7 @@ EXTRACT_ONLY=	${DISTFILES:C/:[[:alpha:]]+$//:N*.pl:N*.c}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Accessory programs for pMARS (Core War simulator)
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 USE_PERL5=	run
 MAKEFILE=	makefile.ptools
 ALL_TARGET=	mopt mts pname
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index 1455034250f7..84faa0d5f2ee 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -20,9 +20,8 @@ EXTRACT_AFTER_ARGS=	# empty
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
+USES=		gmake zip:infozip
 USE_PYTHON=	yes
-USE_GMAKE=	yes
-USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/kawari-${PORTVERSION:S/.//g}
 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index f4037c73a7c5..ad61d706ec45 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The pysycache lang support
 
 RUN_DEPENDS=	pysycache.py:${PORTSDIR}/games/pysycache
 
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${DIST_SUBDIR}
diff --git a/games/pysycache-themes/Makefile b/games/pysycache-themes/Makefile
index 3cf5aa0e263a..4178953ed3aa 100644
--- a/games/pysycache-themes/Makefile
+++ b/games/pysycache-themes/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Pysycache themes support
 
 RUN_DEPENDS=	pysycache.py:${PORTSDIR}/games/pysycache
 
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${DIST_SUBDIR}
diff --git a/games/pysycache/Makefile b/games/pysycache/Makefile
index 2745497a0d50..030cc72d72e1 100644
--- a/games/pysycache/Makefile
+++ b/games/pysycache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Educational software made in python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/games/pytowerdefense/Makefile b/games/pytowerdefense/Makefile
index 167d01d32f19..9bcd410ab690 100644
--- a/games/pytowerdefense/Makefile
+++ b/games/pytowerdefense/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYGAME}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 INSTALLS_ICONS=	yes
 
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index 384c5b187ef7..bd5ded09b76a 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Quake III engine with Cell Shading capabilities
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	does not run properly; try games/ioquake3 with option
 
-USES=		gmake dos2unix
-USE_ZIP=	yes
+USES=		gmake dos2unix zip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/code/unix
 
diff --git a/games/qccx/Makefile b/games/qccx/Makefile
index 25db9e556a14..a015f9a54b82 100644
--- a/games/qccx/Makefile
+++ b/games/qccx/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Very fast optimizing QuakeC compiler
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	pr_comp.cpp qcc.cpp ${PORTDOCS}
+USES=		dos2unix zip
+DOS2UNIX_FILES=	pr_comp.cpp qcc.cpp ${PORTDOCS}
 MAKEFILE=	${FILESDIR}/Makefile
 
 NO_WRKSUBDIR=	yes
diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile
index 7ea5cec1a4c3..0d287633059c 100644
--- a/games/quake-dpmod/Makefile
+++ b/games/quake-dpmod/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Quake 1 modification (for DarkPlaces)
 
 RUN_DEPENDS=	${LOCALBASE}/share/darkplaces/dummy:${PORTSDIR}/games/darkplaces
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/quake-reaper/Makefile b/games/quake-reaper/Makefile
index bc2ade03fd02..8cc9c0f3b011 100644
--- a/games/quake-reaper/Makefile
+++ b/games/quake-reaper/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	reaprb81
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 1 bots
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 DOS2UNIX_GLOB=	${PORTDOCS}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile
index ec4a3f37cf21..9a67616dff4a 100644
--- a/games/quake2-3zb2/Makefile
+++ b/games/quake2-3zb2/Makefile
@@ -16,8 +16,8 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	3rd Zigock II bots for Quake II
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	*.[ch]
+USES=		dos2unix zip
+DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 SUB_FILES=	pkg-message
 
diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile
index 5be32d317c78..8f4ea2de95d9 100644
--- a/games/quake2-ctf/Makefile
+++ b/games/quake2-ctf/Makefile
@@ -15,8 +15,8 @@ DIST_SUBDIR=	quake2lnx
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II CTF (Capture The Flag) mod
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	../../../ctf/readme.txt ../../../ctf/server.cfg
+USES=		dos2unix zip
+DOS2UNIX_FILES=	../../../ctf/readme.txt ../../../ctf/server.cfg
 WRKSRC=		${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf
 
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile
index 4d526effb3d0..e69b5df16476 100644
--- a/games/quake2-data/Makefile
+++ b/games/quake2-data/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II data files
 
 # XXX we need info-unzip for q2-314-demo-x86.exe
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	MANUAL OPTIMIZED_CFLAGS SHAREWARE
diff --git a/games/quake2-extras/Makefile b/games/quake2-extras/Makefile
index 152c6f370153..eca506545279 100644
--- a/games/quake2-extras/Makefile
+++ b/games/quake2-extras/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	#
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II extras (high quality textures and skins)
 
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	RETEXTURE RETEXTURE_FULL SKINS
@@ -29,7 +29,7 @@ SKINS_DESC=		Install high quality skins
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
 RETEX_PAKS=	10 11 12 13 14 16 17 19
-RETEX_FULL=	all_q2_textures_07_17_2006.zip
+RETEX_FULL=	all_q2_textures_07_17_2006zip
 SKINS=		models.zip
 
 NO_STAGE=	yes
diff --git a/games/quake2-zaero/Makefile b/games/quake2-zaero/Makefile
index 5bcceabb2515..18a2b5c93383 100644
--- a/games/quake2-zaero/Makefile
+++ b/games/quake2-zaero/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II Zaero Mission Pack
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	*.[ch]
+USES=		dos2unix zip
+DOS2UNIX_FILES=	*.[ch]
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DEMO DM
diff --git a/games/quake3-excessive/Makefile b/games/quake3-excessive/Makefile
index 7491ce521cbd..f15422269110 100644
--- a/games/quake3-excessive/Makefile
+++ b/games/quake3-excessive/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Quake III Arena Mod: Excessive
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 DATADIR=	${Q3DIR}/${PORTNAME}
diff --git a/games/quake3-freezetag/Makefile b/games/quake3-freezetag/Makefile
index 0fb580257d58..c826f973258c 100644
--- a/games/quake3-freezetag/Makefile
+++ b/games/quake3-freezetag/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Quake III Arena Mod: Freeze Tag
 
 WRKSRC=		${WRKDIR}/freeze
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 DATADIR=	${Q3DIR}/${PORTNAME}
diff --git a/games/quake3-osp/Makefile b/games/quake3-osp/Makefile
index 0f346ddfd0f3..05b18c1d55a0 100644
--- a/games/quake3-osp/Makefile
+++ b/games/quake3-osp/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	osp-Quake3-${PORTVERSION}_full
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake III Arena mod: OSP Tourney DM/CA/CTF
 
-USE_ZIP=	yes
-USE_CRLF=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/quake3-ra3/Makefile b/games/quake3-ra3/Makefile
index 10e7c37e4dfc..23cfa75d899d 100644
--- a/games/quake3-ra3/Makefile
+++ b/games/quake3-ra3/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake III Arena mod: Rocket Arena 3
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/arena
diff --git a/games/quake3-ut/Makefile b/games/quake3-ut/Makefile
index 80de35c7cb13..afb43175c579 100644
--- a/games/quake3-ut/Makefile
+++ b/games/quake3-ut/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Quake III Arena mod: Urban Terror
 
 NO_PACKAGE=	package will be 445MB, set FORCE_PACKAGE if you really want it
 
-USE_ZIP=	yes
-USES=		gmake
+USES=		gmake zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/quake3-wfa/Makefile b/games/quake3-wfa/Makefile
index 7add5028dcf6..5b73297711fa 100644
--- a/games/quake3-wfa/Makefile
+++ b/games/quake3-wfa/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Quake III Arena mod: Weapons Factory Arena
 
 NO_PACKAGE=	package will be 200MB, set FORCE_PACKAGE if you really want it
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index 19c2b2de3809..e4b195c7159f 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -14,11 +14,9 @@ DISTNAME=	${PORTNAME}-${REALVERSION}-source
 MAINTAINER=	shirshegsm@gmail.com
 COMMENT=	Quake III Arena -- first person shooter (native build)
 
-USES=		gmake
+USES=		dos2unix gmake zip
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	does not run properly; try games/ioquake3
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${REALVERSION}
 BUILD_WRKSRC=	${WRKSRC}/code/unix
 MAKE_JOBS_UNSAFE=	yes
diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile
index c14484631457..a3b5aab99dcc 100644
--- a/games/r1q2/Makefile
+++ b/games/r1q2/Makefile
@@ -16,9 +16,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	sets the FPU rounding mode and precision (not available in fenv.h)
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
+USES=		dos2unix gmake zip
 NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/binaries
 ALL_TARGET=	#
diff --git a/games/railroad-rampage/Makefile b/games/railroad-rampage/Makefile
index 8c009004cb29..d56e342dd7f5 100644
--- a/games/railroad-rampage/Makefile
+++ b/games/railroad-rampage/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	bgdc:${PORTSDIR}/devel/bennugd-core \
 RUN_DEPENDS=	bgdi:${PORTSDIR}/devel/bennugd-core \
 		${LOCALBASE}/lib/bennugd/libmod_grproc.so:${PORTSDIR}/devel/bennugd-modules
 
-USE_ZIP=	yes
+USES=		zip
 
 WRKSRC=		${WRKDIR}/RailroadRampage_Linux
 SUB_FILES=	${PORTNAME}
diff --git a/games/rescue/Makefile b/games/rescue/Makefile
index ca027abadc13..8359d1d5b8ce 100644
--- a/games/rescue/Makefile
+++ b/games/rescue/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Action adventure in space
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index 407dccc35b10..29bf336f3b93 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Game for learning Java[tm] programming language
 
 LICENSE=	EPL
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_EXTRACT=	yes
diff --git a/games/scare/Makefile b/games/scare/Makefile
index 7f6e2597a221..e056c47b5d7d 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -21,7 +21,7 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	XGLK
 XGLK_DESC=	Use the xglk graphics library
 
-USE_ZIP=	yes
+USES=		zip
 
 PLIST_FILES=	bin/scare
 
diff --git a/games/sdlsand/Makefile b/games/sdlsand/Makefile
index 1b521e1fd928..b7c4a010b7cd 100644
--- a/games/sdlsand/Makefile
+++ b/games/sdlsand/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simulation of falling sand and other materials
 
-USE_ZIP=	yes
+USES=		zip
 USE_SDL=	sdl
 
 WRKSRC=		${WRKDIR}/SDL\ Sand/SDL\ Sand
diff --git a/games/secretmaryochronicles-music/Makefile b/games/secretmaryochronicles-music/Makefile
index dcf952748d77..caf9a61b79a3 100644
--- a/games/secretmaryochronicles-music/Makefile
+++ b/games/secretmaryochronicles-music/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Background music for Secret Maryo Chronicles
 
 RUN_DEPENDS=	smc:${PORTSDIR}/games/secretmaryochronicles
 
-USE_ZIP=	yes
+USES=		zip
 
 WRKSRC=		${WRKDIR}
 DATADIR=	${PREFIX}/share/smc
diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index ddf2ddb24438..884fa5c1efbf 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -33,9 +33,8 @@ MAKE_ARGS=	BACKEND=mixer_sdl \
 		FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \
 		VERBOSE=1
 NO_WRKSUBDIR=	yes
-USES=		gmake
+USES=		gmake zip
 USE_SDL=	sdl mixer
-USE_ZIP=	yes
 
 DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" "false"
 PLIST_FILES=	bin/simutrans bin/simutrans-bin
diff --git a/games/smashbattle/Makefile b/games/smashbattle/Makefile
index b9e716c9826e..6bf946787c95 100644
--- a/games/smashbattle/Makefile
+++ b/games/smashbattle/Makefile
@@ -13,9 +13,8 @@ COMMENT=	8-bit style platform battle game
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/battle/Battle
 
-USE_ZIP=	yes
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
-USES=		dos2unix gmake
+USES=		dos2unix gmake zip:infozip
 DOS2UNIX_FILES=	*.cpp *.h Makefile
 USE_SDL=	sdl image mixer
 ALL_TARGET=	battle
diff --git a/games/stockfish/Makefile b/games/stockfish/Makefile
index 1d4afcd6b3f3..3f8b2d458e66 100644
--- a/games/stockfish/Makefile
+++ b/games/stockfish/Makefile
@@ -11,7 +11,6 @@ MASTER_SITES=	https://s3.amazonaws.com/stockfish/:src \
 DISTNAME=	stockfish-${PORTVERSION:S/.//g}-win
 DISTFILES=	stockfish-${PORTVERSION:S/.//g}-win.zip:src \
 		stockfish-231-book.zip:book
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	execve@gmail.com
 COMMENT=	Open source chess engine
@@ -19,7 +18,7 @@ COMMENT=	Open source chess engine
 LICENSE=	GPLv3
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USES=		gmake compiler
+USES=		gmake compiler zip
 MYARCH=		${ARCH}
 BOOKDIR=	.
 PORTDOCS=	Readme.md polyglot.ini
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
index c30ca713726f..f70095c91212 100644
--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@@ -14,8 +14,7 @@ COMMENT=	A sequel to Transball and Transball 2 THRUST-type games
 
 LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge
 
-USE_ZIP=	yes
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	sources/main.cpp
 USE_SDL=	sdl image mixer sound
 
diff --git a/games/super_mario_bros_python/Makefile b/games/super_mario_bros_python/Makefile
index f6862d2d821c..22799c2bb956 100644
--- a/games/super_mario_bros_python/Makefile
+++ b/games/super_mario_bros_python/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/Super-Mario-Bros-Python-v${DISTVERSION}release
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 
 PORTDOCS=	changelog.txt readme.txt
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index 3ead34bbe0db..77dfe49136d2 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Quake engine with lighting similar to that in Doom III
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		gmake dos2unix
-USE_ZIP=	yes
+USES=		gmake dos2unix zip
 USE_GL=		glu
 USE_SDL=	yes
 USE_XORG=	xxf86dga
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index 92e3dda80a32..28c746953c1b 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -14,9 +14,8 @@ LICENSE=	GPLv2
 
 NO_WRKSUBDIR=	yes
 
-USES=		gmake
+USES=		gmake zip
 USE_GNOME=	gtk20
-USE_ZIP=	yes
 
 USE_WX=		2.8
 WX_COMPS=	wx:lib
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index 836254727e98..6337e7dd6a28 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Free FPS game featuring two opposing teams: humans and aliens
 
 LICENSE=	GPLv2
 
-USES=		gmake
-USE_ZIP=	yes
+USES=		gmake zip
 MAKE_ENV=	DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/urbanterror-data/Makefile b/games/urbanterror-data/Makefile
index 48a8d638e241..c6b308248967 100644
--- a/games/urbanterror-data/Makefile
+++ b/games/urbanterror-data/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	http://cdn.urbanterror.info/urt/42/zips/ \
 		http://mirror.urtstats.net/urbanterror/
 PKGNAMEPREFIX=	urbanterror-
 DISTNAME=	UrbanTerror${URT_VER}_full${URT_REV}
-EXTRACT_SUFX=	.zip
 EXTRACT_ONLY=
 
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Standalone realism based mod originally for Quake III Arena
 
+USES=		zip
 NO_BUILD=	yes
 NO_CDROM=	The mod files may not be sold or distributed on physical media unless with permission from id Software.
 
diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index ef72364d0738..e41dd5731e5b 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	vavoom:${PORTSDIR}/games/vavoom
 
 DATADIR=	${PREFIX}/share/vavoom
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_PACKAGE=	package could be up to 655MB; set FORCE_PACKAGE if you really want it
diff --git a/games/violetland/Makefile b/games/violetland/Makefile
index 1256c6d7f85a..5216511e39af 100644
--- a/games/violetland/Makefile
+++ b/games/violetland/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Top-down survival shoot 'em up
 
 LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
 
-USE_ZIP=	yes
 USE_SDL=	sdl mixer image ttf
 USE_GL=		gl glu
-USES=		cmake gettext
+USES=		cmake gettext zip
 USE_DOS2UNIX=	CMakeLists.txt src/system/utility/FileUtility.cpp
 CMAKE_ARGS=	-DDATA_INSTALL_DIR="${DATADIR}"
 
diff --git a/games/whichwayisup/Makefile b/games/whichwayisup/Makefile
index 36368d107c63..099fff0cb176 100644
--- a/games/whichwayisup/Makefile
+++ b/games/whichwayisup/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_REGEX=	.*.[^pt][^nt][^gf]
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 7558ea85ecd0..3bb74cb7b247 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -18,8 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=yes
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 USE_XORG=	xpm
 DOS2UNIX_GLOB=	*.cpp *.h config.mk makefile
 MAKEFILE=	makefile
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 61d27b06b457..b3517f404b81 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 
 MANUAL_PACKAGE_BUILD=	huge
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/Xonotic/source/darkplaces
 MAKEFILE=	BSDmakefile
 MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" \
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index b0df7c4e134d..1666cc3ee36a 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -12,8 +12,7 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Old action game
 
 NO_WRKSUBDIR=	Does not unpack into subdir.
-USE_ZIP=	yes
-USES=		imake
+USES=		imake zip
 USE_XORG=	x11 xext
 MAN1=		pacman.1
 PLIST_FILES=	bin/pacman