summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-03-10 14:49:26 +0000
committerbapt <bapt@FreeBSD.org>2014-03-10 14:49:26 +0000
commit365d81bafff5b9accbe7d264a4dc790418804a79 (patch)
treec9bc7d175d1787d3182be06d12c45d1a2fe32a2b
parent6d8e3ef4a66f0d1b8bc3a1f1703f76ad9c862498 (diff)
downloadFreeBSD-ports-365d81bafff5b9accbe7d264a4dc790418804a79.zip
FreeBSD-ports-365d81bafff5b9accbe7d264a4dc790418804a79.tar.gz
Convert g* to USES=zip
-rw-r--r--games/aestats/Makefile2
-rw-r--r--games/alephone-data/Makefile2
-rw-r--r--games/alephone-scenarios/Makefile2
-rw-r--r--games/annelid/Makefile3
-rw-r--r--games/bass/Makefile2
-rw-r--r--games/bombz/Makefile3
-rw-r--r--games/brainworkshop/Makefile4
-rw-r--r--games/cake/Makefile3
-rw-r--r--games/cleanq3/Makefile4
-rw-r--r--games/crafty-open-enormous/Makefile2
-rw-r--r--games/crafty-open-large/Makefile2
-rw-r--r--games/crafty-open-medium/Makefile2
-rw-r--r--games/crafty/Makefile3
-rw-r--r--games/daimonin-music/Makefile2
-rw-r--r--games/dangerdeep-data/Makefile2
-rw-r--r--games/darkplaces/Makefile5
-rw-r--r--games/dcross/Makefile3
-rw-r--r--games/djgame2/Makefile4
-rw-r--r--games/dmjava/Makefile2
-rw-r--r--games/domination/Makefile2
-rw-r--r--games/doom-freedoom/Makefile2
-rw-r--r--games/doom-hr/Makefile3
-rw-r--r--games/doom-hr2/Makefile3
-rw-r--r--games/doom/Makefile3
-rw-r--r--games/doomlegacy/Makefile3
-rw-r--r--games/duke3d-data/Makefile2
-rw-r--r--games/egl/Makefile4
-rw-r--r--games/el-data/Makefile3
-rw-r--r--games/endgame-singularity-music/Makefile2
-rw-r--r--games/exhaust-ma/Makefile3
-rw-r--r--games/f1spirit-remake/Makefile5
-rw-r--r--games/falconseye/Makefile3
-rw-r--r--games/fargoal/Makefile3
-rw-r--r--games/flightgear-aircraft/Makefile2
-rw-r--r--games/flightgear-mb339-pan/Makefile2
-rw-r--r--games/fotaq/Makefile2
-rw-r--r--games/freecol/Makefile2
-rw-r--r--games/freedoko/Makefile3
-rw-r--r--games/frikqcc/Makefile2
-rw-r--r--games/ftjava/Makefile2
-rw-r--r--games/fuhquake/Makefile2
-rw-r--r--games/funnyboat/Makefile2
-rw-r--r--games/gigalomania/Makefile2
-rw-r--r--games/glest-data/Makefile4
-rw-r--r--games/glest/Makefile3
-rw-r--r--games/gondola/Makefile2
-rw-r--r--games/gtkradiant/Makefile3
-rw-r--r--games/gunfudeadlands/Makefile2
-rw-r--r--games/hllib/Makefile3
-rw-r--r--games/hlstatsx/Makefile3
-rw-r--r--games/iceicepenguin/Makefile2
-rw-r--r--games/inform/Makefile2
-rw-r--r--games/inform7/Makefile2
-rw-r--r--games/ioquake3/Makefile3
-rw-r--r--games/jag/Makefile4
-rw-r--r--games/jfsw/Makefile3
-rw-r--r--games/joequake/Makefile3
-rw-r--r--games/jzip/Makefile2
-rw-r--r--games/linux-enemyterritory-etpro/Makefile2
-rw-r--r--games/linux-enemyterritory-omni-bot-0660/Makefile2
-rw-r--r--games/linux-enemyterritory-omni-bot/Makefile2
-rw-r--r--games/linux-enemyterritory-shrub/Makefile2
-rw-r--r--games/linux-enemyterritory-tce/Makefile2
-rw-r--r--games/linux-enemyterritory/Makefile2
-rw-r--r--games/linux-etqw-demo-server/Makefile2
-rw-r--r--games/linux-etqw-server/Makefile2
-rw-r--r--games/linux-quake3/Makefile2
-rw-r--r--games/linux-spheresofchaos-demo/Makefile2
-rw-r--r--games/lostfeathers/Makefile2
-rw-r--r--games/lwjgl/Makefile3
-rw-r--r--games/megamario/Makefile3
-rw-r--r--games/memonix/Makefile3
-rw-r--r--games/meqcc/Makefile3
-rw-r--r--games/moagg/Makefile2
-rw-r--r--games/mopesnake/Makefile2
-rw-r--r--games/motogt/Makefile2
-rw-r--r--games/mvdsv/Makefile2
-rw-r--r--games/nexuiz/Makefile2
-rw-r--r--games/oneisenough/Makefile3
-rw-r--r--games/openarena-oax/Makefile2
-rw-r--r--games/opengfx/Makefile2
-rw-r--r--games/openjazz/Makefile3
-rw-r--r--games/openmsx/Makefile2
-rw-r--r--games/opensfx/Makefile2
-rw-r--r--games/optimax/Makefile3
-rw-r--r--games/pcgen/Makefile2
-rw-r--r--games/ptools/Makefile3
-rw-r--r--games/pykawari/Makefile3
-rw-r--r--games/pysycache-lang/Makefile2
-rw-r--r--games/pysycache-themes/Makefile2
-rw-r--r--games/pysycache/Makefile2
-rw-r--r--games/pytowerdefense/Makefile2
-rw-r--r--games/q3cellshading/Makefile3
-rw-r--r--games/qccx/Makefile4
-rw-r--r--games/quake-dpmod/Makefile2
-rw-r--r--games/quake-reaper/Makefile3
-rw-r--r--games/quake2-3zb2/Makefile4
-rw-r--r--games/quake2-ctf/Makefile4
-rw-r--r--games/quake2-data/Makefile2
-rw-r--r--games/quake2-extras/Makefile4
-rw-r--r--games/quake2-zaero/Makefile4
-rw-r--r--games/quake3-excessive/Makefile2
-rw-r--r--games/quake3-freezetag/Makefile2
-rw-r--r--games/quake3-osp/Makefile3
-rw-r--r--games/quake3-ra3/Makefile2
-rw-r--r--games/quake3-ut/Makefile3
-rw-r--r--games/quake3-wfa/Makefile2
-rw-r--r--games/quake3/Makefile4
-rw-r--r--games/r1q2/Makefile4
-rw-r--r--games/railroad-rampage/Makefile2
-rw-r--r--games/rescue/Makefile2
-rw-r--r--games/robocode/Makefile2
-rw-r--r--games/scare/Makefile2
-rw-r--r--games/sdlsand/Makefile2
-rw-r--r--games/secretmaryochronicles-music/Makefile2
-rw-r--r--games/simutrans/Makefile3
-rw-r--r--games/smashbattle/Makefile3
-rw-r--r--games/stockfish/Makefile3
-rw-r--r--games/stransball2/Makefile3
-rw-r--r--games/super_mario_bros_python/Makefile2
-rw-r--r--games/tenebrae/Makefile3
-rw-r--r--games/traindirector/Makefile3
-rw-r--r--games/tremulous/Makefile3
-rw-r--r--games/urbanterror-data/Makefile2
-rw-r--r--games/vavoom-extras/Makefile2
-rw-r--r--games/violetland/Makefile3
-rw-r--r--games/whichwayisup/Makefile3
-rw-r--r--games/xevil/Makefile3
-rw-r--r--games/xonotic/Makefile2
-rw-r--r--games/xpacman/Makefile3
-rw-r--r--german/hyphen/Makefile2
-rw-r--r--german/mediathek/Makefile2
-rw-r--r--german/pecl-konto_check/Makefile3
-rw-r--r--german/selfhtml/Makefile3
-rw-r--r--german/tipp10/Makefile3
-rw-r--r--german/vtiger/Makefile2
-rw-r--r--graphics/aoi/Makefile2
-rw-r--r--graphics/apngasm/Makefile3
-rw-r--r--graphics/apngdis/Makefile3
-rw-r--r--graphics/autoq3d/Makefile3
-rw-r--r--graphics/batik/Makefile2
-rw-r--r--graphics/bmeps/Makefile3
-rw-r--r--graphics/c-a-i-r/Makefile3
-rw-r--r--graphics/cbviewer/Makefile2
-rw-r--r--graphics/cimg/Makefile2
-rw-r--r--graphics/deegree-csw/Makefile2
-rw-r--r--graphics/deegree-igeoportal/Makefile2
-rw-r--r--graphics/deegree-wcs/Makefile2
-rw-r--r--graphics/deegree-wfs/Makefile2
-rw-r--r--graphics/deegree-wms/Makefile2
-rw-r--r--graphics/deegree-wps/Makefile2
-rw-r--r--graphics/deegree-wpvs/Makefile2
-rw-r--r--graphics/ditaa/Makefile2
-rw-r--r--graphics/ffff/Makefile3
-rw-r--r--graphics/flasm/Makefile5
-rw-r--r--graphics/fli2gif/Makefile4
-rw-r--r--graphics/freeimage/Makefile3
-rw-r--r--graphics/fv/Makefile3
-rw-r--r--graphics/geoapi/Makefile2
-rw-r--r--graphics/geoserver/Makefile2
-rw-r--r--graphics/gle-graphics/Makefile3
-rw-r--r--graphics/glpng/Makefile4
-rw-r--r--graphics/jalbum/Makefile2
-rw-r--r--graphics/jasper/Makefile2
-rw-r--r--graphics/jave6/Makefile3
-rw-r--r--graphics/jogl/Makefile2
-rw-r--r--graphics/jpatch/Makefile2
-rw-r--r--graphics/jumpgis-postgis/Makefile36
-rw-r--r--graphics/jumpgis-postgis/distinfo2
-rw-r--r--graphics/jumpgis-postgis/pkg-deinstall12
-rw-r--r--graphics/jumpgis-postgis/pkg-descr4
-rw-r--r--graphics/jumpgis-postgis/pkg-install11
-rw-r--r--graphics/jumpgis-postgis/pkg-plist2
-rw-r--r--graphics/jumpgis/Makefile57
-rw-r--r--graphics/jumpgis/distinfo6
-rw-r--r--graphics/jumpgis/pkg-descr8
-rw-r--r--graphics/jumpgis/pkg-plist13
-rw-r--r--graphics/l2p/Makefile3
-rw-r--r--graphics/lib3ds/Makefile2
-rw-r--r--graphics/libecwj2/Makefile11
-rw-r--r--graphics/mapyrus/Makefile2
-rw-r--r--graphics/openjump/Makefile2
-rw-r--r--graphics/opennurbs/Makefile4
-rw-r--r--graphics/osg-devel/Makefile3
-rw-r--r--graphics/osg/Makefile3
-rw-r--r--graphics/osgearth/Makefile3
-rw-r--r--graphics/pencil/Makefile3
-rw-r--r--graphics/phplot/Makefile2
-rw-r--r--graphics/pngrewrite/Makefile2
-rw-r--r--graphics/proj/Makefile3
-rw-r--r--graphics/py-gchartwrapper/Makefile2
-rw-r--r--graphics/py-stl/Makefile2
-rw-r--r--graphics/pysvg/Makefile2
-rw-r--r--graphics/separate/Makefile3
-rw-r--r--graphics/structuresynth/Makefile3
-rw-r--r--graphics/tifmerge/Makefile3
-rw-r--r--graphics/yed/Makefile2
197 files changed, 351 insertions, 291 deletions
diff --git a/games/aestats/Makefile b/games/aestats/Makefile
index a7e3aa2..06a5082 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 62412fc..a48e28d 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 285b625..829a46c 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 a8a55ec..0a23148 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 0afc19a..fe98158 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 d5fbe28..718e970 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 3909d99..6821304 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 ccfe79f..283f22c 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 06cf732..4ea5b48 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 56d8d0c..380a92c 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 e163c5f..da11be9 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 7ede89d..182e977 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 5f6ab9f..e4831e90 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 c7b8102..e1d5fa2 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 65f2484..65717c8 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 6aec214..3de9b49 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 418bdff..4367a43 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 1c0b6f9..72179ca 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 b274703..cc475d1 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 ddf74ed..9309c90 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 d57f0be..3ab4138 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 cb2b6fd..7e28935 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 9a40db8..2d461e6 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 00dc3e9..69a3a82 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 72cd31d..735bac2 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 4bf08d6..6e64404 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 d43f0c1..42ff964 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 a2152a4..792ee17 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 48d8f9e..3310884 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 2e7be1a..cec97ce 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 48ed0cb..0520c38 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 e4cea69..417a4aa 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 999ae88..42fa685 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 48c4cb7..8dffb3f 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 859c33c..2184505 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 4af2d4e..ccf04c8 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 b40c1fe..1190be4 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 d2d1039..e5d047d 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 1350a4a..13d01ef 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 4b454eb..b090f05 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 3219f2d..d6e3ce6 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 f4673eb..62de8f1 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 6ba44c6..6f430ea 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 ddecfe9..c58b875 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 06b0c5f..a9ced5c 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 4a8c19c..dd31128 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 366475a..0d9fbdc 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 b61b6db..d33fe7f 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 f25ef84..8853af6 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 54923c9..eae5e99 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 eef4180..3cd2c7f 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 3f1279b..c5f4a91 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 0bb30f7..ad91082 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 966836b..86faf15 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 a5fc517..7da5aad 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 5c08ed0..a9be0bc 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 3ba92a0..c90cb14 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 3f5074c..4c01ff7 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 9721074..8380ecc 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 09fc190..dec8f42 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 ff9acfd..e62c6e4 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 f4fd796..30b3294 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 92a2949..cae386f 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 fee959b..6be21a1 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 5321657..49a7723 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 77c7aca..da50abc 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 c3e9dbd..d5b2867 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 ff853fa..a8f0049 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 bf14f02..9567c18 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 abbaeef..171f495 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 7f61cfb..30a1332 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 34c37d3..a06a6ba5 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 5299889..1cf359d 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 e137639..9c9401a 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 18d72f3..3e0a818 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 c977d3b..9ba7ec5 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 77a69da..a53f336 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 dc33842..0284aec 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 3c4082f..eb8b6a4 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 ea4b9da..28e4f13 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 401f7ee..e214bd8 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 6dc8eee..82a1186 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 eb54bd3..a8c601a 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 acd376a..6b599a6 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 c62a919..cc6bcb9 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 75dff81..2c99197 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 f99ac98..b804032 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 1455034..84faa0d 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 f4037c7..ad61d70 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 3cf5aa0..4178953 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 2745497..030cc72 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 167d01d..9bcd410 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 384c5b1..bd5ded0 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 25db9e5..a015f9a 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 7ea5cec..0d28763 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 bc2ade0..8cc9c0f 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 ec4a3f3..9a67616 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 5be32d3..8f4ea2d 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 4d526ef..e69b5df 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 152c6f3..eca5065 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 5bcceabb..18a2b5c 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 7491ce5..f154222 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 0fb5802..c826f97 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 0f346dd..05b18c1 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 10e7c37..23cfa75 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 80de35c..afb4317 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 7add502..5b73297 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 19c2b2d..e4b195c 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 c144846..a3b5aab 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 8c00900..d56e342 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 ca027ab..8359d1d 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 407dccc..29bf336 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 7f6e259..e056c47 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 1b521e1..b7c4a01 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 dcf9527..caf9a61 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 ddf2ddb..884fa5c 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 b9e716c9..6bf9467 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 1d4afcd..3f8b2d4 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 c30ca71..f70095c 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 f6862d2..22799c2 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 3ead34b..77dfe49 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 92e3dda..28c7469 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 8362547..6337e7d 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 48a8d63..c6b3082 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 ef72364..e41dd57 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 1256c6d7..5216511 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 36368d1..099fff0 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 7558ea8..3bb74cb 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 61d27b0..b3517f4 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 b0df7c4..1666cc3 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
diff --git a/german/hyphen/Makefile b/german/hyphen/Makefile
index 75df501..2d359a1 100644
--- a/german/hyphen/Makefile
+++ b/german/hyphen/Makefile
@@ -13,7 +13,7 @@ COMMENT= German hyphenation rules
LICENSE= LGPL21
-EXTRACT_SUFX= .zip
+USES= zip
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index 17a0ccb..2c383e0 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -13,7 +13,7 @@ COMMENT= Filme der oeff. rechtlichen Sender herunterladen und ansehen
RUN_DEPENDS= flvstreamer:${PORTSDIR}/multimedia/flvstreamer
NO_BUILD= yes
-USE_ZIP= yes
+USES= zip
USE_JAVA= yes
JAVA_VERSION= 1.7+
SUB_FILES= mediathek
diff --git a/german/pecl-konto_check/Makefile b/german/pecl-konto_check/Makefile
index a1dd572..f16b850 100644
--- a/german/pecl-konto_check/Makefile
+++ b/german/pecl-konto_check/Makefile
@@ -6,12 +6,11 @@ PORTVERSION= 2.98
CATEGORIES= german
MASTER_SITES= SF/kontocheck/konto_check-de/${PORTVERSION}
PKGNAMEPREFIX= pecl-
-EXTRACT_SUFX= .zip
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP module to check German and Austrian Bank Account Numbers
-USE_ZIP= yes
+USES= zip:infozip
USE_PHP= yes
USE_PHPIZE= yes
USE_PHPEXT= yes
diff --git a/german/selfhtml/Makefile b/german/selfhtml/Makefile
index 62d8365..9862c31 100644
--- a/german/selfhtml/Makefile
+++ b/german/selfhtml/Makefile
@@ -24,8 +24,7 @@ COMMENT= Extensive German HTML reference
WRKSRC= ${WRKDIR}
NO_BUILD= yes
-USES= dos2unix
-USE_ZIP= yes
+USES= dos2unix zip
DOS2UNIX_REGEX= .*\.(css|dhtml|diverses|editorial|grafik|helferlein|htm|inter|intro|javascript|layouts|navigation|perl|php|projekt|quellen|servercgi|src|xml|xls|dtd)$$
PORTDOCS= \
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index 8bc55dd..ecd5e66 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -14,9 +14,8 @@ COMMENT= 10-finger touch typing learning program
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/license_en.txt
-USES= qmake dos2unix
+USES= qmake dos2unix zip
DOS2UNIX_GLOB= *.pro *.cpp
-USE_ZIP= yes
USE_QT4= gui sql corelib network script qtestlib \
rcc_build uic_build moc_build \
sql-sqlite2_run sql-sqlite3_run
diff --git a/german/vtiger/Makefile b/german/vtiger/Makefile
index d7512ca..192875d 100644
--- a/german/vtiger/Makefile
+++ b/german/vtiger/Makefile
@@ -20,8 +20,8 @@ WWWDIR?= ${PREFIX}/www/${PORTNAME}
RUN_DEPENDS+= ${WWWDIR}/include/language:${PORTSDIR}/www/vtiger
+USES= zip
NO_BUILD= YES
-USE_ZIP= YES
SUB_FILES= pkg-message
diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile
index de6155f..42317c9 100644
--- a/graphics/aoi/Makefile
+++ b/graphics/aoi/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
-USE_ZIP= yes
+USES= zip:infozip
EXTRACT_BEFORE_ARGS= -a -q
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/graphics/apngasm/Makefile b/graphics/apngasm/Makefile
index f6e3341..8ffef80 100644
--- a/graphics/apngasm/Makefile
+++ b/graphics/apngasm/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFINE= DOCS STATIC
NO_WRKSUBDIR= yes
-USE_ZIP= yes
-USES= dos2unix gmake
+USES= dos2unix gmake zip
LDFLAGS+= -lz
diff --git a/graphics/apngdis/Makefile b/graphics/apngdis/Makefile
index ac572d8..dcfff1a 100644
--- a/graphics/apngdis/Makefile
+++ b/graphics/apngdis/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFINE= DOCS STATIC
NO_WRKSUBDIR= yes
-USE_ZIP= yes
-USES= dos2unix gmake
+USES= dos2unix gmake zip
LDFLAGS+= -lz
PORTDOCS= readme.txt
diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index bcb567f..9db54dc 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -14,8 +14,7 @@ COMMENT= Qt 4 quick 3D model editor
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-USE_ZIP= yes
-USES= dos2unix qmake
+USES= dos2unix qmake zip
DOS2UNIX_FILES= *.pro src/cmds/*.cpp src/fgui/*.cpp docs/*.txt
DOS2UNIX_REGEX= .*.[^p][^n][^g]$
USE_GL= glu
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index 507c140..a84363d 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -13,7 +13,7 @@ COMMENT= Java based SVG toolkit
LICENSE= APACHE20
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.6+
USE_ANT= yes
ALL_TARGET= jars all-jar
diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index f5caf6d..4fbe1c2 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.2.26
CATEGORIES= graphics perl5
MASTER_SITES= SF/dktools/dktools/dktools-${PORTVERSION}
DISTNAME= dktools-${PORTVERSION}
-EXTRACT_SUFX= .zip
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert bitmap images (PNG/JPEG/NetPBM) to EPS
@@ -18,7 +17,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff
-USES= perl5
+USES= perl5 zip
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_header_sys_termios_h=no
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/dktools\
diff --git a/graphics/c-a-i-r/Makefile b/graphics/c-a-i-r/Makefile
index 1187f3c..7817ee3 100644
--- a/graphics/c-a-i-r/Makefile
+++ b/graphics/c-a-i-r/Makefile
@@ -10,8 +10,7 @@ DISTNAME= CAIR_v${PORTVERSION}
MAINTAINER= buganini@gmail.com
COMMENT= Content Aware Image Resizer is an implementation of seam carving
-USE_ZIP= yes
-USES= gmake
+USES= gmake zip
MAKE_ARGS+= CC="${CXX}"
diff --git a/graphics/cbviewer/Makefile b/graphics/cbviewer/Makefile
index caf9426..bea8ef4 100644
--- a/graphics/cbviewer/Makefile
+++ b/graphics/cbviewer/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv2
RUN_DEPENDS= unrar:${PORTSDIR}/archivers/unrar \
unzip:${PORTSDIR}/archivers/unzip
-USE_ZIP= yes
+USES= zip:infozip
USE_JAVA= yes
JAVA_VERSION= 1.6+
NO_BUILD= yes
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index c176e9c..0c3f1fd 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -26,7 +26,7 @@ LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= "invokes i386 asm"
-USE_ZIP= yes
+USES= zip
WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/}
BUILD_WRKSRC= ${WRKSRC}/examples
MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
diff --git a/graphics/deegree-csw/Makefile b/graphics/deegree-csw/Makefile
index c5cbccc..d9779e5 100644
--- a/graphics/deegree-csw/Makefile
+++ b/graphics/deegree-csw/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Catalogue Service(CSW)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-igeoportal/Makefile b/graphics/deegree-igeoportal/Makefile
index c31b2a5..395ba86 100644
--- a/graphics/deegree-igeoportal/Makefile
+++ b/graphics/deegree-igeoportal/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-std_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Browser based client handling WMS, WFS, and proxy service
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-wcs/Makefile b/graphics/deegree-wcs/Makefile
index bfdf646..c009a60 100644
--- a/graphics/deegree-wcs/Makefile
+++ b/graphics/deegree-wcs/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Web Coverage Service(WCS)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-wfs/Makefile b/graphics/deegree-wfs/Makefile
index a9b02d3..13145db 100644
--- a/graphics/deegree-wfs/Makefile
+++ b/graphics/deegree-wfs/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Web Feature Service(WFS)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-wms/Makefile b/graphics/deegree-wms/Makefile
index b07c5ac..c14c32b 100644
--- a/graphics/deegree-wms/Makefile
+++ b/graphics/deegree-wms/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Web Map Service(WMS)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-wps/Makefile b/graphics/deegree-wps/Makefile
index b8b95bc..a34d6ff 100644
--- a/graphics/deegree-wps/Makefile
+++ b/graphics/deegree-wps/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Web Processing Service(WPS)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/deegree-wpvs/Makefile b/graphics/deegree-wpvs/Makefile
index 37ac75c..f554794 100644
--- a/graphics/deegree-wpvs/Makefile
+++ b/graphics/deegree-wpvs/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= Deegree Web Terrain Service(WTS)/Web Perspective View Service(WPVS)
-USE_ZIP= yes
+USES= zip
USE_JAVA= 1.5+
NO_BUILD= yes
diff --git a/graphics/ditaa/Makefile b/graphics/ditaa/Makefile
index dd3bbbc..4055f0e 100644
--- a/graphics/ditaa/Makefile
+++ b/graphics/ditaa/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}${DISTVERSION}
MAINTAINER= graudeejs@gmail.com
COMMENT= Convert ASCII art diagrams into proper bitmap graphics
-USE_ZIP= yes
+USES= zip
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/graphics/ffff/Makefile b/graphics/ffff/Makefile
index 8063a8d..c54714a 100644
--- a/graphics/ffff/Makefile
+++ b/graphics/ffff/Makefile
@@ -12,9 +12,8 @@ MAINTAINER= rossiya@gmail.com
COMMENT= Fast Mandelbrot fractal generator
USE_XORG= x11 xmu xext
-USE_DOS2UNIX= yes
USE_GL= gl glut
-USE_ZIP= yes
+USES= dos2unix zip
SOURCE= FFFF3 FragmentProgram FragmentProgramARB10 GPUProgram \
PixelBuffer VertexProgram VertexProgramATI VertexProgramNV \
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index de85183..3dc64cf 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -12,10 +12,7 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Command line assembler/disassembler of flash actionscript bytecode
PLIST_FILES= bin/flasm
-USE_ZIP= YES
-USE_GMAKE= YES
-USE_DOS2UNIX= YES
-USES= bison
+USES= bison dos2unix gmake zip
NO_WRKSUBDIR= YES
MAKE_ARGS= CFLAGS="${CFLAGS}"
diff --git a/graphics/fli2gif/Makefile b/graphics/fli2gif/Makefile
index 24575be..4ac0ab1 100644
--- a/graphics/fli2gif/Makefile
+++ b/graphics/fli2gif/Makefile
@@ -13,8 +13,8 @@ COMMENT= Automatic Flic to animated GIF converter
NO_WRKSUBDIR= yes
-USE_ZIP= yes
-USE_DOS2UNIX= fli2gif.cpp FLI2GIF.TXT
+USES= dos2unix zip:infozip
+DOS2UNIX_FILES= fli2gif.cpp FLI2GIF.TXT
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= fli2gif.txt
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 2dce612..274bcc2 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -11,8 +11,7 @@ DISTNAME= FreeImage${PORTVERSION:S/.//g}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Simple C/C++ bitmap graphics library
-USES= gmake dos2unix
-USE_ZIP= yes
+USES= gmake dos2unix zip
DOS2UNIX_FILES= Source/LibOpenJPEG/opj_malloc.h
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/FreeImage
diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile
index 2650a42..eb42174 100644
--- a/graphics/fv/Makefile
+++ b/graphics/fv/Makefile
@@ -15,8 +15,7 @@ LICENSE= GPLv2
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
-USES= pkgconfig
-USE_ZIP= yes
+USES= pkgconfig zip
USE_GL= glut
USE_GMAKE= yes
ALL_TARGET= ${PORTNAME}
diff --git a/graphics/geoapi/Makefile b/graphics/geoapi/Makefile
index 7b46ffd..15fcb08 100644
--- a/graphics/geoapi/Makefile
+++ b/graphics/geoapi/Makefile
@@ -10,7 +10,7 @@ DISTNAME= GeoAPI-2_1_1
MAINTAINER= wenheping@gmail.com
COMMENT= A Java interface API based upon OGC Standards
-USE_ZIP= yes
+USES= zip
NO_BUILD= yes
USE_JAVA= yes
NO_WRKSUBDIR= yes
diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index afd57a3..5b3aa34 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -13,7 +13,7 @@ COMMENT= An Open Source GIS Server
LICENSE= GPLv2
USE_JAVA= yes
-USE_ZIP= yes
+USES= zip
JAVA_VERSION= 1.6+
NO_BUILD= yes
diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile
index e57359f..cca9211 100644
--- a/graphics/gle-graphics/Makefile
+++ b/graphics/gle-graphics/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS+= --with-qt=no
PLIST_SUB+= PORTVERSION=${PORTVERSION}
REINPLACE_FILES= configure
-USE_GMAKE= yes
-USE_ZIP= yes
+USES= gmake zip
NO_STAGE= yes
post-patch:
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index c1984b4..39f5184 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -15,9 +15,9 @@ COMMENT= Library to easily load PNG files as an OpenGL textures
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
USE_GL= gl
-USE_ZIP= yes
+USES= dos2unix zip
USE_LDCONFIG= yes
-USE_DOS2UNIX= glpng.c
+DOS2UNIX_FILES= glpng.c
AR?= /usr/bin/ar
diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile
index e8663b1..703a51d 100644
--- a/graphics/jalbum/Makefile
+++ b/graphics/jalbum/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
WRKSRC= ${WRKDIR}/jAlbum
-USE_ZIP= yes
+USES= zip
NO_BUILD= yes
USE_JAVA= yes
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index b584ce8..98a8970 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
LICENSE= MIT
USE_AUTOTOOLS= libtool
-USE_ZIP= yes
+USES= zip
USE_GNOME= lthack
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile
index 67a6a36..0f3b085 100644
--- a/graphics/jave6/Makefile
+++ b/graphics/jave6/Makefile
@@ -8,13 +8,12 @@ CATEGORIES= graphics java
MASTER_SITES= http://www.jave.de/developer/\
http://ikaria.informatik.uni-rostock.de/public_bsd/FreeBSD/
DISTNAME= jave_6.0_i20060105
-EXTRACT_SUFX= .zip
MAINTAINER= ad001@uni-rostock.de
COMMENT= Java ASCII-Art-Generator
+USES= zip
USE_JAVA= YES
-USE_ZIP= YES
JAVA_VERSION= 1.6+
NO_BUILD= YES
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile
index 742150b..9739822 100644
--- a/graphics/jogl/Makefile
+++ b/graphics/jogl/Makefile
@@ -35,10 +35,10 @@ ALL_TARGET+= javadoc
# jogl/make/build.xml
ONLY_FOR_ARCHS= i386 amd64
+USES= zip
USE_XORG= x11 xau xdamage xdmcp xext xf86vidmodeproto xfixes xproto xt \
xxf86vm
USE_GL= gl
-USE_ZIP= yes
USE_ANT= yes
USE_LDCONFIG= yes
USE_JAVA= yes
diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile
index 6ec2676..366afda 100644
--- a/graphics/jpatch/Makefile
+++ b/graphics/jpatch/Makefile
@@ -13,7 +13,7 @@ COMMENT= A spline based 3D modeling tool
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
-USE_ZIP= yes
+USES= zip
USE_JAVA= yes
JAVA_VERSION= 1.6+
NO_BUILD= yes
diff --git a/graphics/jumpgis-postgis/Makefile b/graphics/jumpgis-postgis/Makefile
new file mode 100644
index 0000000..306e812
--- /dev/null
+++ b/graphics/jumpgis-postgis/Makefile
@@ -0,0 +1,36 @@
+# Created by: Sam Lawrance <boris@brooknet.com.au>
+# $FreeBSD$
+
+PORTNAME= jumpgis-postgis
+PORTVERSION= 1.1.0
+PORTREVISION= 2
+CATEGORIES= graphics databases java geography
+MASTER_SITES= http://postgis.refractions.net/download/
+DISTNAME= postgisdriver-${PORTVERSION}
+
+MAINTAINER= ports@FreeBSD.org
+COMMENT= JUMP support for reading and writing a PostGIS database
+
+DEPRECATED= Depends on expiring graphics/jumpgis
+EXPIRATION_DATE= 2014-03-10
+
+RUN_DEPENDS= jumpgis:${PORTSDIR}/graphics/jumpgis
+
+USES= zip
+TARGET_DIR= ${PREFIX}/jumpgis
+USE_JAVA= yes
+JAVA_VERSION= 1.6+
+NO_BUILD= yes
+NO_WRKSUBDIR= yes
+
+NO_STAGE= yes
+do-install:
+ @${ECHO_MSG} " >> Installing JAR files"
+ ${MKDIR} ${TARGET_DIR}/lib/ext/
+ ${INSTALL_DATA} ${WRKSRC}/lib/ext/postgisdriver-1.1.0.jar ${TARGET_DIR}/lib/ext/
+ ${INSTALL_DATA} ${WRKSRC}/lib/ext/pg74jdbc3.jar ${TARGET_DIR}/lib/
+
+post-install:
+ @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/graphics/jumpgis-postgis/distinfo b/graphics/jumpgis-postgis/distinfo
new file mode 100644
index 0000000..7d884dd
--- /dev/null
+++ b/graphics/jumpgis-postgis/distinfo
@@ -0,0 +1,2 @@
+SHA256 (postgisdriver-1.1.0.zip) = 7d28b6644a9c074ee834d39c4d43ec1413a9aa478060ac38a8c78a1425551b64
+SIZE (postgisdriver-1.1.0.zip) = 239876
diff --git a/graphics/jumpgis-postgis/pkg-deinstall b/graphics/jumpgis-postgis/pkg-deinstall
new file mode 100644
index 0000000..1e60b15
--- /dev/null
+++ b/graphics/jumpgis-postgis/pkg-deinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ "$2" != "DEINSTALL" ]; then
+ exit
+fi
+
+echo Restoring CLASSPATH in ${PKG_PREFIX}/bin/jumpgis
+
+grep -v '^CLASSPATH=$CLASSPATH:$LIB/pg74jdbc3.jar$' ${PKG_PREFIX}/bin/jumpgis > ${PKG_PREFIX}/bin/jumpgis.new
+cat ${PKG_PREFIX}/bin/jumpgis.new > ${PKG_PREFIX}/bin/jumpgis
+rm ${PKG_PREFIX}/bin/jumpgis.new
diff --git a/graphics/jumpgis-postgis/pkg-descr b/graphics/jumpgis-postgis/pkg-descr
new file mode 100644
index 0000000..1e83fdb
--- /dev/null
+++ b/graphics/jumpgis-postgis/pkg-descr
@@ -0,0 +1,4 @@
+The JUMP PostGIS driver plugin allows reading from and writing to a
+PostGIS database.
+
+WWW: http://www.jump-project.org/
diff --git a/graphics/jumpgis-postgis/pkg-install b/graphics/jumpgis-postgis/pkg-install
new file mode 100644
index 0000000..ddad414
--- /dev/null
+++ b/graphics/jumpgis-postgis/pkg-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+# $FreeBSD$
+
+if [ "$2" != "POST-INSTALL" ]; then
+ exit
+fi
+
+echo Fixing CLASSPATH in ${PKG_PREFIX}/bin/jumpgis
+
+sed -i '.bak' 's,CLASSPATH=.*,&\
+CLASSPATH=$CLASSPATH:$LIB/pg74jdbc3.jar,g' ${PKG_PREFIX}/bin/jumpgis && rm ${PKG_PREFIX}/bin/jumpgis.bak
diff --git a/graphics/jumpgis-postgis/pkg-plist b/graphics/jumpgis-postgis/pkg-plist
new file mode 100644
index 0000000..5600905
--- /dev/null
+++ b/graphics/jumpgis-postgis/pkg-plist
@@ -0,0 +1,2 @@
+jumpgis/lib/ext/postgisdriver-1.1.0.jar
+jumpgis/lib/pg74jdbc3.jar
diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
new file mode 100644
index 0000000..2b9f5ed
--- /dev/null
+++ b/graphics/jumpgis/Makefile
@@ -0,0 +1,57 @@
+# Created by: Sam Lawrance <boris@brooknet.com.au>
+# $FreeBSD$
+
+PORTNAME= jumpgis
+PORTVERSION= 1.1.2
+PORTREVISION= 5
+CATEGORIES= graphics java geography
+MASTER_SITES= http://www.jump-project.org/downloads/jump/:main \
+ http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/:main,extra
+DISTFILES= jump-${PORTVERSION}.zip:main \
+ jump.png:extra jump.desktop:main,extra
+EXTRACT_ONLY= jump-${PORTVERSION}.zip
+
+MAINTAINER= ports@FreeBSD.org
+COMMENT= A GUI based application for viewing and processing spatial data
+
+DEPRECATED= No more public distfiles
+EXPIRATION_DATE= 2014-03-10
+
+WRKSRC= ${WRKDIR}/jump
+EXTRACT_AFTER_ARGS= -d ${WRKSRC}
+TARGET_DIR= ${PREFIX}/${PORTNAME}
+
+USES= zip:infozip
+USE_JAVA= yes
+JAVA_VERSION= 1.6+
+NO_BUILD= yes
+PORTDOCS= *
+
+REINPLACE_ARGS= -i ""
+
+NO_STAGE= yes
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -e "s,#!sh,#!/bin/sh,g" \
+ -e "s,^LIB=../lib,LIB=${TARGET_DIR}/lib,g" \
+ -e "s,workbench-properties.xml,~/.jump-workbench-properties.xml,g" \
+ ${WRKSRC}/bin/JUMPWorkbench-unix.sh
+
+do-install:
+ @${ECHO_CMD} "---> Installing JAR files"
+ ${MKDIR} ${TARGET_DIR}/lib
+ ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${TARGET_DIR}/lib
+ ${MKDIR} ${TARGET_DIR}/lib/ext
+ @${ECHO_MSG} "Installing startup script"
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/JUMPWorkbench-unix.sh ${PREFIX}/bin/jumpgis
+
+.if !defined(NOPORTDOCS)
+ @${ECHO_MSG} "---> Installing documentation"
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.else
+ @${ECHO_MSG} "---> Skipping documentation"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/jumpgis/distinfo b/graphics/jumpgis/distinfo
new file mode 100644
index 0000000..a03b84a
--- /dev/null
+++ b/graphics/jumpgis/distinfo
@@ -0,0 +1,6 @@
+SHA256 (jump-1.1.2.zip) = b1e1991cb0494e3c8e6229637f28f1891cc7fe7990d9a58d6640aeae5fe392bb
+SIZE (jump-1.1.2.zip) = 8813307
+SHA256 (jump.png) = e3ab487f5ad3592de80f7a24af2d1d32502b9610d47476123326fa12bd0d3895
+SIZE (jump.png) = 786
+SHA256 (jump.desktop) = e2224a44720945807b398cbf69f2a135fa7e880d0d0a4989127d8e221cea3b29
+SIZE (jump.desktop) = 232
diff --git a/graphics/jumpgis/pkg-descr b/graphics/jumpgis/pkg-descr
new file mode 100644
index 0000000..acf84b7
--- /dev/null
+++ b/graphics/jumpgis/pkg-descr
@@ -0,0 +1,8 @@
+The JUMP Unified Mapping Platform (JUMP) is a GUI-based application for
+viewing and processing spatial data. It includes many functions common
+to other popular GIS products for the analysis and manipulation of
+geospatial data. The JUMP also provides a highly extensible framework
+for the development and execution of custom spatial data processing
+applications.
+
+WWW: http://www.jump-project.org/
diff --git a/graphics/jumpgis/pkg-plist b/graphics/jumpgis/pkg-plist
new file mode 100644
index 0000000..3992b4f
--- /dev/null
+++ b/graphics/jumpgis/pkg-plist
@@ -0,0 +1,13 @@
+bin/jumpgis
+jumpgis/lib/bsh-2.0b1.jar
+jumpgis/lib/Jama-1.0.1.jar
+jumpgis/lib/jdom.jar
+jumpgis/lib/jts-1.4.1-RC1.jar
+jumpgis/lib/jump-1.1.2.jar
+jumpgis/lib/junit.jar
+jumpgis/lib/xercesImpl.jar
+jumpgis/lib/xml-apis.jar
+@exec mkdir -p %D/jumpgis/lib/ext
+@dirrm jumpgis/lib/ext
+@dirrm jumpgis/lib
+@dirrm jumpgis
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index 57a2d31..6c9bb04 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -23,8 +23,7 @@ SHEBANG_FILES= ${WRKSRC}/${PORTNAME}
USE_PERL5= run
USE_TEX= latex dvipsk
-USE_ZIP= yes
-USES= perl5 shebangfix
+USES= perl5 shebangfix zip
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 4d4e3c7..e3b3e44 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -12,7 +12,7 @@ COMMENT= A library for handling 3DS (3D Studio) files
LICENSE= LGPL21 # (or later)
-USE_ZIP= yes
+USES= zip
USE_GL= glut
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/graphics/libecwj2/Makefile b/graphics/libecwj2/Makefile
index 0013b9b..bcd56cb 100644
--- a/graphics/libecwj2/Makefile
+++ b/graphics/libecwj2/Makefile
@@ -14,18 +14,11 @@ COMMENT= Erdas ECW and JPEG2000 support library
RESTRICTED= Registration required to download sources, \
but sources no longer available on ERDAS website
-USE_ZIP= yes
USE_AUTOTOOLS= libtool autoconf
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USES= gmake
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-BROKEN= does not build on 7.X
-.endif
+USES= gmake zip:infozip
post-extract:
cd ${WRKDIR} && \
@@ -34,4 +27,4 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index d6da953..e2ebf83 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes
USE_JAVA= yes
JAVA_VERSION= 1.6+
-USE_ZIP= yes
+USES= zip
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
SUB_FILES= ${PORTNAME} pkg-message
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 4149fce..54489eb 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -40,7 +40,7 @@ LICENSE_PERMS_JYTHON= auto-accept
TARGET_DIR= ${STAGEDIR}${PREFIX}/${PORTNAME}
USE_JAVA= yes
JAVA_VERSION= 1.6+
-USE_ZIP= yes
+USES= zip
NO_BUILD= yes
NO_WRKSUBDIR= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 867892c..668852b 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -12,9 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= fernando.apesteguia@gmail.com
COMMENT= Tools to accurately transfer 3-D geometry between applications
-USE_DOS2UNIX= yes
-USE_ZIP= yes
-USES= iconv:build gmake
+USES= iconv:build dos2unix gmake zip
MAKE_ARGS= CC=${CC} CCC=${CXX}
MAKEFILE= makefile
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 1287ed4..852d3e1 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
CONFLICTS= osg-[0-9]*
-USE_ZIP= yes
-USES= cmake:outsource pkgconfig
+USES= cmake:outsource pkgconfig zip
USE_GL= gl glu
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 7dcfaf9..c54be52 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \
CONFLICTS= osg-devel-[0-9]*
-USE_ZIP= yes
-USES= cmake:outsource pkgconfig
+USES= cmake:outsource pkgconfig zip
USE_GL= gl glu
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile
index 275381c..d0bfba2 100644
--- a/graphics/osgearth/Makefile
+++ b/graphics/osgearth/Makefile
@@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTNAME}
USE_LDCONFIG= YES
USE_SQLITE= 3
-USE_ZIP= YES
-USES= cmake gmake pkgconfig
+USES= cmake gmake pkgconfig zip
PLIST_SUB= OSGVERSION=3.2.0
CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 93c1c1c..9dc2d94 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS+= libming.so:${PORTSDIR}/graphics/ming \
libpcre.so:${PORTSDIR}/devel/pcre \
libdrm.so:${PORTSDIR}/graphics/libdrm
-USE_ZIP= yes
-USES= gettext iconv qmake
+USES= gettext iconv qmake zip
USE_GNOME= glib20
USE_QT4= gui moc_build rcc_build xml_build opengl_build
USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
diff --git a/graphics/phplot/Makefile b/graphics/phplot/Makefile
index fcb6df0..4071e63 100644
--- a/graphics/phplot/Makefile
+++ b/graphics/phplot/Makefile
@@ -15,7 +15,7 @@ COMMENT= PHP class for creating scientific and business charts
LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd
-USE_ZIP= yes
+USES= zip
USE_PHP= yes
DEFAULT_PHP_VER= 5
NO_BUILD= YES
diff --git a/graphics/pngrewrite/Makefile b/graphics/pngrewrite/Makefile
index e8ce50c..4905932 100644
--- a/graphics/pngrewrite/Makefile
+++ b/graphics/pngrewrite/Makefile
@@ -13,7 +13,7 @@ COMMENT= PNG palette optimizer
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
-USE_ZIP= yes
+USES= zip
NO_WRKSUBDIR= yes
PLIST_FILES= bin/pngrewrite
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 07d0e29..2cf406d 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -18,9 +18,8 @@ CONFLICTS= proj4-[0-9]*
DATUM_GRID_FILES= proj-datumgrid-1.5.zip
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake zip:infozip
USE_LDCONFIG= yes
-USE_ZIP= yes
post-extract:
@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
diff --git a/graphics/py-gchartwrapper/Makefile b/graphics/py-gchartwrapper/Makefile
index b02ef9b..5329fbd 100644
--- a/graphics/py-gchartwrapper/Makefile
+++ b/graphics/py-gchartwrapper/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}imaging>=1.1.6_2:${PORTSDIR}/graphics/py-ima
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-USE_ZIP= yes
+USES= zip
NO_STAGE= yes
EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/graphics/py-stl/Makefile b/graphics/py-stl/Makefile
index 5517cf0..4d8d0a3 100644
--- a/graphics/py-stl/Makefile
+++ b/graphics/py-stl/Makefile
@@ -16,7 +16,7 @@ LICENSE= BSD
# bypass infrastructure bug
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-USE_ZIP= YES
+USES= zip
USE_PYTHON= yes
USE_PYDISTUTILS= YES
PYDISTUTILS_EGGINFO= py_stl-${PORTVERSION}-py${PYTHON_VER}.egg-info
diff --git a/graphics/pysvg/Makefile b/graphics/pysvg/Makefile
index d364afb..b9a2d84 100644
--- a/graphics/pysvg/Makefile
+++ b/graphics/pysvg/Makefile
@@ -15,6 +15,6 @@ USE_PYTHON= 2
USE_PYDISTUTILS= yes
PYDISTUTILS_AUTOPLIST= yes
-USE_ZIP= yes
+USES= zip
.include <bsd.port.mk>
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index ebc7953..eb2f0d7 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -21,8 +21,7 @@ BUILD_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep
LIB_DEPENDS= liblcms.so.1:${PORTSDIR}/graphics/lcms \
libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
-USE_ZIP= yes
-USES= gmake pkgconfig
+USES= gmake pkgconfig zip
BIN_TARGETS= separate separate_import icc_colorspace
L10N_TARGETS= cs es fr ja ko pl ru
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index 1e48daf..68d85dd 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -11,9 +11,8 @@ DISTNAME= StructureSynth-Source-v${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Rule-based 3D structure generator
-USES= qmake
+USES= qmake zip
USE_GL= glu
-USE_ZIP= yes
USE_QT4= corelib gui opengl moc_build rcc_build xml script
WRKSRC= ${WRKDIR}/structure-synth
USE_DOS2UNIX= *.cpp *.h
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index cd738c1..15a79a9 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -7,12 +7,11 @@ PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.whizkidtech.redprince.net/fports/
DISTNAME= tiff
-EXTRACT_SUFX= .zip
MAINTAINER= ports@FreeBSD.org
COMMENT= Library to merge TIFF files into multi-page TIFF files
-USES= dos2unix
+USES= dos2unix zip
DOS2UNIX_GLOB= *.[ch]
USE_LDCONFIG= yes
NO_WRKSUBDIR= yes
diff --git a/graphics/yed/Makefile b/graphics/yed/Makefile
index cf69eb5..7f4ff17 100644
--- a/graphics/yed/Makefile
+++ b/graphics/yed/Makefile
@@ -16,7 +16,7 @@ LICENSE_TEXT= Description of the license can be obtained from the following URL:
http://www.yworks.com/products/yed/license.html
LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-USE_ZIP= yes
+USES= zip
USE_JAVA= yes
JAVA_VERSION= 1.6+
NO_BUILD= yes
OpenPOWER on IntegriCloud