Convert d* to USES=zip

author: Baptiste Daroussin <bapt@FreeBSD.org> 2014-03-07 16:49:09 +0000
committer: Baptiste Daroussin <bapt@FreeBSD.org> 2014-03-07 16:49:09 +0000
commit: c23ef8bc8bf7d31214830bdcaa75c6018065881a (patch)
tree: 4a5c38c58618cc47e6b107297e7eebb1a64292be
parent: 1510b743f230c8b6af6cc251122903f0afdc1461 (diff)
214 files changed, 216 insertions, 269 deletions
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 4cd301ceb9f1..5ebe8b0a4968 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Full-featured database management tool written in PHP
 
 LICENSE=	APACHE20
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 USE_PHP=	mssql mysql odbc pgsql session pdo_sqlite
 SUB_FILES=	pkg-message
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 524ead4befeb..43b169579c90 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD
 
 CONFLICTS=	adodb-4.*
 
-USE_ZIP=	yes
+USES=		zip
 USE_PHP=	pcre
 DEFAULT_PHP_VER=5
 
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index d6b07b5ea034..21e7289b2263 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	A pure-Python database engine
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile
index 2dab97725545..34ec8cefc984 100644
--- a/databases/dbf/Makefile
+++ b/databases/dbf/Makefile
@@ -17,8 +17,7 @@ OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/lib${PORTNAME}
 
-USE_ZIP=	yes
-USES=		pathfix
+USES=		pathfix zip
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_DOC_TO_MAN=""
diff --git a/databases/exist/Makefile b/databases/exist/Makefile
index 0d44a04330ed..d0357aaa42f0 100644
--- a/databases/exist/Makefile
+++ b/databases/exist/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	#
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Native XML Database
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_RC_SUBR=	eXist
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index 71aa14cf5d01..acaa0c62152d 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A MySQL DataStore implementation for GeoServer
 
 RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:${PORTSDIR}/graphics/geoserver
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
diff --git a/databases/hashtypes/Makefile b/databases/hashtypes/Makefile
index 0d1e34485b6f..7c669e0c6228 100644
--- a/databases/hashtypes/Makefile
+++ b/databases/hashtypes/Makefile
@@ -11,9 +11,8 @@ MASTER_SITES=	http://api.pgxn.org/dist/hashtypes/${PORTVERSION}/ \
 MAINTAINER=	oss-contrib@dreamindustries.co
 COMMENT=	Hash data types for PostgreSQL
 
+USES=		gmake zip
 USE_PGSQL=	yes
-USE_GMAKE=	yes
-USE_ZIP=	yes
 
 MAKE_ARGS=	USE_PGXS=1 MODULEDIR=extension
 MODULEDIR=	${PREFIX}/share/postgresql/extension
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index a2cf5730d56e..7cefe593091c 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -11,10 +11,10 @@ COMMENT=	An embeddable SQL database written in Java
 
 LICENSE=	BSD
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
-USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/build
 ALL_TARGET=	hsqldb hsqljdbc
diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index 3add0612a4e2..458e8687e0af 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -33,8 +33,8 @@ JSREPO=		${JS}-repo
 JSUPDATE=	5.0.0-${PORTVERSION}
 
 NO_WRKSUBDIR=	yes
+USES=		zip
 USE_JAVA=	yes
-USE_ZIP=	yes
 
 # use own DOS2UNIX in pre-patch, not the one from bsd.port.mk!
 DOS2UNIX_REGEX=	.*(css|dtd|java|js|txt|wsdd|xml|xsl)$$
diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
index 0e29cc872bd9..670d0e6a74a0 100644
--- a/databases/java-mybatis/Makefile
+++ b/databases/java-mybatis/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	SQL Mapping Framework
 
 USE_JAVA=	yes
-USE_ZIP=	yes
+USES=		zip
 LICENSE=	APACHE20
 NO_BUILD=	yes
 
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index 165dadecb30c..4ab8f4eda79a 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -19,8 +19,8 @@ PATCH_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
 
 RESTRICTED=	Must be downloaded direct from Oracle via www interface
 
-USE_ZIP=	yes
-USE_JAVA=	yes
+USES=		zip
+SE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
diff --git a/databases/jdbm2/Makefile b/databases/jdbm2/Makefile
index d94d7261b4ee..d6bbf4788421 100644
--- a/databases/jdbm2/Makefile
+++ b/databases/jdbm2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A fast, simple, and transactional Java persistence engine
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/databases/linux-oracle-instantclient-basic/Makefile b/databases/linux-oracle-instantclient-basic/Makefile
index 2e2c66120dcb..8573fa332ed2 100644
--- a/databases/linux-oracle-instantclient-basic/Makefile
+++ b/databases/linux-oracle-instantclient-basic/Makefile
@@ -20,7 +20,7 @@ DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
-USE_ZIP=		yes
+USES=			zip
 USE_LINUX=		yes
 USE_LINUX_PREFIX=	yes
 
diff --git a/databases/linux-oracle-instantclient-sdk/Makefile b/databases/linux-oracle-instantclient-sdk/Makefile
index 9a7a9b59baf9..419f2d9853f0 100644
--- a/databases/linux-oracle-instantclient-sdk/Makefile
+++ b/databases/linux-oracle-instantclient-sdk/Makefile
@@ -21,7 +21,7 @@ DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
-USE_ZIP=		yes
+USES=			zip
 USE_LINUX_PREFIX=	yes
 
 ORACLEVERSION=		10.2.0.3
diff --git a/databases/linux-oracle-instantclient-sqlplus/Makefile b/databases/linux-oracle-instantclient-sqlplus/Makefile
index 31d9dd540e23..8b525c0b1885 100644
--- a/databases/linux-oracle-instantclient-sqlplus/Makefile
+++ b/databases/linux-oracle-instantclient-sqlplus/Makefile
@@ -22,7 +22,7 @@ DISTINFO_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
-USE_ZIP=		yes
+USES=			zip
 USE_LINUX_PREFIX=	yes
 
 ORACLEVERSION=		10.2.0.3
diff --git a/databases/mysqldumper/Makefile b/databases/mysqldumper/Makefile
index ec1ed02aeadc..7137ea6e4887 100644
--- a/databases/mysqldumper/Makefile
+++ b/databases/mysqldumper/Makefile
@@ -15,9 +15,8 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-DBI>=1.48:${PORTSDIR}/databases/p5-DBI
 
-USE_ZIP=	yes
 USE_MYSQL=	yes
-USES=		perl5
+USES=		perl5 zip
 USE_PHP=	session mysql zlib ftp
 
 NO_BUILD=	yes
diff --git a/databases/openbase-jdbc/Makefile b/databases/openbase-jdbc/Makefile
index 63f7edc19293..6fb9f2930d72 100644
--- a/databases/openbase-jdbc/Makefile
+++ b/databases/openbase-jdbc/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	OpenBaseJDBC_${OBVERSION}
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	The Java JDBC implementation for OpenBase
 
+USES=		zip
 USE_JAVA=	yes
-USE_ZIP=	yes
 JAVA_VERSION=	1.6+
 
 NO_BUILD=	yes
diff --git a/databases/php-adodb-ext/Makefile b/databases/php-adodb-ext/Makefile
index 5a56d2d6d024..97909371eadb 100644
--- a/databases/php-adodb-ext/Makefile
+++ b/databases/php-adodb-ext/Makefile
@@ -14,10 +14,10 @@ COMMENT=	ADOdb Extension
 
 WRKSRC=		${WRKDIR}/adodb-${PORTVERSION:S/.//}
 
+USES=		zip
 USE_PHP=	yes
 USE_PHPIZE=	yes
 DEFAULT_PHP_VER=53
-USE_ZIP=	yes
 
 CONFIGURE_ARGS=		--with-php-config=${PREFIX}/bin/php-config \
 			--prefix=${PREFIX}/lib/php/${PHP_EXT_DIR}
diff --git a/databases/phpminiadmin/Makefile b/databases/phpminiadmin/Makefile
index e0c0e5d42a1e..3c6a9bf3f1ec 100644
--- a/databases/phpminiadmin/Makefile
+++ b/databases/phpminiadmin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight alternative to phpMyAdmin
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
+USES=		zip
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile
index 43f770350af4..eedb7d930a9b 100644
--- a/databases/postgresql-plv8js/Makefile
+++ b/databases/postgresql-plv8js/Makefile
@@ -13,9 +13,8 @@ COMMENT=	PL/v8js procedural language for PostgreSQL database
 
 LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8
 
-USES=		gmake perl5
+USES=		gmake perl5 zip
 USE_PERL5=	build
-USE_ZIP=	yes
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	91+
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index f039532ad928..5dad1f692a55 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -14,9 +14,9 @@ COMMENT=	APSW stands for Another Python SQLite Wrapper
 LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 PYDISTUTILS_PKGVERSION=	${PORTVERSION}_r1
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_ZIP=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/py-dbf/Makefile b/databases/py-dbf/Makefile
index 458e8af538eb..cd1d4b0af477 100644
--- a/databases/py-dbf/Makefile
+++ b/databases/py-dbf/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure python package for reading/writing dbf files
 
-USE_ZIP=		yes
+USES=			zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index b198db0ae719..d7b4aae98594 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rob.kruus@gmail.com
 COMMENT=	ODBC connections for python
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 5fce994f2bec..c87b246b97af 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python 3 compatible PostgreSQL database driver and tools
 
 LICENSE=	BSD3CLAUSE
 
-USE_ZIP=		yes
+USES=			zip
 USE_PGSQL=		yes
 USE_PYTHON=		3
 USE_PYDISTUTILS=	yes
diff --git a/databases/py-umemcache/Makefile b/databases/py-umemcache/Makefile
index 300e4ffc6da5..4c23443dced0 100644
--- a/databases/py-umemcache/Makefile
+++ b/databases/py-umemcache/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Memcache client written in highly optimized C++ with Python bindings
 
 LICENSE=	BSD4CLAUSE
 
-USES=			dos2unix
+USES=			dos2unix zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index a533706b8138..b1a66c94336b 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -14,8 +14,7 @@ COMMENT=	The C++ Database Access Library
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-USE_ZIP=	yes
-USES=		cmake
+USES=		cmake zip
 CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=OFF
 USE_LDCONFIG=	yes
 
diff --git a/databases/sqlbuddy/Makefile b/databases/sqlbuddy/Makefile
index 78cb96ccb25a..825863b6614c 100644
--- a/databases/sqlbuddy/Makefile
+++ b/databases/sqlbuddy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web based MySQL administration with a set of PHP scripts
 
 BROKEN=		Fails to check-sanity
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 55628a17abc1..1090d3aa40f7 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graphical tool for database development
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 
 JAVA_VERSION=	1.7+
diff --git a/deskutils/epoch/Makefile b/deskutils/epoch/Makefile
index 28c0e4f49b94..b3975402f44e 100644
--- a/deskutils/epoch/Makefile
+++ b/deskutils/epoch/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Small and handy timeline application
 LINCENSE=	GPLv3
 PROJECTHOST=	gepoch
 
-USES=		qmake
-USE_ZIP=	yes
+USES=		qmake zip
 USE_QT4=	gui moc_build rcc_build
 
 PLIST_FILES=	bin/${PORTNAME} share/pixmaps/${PORTNAME}.png
diff --git a/deskutils/fengoffice/Makefile b/deskutils/fengoffice/Makefile
index f0c3d48b2060..3b2b18b4da95 100644
--- a/deskutils/fengoffice/Makefile
+++ b/deskutils/fengoffice/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	An open source web-based collaboration software
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 USE_PHP=	mysql gd simplexml
 DEFAULT_PHP_VER=5
diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index f39321f31904..c1544e90de67 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		zip:${PORTSDIR}/archivers/zip
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
-USE_ZIP=	yes
+USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 
diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
index faf3e72d938e..4aee529fa657 100644
--- a/deskutils/ganttproject/Makefile
+++ b/deskutils/ganttproject/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 USES=		shebangfix
 SHEBANG_FILES=	ganttproject
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index b4ed58a664a6..b789f81f4a42 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MyIT CRM is a CRM project designed for Computer Servicing and Repairs
 
 LICENSE=	GPLv3
 
-USE_ZIP=	yes
+USES=		zip
 USE_PHP=	mysql session xml
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/MyITCRM-${PORTVERSION}
diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile
index 57fd1ba77449..dd7314e81f04 100644
--- a/deskutils/phpcollab/Makefile
+++ b/deskutils/phpcollab/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	phpcollab-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHPcollab is project management and collaboration over the internet
 
-USE_ZIP=	yes
+USES=		zip
 USE_PHP+=	mysql
 USE_MYSQL=	yes
 NO_BUILD=	yes
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index a0a93ecc5fa9..11e67b59a785 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -29,9 +29,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
diff --git a/deskutils/sugarcrm/Makefile b/deskutils/sugarcrm/Makefile
index c4d1c2e38f54..742e6a9ed27d 100644
--- a/deskutils/sugarcrm/Makefile
+++ b/deskutils/sugarcrm/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	SugarCE-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Web based customer relationship management suite
 
+USES=		zip
 USE_PHP=	gd mysql session pcre xml zlib mbstring curl imap spl posix
-USE_ZIP=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/SugarCE-Full-${PORTVERSION}
 
diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile
index f3e717e5c8da..98123db0f3ab 100644
--- a/deskutils/surrealtodo/Makefile
+++ b/deskutils/surrealtodo/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	surrealtodo_v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Surreal ToDo is an AJAX enabled web 2.0 list manager
 
-USE_ZIP=	yes
+USES=		zip
 USE_PHP+=	mysql
 USE_MYSQL=	yes
 NO_BUILD=	yes
diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 486eb059c94f..f17fcd02f46a 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	DOCS
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
diff --git a/devel/arduino-glcd/Makefile b/devel/arduino-glcd/Makefile
index caef0093e3e0..13c3a3c6b7d7 100644
--- a/devel/arduino-glcd/Makefile
+++ b/devel/arduino-glcd/Makefile
@@ -16,8 +16,7 @@ LICENSE=	LGPL21
 RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
 
 WRKSRC=		${WRKDIR}/glcd
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		zip dos2unix
 
 NO_BUILD=	yes
 NO_STAGE=	yes
diff --git a/devel/arduino-irremote/Makefile b/devel/arduino-irremote/Makefile
index a674f21002d3..b6324478459b 100644
--- a/devel/arduino-irremote/Makefile
+++ b/devel/arduino-irremote/Makefile
@@ -16,8 +16,7 @@ LICENSE=	LGPL21
 RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
 
 WRKSRC=		${WRKDIR}/IRremote
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		zip dos2unix
 
 NO_BUILD=	yes
 
diff --git a/devel/asmx/Makefile b/devel/asmx/Makefile
index d85de1480867..b9d9ab351f83 100644
--- a/devel/asmx/Makefile
+++ b/devel/asmx/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.8.2
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://xi6.com/files/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-CPU macro assembler for many major 8-bit and 16-bit CPUs
@@ -25,6 +24,7 @@ OPTIONS_DEFAULT=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80
 F8_DESC=	Fairchild F8
 Z80_DESC=	Zilog Z-80 and Nintendo Gameboy Z-80 variant
 
+USES=		zip
 NO_WRKSUBDIR=	yes
 
 PORTDOCS=	README.txt
diff --git a/devel/astah-community/Makefile b/devel/astah-community/Makefile
index ee4edd5ba5f3..65ebc9213538 100644
--- a/devel/astah-community/Makefile
+++ b/devel/astah-community/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell no-auto-acc
 
 RESTRICTED=	License restrictions -- See http://astah.net/faq/community/enduser-license-agreement
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 REVISION=	d254c5
diff --git a/devel/bncsutil-ghost++/Makefile b/devel/bncsutil-ghost++/Makefile
index cb73ea161de2..7a90a944013a 100644
--- a/devel/bncsutil-ghost++/Makefile
+++ b/devel/bncsutil-ghost++/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.3.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX=	-ghost++
-EXTRACT_SUFX=	.zip
 DISTNAME=	${PROJECTHOST}_${PROJECTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 PROJECTHOST=	ghostplusplus
 PROJECTVERSION=	17.1
 
-USES=		dos2unix gmake
+USES=		dos2unix gmake zip
 WRKSRC=		${WRKDIR}/ghost/bncsutil/src/bncsutil
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index d41fcaad801d..5b0a098a9d64 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -14,8 +14,7 @@ COMMENT=	A cross platform RAD GUI Building IDE for wxPython
 
 WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
 
-USE_ZIP=	yes
-USES=		gettext
+USES=		gettext zip
 USE_PYTHON=	yes
 USE_WX=		2.6
 WX_COMPS=	python
diff --git a/devel/cbind/Makefile b/devel/cbind/Makefile
index e4a0a31a661c..71350c627cc0 100644
--- a/devel/cbind/Makefile
+++ b/devel/cbind/Makefile
@@ -7,13 +7,13 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.kuleuven.ac.be/pub/Ada-Belgium/cdrom/ase02_02/tools/cbind/ \
 			   ftp://ftp.cnam.fr/pub2/Ada/PAL/swtools/cbind/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translator for "thin" Ada bindings to C
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		zip
 MAKE_JOBS_UNSAFE=	yes
 
 ${WRKSRC}=	${WRKDIR}/${PORTNAME}
diff --git a/devel/cdash/Makefile b/devel/cdash/Makefile
index 5d5e52112600..4449b00b85f4 100644
--- a/devel/cdash/Makefile
+++ b/devel/cdash/Makefile
@@ -17,8 +17,7 @@ OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=MYSQL
 
-USE_ZIP=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource zip
 CMAKE_ARGS+=	-DCDASH_DB_NAME:STRING=cdash \
    		-DCDASH_DB_LOGIN:STRING=cdash \
    		-DCDASH_DB_TYPE:STRING=${DB_TYPE}
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index cce7e2ddb151..e9ab36fc54c4 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -16,8 +16,8 @@ RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-
 
 OPTIONS_DEFINE=	DOCS
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	Makefile.freebsd.txt
+USES=		dos2unix zip
+DOS2UNIX_FILES=	Makefile.freebsd.txt
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/devel/checkheaders/Makefile b/devel/checkheaders/Makefile
index 245d9197e038..0a2f830bc7bf 100644
--- a/devel/checkheaders/Makefile
+++ b/devel/checkheaders/Makefile
@@ -5,12 +5,11 @@ PORTNAME=	checkheaders
 PORTVERSION=	1.0.1
 CATEGORIES=	devel
 MASTER_SITES=	GOOGLE_CODE
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Checks headers in C/C++ programs
 
-USES=		gmake
+USES=		gmake zip
 MAKE_ARGS=	CXX="${CXX}"
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/devel/cobf/Makefile b/devel/cobf/Makefile
index 6311b204ad08..f02105251ae4 100644
--- a/devel/cobf/Makefile
+++ b/devel/cobf/Makefile
@@ -6,13 +6,13 @@ PORTVERSION=	1.06
 CATEGORIES=	devel
 MASTER_SITES=	http://home.arcor.de/bernhard.baier/${PORTNAME}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	C and C++ code obfuscator
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		zip
 WRKSRC=		${WRKDIR}
 PORTDOCS=	COPYING README cobf.pdf
 PLIST_FILES=	bin/cobf
diff --git a/devel/codeworker/Makefile b/devel/codeworker/Makefile
index fa7d5c37281e..e346d472510c 100644
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	4.5.3
 CATEGORIES=	devel
 MASTER_SITES=	http://codeworker.free.fr/downloads/
 DISTNAME=	CodeWorker_SRC${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Versatile parsing tool and source code generator
@@ -15,7 +14,7 @@ LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/CodeWorker${PORTVERSION:S/./_/g}
 
-USES=		dos2unix gmake
+USES=		dos2unix gmake zip
 MAKE_ARGS=	CC="${CXX}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LFLAGS="-lm"
 ALL_TARGET=	build
 
diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile
index 897ac5ed0b12..3287c7c357d4 100644
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@@ -11,9 +11,8 @@ MAINTAINER=	novator24@gmail.com
 COMMENT=	C++ test coverage analyzer
 
 WRKSRC=	        ${WRKDIR}
-USE_ZIP=	yes
+USES=		gmake zip
 USE_GCC=	yes
-USE_GMAKE=	yes
 MAKEFILE=	makefile
 
 MAN1=		cov++.1 \
diff --git a/devel/djgpp-crx/Makefile b/devel/djgpp-crx/Makefile
index c0690bb0126c..66942a423ee8 100644
--- a/devel/djgpp-crx/Makefile
+++ b/devel/djgpp-crx/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	djcrx203
 MAINTAINER=	johnson.peter@gmail.com
 COMMENT=	Headers and Libraries for DJGPP cross-development
 
-USE_ZIP=	yes
+USES=		zip
 NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index 083eaa5170e8..31040695fd9d 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/DrPython
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/eclipse-eclemma/Makefile b/devel/eclipse-eclemma/Makefile
index 07825248fce3..cf51341228d5 100644
--- a/devel/eclipse-eclemma/Makefile
+++ b/devel/eclipse-eclemma/Makefile
@@ -13,7 +13,7 @@ RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
 
 PLUGIN_PATHS=	features plugins
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}
diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index d2f0bf1ae259..c315d8fafbd9 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Adobe Flex SDK
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.*
-USE_ZIP=	YES
+USES=		zip
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
diff --git a/devel/flex-sdk2/Makefile b/devel/flex-sdk2/Makefile
index c3bbc1cc4513..dc8a78d668ac 100644
--- a/devel/flex-sdk2/Makefile
+++ b/devel/flex-sdk2/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 RESTRICTED=	Need agreement before download
 
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk3-3.* flex-sdk-4.*
-USE_ZIP=	YES
+USES=		zip
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index 6e6e60ce42f1..0d7ee253e222 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Adobe Flex SDK
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.*
-USE_ZIP=	YES
+USES=		zip
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
diff --git a/devel/flex_compiler_shell/Makefile b/devel/flex_compiler_shell/Makefile
index 355dd68ed678..b28632d079b0 100644
--- a/devel/flex_compiler_shell/Makefile
+++ b/devel/flex_compiler_shell/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 RESTRICTED=	Redistribution is not allowed
 CONFLICTS=	flex-sdk-3.*
 
-USE_ZIP=	YES
+USES=		zip
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 WRKSRC=		${WRKDIR}
diff --git a/devel/flexdock/Makefile b/devel/flexdock/Makefile
index 4670f951129f..ce2e7b11ba38 100644
--- a/devel/flexdock/Makefile
+++ b/devel/flexdock/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	otacilio.neto@bsd.com.br
 COMMENT=	Swing windowing and docking framework
 
-USE_ZIP=	yes
+USES=		zip
 USE_ANT=	yes
 USE_JAVA=	yes
 
diff --git a/devel/flexjson/Makefile b/devel/flexjson/Makefile
index 37def3978478..f639a81da3b2 100644
--- a/devel/flexjson/Makefile
+++ b/devel/flexjson/Makefile
@@ -7,11 +7,11 @@ PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Flexjson%201.0
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight Java library to write JSON
 
+USES=		zip
 OPTIONS_DEFINE=	DOCS
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/devel/flickrnet/Makefile b/devel/flickrnet/Makefile
index 703ee7ee85bb..c6a2b2b78576 100644
--- a/devel/flickrnet/Makefile
+++ b/devel/flickrnet/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Flickr .Net API Library
 BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		gmake zip
 WRKSRC=		${WRKDIR}/FlickrNet
 
 NO_STAGE=	yes
diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index c8bca570920b..87627e267f88 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -13,13 +13,12 @@ COMMENT=	A simple, easy-to-use web based bug tracking system
 RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
 
 USE_PHP=	pcre session zlib xml gd
-USE_ZIP=	yes
+USES=		dos2unix zip
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.php
 
 OPTIONS_DEFINE=	GRAPHVIZ MYSQL MYSQLI POSTGRES
diff --git a/devel/fujaba/Makefile b/devel/fujaba/Makefile
index 0286693dcd47..fc6260d56f4b 100644
--- a/devel/fujaba/Makefile
+++ b/devel/fujaba/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Another UML CASE 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/devel/geoip-java/Makefile b/devel/geoip-java/Makefile
index 4be1760cac7f..0b3ee1823b02 100644
--- a/devel/geoip-java/Makefile
+++ b/devel/geoip-java/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 RUN_DEPENDS=	GeoIP>=1.4.8:${PORTSDIR}/net/GeoIP
 
 PKGNAMESUFFIX:=	-java
-USE_ZIP=	YES
+USES=		zip
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 089f32239b78..9f33d492166d 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gSOAP
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generator Tools for Coding SOAP/XML Web Services in C and C++
@@ -17,7 +16,7 @@ LICENSE=	GPLv2
 CONFIGURE_ENV=	LEX=flex YACC=yacc
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
-USES=		pathfix
+USES=		pathfix zip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 OPTIONS_RADIO=	SSL
diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile
index 93586f3cc788..3d7d2088c1e6 100644
--- a/devel/hgsvn/Makefile
+++ b/devel/hgsvn/Makefile
@@ -15,9 +15,9 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion \
 		hg:${PORTSDIR}/devel/mercurial
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-USE_ZIP=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//}
 
diff --git a/devel/hp48xgcc/Makefile b/devel/hp48xgcc/Makefile
index 334ea9f83f51..730d361b72e8 100644
--- a/devel/hp48xgcc/Makefile
+++ b/devel/hp48xgcc/Makefile
@@ -20,9 +20,8 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386
 
-USES=		gmake perl5
+USES=		gmake perl5 zip
 USE_PERL5=	build
-USE_ZIP=	yes
 
 GCC_VER=	2.7.2
 GCC_DIR=	${WRKDIR}/gcc-${GCC_VER}
diff --git a/devel/initutil/Makefile b/devel/initutil/Makefile
index 1c47f86458b0..3b2ce18255e1 100644
--- a/devel/initutil/Makefile
+++ b/devel/initutil/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	2.1.b
 CATEGORIES=	devel
 MASTER_SITES=	http://www.bdsoft.com/dist/
 DISTNAME=	${PORTNAME}2
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	STL Container Initialization Library
 
-USES=		dos2unix
+USES=		dos2unix zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 1a94d1fca743..7edfa96c795b 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -6,13 +6,13 @@ PORTVERSION=	2.5
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/jam/
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Build utility like make(1)
 
 OPTIONS_DEFINE=	DOCS
 NO_WRKSUBDIR=	yes
+USES=		zip
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/jgoodies-common/Makefile b/devel/jgoodies-common/Makefile
index 103c9ce80653..852fa88d3304 100644
--- a/devel/jgoodies-common/Makefile
+++ b/devel/jgoodies-common/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
-USES=		dos2unix
-USE_ZIP=	yes
+USES=		dos2unix zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/devel/jline/Makefile b/devel/jline/Makefile
index c66fa83b0df7..b783ff539f22 100644
--- a/devel/jline/Makefile
+++ b/devel/jline/Makefile
@@ -12,8 +12,8 @@ COMMENT=	JLine is a Java library for handling console input
 LICENSE=	BSD
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
+USES=		zip
 USE_JAVA=	yes
-USE_ZIP=	yes
 OPTIONS_DEFINE=	JLINEPATCH
 JLINEPATCH_DESC=	Allow ConsoleRunner customized completion
 JLINEJAR=	${WRKSRC}/jline-${PORTVERSION}.jar
diff --git a/devel/json-c/Makefile b/devel/json-c/Makefile
index d0caf6e6e6e9..38a3b1a97973 100644
--- a/devel/json-c/Makefile
+++ b/devel/json-c/Makefile
@@ -11,9 +11,8 @@ COMMENT=	JSON (JavaScript Object Notation) implementation in C
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig zip
 USE_GITHUB=	yes
-USE_ZIP=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 GH_ACCOUNT=	${PORTNAME}
diff --git a/devel/jwasm/Makefile b/devel/jwasm/Makefile
index b9d84626dcc5..16ad23924e2a 100644
--- a/devel/jwasm/Makefile
+++ b/devel/jwasm/Makefile
@@ -16,9 +16,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 NO_WRKSUBDIR=	yes
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
-USES=	gmake
+USES=	dos2unix gmake zip
 MAKEFILE=	GccUnix.mak
 
 PORTDOCS=	*
diff --git a/devel/kickassembler/Makefile b/devel/kickassembler/Makefile
index 34e3c30c7b33..49e83e7964f7 100644
--- a/devel/kickassembler/Makefile
+++ b/devel/kickassembler/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	KickAssembler${PORTVERSION}
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Advanced MOS 65xx assembler with embedded script language
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 6efa4e56c75c..71c8264ddaa0 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -18,10 +18,9 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		gmake uses
 USE_GL=		gl
 USE_SDL=	image sdl
-USE_GMAKE=	yes
 MAKEFILE=	MakefileKyra
 MAKE_ENV=	MAKE_KYRA=RELEASE KYRA_OPENGL=YES
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}" LD="${CXX}" \
diff --git a/devel/libgpc/Makefile b/devel/libgpc/Makefile
index 633edd7471a1..846e02d81763 100644
--- a/devel/libgpc/Makefile
+++ b/devel/libgpc/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	2.32
 CATEGORIES=	devel math graphics
 MASTER_SITES=	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
 DISTNAME=	gpc${PORTVERSION:S/.//}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Generic Polygon Clipper
 
-USES=		dos2unix uidfix
+USES=		dos2unix uidfix zip
 PLIST_FILES=	lib/libgpc.so.2	\
 		lib/libgpc.so	lib/libgpc.a	\
 		include/gpc.h
diff --git a/devel/libs11n/Makefile b/devel/libs11n/Makefile
index 92cd1919ffb6..e3a4bc94f84c 100644
--- a/devel/libs11n/Makefile
+++ b/devel/libs11n/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	1.2.10
 CATEGORIES=	devel
 MASTER_SITES=	SF/s11n/s11n/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-nobuildfiles
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for easily serializing a wide variety of objects
 
-USES=		uidfix
+USES=		uidfix zip
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_LDCONFIG=	yes
 
diff --git a/devel/log4net/Makefile b/devel/log4net/Makefile
index 028bdf71b9d9..9bc219fff2f6 100644
--- a/devel/log4net/Makefile
+++ b/devel/log4net/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 SUB_FILES=	log4net.pc
diff --git a/devel/looks/Makefile b/devel/looks/Makefile
index af13064a170d..d79ad8c35edc 100644
--- a/devel/looks/Makefile
+++ b/devel/looks/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.jgoodies.com/download/libraries/${PORTNAME}/
 DISTNAME=	jgoodies-${PORTNAME}-${PORTVERSION:S|.|_|g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JGoodies Looks improve the appearance of your Java applications
@@ -16,6 +15,7 @@ OPTIONS_DEFINE=	DOCS
 
 LICENSE=	BSD3CLAUSE
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/devel/naturaldocs/Makefile b/devel/naturaldocs/Makefile
index c5a3b7d910d3..cb95fc1736b8 100644
--- a/devel/naturaldocs/Makefile
+++ b/devel/naturaldocs/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	NaturalDocs-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible, multi-language source code documentation generator
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/devel/nini/Makefile b/devel/nini/Makefile
index f98968a3664b..55d90d154caf 100644
--- a/devel/nini/Makefile
+++ b/devel/nini/Makefile
@@ -13,7 +13,7 @@ COMMENT=	NET configuration library
 
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/Nini
diff --git a/devel/p5-Array-Group/Makefile b/devel/p5-Array-Group/Makefile
index 2982286d76cb..6445ed81dadf 100644
--- a/devel/p5-Array-Group/Makefile
+++ b/devel/p5-Array-Group/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert an array into array of arrayrefs of uniform size N
 
-USE_ZIP=	yes
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Module-Versions/Makefile b/devel/p5-Module-Versions/Makefile
index 134393b593fe..808168ae8a5d 100644
--- a/devel/p5-Module-Versions/Makefile
+++ b/devel/p5-Module-Versions/Makefile
@@ -9,8 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to handle versions of loaded modules
 
-USE_ZIP=	yes
-USES=		perl5
+USES=		perl5 zip
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile
index 3005c29cbea8..8fdf4499d4b4 100644
--- a/devel/pccts/Makefile
+++ b/devel/pccts/Makefile
@@ -14,7 +14,7 @@ CONFLICTS=	antlr*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 MAKE_ENV=	COPT="${CFLAGS}"
 MAKEFILE=	makefile
 ALL_TARGET=	# empty
diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile
index f145b4f3993b..ea5bdec19070 100644
--- a/devel/pmd/Makefile
+++ b/devel/pmd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Static analysis tool for Java source code
 LICENSE=	APACHE20 BSD4CLAUSE
 LICENSE_COMB=	dual
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/devel/premake/Makefile b/devel/premake/Makefile
index fe069ac3093e..b8dc156805cf 100644
--- a/devel/premake/Makefile
+++ b/devel/premake/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/Premake/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Writes build scripts
@@ -16,7 +15,7 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/Premake-${PORTVERSION}
 
-USES=		gmake dos2unix
+USES=		gmake dos2unix zip
 
 PLIST_FILES=	bin/premake
 
diff --git a/devel/premake4/Makefile b/devel/premake4/Makefile
index 36e284ae688a..03f9cd48d6b2 100644
--- a/devel/premake4/Makefile
+++ b/devel/premake4/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	4.3
 CATEGORIES=	devel
 MASTER_SITES=	SF/premake/Premake/${PORTVERSION}
 DISTNAME=	premake-${PORTVERSION}-src
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	vmagerya@gmail.com
 COMMENT=	Writes build scripts
@@ -16,7 +15,7 @@ OPTIONS_DEFINE=	DOCS
 WRKSRC=		${WRKDIR}/premake-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/build/gmake.unix
 
-USES=		gmake
+USES=		gmake zip
 MAKE_ARGS=	ARCH=""
 
 PLIST_FILES=	bin/premake4
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index 3a296b0a4a60..b0885fa13f47 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.0:${PORTSDIR}/devel/py-ExtensionClass \
 		${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/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index 8e8c3a268ce8..72d46616d1af 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dynamically extend other objects with AddOns
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index e2b6fe948bc5..ddd92370036e 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-d
 		${PYTHON_PKGNAMEPREFIX}SymbolType>0:${PORTSDIR}/devel/py-SymbolType
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index 7735859cd2ef..c57fec715743 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -17,9 +17,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index 9645029c9fb5..6b522176ce09 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \
 		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ExtensionClass/Makefile b/devel/py-ExtensionClass/Makefile
index 13d31e5adab3..1211a3452650 100644
--- a/devel/py-ExtensionClass/Makefile
+++ b/devel/py-ExtensionClass/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Metaclass for subclassable extension types
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index e3ebc004c345..ca94ad910925 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index bd6ed16471ab..6c0c2b9cbe33 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index af92adc50bb2..9374bc7f14fd 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index 9e1838047875..ccc068cca6c1 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -41,7 +41,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTS
 
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index e7fa55255995..ac2737797dfc 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
 		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index f1778055f06a..e16845db0be0 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -52,7 +52,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index 0d1ba3fc15e6..5dea44b9ad24 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
 		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 35c2c6c44bca..7650ada7200c 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -18,10 +18,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 #USES=			zope
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index 448b571375cd..ac083c07feba 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -21,10 +21,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 #USES=			zope
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 0e9f5703726d..c4496af5ca02 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -29,7 +29,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:${PORTSDIR}/devel/py-zope.copy \
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 32611d5e9f02..aeb5c8dc20c3 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index fb67478d9252..13632b3c2cc3 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
 		${PYTHON_PKGNAMEPREFIX}Products.PloneTestCase>=0:${PORTSDIR}/devel/py-Products.PloneTestCase
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index 93fbe666623f..52529626c052 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -24,9 +24,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index 76d940b2e461..e1420b727fc0 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:${PORTSDIR}/security/py-Acce
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ExternalEditor/Makefile b/devel/py-Products.ExternalEditor/Makefile
index 685745e3a2b0..9885a5238e73 100644
--- a/devel/py-Products.ExternalEditor/Makefile
+++ b/devel/py-Products.ExternalEditor/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope external editor
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index 56f7db1d5e31..3e75663a7e10 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.MIMETools/Makefile b/devel/py-Products.MIMETools/Makefile
index 5bdf96fece8b..3fa992db64c7 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 727016bf42ea..08468ee2c072 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
 		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index 7249ba807305..fa7c51b80498 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -6,7 +6,6 @@ PORTREVISION=	2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
@@ -20,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zop
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index 78ed7bd91de0..7f853621ef54 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
 		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index 9cd73906dc6d..e1a2917f0882 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.me
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index ab7d45cc6276..54ead532430b 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -26,9 +26,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gettext>=0.6:${PORTSDIR}/textproc/py-gettext
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PloneLanguageTool/Makefile b/devel/py-Products.PloneLanguageTool/Makefile
index aeb1d339f8e6..148a98a291db 100644
--- a/devel/py-Products.PloneLanguageTool/Makefile
+++ b/devel/py-Products.PloneLanguageTool/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Allows to set the available languages in Plone site
 
 LICENSE=	GPLv2
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index e0a44d60f4fc..5d330832db83 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index 51493a533626..4de0a6582a3a 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:${PORTSDIR}/www/py-
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
 		${PYTHON_PKGNAMEPREFIX}markdown>=1.7:${PORTSDIR}/textproc/py-markdown
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index 59971da97c06..feb424b1b829 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
 		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index 190e8cc232b5..4bfaa152b614 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -6,7 +6,6 @@ PORTREVISION=	2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	zope
 
 MAINTAINER=	zope@FreeBSD.org
@@ -27,6 +26,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.StandardCacheManagers/Makefile b/devel/py-Products.StandardCacheManagers/Makefile
index dceb12de4a2f..1d98fbdf351b 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index 511ff5d2b09b..db86cb8e7265 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
 		${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/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index bf69dfba25ab..c242d0403aed 100644
--- a/devel/py-Products.ZCatalog/Makefile
+++ b/devel/py-Products.ZCatalog/Makefile
@@ -29,9 +29,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-Acc
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.ZSQLMethods/Makefile b/devel/py-Products.ZSQLMethods/Makefile
index ad0a7a5a92c8..5a72bfdcd7fc 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -23,9 +23,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
 		${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/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index afcd33b12a3e..56b7a91f739a 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -19,10 +19,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 #USES=		zope
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.contentmigration/Makefile b/devel/py-Products.contentmigration/Makefile
index 163c1b2cf4ef..f2c1388c2b9b 100644
--- a/devel/py-Products.contentmigration/Makefile
+++ b/devel/py-Products.contentmigration/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Generic content migration framework for Plone
 
 LICENSE=	LGPL20
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 5aba8c6b3847..1a859b24b4db 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
 		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
 		${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/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index 9177ecb97e08..4be18ee44789 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
 		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index f615d231902e..b2f2ad2f5ed2 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-SymbolType/Makefile b/devel/py-SymbolType/Makefile
index ea817a2509f6..167f4e308705 100644
--- a/devel/py-SymbolType/Makefile
+++ b/devel/py-SymbolType/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Simple Symbol Type for Python
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-TurboJinja/Makefile b/devel/py-TurboJinja/Makefile
index 69a43723f5a7..695733d5af57 100644
--- a/devel/py-TurboJinja/Makefile
+++ b/devel/py-TurboJinja/Makefile
@@ -15,9 +15,9 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.1.2:${PORTSDIR}/www/py-turbo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:${PORTSDIR}/devel/py-Jinja
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
-USE_ZIP=	yes
 
 NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/py-ZopeUndo/Makefile b/devel/py-ZopeUndo/Makefile
index c5cc27710419..8e839f0944ca 100644
--- a/devel/py-ZopeUndo/Makefile
+++ b/devel/py-ZopeUndo/Makefile
@@ -13,9 +13,9 @@ COMMENT=	ZODB undo support for Zope2
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-akismet/Makefile b/devel/py-akismet/Makefile
index 8e4ba18e7ec9..0660d8b7b0a6 100644
--- a/devel/py-akismet/Makefile
+++ b/devel/py-akismet/Makefile
@@ -11,12 +11,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jacob@whotookspaz.org
 COMMENT=	A Python interface to the Akismet API
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	akismet
 
-USE_ZIP=	yes
-
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 NO_STAGE=	yes
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index f7c066f6a737..67414798682d 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:${PORTSDIR}/www/py-plone.app.querystring \
 		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:${PORTSDIR}/www/py-plone.app.jquerytools
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index 4d3819102bd1..156eb5b95b04 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
 		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:${PORTSDIR}/www/py-plone.app.jquerytools
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index 63b05d198f55..6b3b20079dec 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -15,9 +15,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-bitstring/Makefile b/devel/py-bitstring/Makefile
index b4cbd923747d..24996af5c515 100644
--- a/devel/py-bitstring/Makefile
+++ b/devel/py-bitstring/Makefile
@@ -6,13 +6,13 @@ PORTVERSION=	3.1.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Simple construction, analysis, and modification of binary data
 
 LICENSE=	MIT
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-cfgparse/Makefile b/devel/py-cfgparse/Makefile
index bc67af1e8ee0..e5f746053842 100644
--- a/devel/py-cfgparse/Makefile
+++ b/devel/py-cfgparse/Makefile
@@ -10,12 +10,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jdferrell3@yahoo.com
 COMMENT=	Python module for parsing configuration files
 
-USES=			dos2unix
+USES=			dos2unix zip
 DOS2UNIX_FILES=		cfgparse.py
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOCS=	*
diff --git a/devel/py-cmdln/Makefile b/devel/py-cmdln/Makefile
index bf5a74126df0..9e0bce661d5a 100644
--- a/devel/py-cmdln/Makefile
+++ b/devel/py-cmdln/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module for easily building good multi-command scripts
 
 LICENSE=	MIT
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 
diff --git a/devel/py-collective.monkeypatcher/Makefile b/devel/py-collective.monkeypatcher/Makefile
index c5eca06f9020..587aa7da1049 100644
--- a/devel/py-collective.monkeypatcher/Makefile
+++ b/devel/py-collective.monkeypatcher/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Applying monkey patches on startup using ZCML configuration
 
 LICENSE=	BSD
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index 1df36e9131c3..8667363dc6e3 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n
 		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
 		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-conditional/Makefile b/devel/py-conditional/Makefile
index 209f00d5888e..d1b029125a70 100644
--- a/devel/py-conditional/Makefile
+++ b/devel/py-conditional/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Conditionally enter a context manager
 
 LICENSE=	BSD2CLAUSE
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 3cd80f6ebbd6..a4fc644fc4e3 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Simple but powerful config file reader and writer
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index f5095061e7a8..cad46a19e166 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	pycountry-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python API for ISO country, subdivision, language and currency
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-decoratortools/Makefile b/devel/py-decoratortools/Makefile
index a98457b294b1..b26d53622cbb 100644
--- a/devel/py-decoratortools/Makefile
+++ b/devel/py-decoratortools/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Class, function, and metaclass decorators
@@ -18,5 +17,6 @@ LICENSE_COMB=	dual
 PYDISTUTILS_AUTOPLIST=	yes
 USE_PYDISTUTILS=yes
 USE_PYTHON=	2
+USES=		zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index bd85e4684f71..b38791aa72a9 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:${PORTSDIR}/devel/py-repoze.xmliter \
 		${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-experimental.cssselect/Makefile b/devel/py-experimental.cssselect/Makefile
index a9e27f1a0725..9d5be3a77d78 100644
--- a/devel/py-experimental.cssselect/Makefile
+++ b/devel/py-experimental.cssselect/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Experimental version of lxml.cssselect
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-extremes/Makefile b/devel/py-extremes/Makefile
index 60b5583997b1..9c10c31e57aa 100644
--- a/devel/py-extremes/Makefile
+++ b/devel/py-extremes/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Production-quality 'Min' and 'Max' objects (adapted from PEP 326)
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index a9cdb9da40a6..628902849d72 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -32,7 +32,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.p
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
-USES=			zope
+USES=			zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index aace5e05ecea..092fb4adf19f 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -27,9 +27,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transact
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index cf2d08762eef..d8a221713099 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -23,10 +23,10 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisit
 		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
 		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 #USES=			zope
 
 .include <bsd.port.mk>
diff --git a/devel/py-greenlet/Makefile b/devel/py-greenlet/Makefile
index d72606b1627b..12a979c545a7 100644
--- a/devel/py-greenlet/Makefile
+++ b/devel/py-greenlet/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	0.4.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Light-weight microthreads for Python
@@ -17,6 +16,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 PYDISTUTILS_AUTOPLIST=	yes
 USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
+USES=		zip
 
 post-build:
 	@${STRIP_CMD} ${WRKSRC}/greenlet.so
diff --git a/devel/py-hgtools/Makefile b/devel/py-hgtools/Makefile
index f24495ed35e4..cbb23c297eac 100644
--- a/devel/py-hgtools/Makefile
+++ b/devel/py-hgtools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Classes and setuptools plugin for Mercurial repositories
 
 LICENSE=	GPLv2
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-initgroups/Makefile b/devel/py-initgroups/Makefile
index 10bca293ae7c..f9655b839c67 100644
--- a/devel/py-initgroups/Makefile
+++ b/devel/py-initgroups/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Convenience uid/gid helper function used in Zope2
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index cb0113113642..199657f04b5a 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.10:${PORTSDIR}/devel/ipython
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile
index 70cfac1ce475..1c9677c31a86 100644
--- a/devel/py-json-py/Makefile
+++ b/devel/py-json-py/Makefile
@@ -8,15 +8,14 @@ CATEGORIES=	devel lang www python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3_4
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A python implementation of a JSON (http//:json.org) reader/writer
 
 NO_WRKSUBDIR=	yes
 
+USES=		zip
 USE_PYTHON=	yes
-USE_ZIP=	yes
 
 NO_STAGE=	yes
 do-build:
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 41e8a0cd9488..27e3ff8e7709 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -17,10 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
 
 USE_PYTHON=	yes
-USE_ZIP=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USES=		gmake
+USES=		gmake zip
 
 
 .include <bsd.port.mk>
diff --git a/devel/py-ll-core/Makefile b/devel/py-ll-core/Makefile
index c331310bcdaa..c3420f83ffe7 100644
--- a/devel/py-ll-core/Makefile
+++ b/devel/py-ll-core/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility functions and classes used by the other LivingLogic packages
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-mwlib.ext/Makefile b/devel/py-mwlib.ext/Makefile
index 8019de9a73ed..ac22d91ab677 100644
--- a/devel/py-mwlib.ext/Makefile
+++ b/devel/py-mwlib.ext/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Provide Dependencies for mwlib
 
-USE_ZIP=		yes
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index bd4352196dda..ce777eaca3ef 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_ZIP=	yes
-USES=		gettext
+USES=		gettext zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index bf8d61eb006a..f9ac4d640e60 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsing>0:${PORTSDIR}/devel/py-parsing \
 		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
 		${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:${PORTSDIR}/databases/py-sqlite3dbm
 
-USE_ZIP=		yes
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
diff --git a/devel/py-olefileio_pl/Makefile b/devel/py-olefileio_pl/Makefile
index 8145b2341377..bf31ba97838a 100644
--- a/devel/py-olefileio_pl/Makefile
+++ b/devel/py-olefileio_pl/Makefile
@@ -7,14 +7,13 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://cdn.bitbucket.org/decalage/olefileio_pl/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	OleFileIO_PL-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Python module to read MS OLE2 files
 
 LICENSE=	MIT
 
-USES=		dos2unix
+USES=		dos2unix zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 02d90f7bdeda..b0f32b2eea5a 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Protocol Definition, Declaration, and Adaptation for Python
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
diff --git a/devel/py-px/Makefile b/devel/py-px/Makefile
index aa3c79d28413..c0a94749e568 100644
--- a/devel/py-px/Makefile
+++ b/devel/py-px/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	python-p4lib
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,6 +15,7 @@ COMMENT=	Perforce p4 wrapper and Python Perforce interface
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+USES=	zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index 827144d1ca4e..71d1ad427799 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Knowledge Engine
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=2.3:${PORTSDIR}/devel/py-ply
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index 7764e7e2b540..4be93c04a5ae 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Test support for pytest runner in setup.py
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>=0:${PORTSDIR}/devel/py-hgtools
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=yes
diff --git a/devel/py-qserve/Makefile b/devel/py-qserve/Makefile
index 4f4e1c9b02d1..137bf0ef20a6 100644
--- a/devel/py-qserve/Makefile
+++ b/devel/py-qserve/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Job queue server
 
-USE_ZIP=	yes
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index f074b8e027af..ea51dca04744 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -14,9 +14,9 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:${PORTSDIR}/devel/py-lxml
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index 00085ab1d2d7..1701f462a77b 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ZPL21
 RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:${PORTSDIR}/databases/zodb3 \
 		${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-timelib/Makefile b/devel/py-timelib/Makefile
index 320b0db93a73..2e2617f065ec 100644
--- a/devel/py-timelib/Makefile
+++ b/devel/py-timelib/Makefile
@@ -7,11 +7,11 @@ PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Parse English textual date descriptions
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index a7e89a66ccb5..bb9daee11196 100644
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Transaction management for Python
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-ujson/Makefile b/devel/py-ujson/Makefile
index 6d6d9b3da872..7e38c92f4411 100644
--- a/devel/py-ujson/Makefile
+++ b/devel/py-ujson/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ultra fast JSON encoder and decoder for Python
 
 LICENSE=	BSD
 
-USE_ZIP=		yes
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 99e4ffc52814..f0889ea6169b 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Unittest features for Python 2.7 backported to Python 2.3+
 
 LICENSE=	BSD
 
+USES=		zip
 USE_PYTHON=		2
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-unittestplus/Makefile b/devel/py-unittestplus/Makefile
index ff1c762f5f7f..d759f7522708 100644
--- a/devel/py-unittestplus/Makefile
+++ b/devel/py-unittestplus/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=		hsmtkk@gmail.com
 COMMENT=		Test utilities built on unittest
 
-USE_ZIP=		yes
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-utils/Makefile b/devel/py-utils/Makefile
index 63f266de96f8..ba9668af51b5 100644
--- a/devel/py-utils/Makefile
+++ b/devel/py-utils/Makefile
@@ -7,11 +7,11 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://www.voidspace.org.uk/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pythonutils-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	daniel@netwalk.org
 COMMENT=	General utility modules that simplify common programming in Python
 
+USES=		zip
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index 77a5f0613ed3..73a3b61c8644 100644
--- a/devel/py-z3c.autoinclude/Makefile
+++ b/devel/py-z3c.autoinclude/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope
 		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
 		${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:${PORTSDIR}/devel/py-zc.buildout
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index d0143a899967..9d463c4593ce 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -33,9 +33,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}zope.site>0:${PORTSDIR}/devel/py-zope.site \
 		${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/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index 9b60be693940..8d5d98d05f68 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -19,9 +19,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
 		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
 		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index 7c6199ffb004..bb9c6b528fb1 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
 		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zclockfile/Makefile b/devel/py-zclockfile/Makefile
index a1edb9c443aa..52b83c485b54 100644
--- a/devel/py-zclockfile/Makefile
+++ b/devel/py-zclockfile/Makefile
@@ -13,9 +13,9 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Basic inter-process locks
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index 1e5088edc87c..e9acf276577c 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -26,9 +26,9 @@ RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
 		${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/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index 72470d8299f1..dfab05791d36 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -32,9 +32,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
 		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index dc174318dee6..8dbf6b285036 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope
 		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
 		${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/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index b7987ba8bad3..931b0cf42c67 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -27,9 +27,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zop
 		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
 		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index 6b7a8ffcba60..737c1cf18b27 100644
--- a/devel/py-zope.broken/Makefile
+++ b/devel/py-zope.broken/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${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/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 907427091680..51b7386757d7 100644
--- a/devel/py-zope.browser/Makefile
+++ b/devel/py-zope.browser/Makefile
@@ -15,9 +15,9 @@ LICENSE=	ZPL21
 
 RUN_DEPENDS=	${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/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index 15d9cbe8f17d..f04f367bc98d 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -24,9 +24,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
 		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:${PORTSDIR}/devel/py-zope.pagetemplate
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index 047aff3481be..6b3d6fcb79c6 100644
--- a/devel/py-zope.browserresource/Makefile
+++ b/devel/py-zope.browserresource/Makefile
@@ -24,9 +24,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-z
 		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:${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/devel/py-zope.cachedescriptors/Makefile b/devel/py-zope.cachedescriptors/Makefile
index a9d3145916e3..2171dd1d3e53 100644
--- a/devel/py-zope.cachedescriptors/Makefile
+++ b/devel/py-zope.cachedescriptors/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Method and property caching decorators
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index 8321f6419a02..cb39f2de36fc 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -30,9 +30,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
 		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.contenttype/Makefile b/devel/py-zope.contenttype/Makefile
index 7b5850d613c8..410f0a257641 100644
--- a/devel/py-zope.contenttype/Makefile
+++ b/devel/py-zope.contenttype/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope contenttype
 
 LICENSE=	ZPL21
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index 649b9d496964..90965794bdb1 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -28,9 +28,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
 		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index 2883f9109e43..94a831f6689f 100644
--- a/devel/py-zope.globalrequest/Makefile
+++ b/devel/py-zope.globalrequest/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.te
 		${PYTHON_PKGNAMEPREFIX}zope.app.zcmlfiles>=0:${PORTSDIR}/devel/py-zope.app.zcmlfiles \
 		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:${PORTSDIR}/devel/py-zope.testbrowser
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index 710464944ef8..d6c0d4f7f901 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -22,9 +22,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
 		${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/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index a00b89a249df..d7832e991f10 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -18,9 +18,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
 		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index 5c70c0e53ec8..008afd729511 100644
--- a/devel/py-zope.traversing/Makefile
+++ b/devel/py-zope.traversing/Makefile
@@ -21,9 +21,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.
 		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
 		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
 
+USES=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index db3afcbf3b4e..b0fe2857a758 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -24,13 +24,12 @@ LICENSE_FILE_SpecialAuth=	${FILESDIR}/SpecialAuth.mbox
 LICENSE_PERMS_SpecialAuth=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LEGAL_TEXT=	FreeBSD granted special license to distribute 3.x under GPLv3
 
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
 USE_LDCONFIG=	yes
 USE_GCC=	any
 
-USES=		dos2unix cmake gmake
+USES=		dos2unix cmake gmake zip
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 
 # XXX Do not provide Samples for the following reason :
diff --git a/devel/rth/Makefile b/devel/rth/Makefile
index 4667d1dd2bb2..c80390948f70 100644
--- a/devel/rth/Makefile
+++ b/devel/rth/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	jsi@jules.de
 COMMENT=	Web-based requirement, test, and bugtracking system
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 USE_PHP=	mysql gd
 
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index ab9102f6ab6e..99c43a77a93d 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	devel multimedia java
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sabre-library
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Simple API for Binary REpresentations and an UDF Library
@@ -15,6 +14,7 @@ COMMENT=	Simple API for Binary REpresentations and an UDF Library
 LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\)
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/devel/scala-ide/Makefile b/devel/scala-ide/Makefile
index bccb0aca0867..0cd46535b690 100644
--- a/devel/scala-ide/Makefile
+++ b/devel/scala-ide/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	WTP
 OPTIONS_DEFAULT=WTP
 WTP_DESC=	Install Eclipse Web Tools Platform (required for Play2 plug-in)
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/site
 
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index 05c329d671d8..7235954d83cf 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	scala>=2.9.0:${PORTSDIR}/lang/scala
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes
 
diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile
index e1b32074602c..4f05b1382acc 100644
--- a/devel/statcvs/Makefile
+++ b/devel/statcvs/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.6+
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 939cde974c02..852727cc8823 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-USE_ZIP=	yes
+USES=		zip
 USE_JAVA=	yes
 USE_ANT=	yes
 JAVA_VERSION=	1.6+
diff --git a/devel/stormlib-ghost++/Makefile b/devel/stormlib-ghost++/Makefile
index a51201f07879..30cb6137f0c1 100644
--- a/devel/stormlib-ghost++/Makefile
+++ b/devel/stormlib-ghost++/Makefile
@@ -14,8 +14,7 @@ COMMENT=	C++ library to read and write MPQ archives
 PROJECTHOST=	ghostplusplus
 PROJECTVERSION=	17.1
 
-USE_ZIP=	yes
-USES=		dos2unix gmake
+USES=		dos2unix gmake zip
 
 WRKSRC=		${WRKDIR}/ghost/StormLib/stormlib
 
diff --git a/devel/subclipse/Makefile b/devel/subclipse/Makefile
index 7939f186ffd1..bbf549bf8dd5 100644
--- a/devel/subclipse/Makefile
+++ b/devel/subclipse/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
-USE_ZIP=	yes
+USES=		zip
 
 ECLIPSE=	${PREFIX}/lib/eclipse
 SUBCLIPSE=	org.tigris.subversion.subclipse
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index 306acf58ee41..c1b668a16a8f 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
 
 CONNECTORS=	Subversive-connectors-allplatforms-3.0.5.I20140122-1700.zip
 
+USES=		zip
 NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
 
 .include "${.CURDIR}/../../java/eclipse/Makefile.plugins"
 
diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index 1144011d7d05..b2de0eaff82a 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	1.3.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://svnkit.com/
 DISTNAME=	org.tmatesoft.svn_${PORTVERSION}.standalone
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The only pure Java Subversion client library in the world
@@ -15,6 +14,7 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		zip
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile
index d9233804c619..161de7ed8505 100644
--- a/devel/tinylaf/Makefile
+++ b/devel/tinylaf/Makefile
@@ -6,13 +6,13 @@ PORTVERSION=	1.4.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://www.muntjak.de/hans/java/tinylaf/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Pluggable Look and Feel for Java
 
 OPTIONS_DEFINE=	DOCS
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/devel/tnt/Makefile b/devel/tnt/Makefile
index 697372e40c4c..cb48b5ebd168 100644
--- a/devel/tnt/Makefile
+++ b/devel/tnt/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Template Numerical Toolkit
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile
index 3ca0b17848af..9d2d4d23bb34 100644
--- a/devel/tokamak/Makefile
+++ b/devel/tokamak/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High performance real-time physics library
 
-USE_ZIP=	yes
-USES=		gmake
+USES=		gmake zip:infozip
 USE_DOS2UNIX=	*
 
 MAKEFILE=	tokamak.make
diff --git a/devel/uppaal/Makefile b/devel/uppaal/Makefile
index b7223833b755..fd112222b286 100644
--- a/devel/uppaal/Makefile
+++ b/devel/uppaal/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	uppaal-${PORTVERSION}-aca
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool environment for modeling and verifying timed automata
 
-USE_ZIP=	yes
+USES=		zip
 USE_LINUX=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile
index ddf46b74b615..c591c81f18e2 100644
--- a/dns/crossip/Makefile
+++ b/dns/crossip/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CrossIP%20${PORTVERSION}
 MAINTAINER=	dan@algenta.com
 COMMENT=	Java DNS update client for the ThatIP protocol
 
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ZIP=	yes
 
 NO_BUILD=	yes
 
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index f769bafdf0d7..916f88a8c388 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -14,9 +14,8 @@ BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
-USE_ZIP=	yes
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 zip
 
 PLIST_FILES=	bin/dnsmax-perl
 PORTDOCS=	LICENSE INSTALL README
diff --git a/dns/inadyn/Makefile b/dns/inadyn/Makefile
index 3e82eea270db..554071b82ac9 100644
--- a/dns/inadyn/Makefile
+++ b/dns/inadyn/Makefile
@@ -13,10 +13,8 @@ DISTNAME=	${PORTNAME}.v${PORTVERSION}
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Dynamic DNS update client
 
+USES=		dos2unix gmake zip
 USE_RC_SUBR=	inadyn
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
 MAKEFILE=	makefile
 
 PORTDOCS=	readme.html
author	Baptiste Daroussin <bapt@FreeBSD.org>	2014-03-07 16:49:09 +0000
committer	Baptiste Daroussin <bapt@FreeBSD.org>	2014-03-07 16:49:09 +0000
commit	c23ef8bc8bf7d31214830bdcaa75c6018065881a (patch)
tree	4a5c38c58618cc47e6b107297e7eebb1a64292be
parent	1510b743f230c8b6af6cc251122903f0afdc1461 (diff)