28 files changed, 29 insertions, 35 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+