Convert x* to USES=zip

46 files changed, 47 insertions, 53 deletions

diff --git a/x11-fonts/andika/Makefile b/x11-fonts/andika/Makefile
index 1c0f4b591e6b..3a6b8b69e9ee 100644
--- a/x11-fonts/andika/Makefile
+++ b/x11-fonts/andika/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Andika TrueType fonts
 
 LICENSE=	OFL11
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTLIBPATH=	lib/X11/fonts
diff --git a/x11-fonts/anonymous-pro/Makefile b/x11-fonts/anonymous-pro/Makefile
index b3150a52fb26..8b08686d76d3 100644
--- a/x11-fonts/anonymous-pro/Makefile
+++ b/x11-fonts/anonymous-pro/Makefile
@@ -14,7 +14,7 @@ LICENSE=	OFL11
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
diff --git a/x11-fonts/bitter/Makefile b/x11-fonts/bitter/Makefile
index 970ba11f7c83..b2e0fb608c8e 100644
--- a/x11-fonts/bitter/Makefile
+++ b/x11-fonts/bitter/Makefile
@@ -12,9 +12,9 @@ LICENSE=	OFL11
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
 
 FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-fonts/charis-compact/Makefile b/x11-fonts/charis-compact/Makefile
index 23abe901169c..01ef0e66d84e 100644
--- a/x11-fonts/charis-compact/Makefile
+++ b/x11-fonts/charis-compact/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Charis SIL TrueType font collection, compact variant
 
 LICENSE=	OFL11
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTROOTDIR=	${PREFIX}/lib/X11/fonts
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index 03b318cedbb9..02e5e1cb2102 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Charis SIL TrueType font collection
 
 LICENSE=	OFL11
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTROOTDIR=	${PREFIX}/lib/X11/fonts
diff --git a/x11-fonts/clearsans/Makefile b/x11-fonts/clearsans/Makefile
index 6026f34484ec..17aa05b7bc31 100644
--- a/x11-fonts/clearsans/Makefile
+++ b/x11-fonts/clearsans/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Versatile OpenType font for screen, print, and Web
 
 LICENSE=	APACHE20
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
 
 FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 5a45b2443e20..4f5e4f21401b 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir	\
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
diff --git a/x11-fonts/comfortaa-ttf/Makefile b/x11-fonts/comfortaa-ttf/Makefile
index 1341f6d950a8..555efe130b37 100644
--- a/x11-fonts/comfortaa-ttf/Makefile
+++ b/x11-fonts/comfortaa-ttf/Makefile
@@ -15,7 +15,7 @@ LICENSE=	OFL11
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_ZIP=	yes
+USES=		zip
 
 FONTDIR=	lib/X11/fonts/Comfortaa
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/x11-fonts/consolamono-ttf/Makefile b/x11-fonts/consolamono-ttf/Makefile
index 31381f2a775d..7198e531eb10 100644
--- a/x11-fonts/consolamono-ttf/Makefile
+++ b/x11-fonts/consolamono-ttf/Makefile
@@ -14,7 +14,7 @@ LICENSE=	OFL11
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_ZIP=	yes
+USES=		zip
 
 FONTDIR=	lib/X11/fonts/ConsolaMono
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index a4a77d4a6c59..ca884c091860 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Bitstream Cyberbit is a TrueType font covers Unicode 2.0
 
 RESTRICTED=	Redistribution not permitted; single user license only.
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 FONTSDIR=	lib/X11/fonts/TrueType
diff --git a/x11-fonts/doulos-compact/Makefile b/x11-fonts/doulos-compact/Makefile
index 379a94ab0519..a9e6c838329a 100644
--- a/x11-fonts/doulos-compact/Makefile
+++ b/x11-fonts/doulos-compact/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Doulos SIL TrueType font collection, compact variant
 
 LICENSE=	OFL11
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTROOTDIR=	${PREFIX}/lib/X11/fonts
diff --git a/x11-fonts/doulos/Makefile b/x11-fonts/doulos/Makefile
index e96079033bcf..6947e969eedb 100644
--- a/x11-fonts/doulos/Makefile
+++ b/x11-fonts/doulos/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Doulos SIL TrueType font collection
 
 LICENSE=	OFL11
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTROOTDIR=	${PREFIX}/lib/X11/fonts
diff --git a/x11-fonts/ecofont/Makefile b/x11-fonts/ecofont/Makefile
index 763ceffafb4b..5a0ec71cba4a 100644
--- a/x11-fonts/ecofont/Makefile
+++ b/x11-fonts/ecofont/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Environmentally friendly, ink saving typeface
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	${ECOFONTDIR}/${ECOFONT}
diff --git a/x11-fonts/fantasque-sans-mono/Makefile b/x11-fonts/fantasque-sans-mono/Makefile
index 01c4e775a83e..4286db4cdc65 100644
--- a/x11-fonts/fantasque-sans-mono/Makefile
+++ b/x11-fonts/fantasque-sans-mono/Makefile
@@ -13,7 +13,7 @@ LICENSE=	OFL11
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
+USES=		zip
 
 FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-fonts/farsifonts/Makefile b/x11-fonts/farsifonts/Makefile
