Finally retire USE_PGSQL

11 files changed, 11 insertions, 15 deletions

diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 8fc3491884a1..ef0077238d21 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -19,10 +19,8 @@ GH_PROJECT=	aox
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	39bdb8b
 
-USES=		perl5 tar:bzip2
+USES=		perl5 tar:bzip2 pgsql:9.1+
 USE_PERL5=	build
-USE_PGSQL=	yes
-WANT_PGSQL_VER=	91+
 
 PORTDOCS=	COPYING README bsd.txt
 
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index bbe24c8d7a31..f80b0ebbc56e 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -14,10 +14,8 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 
-USES=	perl5 tar:bzip2
+USES=		perl5 tar:bzip2 pgsql:9.1+
 USE_PERL5=	build
-USE_PGSQL=	yes
-WANT_PGSQL_VER=	91+
 
 PORTDOCS=	COPYING README bsd.txt
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index da1afdc1f100..bd5d7195b845 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -51,7 +51,7 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 ICONV_USES=	iconv:lib,build
 MYSQL_USE=	mysql=yes
 OPENLDAP_USE=	openldap=yes
-PGSQL_USE=	pgsql=yes
+PGSQL_USES=	pgsql
 REDIS_LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 9c6abd774321..3505da5600e7 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+=	MYSQL="" PGSQL="@comment " SQLITE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 EXTRACT_INCLUDE+=	-I${LOCALBASE}/include
 EXTRACT_LIB+=	-L${LOCALBASE}/lib -lpq -lcrypt
 ALL_TARGET+=	pgsql
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index fce4e8c1f10e..24b5338324dc 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -38,7 +38,7 @@ SUB_LIST+=	MYSQL=
 
 .if ${PORT_OPTIONS:MPGSQL}
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
-USE_PGSQL=	yes
+USES+=		pgsql
 .	if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
 RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 SUB_LIST+=	PGSQL=postgresql
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index bca3fb39e894..0c731da878e6 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -102,7 +102,7 @@ PLIST_SUB+=		MYSQL="@comment "
 
 .if ${PORT_OPTIONS:MPGSQL}
 CONFIGURE_ARGS+=	--enable-pg
-USE_PGSQL=		yes
+USES+=			pgsql
 PLIST_SUB+=		PGSQL=""
 .else
 CONFIGURE_ARGS+=	--disable-pg
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 3b51fe179e40..75a95acf1fe0 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -210,7 +210,7 @@ _REQUIRE+=		mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+USES+=			pgsql
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 76f069bdb7d7..1bdda1e7e4d6 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -202,7 +202,7 @@ _REQUIRE+=		mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+USES+=			pgsql
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile
index 8f9cc9f964f6..44fd5c63fa5c 100644
--- a/mail/postfix210/Makefile
+++ b/mail/postfix210/Makefile
@@ -177,7 +177,7 @@ _REQUIRE+=		mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+USES+=			pgsql
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index 4e19dc39de07..67c0bc65e558 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -72,7 +72,7 @@ _REQUIRE+=	mysql
 
 .if ${PORT_OPTIONS:MPGSQL}
 LIB_DEPENDS+=	libzdb.so:${PORTSDIR}/databases/libzdb
-USE_PGSQL=	yes
+USES+=		pgsql
 _REQUIRE+=	postgresql
 .endif
 
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index 2c6a76e2303a..b15ba5f6a41e 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--enable-auth-mysql \
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=		yes
+USES+=			pgsql
 DEFAULT_PGSQL_VER=	80
 CONFIGURE_ARGS+=	--enable-auth-pgsql \
 			--with-pgsql-lib-dir=${LOCALBASE}/lib \