Split the postgresql ports into a server and a client part.

All ports depending on postgresql shall use the USE_PGSQL=yes knob
defined in Mk/bsd.ports.mk. Bumping portrevisions where needed.

PR:		75344
Approved by:	portmgr@ (kris), ade & sean (mentors)

12 files changed, 23 insertions, 31 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index 4c238537259a..c81a37d4953b 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -37,8 +37,7 @@ USE_MYSQL=		yes
 .elif defined(WITH_POSTGRES)
 DB_DIR?=		${PREFIX}/pgsql/data/blog
 # Or somewhere defined in $PGDATA
-
-RUN_DEPENDS+=	postgres:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 .elif defined(WITH_SQLITE)
 DB_DIR?=	${PREFIX}/${CGIDIR}/db
 RUN_DEPENDS+=\
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index 3aa25ca9cae1..a505a96935b4 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -36,9 +36,9 @@ OPTIONS=	DPSEARCH_THREADS  "Enable pthreads"                       on  \
 		DPSEARCH_CHASEN   "Enable ChaSen japanese analyzer"       off \
 		DPSEARCH_APACHE   "Enable mod_dpsearch for Apache"        off \
 		DPSEARCH_IDN      "Enable Internationalized Domain Names" off \
-		DPSEARCH_PGSQL    "Use PGSQL  (mutually exclusive)"       off \
-		DPSEARCH_MYSQL    "Use MySQL  (mutually exclusive)"       on \
-		DPSEARCH_SQLITE   "Use SQLite (mutually exclusive)"       off \
+		DPSEARCH_PGSQL    "Use PostgreSQL  (mutually exclusive)"  off \
+		DPSEARCH_MYSQL    "Use MySQL       (mutually exclusive)"  on \
+		DPSEARCH_SQLITE   "Use SQLite      (mutually exclusive)"  off
 
 .include <bsd.port.pre.mk>
 
@@ -109,8 +109,7 @@ pre-fetch:
 .endif
 
 .if defined(WITH_DPSEARCH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 
 .elif defined(WITH_DPSEARCH_MYSQL)
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index e0626ece7db7..88016f293055 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -64,8 +64,7 @@ CONFIGURE_ARGS+= --enable-charset-guesser
 .endif
 
 .if defined(WITH_MNOGO_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 
 .elif defined(WITH_MNOGO_MSQL)
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index e0626ece7db7..88016f293055 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -64,8 +64,7 @@ CONFIGURE_ARGS+= --enable-charset-guesser
 .endif
 
 .if defined(WITH_MNOGO_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 
 .elif defined(WITH_MNOGO_MSQL)
diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile
index 820d484f8936..fb98c8c80ed4 100644
--- a/www/mod_accounting/Makefile
+++ b/www/mod_accounting/Makefile
@@ -22,7 +22,7 @@ MAKE_ARGS+=	APXS="${APXS}"
 .if defined(WITHOUT_PGSQL)
 MAKE_ARGS+=	WITHOUT_PGSQL=YES
 .else
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=	YES
 .endif
 
 .if defined(WITHOUT_MYSQL)
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index 32ea83c2163f..34e02bc85cca 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	0.9.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 
@@ -15,14 +15,13 @@ COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${APACHE_PORT}
-LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+
+USE_PGSQL=	yes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 
 .include <bsd.port.pre.mk>
 
-POSTGRESQL_PORT?=	databases/postgresql7
-
 .if exists(${APXS})
 APXS_WORKS!=	${APXS} -q TARGET 2>/dev/null || echo no
 .endif
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index fa2f980128d1..ad523b7cd998 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	mod_auth_pgsql
 PORTVERSION=	2.0.2b1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 
@@ -15,7 +15,8 @@ COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	pq.3:${PORTSDIR}/databases/postgresql7
+
+USE_PGSQL=	yes
 
 LATEST_LINK=	mod_auth_pgsql2
 
diff --git a/www/nspostgres/Makefile b/www/nspostgres/Makefile
index 333d3ba69a07..1f4a736cb7b9 100644
--- a/www/nspostgres/Makefile
+++ b/www/nspostgres/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nspostgres
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aolserver
@@ -16,11 +16,10 @@ DISTNAME=	nspostgres3_0
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	A driver to access PostgreSQL databases from Aolserver
 
-BUILD_DEPENDS=	${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver \
-		${LOCALBASE}/bin/postmaster:${PORTSDIR}/${POSTGRESQL_PORT}
+BUILD_DEPENDS=	${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-POSTGRESQL_PORT?=	databases/postgresql7
+USE_PGSQL=	yes
 
 WRKSRC=		${WRKDIR}/nspostgres
 
diff --git a/www/pgdriver/Makefile b/www/pgdriver/Makefile
index a5b357a1a364..a48727c356ac 100644
--- a/www/pgdriver/Makefile
+++ b/www/pgdriver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgdriver
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www databases
 MASTER_SITES=	http://openacs.org/sdm/download-package/2/38/
 EXTRACT_SUFX=	.tgz
@@ -15,11 +15,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	A driver for AOLserver to PostgreSQL connectivity
 
-LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 BUILD_DEPENDS=	${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-POSTGRESQL_PORT?=	databases/postgresql7
+USE_PGSQL=	yes
 
 MAKEFILE=	makefile
 MAKE_ENV+=	PREFIX=${PREFIX}
diff --git a/www/pglogd/Makefile b/www/pglogd/Makefile
index c780100c070a..77243ebddde3 100644
--- a/www/pglogd/Makefile
+++ b/www/pglogd/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pglogd
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.digitalstratum.com/pglogd/
 
 MAINTAINER=	allie@pajunas.com
 COMMENT=	Sends web server log entries to a PostgreSQL database
 
-LIB_DEPENDS=	pq.3:${PORTSDIR}/databases/postgresql7
-
+USE_PGSQL=	yes
 USE_REINPLACE=	yes
 
 post-extract:
diff --git a/www/rt2/Makefile b/www/rt2/Makefile
index 9501f344e8ad..6a69d12a01e1 100644
--- a/www/rt2/Makefile
+++ b/www/rt2/Makefile
@@ -45,8 +45,7 @@ RT_VERSION=	${PORTVERSION:C/\./-/g}
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Pg"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \
-		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .else
 DB_TYPE=	mysql
 BUILD_DEPENDS+=	${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 14dbc6ac3692..196739e2dac3 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -27,8 +27,7 @@ CONFIGURE_ARGS=	--enable-charset-guesser \
 		--localstatedir=/var/udmsearch
 
 .if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=		YES
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
 
 .elif defined(WITH_MSQL)