Convert e* to USES=zip

14 files changed, 14 insertions, 22 deletions

diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index cbd27167696d..20abb125a768 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -16,8 +16,7 @@ COMMENT=		A full-featured text editor for X11
 WRKSRC=			${WRKDIR}/fte
 
 USE_XORG=	x11 xpm
-USE_ZIP=		yes
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	build
 
 NO_STAGE=	yes
diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile
index 5679e16ddfd6..b61cec30a8b3 100644
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VENDOR=openjdk
diff --git a/editors/treeform/Makefile b/editors/treeform/Makefile
index d126a145c788..cb464e3a971c 100644
--- a/editors/treeform/Makefile
+++ b/editors/treeform/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	TreeForm_1_0_3
 MAINTAINER=	buganini@gmail.com
 COMMENT=	A Linguistic Syntax/Semantics tree drawing editor
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 47def926c90c..f5c109f49f3f 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -14,7 +14,7 @@ NO_CDROM=	Resale allowed for media cost only
 
 NO_STAGE=	yes
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
+USES=		zip:infozip
 EXTRACT_BEFORE_ARGS=	-Laq
 
 post-patch:
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index ba78f04b34d2..5521c1696190 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -13,8 +13,7 @@ DISTNAME=	dtcyber20b1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop CYBER Emulator
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 USE_XORG=	x11
 NO_WRKSUBDIR=	yes
 INSTALL_TARGET=
diff --git a/emulators/dynamips-community/Makefile b/emulators/dynamips-community/Makefile
index e1f45b66cdee..3c0c4343e82c 100644
--- a/emulators/dynamips-community/Makefile
+++ b/emulators/dynamips-community/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libelf.so:${PORTSDIR}/devel/libelf \
 
 CONFLICTS=	dynamips-[0-9]* dynamips-devel-[0-9]*
 
-USES=		gmake
-USE_ZIP=	yes
+USES=		gmake zip
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS UNSTABLE
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 9bbac952c95a..7ca3e24f923e 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -17,8 +17,7 @@ MAINTAINER=	dk@farm.org
 COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
 
 USE_XORG=	xi x11
-USE_ZIP=	yes
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
 		EMULib/Rules.Unix
 RESTRICTED=	Legal status of distributed ROM images unclear
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 5ffc28994d80..3a2d5cee493f 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IA64 simulator (Intel(R) Architecture 64)
 
-USE_ZIP=	yes
-USES=		gmake
+USES=		gmake zip
 MAKEFILE=	makefile.unx
 MAKE_ARGS=	CC="${CC}"
 
diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index 8db0b055adad..055aa1b8de62 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -16,10 +16,9 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/jzintv-1.0-beta4
 BUILD_WRKSRC=	${WRKSRC}/src
-USES=	gmake
+USES=	gmake zip
 USE_XORG=	x11 xau xdmcp
 USE_SDL=	sdl
-USE_ZIP=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
 
diff --git a/emulators/linux-geepee32/Makefile b/emulators/linux-geepee32/Makefile
index faae5e1e86f0..c2e3c5bd8b9f 100644
--- a/emulators/linux-geepee32/Makefile
+++ b/emulators/linux-geepee32/Makefile
@@ -13,9 +13,9 @@ MAINTAINER=	arundel@h3c.de
 COMMENT=	The only GP32 emulator for i386
 
 ONLY_FOR_ARCHS=	i386
+USES=		zip
 USE_LINUX=	yes
 USE_LINUX_APPS=	sdl12 xorglibs
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=
diff --git a/emulators/o2em/Makefile b/emulators/o2em/Makefile
index bf68180340af..2426d7dc0742 100644
--- a/emulators/o2em/Makefile
+++ b/emulators/o2em/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=		alleg:${PORTSDIR}/devel/allegro
 
 WRKSRC=			${WRKDIR}/o2em117src
 MAKEFILE=		Makefile.freebsd
-USE_ZIP=		yes
-USE_GMAKE=		yes
+USES=			gmake zip
 LDFLAGS+=		${PTHREAD_LIBS}
 
 NO_STAGE=	yes
diff --git a/emulators/ods2reader/Makefile b/emulators/ods2reader/Makefile
index c97195987139..ff7596e7fa40 100644
--- a/emulators/ods2reader/Makefile
+++ b/emulators/ods2reader/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.ZIP
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Copies files from VMS Files-11 (ODS2) file systems
 
-USE_ZIP=	yes
+USES=		zip:infozip
 EXTRACT_BEFORE_ARGS=	-qoa
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/ods2reader
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index bfc02843fd03..275ebd56ba53 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
 
 NO_WRKSUBDIR=	yes
 
-USES=		gmake dos2unix
-USE_ZIP=	yes
+USES=		gmake dos2unix zip
 DOS2UNIX_FILES=	VAX/vax_sysdev.c
 MAKE_ENV=	GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1
 MAKEFILE=	makefile
diff --git a/emulators/vboxtool/Makefile b/emulators/vboxtool/Makefile
index b9ea3e75aedf..9b225190af73 100644
--- a/emulators/vboxtool/Makefile
+++ b/emulators/vboxtool/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	VBoxManage:${PORTSDIR}/emulators/virtualbox-ose\
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
+USES=		zip
 GROUPS=		vboxusers
-USE_ZIP=	yes
 
 SAMPLESDIR=	${PREFIX}/share/${PORTNAME}