Finally retire USE_PGSQL

15 files changed, 17 insertions, 26 deletions

diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index aadc085e137b..fb26c704bea0 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -27,6 +27,7 @@ RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pgsql pkgconfig python shared-mime-info tar:xz
+WANT_PGSQL=	server
 USE_GNOME=	gnomedocutils gnomeprefix intlhack pygobject3 libxml2 \
 		gtksourceviewmm3 libgdamm5
 USE_LDCONFIG=	yes
@@ -43,11 +44,6 @@ INSTALLS_ICONS=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION:R}
 #PLIST_SUB+=	VERSION=1.24
 
-# We need postgreSQL tools the server installs, and configure checks for these.
-# Note: USE_PGSQL has already been set above.
-BUILD_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER:S/.//}-server
-RUN_DEPENDS+=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER:S/.//}-server
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
 		${WRKSRC}/Makefile.in
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index 1ccec4f0c21a..59e91585f49d 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE SSL
 MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_CONFIGURE_OFF=	--without-mysql
-PGSQL_USE=		pgsql=yes
+PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 SQLITE_USE=		sqlite=3
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 8cc319779ca5..22d99bed775c 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -34,7 +34,7 @@ MYSQL_USE=	MYSQL=YES
 MYSQL_CPPFLAGS=	-I${LOCALBASE}/include/mysql
 MYSQL_LDFLAGS=	-L${LOCALBASE}/lib/mysql
 
-PGSQL_USE=	PGSQL=YES
+PGSQL_USES=	pgsql
 
 SQLITE_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
 
diff --git a/databases/pglesslog/Makefile b/databases/pglesslog/Makefile
index 243b037d3850..82adb2d1776f 100644
--- a/databases/pglesslog/Makefile
+++ b/databases/pglesslog/Makefile
@@ -9,12 +9,11 @@ DISTNAME=	pg_lesslogg_${PORTVERSION}_pg84
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Reduce size of PostgreSQL archive log files by replacing backup blocks
 
-USES=		gmake
-USE_PGSQL=	client server:build
-WANT_PGSQL_VER=	84
+USES=		gmake pgsql:8.4
+WANT_PGSQL=	server:build
 WRKSRC=		${WRKDIR}/pg_lesslog_${PORTVERSION}_pg84
 
-PGSQL_PORT=	databases/postgresql${PGSQL_VER}
+PGSQL_PORT=	databases/postgresql${PGSQL_VER:S,.,,}
 PGSQL_SRCDIR=	`cd ${PORTSDIR}/${PGSQL_PORT}-server; ${MAKE} -VWRKSRC`
 
 pre-build:
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index 7e95027e2dce..6a1e0a3e8eb5 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -13,7 +13,7 @@ DB=		psql
 USE_QT4=	moc_build sql
 QT_DIST=	yes
 
-USE_PGSQL=	yes
+USES+=		pgsql
 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
 EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
diff --git a/databases/qt5-sqldrivers-pgsql/Makefile b/databases/qt5-sqldrivers-pgsql/Makefile
index 5325533a4c29..bf7cb5bdaa22 100644
--- a/databases/qt5-sqldrivers-pgsql/Makefile
+++ b/databases/qt5-sqldrivers-pgsql/Makefile
@@ -5,6 +5,6 @@ PORTNAME=	pgsql
 DB=		PSQL
 DB_DESC=	PostgreSQL
 
-USE_PGSQL=	yes
+USES+=		pgsql
 
 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile
index beff9063ca1b..052d81f9e80c 100644
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby DataObjects driver for PostgreSQL
 
 RUN_DEPENDS=	rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects
 
-USE_PGSQL=	yes
+USES+=		pgsql
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile
index 05eb9a4b0cd4..6d67f11d866a 100644
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
 		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
 PG_CONFIG=	${LOCALBASE}/bin/pg_config
-USE_PGSQL=	yes
+USES+=		pgsql
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
index 06bbaae34b0f..29b8c08b4e6f 100644
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@@ -10,9 +10,7 @@ MAINTAINER=	sam@cassiba.com
 COMMENT=	PostgreSQL tools from Skype: walshipping, queueing, replication
 
 GNU_CONFIGURE=	yes
-USES=		gmake python:2 shebangfix
-
-USE_PGSQL=	yes
+USES=		gmake python:2 shebangfix pgsql
 
 python_OLD_CMD=	/usr/bin/env python
 python_CMD=	/usr/bin/env python2
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index d54d785d5425..397a51854a29 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 
 GNU_CONFIGURE=	yes
-USES=		bison gmake shebangfix tar:bzip2
-USE_PGSQL=	yes
+USES=		bison gmake shebangfix tar:bzip2 pgsql
 USE_RC_SUBR=	slon
 SHEBANG_FILES=	tools/altperl/slonik_restart_node.pl
 
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index f596b8c5232a..8d490d9e9932 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	Performance:${PERFORMANCE_PORT}
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
-USE_PGSQL=yes
+USES+=	pgsql
 USE_MYSQL=yes
 USE_SQLITE=yes
 
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 92e18a83ca3b..71adf63e4b3c 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	--disable-firebird
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=			pgsql
 CONFIGURE_ARGS+=	--with-postgresql-prefix="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=	--disable-postgresql
diff --git a/databases/tablelog/Makefile b/databases/tablelog/Makefile
index 9ca0cdbafa48..b502481cd390 100644
--- a/databases/tablelog/Makefile
+++ b/databases/tablelog/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Logs changes on a table in PostgreSQL
 
 WRKSRC=		${WRKDIR}/table_log-${DISTVERSION}
 
-USES=		gmake
-USE_PGSQL=	yes
+USES=		gmake pgsql
 MAKE_ARGS=	USE_PGXS=1
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index bb8d528bd630..3806508d9a6a 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -62,7 +62,7 @@ PLIST_SUB+=	MYSQL="@comment "
 .if ${PORT_OPTIONS:MPGSQL}
 CMAKE_ARGS+=	-DWITH_POSTGRESQL=ON
 PLIST_SUB+=	PGSQL=""
-USE_PGSQL=	yes
+USES+=		pgsql
 .else
 CMAKE_ARGS+=	-DWITH_POSTGRESQL=OFF
 PLIST_SUB+=	PGSQL="@comment "
diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile
index 3bdc883448e9..ad47235f01ef 100644
--- a/databases/vfront/Makefile
+++ b/databases/vfront/Makefile
@@ -28,7 +28,7 @@ USE_MYSQL=	yes
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
-USE_PGSQL=	yes
+USES+=		pgsql
 .endif
 
 post-patch: