Convert to rest of a* to USES=zip

19 files changed, 19 insertions, 29 deletions

diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index d7c412d2a044..b2a3a44e74aa 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2011.04.29
 CATEGORIES=	audio
 MASTER_SITES=	http://ifdo.ca/~seymour/runabc/
 DISTNAME=	abcMIDI-${PORTVERSION:S/./-/g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Convert abc music files to MIDI and PostScript
@@ -15,7 +14,7 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gmake
+USES=		gmake zip
 MAKEFILE=	makefiles/unix.mak
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DANSILIBS -c" LNK="${CC}"
 
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index c587c956ba09..b249667599e9 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -32,9 +32,8 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		AUDIO="${AUDIO}"
 
 CXXFLAGS+=	-I${LOCALBASE}/include
-USES=		gmake
+USES=		gmake zip
 USE_LDCONFIG=	yes
-USE_ZIP=	yes
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/audio/gervill/Makefile b/audio/gervill/Makefile
index dbf85bd804a5..862e58f7476e 100644
--- a/audio/gervill/Makefile
+++ b/audio/gervill/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/audio/hawkvoice/Makefile b/audio/hawkvoice/Makefile
index 6856dd82228a..c1f321f027c8 100644
--- a/audio/hawkvoice/Makefile
+++ b/audio/hawkvoice/Makefile
@@ -6,14 +6,13 @@ PORTVERSION=	0.91
 CATEGORIES=	audio devel
 MASTER_SITES=	http://www.hawksoft.com/download/files/
 DISTNAME=	HawkVoiceDI091src
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Portable sound and speech compression library
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 MAKEFILE=	makefile.linux
 USE_CSTD=	gnu89
 USE_LDCONFIG=	yes
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index dfaf0ff56fc4..b40ec6f36b46 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates three-dimensional coherent noise
 
-USES=		gmake
+USES=		gmake zip
 USE_AUTOTOOLS=	libtool:env
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-O3 -fomit-frame-pointer
diff --git a/audio/linux-neroaaccodec/Makefile b/audio/linux-neroaaccodec/Makefile
index e9daa2ade2b8..68e1bbdd1df9 100644
--- a/audio/linux-neroaaccodec/Makefile
+++ b/audio/linux-neroaaccodec/Makefile
@@ -7,12 +7,11 @@ CATEGORIES=	audio multimedia linux
 MASTER_SITES=	ftp://ftp6.nero.com/tools/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	NeroAACCodec-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	yaizawa@2004.jukuin.keio.ac.jp
 COMMENT=	Nero AAC reference quality MPEG-4 and 3GPP audio codec
 
-USES=		dos2unix
+USES=		dos2unix zip
 USE_LINUX=	yes
 DOS2UNIX_REGEX=	.*\.txt
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/mbrolavox/Makefile b/audio/mbrolavox/Makefile
index 2dc2445dbe2d..c811228e954f 100644
--- a/audio/mbrolavox/Makefile
+++ b/audio/mbrolavox/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Voices for MBROLA voice synthesizer
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 RESTRICTED=	No commercial nor military use, no sale
 WRKSRC=		${WRKDIR}/voices
diff --git a/audio/mp3gain/Makefile b/audio/mp3gain/Makefile
index 24049f8e3dbe..f37ae8ed6bd4 100644
--- a/audio/mp3gain/Makefile
+++ b/audio/mp3gain/Makefile
@@ -12,10 +12,8 @@ COMMENT=	Tool to normalize the gain of MP3 files
 
 LICENSE=	LGPL21
 
-USES=		uidfix
+USES=		uidfix dos2unix zip
 
-USE_ZIP=	yes
-USES=		dos2unix
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/mp3gain
 
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index c12c28881c41..4cbd0e28e0cc 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Mp3riot creates mp3 playlists, HTML files, etc
 
 RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/audio/optimfrog/Makefile b/audio/optimfrog/Makefile
index 0f42fe62790e..3c0e9ce75808 100644
--- a/audio/optimfrog/Makefile
+++ b/audio/optimfrog/Makefile
@@ -14,8 +14,8 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 NO_CDROM=	No commercial use
 NO_BUILD=	yes
+USES=		zip
 USE_LINUX=	yes
-USE_ZIP=	yes
 PLIST_FILES=	bin/off bin/ofr bin/ofs
 
 do-install:
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 273efefed718..333db109d919 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Portable cross-platform Audio API
 
 LICENSE=	MIT
 
-USES=		gmake dos2unix
-USE_ZIP=	yes
+USES=		gmake dos2unix zip
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 USE_LDCONFIG=	yes
diff --git a/audio/py-fastaudio/Makefile b/audio/py-fastaudio/Makefile
index b9cd634cd68d..d99738dda0b3 100644
--- a/audio/py-fastaudio/Makefile
+++ b/audio/py-fastaudio/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/fastaudio.so
 PLIST_DIRS=
 EXAMPLESDIR=	${LOCALBASE}/share/examples/py-${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 NO_STAGE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index db5d0af21d25..bd5759c4332f 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -24,9 +24,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
 OPTIONS_DEFINE=	MUTAGEN
 MUTAGEN_DESC=	Enable Mutagen support
 
-USES=		iconv
+USES=		iconv zip
 NO_STAGE=	yes
-USE_ZIP=	yes
 USE_SDL=	sdl
 USE_XORG=	x11 xau xcb xdmcp
 USE_WX=		2.6+
diff --git a/audio/squeezeboxserver-dynamicplaylist/Makefile b/audio/squeezeboxserver-dynamicplaylist/Makefile
index 9845d1f95b56..0a5ac3432fb4 100644
--- a/audio/squeezeboxserver-dynamicplaylist/Makefile
+++ b/audio/squeezeboxserver-dynamicplaylist/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Squeezebox Server plugin to create dynamic playlists
 RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
+USES=		zip:infozip
 NO_STAGE=	yes
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/audio/squeezeboxserver-lazysearch/Makefile b/audio/squeezeboxserver-lazysearch/Makefile
index cea616c82fe8..6e0e5e8ebfdd 100644
--- a/audio/squeezeboxserver-lazysearch/Makefile
+++ b/audio/squeezeboxserver-lazysearch/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Squeezebox Server plugin for performing lazy searches
 
 RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
-USE_ZIP=	yes
+USES=		zip
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/audio/squeezeboxserver-sqlplaylist/Makefile b/audio/squeezeboxserver-sqlplaylist/Makefile
index ed22b5cd1c8c..35613ef8d4c0 100644
--- a/audio/squeezeboxserver-sqlplaylist/Makefile
+++ b/audio/squeezeboxserver-sqlplaylist/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver \
 		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:${PORTSDIR}/audio/squeezeboxserver-dynamicplaylist
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/audio/squeezeboxserver-superdatetime/Makefile b/audio/squeezeboxserver-superdatetime/Makefile
index 9c0cd8e014a8..e53d4b2ea96c 100644
--- a/audio/squeezeboxserver-superdatetime/Makefile
+++ b/audio/squeezeboxserver-superdatetime/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 PROJECTHOST=	grebrown-projects
 
-USE_ZIP=	yes
+USES=		zip
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/audio/squeezeboxserver-trackstat/Makefile b/audio/squeezeboxserver-trackstat/Makefile
index fa0bcc996f88..dcef32799b58 100644
--- a/audio/squeezeboxserver-trackstat/Makefile
+++ b/audio/squeezeboxserver-trackstat/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Squeezebox Server plugin to store ratings and statistics about songs
 RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/audio/wavegain/Makefile b/audio/wavegain/Makefile
index 863ae094dd4c..e22a278e0ca9 100644
--- a/audio/wavegain/Makefile
+++ b/audio/wavegain/Makefile
@@ -6,14 +6,13 @@ PORTVERSION=	1.2.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.rarewares.org/files/others/
 DISTNAME=	${PORTNAME}-${PORTVERSION}srcs${EXTRACT_SUFFIX}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	Program that applies ReplayGain to wave files
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	audio.c wavegain.c
 
 PLIST_FILES=	bin/wavegain