index c13c9ddcc8bf..8b0fed2622b7 100644
--- a/x11-fonts/farsifonts/Makefile
+++ b/x11-fonts/farsifonts/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Standard set of Unicode Persian fonts
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
 
-USE_ZIP=	yes
+USES=		zip
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-fonts/font-gost/Makefile b/x11-fonts/font-gost/Makefile
index 8a72d820ba9e..a2e0728a12dd 100644
--- a/x11-fonts/font-gost/Makefile
+++ b/x11-fonts/font-gost/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GOST TrueType fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 FONTSDIR=	${PREFIX}/lib/X11/fonts/gost
diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile
index bac3f580c5a9..df0f61aaa29a 100644
--- a/x11-fonts/freefont-ttf/Makefile
+++ b/x11-fonts/freefont-ttf/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+USES=		zip
 
 WRKSRC=		${WRKDIR}/freefont-${PORTVERSION}
 INSTALLDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile
index efa4dd541d97..993fe0fb8af8 100644
--- a/x11-fonts/gentium-plus/Makefile
+++ b/x11-fonts/gentium-plus/Makefile
@@ -14,7 +14,7 @@ LICENSE=	OFL11
 
 NO_ARCH=	yes
 
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTLIBPATH=	lib/X11/fonts
diff --git a/x11-fonts/hanazono-fonts-ttf/Makefile b/x11-fonts/hanazono-fonts-ttf/Makefile
index fa32be2fbf6b..4d57d2d65408 100644
--- a/x11-fonts/hanazono-fonts-ttf/Makefile
+++ b/x11-fonts/hanazono-fonts-ttf/Makefile
@@ -16,7 +16,7 @@ LICENSE=	OFL11
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 
 FONTDIR=	lib/X11/fonts/Hana
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index dd10d0ce75b6..27b0415059fe 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
diff --git a/x11-fonts/kaputa/Makefile b/x11-fonts/kaputa/Makefile
index a40952a128bc..ebec5a3efdd1 100644
--- a/x11-fonts/kaputa/Makefile
+++ b/x11-fonts/kaputa/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir	\
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
diff --git a/x11-fonts/khmeros/Makefile b/x11-fonts/khmeros/Makefile
index e34d26f29077..4b160e8f8b3c 100644
--- a/x11-fonts/khmeros/Makefile
+++ b/x11-fonts/khmeros/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Khmer OS fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 FONTSDIR=	lib/X11/fonts/Khmer/
diff --git a/x11-fonts/linuxlibertine-g/Makefile b/x11-fonts/linuxlibertine-g/Makefile
index cc76eb765e92..0736999f6699 100644
--- a/x11-fonts/linuxlibertine-g/Makefile
+++ b/x11-fonts/linuxlibertine-g/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
diff --git a/x11-fonts/mondulkiri/Makefile b/x11-fonts/mondulkiri/Makefile
index b1e26244a30a..2fa8b481bdfa 100644
--- a/x11-fonts/mondulkiri/Makefile
+++ b/x11-fonts/mondulkiri/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mondulkiri Khmer fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 FONTSDIR=	lib/X11/fonts/Khmer/
diff --git a/x11-fonts/moveable-type-fonts/Makefile b/x11-fonts/moveable-type-fonts/Makefile
index f4e6268cc3a0..b403bc6fe18d 100644
--- a/x11-fonts/moveable-type-fonts/Makefile
+++ b/x11-fonts/moveable-type-fonts/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
diff --git a/x11-fonts/padauk/Makefile b/x11-fonts/padauk/Makefile
index 0e6b14d67dd2..c1d3fa39ed13 100644
--- a/x11-fonts/padauk/Makefile
+++ b/x11-fonts/padauk/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 
 FONTSDIR=	lib/X11/fonts/Myanmar
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
diff --git a/x11-fonts/paratype/Makefile b/x11-fonts/paratype/Makefile
index 3cb7cabebf69..7bf533888bbe 100644
--- a/x11-fonts/paratype/Makefile
+++ b/x11-fonts/paratype/Makefile
@@ -18,7 +18,7 @@ INSTALLS_TTF=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 USE_TGZ=	yes
-USE_ZIP=	yes
+USES=		zip
 XORG_CAT=	font
 
 FONTDIR=	ParaType
