78 files changed, 85 insertions, 92 deletions

diff --git a/textproc/bg-hyphen/Makefile b/textproc/bg-hyphen/Makefile
index 2cbc3f1ab851..5e3eddc55454 100644
--- a/textproc/bg-hyphen/Makefile
+++ b/textproc/bg-hyphen/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Bulgarian hyphenation rules
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/hyph_bg_BG.dic
diff --git a/textproc/bg-mythes/Makefile b/textproc/bg-mythes/Makefile
index b71983e733b7..89dceaff86d4 100644
--- a/textproc/bg-mythes/Makefile
+++ b/textproc/bg-mythes/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Bulgarian thesaurus
 LICENSE=	GPLv2 LGPL21 MPL
 LICENSE_COMB=	dual
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/th_bg_BG.dat \
diff --git a/textproc/clit/Makefile b/textproc/clit/Makefile
index b96359b8d5fb..efed6b8871ab 100644
--- a/textproc/clit/Makefile
+++ b/textproc/clit/Makefile
@@ -22,8 +22,7 @@ MIN_VER=	8
 
 PLIST_FILES=	bin/clit
 
-USES=	dos2unix gmake
-USE_ZIP=	yes
+USES=	dos2unix gmake zip
 
 post-extract:
 	cd ${WRKDIR} && ${BZIP2_CMD} -dc "${DISTDIR}/ltm-0.33.tar.bz2" | \
