Convert to USES=pgsql

19 files changed, 30 insertions, 39 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index 83a9cf238232..c6508498c951 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -101,7 +101,8 @@ DB_DIR?=	${BASEDIR}/var/db/mysql/WEBLOG_DATABASEDIR
 RUN_DEPENDS+=	p5-DBD-mysql>=2.9005:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	server
+USES+=	pgsql
+WANT_PGSQL=	server
 RUN_DEPENDS+=	p5-DBD-Pg>=1.32:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 .if empty(PORT_OPTIONS:MPGSQL) && empty(PORT_OPTIONS:MMYSQL)
diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index 70d94d75a8c3..3a3794c25163 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -37,7 +37,7 @@ USE_PHP+=		pdo_mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+USES+=	pgsql
 CONFIGURE_ARGS+=	--with-postgresql=yes
 SUB_LIST+=		REQ_PGSQL=postgresql
 USE_PHP+=		pdo_pgsql
diff --git a/www/davical/Makefile b/www/davical/Makefile
index 10668d1cdccf..5dfb2d843985 100644
--- a/www/davical/Makefile
+++ b/www/davical/Makefile
@@ -23,9 +23,8 @@ GH_ACCOUNT=	DAViCal
 GH_TAGNAME=	r${DISTVERSION}
 GH_COMMIT=	cc8e6a0
 NO_BUILD=	yes
-USE_PGSQL=	yes
 USE_PHP=	gettext iconv pcre pdo pdo_pgsql pgsql xml calendar
-USES=		shebangfix
+USES=		shebangfix pgsql
 SHEBANG_FILES=	scripts/sync-remote-caldav.php
 
 SUB_FILES=	pkg-message httpd-davical.conf
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 466709acd0d6..d854e2322511 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -31,6 +31,9 @@ DOCS=		CHANGELOG.txt INSTALL.mysql.txt INSTALL.sqlite.txt \
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+PGSQL_USES=	pgsql
+PGSQL_USE=	PHP=pdo_pgsql
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLITE3}
@@ -40,10 +43,6 @@ USE_PHP+=	pdo_sqlite
 USE_MYSQL=	yes
 USE_PHP+=	pdo_mysql
 .endif
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-USE_PHP+=	pdo_pgsql
-.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DRUPAL_DIR}
diff --git a/www/fusionpbx/Makefile b/www/fusionpbx/Makefile
index 3670a7647959..66f57aa5bda3 100644
--- a/www/fusionpbx/Makefile
+++ b/www/fusionpbx/Makefile
@@ -33,12 +33,10 @@ OPTIONS_DEFINE=	PDOPGSQL PDOMYSQL
 PDOPGSQL_DESC=	Install POSTGRESQL PDO Connector
 PDOMYSQL_DESC=	Install MySQL PDO Connector
 
-.include <bsd.port.options.mk>
+PDOPGSQL_USES=	pgsql
+PDOPGSQL_USE=	PHP=pgsql,pdo_pgsql
 
-.if ${PORT_OPTIONS:MPDOPGSQL}
-USE_PGSQL=	yes
-USE_PHP+=	pgsql pdo_pgsql
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPDOMYSQL}
 USE_MYSQL=	client
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index 09ddf2e893b1..81c65724c581 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -43,7 +43,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/database
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
 .endif
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index 775f636b5f8d..a0c1eb6d2c20 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -42,7 +42,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/database
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
 .endif
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index 60e113d3677f..dfe82ab02055 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -25,7 +25,7 @@ ZIP_DESC=		Install PHP zip extension
 
 # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 USE_PHP=	pgsql
 .else
 # server is not necessary on this host.
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 6744d5955e9d..5cef3ffa5bf4 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -38,6 +38,9 @@ CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} \
 
 SUB_FILES+=	pkg-message
 
+PGSQL_USES=	pgsql
+PGSQL_CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -62,11 +65,6 @@ CONFIGURE_ARGS+=	--with-extra-charsets=all
 CONFIGURE_ARGS+=	--disable-syslog
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
-.endif
-
 .if ${PORT_OPTIONS:MMSQL}
 LIB_DEPENDS+=		libmsql.so:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index e7080c966e56..e6eb05032fb0 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-USE_PGSQL=	yes
+USES=		pgsql
 USE_APACHE=	22
 
 AP_INC?=	${LOCALBASE}/include
diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile
index 6075efe78e62..4c48efd7b5ee 100644
--- a/www/mod_tsa/Makefile
+++ b/www/mod_tsa/Makefile
@@ -44,7 +44,7 @@ AP_LIB+=	-L${LOCALBASE}/lib/mysql -lmysqlclient
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 CONFIGURE_ARGS+=	--enable-pgsql=yes
 SRC_FILE+=	db_postgresql.c
 AP_LIB+=	-lpq
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 1516be7feb6b..15391fa943d4 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -655,7 +655,7 @@ CFLAGS+=	-DNDEBUG
 
 .if ${PORT_OPTIONS:MPOSTGRES}
 IGNORE=	POSTGRES: update require
-USE_PGSQL=	yes
+USES+=	pgsql
 NGINX_POSTGRES_VERSION=	0.9
 MASTER_SITES+=	http://labs.frickle.com/files/:postgres
 DISTFILES+=	ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 64028729f3b6..96b88512d4a2 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -667,7 +667,7 @@ CFLAGS+=	-DNDEBUG
 
 .if ${PORT_OPTIONS:MPOSTGRES}
 IGNORE=	POSTGRES: update require
-USE_PGSQL=	yes
+USES+=	pgsql
 NGINX_POSTGRES_VERSION=	0.9
 MASTER_SITES+=	http://labs.frickle.com/files/:postgres
 DISTFILES+=	ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 1939eb41da7d..fff0f6ea3723 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -56,6 +56,9 @@ DB4_DESC=	Berkeley DB v4 storage
 MYSQL_DESC=	MySQL auth support
 PGSQL_DESC=	PostgreSQL auth support
 
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ARGS=	--with-PGSQL=${PREFIX}/pgsql
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGIGABASE}
@@ -73,11 +76,6 @@ USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--with-MYSQL=${PREFIX}
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		YES
-CONFIGURE_ARGS+=	--with-PGSQL=${PREFIX}/pgsql
-.endif
-
 .if ${PORT_OPTIONS:MPCRE}
 LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--with-regexp=pcre
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index 15bfac8b9555..53c894c03196 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -86,6 +86,9 @@ USE_APACHE_RUN=	22+
 
 PLIST_SUB+=	VER_CKEDITOR="4.3" OTRS_USER=${USERS} WWWOWN=${WWWOWN}
 
+PGSQL_RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+PGSQL_USES=		pgsql
+
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -93,11 +96,6 @@ RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 USE_MYSQL=	yes
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-USE_PGSQL=	yes
-.endif
-
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2 \
 		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
 
diff --git a/www/pglogd/Makefile b/www/pglogd/Makefile
index 2cab711fb82e..4286d100aea9 100644
--- a/www/pglogd/Makefile
+++ b/www/pglogd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://digitalstratum.com/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sends web server log entries to a PostgreSQL database
 
-USE_PGSQL=	yes
+USES=		pgsql
 USE_RC_SUBR= 	020.pglogd.sh
 SUB_FILES=	pkg-message
 
diff --git a/www/phprecipebook/Makefile b/www/phprecipebook/Makefile
index 56db0048d05e..c22e6f361abf 100644
--- a/www/phprecipebook/Makefile
+++ b/www/phprecipebook/Makefile
@@ -32,7 +32,7 @@ USE_MYSQL=	yes
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
-USE_PGSQL=	yes
+USES+=		pgsql
 .endif
 
 post-extract:
diff --git a/www/rt38/Makefile b/www/rt38/Makefile
index 6ca15385bbb9..cb19893423fc 100644
--- a/www/rt38/Makefile
+++ b/www/rt38/Makefile
@@ -92,7 +92,7 @@ BUILD_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .elif ${PORT_OPTIONS:MPGSQL}
 DB_TYPE=	Pg
-USE_PGSQL=	yes
+USES+=		pgsql
 BUILD_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .elif ${PORT_OPTIONS:MQLITE}
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index 2218808430b3..8dbcdfd65e87 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -549,7 +549,7 @@ WITH_HTTP_REWRITE=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPOSTGRES}
-USE_PGSQL=	yes
+USES+=	pgsql
 WITH_HTTP_REWRITE=	yes
 NGINX_POSTGRES_VERSION=	0.9
 MASTER_SITES+=	http://labs.frickle.com/files/:postgres