diff --git a/x11-fonts/pingwi/Makefile b/x11-fonts/pingwi/Makefile
index 8e5480b46544..998767e721b0 100644
--- a/x11-fonts/pingwi/Makefile
+++ b/x11-fonts/pingwi/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PingWi Typography fonts
 
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 FONTSDIR=	${PREFIX}/lib/X11/fonts/pingwi
diff --git a/x11-fonts/proggy_fonts-ttf/Makefile b/x11-fonts/proggy_fonts-ttf/Makefile
index a8ef5ff18dde..1fe6269be9d9 100644
--- a/x11-fonts/proggy_fonts-ttf/Makefile
+++ b/x11-fonts/proggy_fonts-ttf/Makefile
@@ -18,7 +18,7 @@ LICENSE=	MIT
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 INSTALLDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index 5c31ac4a131d..1931039e3979 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -32,7 +32,7 @@ ALREADY_UNZIP=	${DISTDIR}/Opti.pcf.gz ${DISTDIR}/OptiSmall.pcf.gz \
 	        ${DISTDIR}/PixelCarnageMono.pcf.gz
 
 USE_XORG=	x11
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 XFONTDIR=	${PREFIX}/lib/X11/fonts/local
diff --git a/x11-fonts/roboto-fonts-ttf/Makefile b/x11-fonts/roboto-fonts-ttf/Makefile
index 99a0e3cf24e8..e45ec662c84f 100644
--- a/x11-fonts/roboto-fonts-ttf/Makefile
+++ b/x11-fonts/roboto-fonts-ttf/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/Roboto_v${PORTVERSION}
 
 FONTDIR=	lib/X11/fonts/Roboto
diff --git a/x11-fonts/sourcecodepro-ttf/Makefile b/x11-fonts/sourcecodepro-ttf/Makefile
index b7df5737340c..7a3e01c4a898 100644
--- a/x11-fonts/sourcecodepro-ttf/Makefile
+++ b/x11-fonts/sourcecodepro-ttf/Makefile
@@ -15,7 +15,7 @@ LICENSE=	OFL11
 BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-USE_ZIP=	yes
+USES=		zip
 USE_XORG=	x11
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
diff --git a/x11-fonts/sourcesanspro-ttf/Makefile b/x11-fonts/sourcesanspro-ttf/Makefile
index 7f0a27ae841e..a6ae2f4495ca 100644
--- a/x11-fonts/sourcesanspro-ttf/Makefile
+++ b/x11-fonts/sourcesanspro-ttf/Makefile
@@ -15,7 +15,7 @@ LICENSE=	OFL11
 BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-USE_ZIP=	yes
+USES=		zip
 USE_XORG=	x11
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index f019cb695e8b..0896ecf84578 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_WRKSUBDIR=	yes
 
-USE_ZIP=	yes
+USES=		zip
 USE_XORG=	x11
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"	\
diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile
index 7215ded76738..92ebca5f74dd 100644
--- a/x11-fonts/texcm-ttf/Makefile
+++ b/x11-fonts/texcm-ttf/Makefile
@@ -20,7 +20,7 @@ DEPRECATED=	Should be replaced by x11-fonts/stix-fonts
 EXPIRATION_DATE=2014-05-03
 NO_CDROM=	Cannot be sold or distributed with any commercial product
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 SUB_FILES=	pkg-message
diff --git a/x11-fonts/ubuntu-font/Makefile b/x11-fonts/ubuntu-font/Makefile
index e2dca260ef3a..9187b620233a 100644
--- a/x11-fonts/ubuntu-font/Makefile
+++ b/x11-fonts/ubuntu-font/Makefile
@@ -20,7 +20,7 @@ LICENSE_PERMS=	auto-accept
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
diff --git a/x11-fonts/vollkorn-ttf/Makefile b/x11-fonts/vollkorn-ttf/Makefile
index dedddf31ea15..86e43a28d548 100644
--- a/x11-fonts/vollkorn-ttf/Makefile
+++ b/x11-fonts/vollkorn-ttf/Makefile
@@ -13,7 +13,7 @@ LICENSE=	OFL11
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
+USES=		zip
 
 FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
 
diff --git a/x11-themes/gnome-icons-faenza/Makefile b/x11-themes/gnome-icons-faenza/Makefile
index 74033bc48e3f..2cc79d5da685 100644
--- a/x11-themes/gnome-icons-faenza/Makefile
+++ b/x11-themes/gnome-icons-faenza/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Faenza GNOME 2 icon themes
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index 89c1e70bb178..57141e0f32f7 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		tk:run
-USE_ZIP=	yes
+USES=		tk:run zip
 NO_BUILD=	yes
 PORTDOCS=	*
 
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index 16eec87c9ef4..0820736bf8e5 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -12,9 +12,8 @@ COMMENT=	High performance realtime 3D engine
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	Makefile *.cpp *.h *.txt
-USES=		gmake
+DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
+USES=		dos2unix gmake zip
 USE_GL=		yes
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
diff --git a/x11-toolkits/mygui/Makefile b/x11-toolkits/mygui/Makefile
index 25abc807df14..aa3d2bce0113 100644
--- a/x11-toolkits/mygui/Makefile
+++ b/x11-toolkits/mygui/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libOgreMain.so:${PORTSDIR}/graphics/ogre3d \
 		libOIS.so:${PORTSDIR}/devel/ois
 
-USE_ZIP=	yes
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig zip
 CMAKE_ARGS=	-DMYGUI_BUILD_DEMOS=OFF -DMYGUI_BUILD_DOCS=OFF
 USE_LDCONFIG=	yes
 USE_GCC=	yes
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index c8280952a758..f776d00faed7 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libtreectrl.so.1:${PORTSDIR}/x11-toolkits/tktreectrl
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
 
-USES=		tk:run
-USE_ZIP=	yes
+USES=		tk:run zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	TkinterTreectrl
diff --git a/x11-toolkits/skinlf/Makefile b/x11-toolkits/skinlf/Makefile
index 2d9b06bf65d6..8870092e6586 100644
--- a/x11-toolkits/skinlf/Makefile
+++ b/x11-toolkits/skinlf/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 
 JAR_NAME=	${PORTNAME}.jar
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index d127827b79fe..286ab06c3afe 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -21,9 +21,8 @@ ONLY_FOR_ARCHS=	i386 amd64 powerpc
 SWT_VERSION=	3738
 OUTPUT_JAR=	${PORTNAME}${PKGNAMESUFFIX}.jar
 
-USE_ZIP=	yes
 USE_GL=		yes
-USES=		pkgconfig
+USES=		pkgconfig zip
 USE_GNOME=	gtk20
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index fe8bc76669ae..c1409aed473f 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -22,9 +22,8 @@ CONFLICTS=	swt-3.1*
 SWT_VERSION=	3557
 OUTPUT_JAR=	swt.jar
 
-USE_ZIP=	yes
 USE_GL=		yes
-USES=		pkgconfig
+USES=		pkgconfig zip
 USE_GNOME=	gtk20
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index 402c5ae80fbe..1a804f906db3 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Evaluation tool for the Generic Polygon Clipper library
 LIB_DEPENDS=	libgpc.so:${PORTSDIR}/devel/libgpc	\
 		libformsGL.so:${PORTSDIR}/x11-toolkits/xforms
 
-USE_ZIP=	yes
+USES=		zip
 USE_GL=		yes
 PLIST_FILES=	bin/gpctool
 USE_LDCONFIG=	yes