diff --git a/textproc/cs-mythes/Makefile b/textproc/cs-mythes/Makefile
index a1286fdf96a5..505549f07570 100644
--- a/textproc/cs-mythes/Makefile
+++ b/textproc/cs-mythes/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 PKGNAMEPREFIX=	cs-
 DISTNAME=	thes_cs_CZ_v2-${PORTVERSION:C/\.//g}
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Czech thesaurus
 
 LICENSE=	BSD
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/da-hyphen/Makefile b/textproc/da-hyphen/Makefile
index d63273466c33..4bcf49bf8c15 100644
--- a/textproc/da-hyphen/Makefile
+++ b/textproc/da-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Danish hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/docbook-tdg/Makefile b/textproc/docbook-tdg/Makefile
index 1f2fc16cc42a..ff13fd49ddb0 100644
--- a/textproc/docbook-tdg/Makefile
+++ b/textproc/docbook-tdg/Makefile
@@ -6,11 +6,11 @@ PORTVERSION=	2.0.17
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/tdg/en/
 DISTNAME=	tdg-en-html-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Norman Walsh's book "DocBook: The Definitive Guide"
 
+USES=		zip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/tdg/en
 
diff --git a/textproc/docbook-xsd/Makefile b/textproc/docbook-xsd/Makefile
index 213fe2142614..8513a5aa4ac8 100644
--- a/textproc/docbook-xsd/Makefile
+++ b/textproc/docbook-xsd/Makefile
@@ -5,11 +5,11 @@ PORTNAME=	docbook-xsd
 DISTVERSION=	1.0b1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xmlschema/${DISTVERSION}/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook W3C XML Schema
 
+USES=		zip
 NO_BUILD=	yes
 
 do-install:
diff --git a/textproc/docbookide.el/Makefile b/textproc/docbookide.el/Makefile
index 88836697a754..2378b4ec53f7 100644
--- a/textproc/docbookide.el/Makefile
+++ b/textproc/docbookide.el/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	docbookide01
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs lisp modules for editing DocBook documents
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/docbookide
 NO_BUILD=	yes
 
diff --git a/textproc/dtd2relax/Makefile b/textproc/dtd2relax/Makefile
index 94e7a2f6e6d6..6169d7c6eeb8 100644
--- a/textproc/dtd2relax/Makefile
+++ b/textproc/dtd2relax/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DTD to RELAX converter for Java
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/dtdinst/Makefile b/textproc/dtdinst/Makefile
index c8df7933d2fc..21c51aa588b1 100644
--- a/textproc/dtdinst/Makefile
+++ b/textproc/dtdinst/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_BUILD=	yes
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 
 PORTDOCS=	*
diff --git a/textproc/el-hyphen/Makefile b/textproc/el-hyphen/Makefile
index 30e6398080a5..730f2680ca01 100644
--- a/textproc/el-hyphen/Makefile
+++ b/textproc/el-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Greek hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/en-hunspell/Makefile b/textproc/en-hunspell/Makefile
index b4e7c2712b4e..bf4d790a0348 100644
--- a/textproc/en-hunspell/Makefile
+++ b/textproc/en-hunspell/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	English hunspell dictionaries
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/en-mythes/Makefile b/textproc/en-mythes/Makefile
index 0899c91bacfc..ded84b0cf69f 100644
--- a/textproc/en-mythes/Makefile
+++ b/textproc/en-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	English thesaurus
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/es-hyphen/Makefile b/textproc/es-hyphen/Makefile
index 820efa9fd945..58de9e64fb07 100644
--- a/textproc/es-hyphen/Makefile
+++ b/textproc/es-hyphen/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spanish hyphenation rules
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/exslt/Makefile b/textproc/exslt/Makefile
index 64e6cd492c2d..9d05fad2f8ef 100644
--- a/textproc/exslt/Makefile
+++ b/textproc/exslt/Makefile
@@ -7,12 +7,12 @@ PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.exslt.org/
 DISTNAME=	all-${PORTNAME}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Community initiative extensions to XSLT
 
+USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/textproc/id-hyphen/Makefile b/textproc/id-hyphen/Makefile
index e8aa9b51b6e4..685987ec9fd7 100644
--- a/textproc/id-hyphen/Makefile
+++ b/textproc/id-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Indonesian hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/is-hyphen/Makefile b/textproc/is-hyphen/Makefile
index bcbf846337e0..42da0b58248a 100644
--- a/textproc/is-hyphen/Makefile
+++ b/textproc/is-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Icelandic hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/iso-schematron-xslt/Makefile b/textproc/iso-schematron-xslt/Makefile
index 6a9cbc20eb81..0316a87bd8df 100644
--- a/textproc/iso-schematron-xslt/Makefile
+++ b/textproc/iso-schematron-xslt/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	iso-schematron-xslt1.zip \
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	The Leading Implementation of ISO Schematron
 
-USE_ZIP=	yes
+USES=		zip:infozip
 NO_BUILD=	yes
 
 do-extract:
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index ed6525406c8a..271bc0df24f1 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PLIST_SUB=	DTD_NAME=${PORTNAME} XMLCATMGR=${XMLCATMGR}
diff --git a/textproc/it-hunspell/Makefile b/textproc/it-hunspell/Makefile
index 1ad28464f8e7..8b61c30ef77d 100644
--- a/textproc/it-hunspell/Makefile
+++ b/textproc/it-hunspell/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Italian hunspell dictionaries
 
 LICENSE=	GPLv3
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/it-mythes/Makefile b/textproc/it-mythes/Makefile
index 6fcc048c502a..94ae0ff62fa6 100644
--- a/textproc/it-mythes/Makefile
+++ b/textproc/it-mythes/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Italian thesaurus
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index a64f0d1e909a..e7fffceb0d1c 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A tool to take notes, annotate documents (including PDF), and more
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index 438baebf31f5..e1b51db0d169 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -19,7 +19,7 @@ JAR_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \
 		${JAVALIBDIR}/jaxen-full.jar:${PORTSDIR}/java/jaxen \
 		${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_JAVA=	yes
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 1d940dfa1281..50defe34fc1b 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
-USE_ZIP=	yes
+USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 874591cddca2..a48da0697609 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2008.10.28
 CATEGORIES=	textproc java
 MASTER_SITES=	http://jing-trang.googlecode.com/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	A RELAX NG validator in Java
@@ -14,6 +13,7 @@ COMMENT=	A RELAX NG validator in Java
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/copying.html
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index 65b79fe6485f..0f737d900490 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -16,8 +16,8 @@ BUILD_DEPENDS=	base64:${PORTSDIR}/converters/base64
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/EuroLatin\ Source\ Files
-USE_DOS2UNIX=	european.kmn
-USE_ZIP=	yes
+USEs=		dos2unix zip
+DOS2UNIX_FILES=	european.kmn
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
diff --git a/textproc/kmfl-sil-ezra/Makefile b/textproc/kmfl-sil-ezra/Makefile
index 09521c8b02e9..70f3d96e0edc 100644
--- a/textproc/kmfl-sil-ezra/Makefile
+++ b/textproc/kmfl-sil-ezra/Makefile
@@ -19,9 +19,9 @@ COMMENT=	KMFL keyboard for Unicode Biblical Hebrew
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/EzraSIL2.51
-USE_DOS2UNIX=	Keyman/EZRAUNI24.KMN
+USES=		dos2unix zip
+DOS2UNIX_FILES=	Keyman/EZRAUNI24.KMN
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
diff --git a/textproc/kmfl-sil-galatia/Makefile b/textproc/kmfl-sil-galatia/Makefile
index a3b74566d391..26c238b414fd 100644
--- a/textproc/kmfl-sil-galatia/Makefile
+++ b/textproc/kmfl-sil-galatia/Makefile
@@ -14,9 +14,9 @@ COMMENT=	KMFL Unicode keyboard for typesetting Ancient Greek
 
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
-USE_DOS2UNIX=	GrkPolyCompv${PORTVERSION:S|.||}.KMN
+USES=		dos2unix zip
+DOS2UNIX_FILES=	GrkPolyCompv${PORTVERSION:S|.||}.KMN
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
diff --git a/textproc/kmfl-sil-ipa-unicode/Makefile b/textproc/kmfl-sil-ipa-unicode/Makefile
index bb6eac1a70f3..612e162ebe54 100644
--- a/textproc/kmfl-sil-ipa-unicode/Makefile
+++ b/textproc/kmfl-sil-ipa-unicode/Makefile
@@ -17,10 +17,10 @@ COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine
 
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
+USES=		dos2unix zip
 WRKSRC=		${WRKDIR}/IPA12
-USE_DOS2UNIX=	IPAUni12.kmn
+DOS2UNIX_FILES=	IPAUni12.kmn
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
diff --git a/textproc/kmfl-sil-panafrican-latin/Makefile b/textproc/kmfl-sil-panafrican-latin/Makefile
index 864cfa00ce9a..b1a9f79b27bf 100644
--- a/textproc/kmfl-sil-panafrican-latin/Makefile
+++ b/textproc/kmfl-sil-panafrican-latin/Makefile
@@ -17,10 +17,10 @@ COMMENT=	KMFL keyboard for African Latin writing systems
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
-USE_DOS2UNIX=	PanAfricaMnemonic/AfricaDeadKey.kmn \
+USES=		dos2unix zip
+DOS2UNIX_FILES=	PanAfricaMnemonic/AfricaDeadKey.kmn \
 		PanAfricaUSlayout/AfricaUS.kmn
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
 DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
diff --git a/textproc/kmfl-sil-yi/Makefile b/textproc/kmfl-sil-yi/Makefile
index 2f9fcbdaa889..bc5dff56d7fe 100644
--- a/textproc/kmfl-sil-yi/Makefile
+++ b/textproc/kmfl-sil-yi/Makefile
@@ -16,9 +16,9 @@ COMMENT=	KMFL Unicode keyboard for standardized Yi script
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
-USE_DOS2UNIX=	SourceFiles/Yi7.kmn
+USES=		dos2unix zip
+DOS2UNIX_FILES=	SourceFiles/Yi7.kmn
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
diff --git a/textproc/kmfl-varamozhi-malayalam/Makefile b/textproc/kmfl-varamozhi-malayalam/Makefile
index ee3facbfe6d4..7e5a574876a8 100644
--- a/textproc/kmfl-varamozhi-malayalam/Makefile
+++ b/textproc/kmfl-varamozhi-malayalam/Makefile
@@ -15,9 +15,9 @@ COMMENT=	KMFL Malayalam keyboard according to the Mozhi scheme
 
 RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
 
-USE_DOS2UNIX=	mozhi_1.1.0.kmn
+USES=		dos2unix zip
+DOS2UNIX_FILES=	mozhi_1.1.0.kmn
 NO_BUILD=	yes
-USE_ZIP=	yes
 
 KMFL_DIR=	share/kmfl
 KMFL_ICONS_DIR=	share/kmfl/icons
diff --git a/textproc/l2a/Makefile b/textproc/l2a/Makefile
index ac50c804e31c..44c66b1e9490 100644
--- a/textproc/l2a/Makefile
+++ b/textproc/l2a/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	l2a
 MAINTAINER=	jflemer@alum.rpi.edu
 COMMENT=	L2a - LaTeX to ASCII converter
 
-USE_ZIP=	yes
+USES=		zip
 
 WRKSRC=		${WRKDIR}
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_MAN="${INSTALL_MAN}"
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index e235765d04d0..8d9075087711 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkint
 
 WRKSRC=		${WRKDIR}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 NO_BUILD=	yes
 
diff --git a/textproc/lt-hyphen/Makefile b/textproc/lt-hyphen/Makefile
index 33341841a246..eb65130a5c51 100644
--- a/textproc/lt-hyphen/Makefile
+++ b/textproc/lt-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lithuanian hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/markdown/Makefile b/textproc/markdown/Makefile
index da906caa7a7e..d7c232795948 100644
--- a/textproc/markdown/Makefile
+++ b/textproc/markdown/Makefile
@@ -14,9 +14,8 @@ COMMENT=	A text-to-HTML conversion tool for web writers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/License.text
 
-USE_ZIP=	yes
 NO_BUILD=	yes
-USES=		shebangfix perl5
+USES=		shebangfix perl5 zip
 SHEBANG_FILES=	Markdown.pl
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/nl-hyphen/Makefile b/textproc/nl-hyphen/Makefile
index b942a88e2434..c173930823d4 100644
--- a/textproc/nl-hyphen/Makefile
+++ b/textproc/nl-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dutch hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/no-hunspell/Makefile b/textproc/no-hunspell/Makefile
index d0770221ecbe..888ccea84eaf 100644
--- a/textproc/no-hunspell/Makefile
+++ b/textproc/no-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Norwegian (Nynorsk and Bokmaal) hunspell dictionaries
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/nb_NO.aff \
diff --git a/textproc/p5-texcount/Makefile b/textproc/p5-texcount/Makefile
index 769e7ed223cb..645d1d3a5de4 100644
--- a/textproc/p5-texcount/Makefile
+++ b/textproc/p5-texcount/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Perl module for LaTeX statistics
 
 NO_BUILD=	yes
 
-USE_ZIP=	YES
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	run
 
 PLIST_FILES+=	bin/texcount
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index 332cc578b1c7..146af4f68c66 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Post processor for PDF presentations made with (La)TeX
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip
 USE_TEX=	latex
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index 2cbbddec210f..3b2924b0dd7a 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	pyexcelerator-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python library for generating Excel 97/2000/XP/2003 files
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/textproc/py-gettext/Makefile b/textproc/py-gettext/Makefile
index 54fcb2fd1a40..21e074b1ccb7 100644
--- a/textproc/py-gettext/Makefile
+++ b/textproc/py-gettext/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python Gettext po to mo file compiler
 
 LICENSE=	BSD
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 5fa4afe97ad8..c3e17c43762a 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A fast and complete Python implementation of Markdown
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index 9f09c788c2f7..44f222dc5acb 100644
--- a/textproc/py-paragrep/Makefile
+++ b/textproc/py-paragrep/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Paragraph Grep Utility
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:${PORTSDIR}/devel/py-grizzled
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index e810f5c9dbc7..5e7c8f653b22 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -18,9 +18,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index 602961821cfa..a6c7dc8f2979 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Forms validation and rendering library for python web development
 
 LICENSE=	BSD
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/textproc/py-xlwriter/Makefile b/textproc/py-xlwriter/Makefile
index 937420987608..bb1e0f9d7e9d 100644
--- a/textproc/py-xlwriter/Makefile
+++ b/textproc/py-xlwriter/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	pyXLWriter-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python library for generating Excel-compatible spreadsheets
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 PORTEXAMPLES=	*
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index 8b2b176b2e10..846c098a0ffd 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/textproc/ro-hunspell/Makefile b/textproc/ro-hunspell/Makefile
index 5942c14234ff..6ee921540a12 100644
--- a/textproc/ro-hunspell/Makefile
+++ b/textproc/ro-hunspell/Makefile
@@ -6,7 +6,6 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF/rospell/Romanian%20dictionaries/dict-${PORTVERSION}/
 PKGNAMEPREFIX=	ro-
 DISTNAME=	ro_RO.${PORTVERSION}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
@@ -15,6 +14,7 @@ COMMENT=	Romanian hunspell dictionaries
 LICENSE=	LGPL21 GPLv2 MPL
 LICENSE_COMB=	dual
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/ro-hyphen/Makefile b/textproc/ro-hyphen/Makefile
index 0681489f0764..8729b9f65374 100644
--- a/textproc/ro-hyphen/Makefile
+++ b/textproc/ro-hyphen/Makefile
@@ -6,7 +6,6 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF/rospell/Romanian%20dictionaries/dict-${PORTVERSION}/
 PKGNAMEPREFIX=	ro-
 DISTNAME=	hyph_ro_RO.${PORTVERSION}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
@@ -15,6 +14,7 @@ COMMENT=	Romanian hyphenation rules
 LICENSE=	LGPL21 GPLv2 MPL
 LICENSE_COMB=	dual
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/ro-mythes/Makefile b/textproc/ro-mythes/Makefile
index dad03ec32382..155f66501e58 100644
--- a/textproc/ro-mythes/Makefile
+++ b/textproc/ro-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Romanian thesaurus
 
 LICENSE=	GPLv2
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/ruby-deplate/Makefile b/textproc/ruby-deplate/Makefile
index 33fb02d9a67a..c52800d1d1f5 100644
--- a/textproc/ruby-deplate/Makefile
+++ b/textproc/ruby-deplate/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=		${WRKSRC}/LICENSE.TXT
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-USE_ZIP=		yes
+USES=		zip
 USE_RUBY=		yes
 USE_RUBY_SETUP=		yes
 
diff --git a/textproc/ruby-htmlrepair/Makefile b/textproc/ruby-htmlrepair/Makefile
index 09385e929f4f..fb35fc8569f3 100644
--- a/textproc/ruby-htmlrepair/Makefile
+++ b/textproc/ruby-htmlrepair/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A Ruby library to repair unclosed tags in an HTML document
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/htmlsplit.rb:${PORTSDIR}/textproc/ruby-htmlsplit
 
 PLIST_FILES=	%%RUBY_SITELIBDIR%%/htmlrepair.rb
-USE_ZIP=	yes
+USES=		zip
 USE_RUBY=	yes
 
 NO_BUILD=	yes
diff --git a/textproc/ruby-htmlsplit/Makefile b/textproc/ruby-htmlsplit/Makefile
index f50c3ee7985e..f6f6c97b8914 100644
--- a/textproc/ruby-htmlsplit/Makefile
+++ b/textproc/ruby-htmlsplit/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A Ruby library to split an HTML document into tags and contents
 
-USE_ZIP=	yes
+USES=		zip
 USE_RUBY=	yes
 
 NO_BUILD=	yes
diff --git a/textproc/s5/Makefile b/textproc/s5/Makefile
index 9a3389cfc533..93f4870743d3 100644
--- a/textproc/s5/Makefile
+++ b/textproc/s5/Makefile
@@ -7,14 +7,13 @@ PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://meyerweb.com/eric/tools/s5/v/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple HTML-based presentation system
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-USES=		dos2unix
+USES=		dos2unix zip
 DOS2UNIX_REGEX=	.*\.(css|htc|html|js|txt)
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index 7451ab541dc3..84b5b409b05b 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -21,7 +21,7 @@ JDOM_DESC=	Jdom support
 DOM4J_DESC=	dom4j support
 XOM_DESC=	XOM support
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_WRKSUBDIR=	yes
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile
index ce4217e79898..7b6c2c00e746 100644
--- a/textproc/saxon-he/Makefile
+++ b/textproc/saxon-he/Makefile
@@ -16,7 +16,7 @@ LICENSE=	MPL
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 89e9a0d9b4c0..f0d0cfaa7392 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MPL
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_WRKSUBDIR=	yes
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 6455c3c6cb26..3f8cc49e1922 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_ZIP=	yes
-USES=		cmake desktop-file-utils pkgconfig
+USES=		cmake desktop-file-utils pkgconfig zip
 NO_WRKSUBDIR=	yes
 USE_QT4=	qmake gui svg webkit xml moc uic rcc imageformats linguist
 
diff --git a/textproc/simplehtmldom/Makefile b/textproc/simplehtmldom/Makefile
index cb5fd28f7ecc..526569044ffe 100644
--- a/textproc/simplehtmldom/Makefile
+++ b/textproc/simplehtmldom/Makefile
@@ -13,7 +13,7 @@ COMMENT=		PHP Simple HTML DOM Parser
 
 WRKSRC=			${WRKDIR}
 
-USE_ZIP=		YES
+USES=		zip
 NO_BUILD=		YES
 
 USE_PHP=		pcre
diff --git a/textproc/sk-hunspell/Makefile b/textproc/sk-hunspell/Makefile
index 693a493ab5eb..31c54825bc73 100644
--- a/textproc/sk-hunspell/Makefile
+++ b/textproc/sk-hunspell/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Slovak hunspell dictionaries
 LICENSE=	LGPL21 GPLv2 MPL
 LICENSE_COMB=	dual
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/sk_SK.aff \
diff --git a/textproc/sk-hyphen/Makefile b/textproc/sk-hyphen/Makefile
index 7822287e799e..2895bb98e5a3 100644
--- a/textproc/sk-hyphen/Makefile
+++ b/textproc/sk-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Slovak hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index 64c6b2c15a72..e9f599536286 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -6,7 +6,6 @@ CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 PKGNAMEPREFIX=	sk-
 DISTNAME=	OOo-Thesaurus2-sk_SK-${PORTVERSION:C/\.//g}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
@@ -14,6 +13,7 @@ COMMENT=	Slovak thesaurus
 
 LICENSE=	MIT
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sl-hyphen/Makefile b/textproc/sl-hyphen/Makefile
index 7a4a0385c9d8..063c55f27668 100644
--- a/textproc/sl-hyphen/Makefile
+++ b/textproc/sl-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Slovenian hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sl-mythes/Makefile b/textproc/sl-mythes/Makefile
index 26d7e27a9aa2..fc83e2516c5c 100644
--- a/textproc/sl-mythes/Makefile
+++ b/textproc/sl-mythes/Makefile
@@ -6,7 +6,6 @@ CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 PKGNAMEPREFIX=	sl-
 DISTNAME=	thes_sl_SI_v2-${PORTVERSION:C/\.//g}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	office@FreeBSD.org
@@ -14,6 +13,7 @@ COMMENT=	Slovenian thesaurus
 
 LICENSE=	LGPL21
 
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sq-hunspell/Makefile b/textproc/sq-hunspell/Makefile
index 9e92e83d40f9..e3685462b5ea 100644
--- a/textproc/sq-hunspell/Makefile
+++ b/textproc/sq-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Albanian hunspell dictionaries
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 
 PLIST_FILES=	%%DATADIR%%/sq_AL.aff \
diff --git a/textproc/sv-hyphen/Makefile b/textproc/sv-hyphen/Makefile
index c74d2f4103c9..c079fd5b4001 100644
--- a/textproc/sv-hyphen/Makefile
+++ b/textproc/sv-hyphen/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Swedish hyphenation rules
 
 LICENSE=	LGPL21
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/sv-mythes/Makefile b/textproc/sv-mythes/Makefile
index c3d1874ca376..eda204138a70 100644
--- a/textproc/sv-mythes/Makefile
+++ b/textproc/sv-mythes/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Swedish thesaurus
 
 LICENSE=	MIT
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/ti-hunspell/Makefile b/textproc/ti-hunspell/Makefile
index f0e9faf353c8..67d8f3bf24c6 100644
--- a/textproc/ti-hunspell/Makefile
+++ b/textproc/ti-hunspell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Tigrigna hunspell dictionaries
 
-EXTRACT_SUFX=	.zip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile
index 558f108190b8..29b90b581614 100644
--- a/textproc/trang/Makefile
+++ b/textproc/trang/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Multi-format schema converter based on RELAX NG
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index 92bf35ede10b..37e374518fde 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 PORTSCOUT=	limitw:1,even	# Second component is even for stable versions.
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/textproc/words/Makefile b/textproc/words/Makefile
index 9ddcc8e9fcb5..24d98d3e178b 100644
--- a/textproc/words/Makefile
+++ b/textproc/words/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://archives.nd.edu/whitaker/
 DISTNAME=	${PORTNAME}all
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Latin-English Dictionary Program
@@ -19,7 +18,7 @@ LICENSE_TEXT=	All parts of the WORDS system, source code and data files, \
 		for whatever purpose.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		ada
+USES=		ada zip
 NO_WRKSUBDIR=	yes
 GNATMAKE=	env ${MAKE_ENV} gnatmake
 
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 4976893bc187..e07d025a5f62 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index 7adfecff6bb1..bfbacc8323ee 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -15,7 +15,7 @@ COMMENT=	W3C's XHTML DTD
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_ZIP=	YES
+USES=		zip
 NO_MTREE=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/xhtml1-20020801
diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index e5b3a978acca..fd8c74d9a1ca 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XML character entities
 
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index 21a027b76b2c..35aedab5feb2 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -16,7 +16,7 @@ JAVA_VERSION=	1.6+
 
 NO_WORKSUBDIR=	yes
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 
 PORTDOCS=	api copying.txt index.html
 
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index 26c62d747cbb..105d2c96f4c7 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -12,8 +12,7 @@ COMMENT=	XSL(T) stylesheet checker
 
 RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
 
-USES=		shebangfix perl5
-USE_ZIP=	yes
+USES=		shebangfix perl5 zip
 USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.05
diff --git a/textproc/xstream/Makefile b/textproc/xstream/Makefile
index 84b031425f73..85f1c2b8a120 100644
--- a/textproc/xstream/Makefile
+++ b/textproc/xstream/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A simple library to serialize Java objects to XML
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes