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)

19 files changed, 41 insertions, 114 deletions

diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index 71952f4da9b4..ea2c8c5b15a5 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \
 CONFIGURE_ARGS+=--without-authpgsql
 PLIST_SUB+=	PGSQLFLAG="@comment "
 .else
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	YES
 PLIST_SUB+=	PGSQLFLAG=""
 .endif
 
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 71952f4da9b4..ea2c8c5b15a5 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -86,8 +86,7 @@ CONFIGURE_ARGS+=--with-authmysql \
 CONFIGURE_ARGS+=--without-authpgsql
 PLIST_SUB+=	PGSQLFLAG="@comment "
 .else
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	YES
 PLIST_SUB+=	PGSQLFLAG=""
 .endif
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index c0be3f488302..f67ae8507111 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -79,7 +79,7 @@ CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--with-mailgroup=${MAILGRP} \
 		--with-mailuid=${MAILUID} \
 		--with-mailgid=${MAILGID} \
- 		--with-etcdir=${ETCDIR} \
+		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
 		--with-userdb=${USERDB} \
 		--datadir=${DATADIR} \
@@ -146,7 +146,7 @@ OPTIONS+=off
 .endif
 
 OPTIONS+=PGSQL "PostgreSQL authentication support"
-.if exists(${PGSQLBASE}/lib/libpq.so.3) || defined(WITH_PGSQL)
+.if exists(${LOCALBASE}/lib/libpq.so) || defined(WITH_PGSQL)
 OPTIONS+=on
 .else
 OPTIONS+=off
@@ -250,10 +250,10 @@ PLIST_SUB+=	SUB_MYSQL="@comment "
 
 .if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
 PKGNAMESUFFIX!=	${ECHO} ${PKGNAMESUFFIX}-pgsql
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-authpgsql \
-		--with-pgsql-libs=${PGSQLBASE}/lib \
-		--with-pgsql-includes=${PGSQLINCLUDES}
+		--with-pgsql-libs=${LOCALBASE}/lib \
+		--with-pgsql-includes=${LOCALBASE}/include
 PLIST_SUB+=	SUB_PGSQL=""
 .else
 CONFIGURE_ARGS+=--without-authpgsql
diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile
index caadfceefbeb..fb5c362f4bb5 100644
--- a/mail/dbmail-devel/Makefile
+++ b/mail/dbmail-devel/Makefile
@@ -31,7 +31,7 @@ SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 
 .if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index caadfceefbeb..fb5c362f4bb5 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -31,7 +31,7 @@ SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 
 .if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile
index caadfceefbeb..fb5c362f4bb5 100644
--- a/mail/dbmail20/Makefile
+++ b/mail/dbmail20/Makefile
@@ -31,7 +31,7 @@ SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 
 .if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile
index caadfceefbeb..fb5c362f4bb5 100644
--- a/mail/dbmail21/Makefile
+++ b/mail/dbmail21/Makefile
@@ -31,7 +31,7 @@ SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 
 .if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index caadfceefbeb..fb5c362f4bb5 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -31,7 +31,7 @@ SED_SCRIPT+=    -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
 
 .if defined(WITH_POSTGRESQL)
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 DATABASE=		postgresql
 PLIST_SUB+=		PGSQL=""
 PLIST_SUB+=		MYSQL="@comment "
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index d4f380244d92..98a0af6fe57b 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -96,7 +96,7 @@ CONFIGURE_ARGS+=	--with-ldap
 # can be used to store user tables.
 #
 .if defined(WITH_PGSQL)
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
 
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d4f380244d92..98a0af6fe57b 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -96,7 +96,7 @@ CONFIGURE_ARGS+=	--with-ldap
 # can be used to store user tables.
 #
 .if defined(WITH_PGSQL)
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
 .endif
 
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index d89a0c827d47..9975836fc47e 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/dspam-cvs-devel${SNAP_DATE}
 .else
 WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
 .endif
-  
+
 #SNAP_DATE=	.20041225.1815
 PORTVER_MAJ=	3.3.4
 
@@ -50,8 +50,7 @@ OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" on
 OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
 OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
-OPTIONS+=	POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off
-OPTIONS+=	POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off
+OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
 OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
 OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
 OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" off
@@ -213,26 +212,8 @@ CONFIGURE_ARGS+=	--disable-trusted-user-security
 DBDRV_TOTAL_COUNT=	ooooooooo # 9
 DBDRV_COUNT=	${DBDRV_TOTAL_COUNT}
 
-.if defined(WITH_POSTGRESQL73)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql73
-#BUILD_DEPENDS+= ${LIB_DEPENDS}
-CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
-		--with-pgsql-includes=${LOCALBASE}/include \
-		--with-pgsql-libraries=${LOCALBASE}/lib
-PLIST_SUB+=	DB4="@comment "
-PLIST_SUB+=	MYSQL="@comment "
-PLIST_SUB+=	PGSQL=""
-PLIST_SUB+=	SQLITE="@comment "
-SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
-SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-#PKGNAMESUFFIX=	-pgsql73
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
-.endif
-
-.if defined(WITH_POSTGRESQL74)
-LIB_DEPENDS+=	ecpg.4:${PORTSDIR}/databases/postgresql7
-#BUILD_DEPENDS+=	${LIB_DEPENDS}
+.if defined(WITH_POSTGRESQL)
+USE_PGSQL=	YES
 CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
 		--with-pgsql-includes=${LOCALBASE}/include \
 		--with-pgsql-libraries=${LOCALBASE}/lib
@@ -243,7 +224,7 @@ PLIST_SUB+=	SQLITE="@comment "
 SED_SCRIPT+=	-e '/%%MYSQL%%/D'
 SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
 SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-#PKGNAMESUFFIX=	-pgsql74
+#PKGNAMESUFFIX=	-pgsql
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .endif
 
@@ -361,7 +342,7 @@ LDA_COUNT:=	${LDA_COUNT:S/o//}
 .if defined(WITH_EXIM_LDA)
 .	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
 _EXIM_EXT=	-mysql
-.	elseif defined(WITH_POSTGRESQL74) || defined(WITH_POSTGRESQL73)
+.	elseif defined(WITH_POSTGRESQL)
 ####
 ### fix me for pg 7.3: how to pass the db option to exim port ?
 ###
@@ -457,16 +438,6 @@ pre-everything::
 	@${ECHO_CMD} ""
 
 pre-extract:
-.if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73)
-	@${ECHO_CMD} "******************************************************************"
-	@${ECHO_CMD} "You have both EXIM_LDA and POSTGRESQL73 defined. To have exim"
-	@${ECHO_CMD} "built with the right pgsql please hit Ctrl-C now and do:"
-	@${ECHO_CMD} "cd ${PORTSDIR}/mail/exim-postgresql && make POSTGRESQL_PORT=postgresql73 inst
-	@${ECHO_CMD} "then return here and do:"
-	@${ECHO_CMD} "make clean && make install"
-	@${ECHO_CMD} "******************************************************************"
-	@${ECHO_CMD} ""
-.endif
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
@@ -540,22 +511,22 @@ pre-configure:
 	@${ECHO_CMD} "You can use one and only one database back-end at once."
 	@${FALSE}
 .endif
-.if defined(WITH_NEURAL_NET) && !(defined(USE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74))
+.if defined(WITH_NEURAL_NET) && !(defined(USE_MYSQL) || defined(WITH_POSTGRESQL))
 	@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
 	@${FALSE}
 .endif
 .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE))
+	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE))
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
 	@${FALSE}
 .endif
 .if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) )
+	defined(WITH_POSTGRESQL) )
 	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
 	@${FALSE}
 .endif
 .if defined(WITH_DAEMON) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) )
+	defined(WITH_POSTGRESQL) )
 	@${ECHO_CMD} "You need MySQL or Postgres for Daemon mode, because multithreading support is needed"
 	@${FALSE}
 .endif
@@ -588,7 +559,7 @@ post-install:
 	@${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
 	@${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql
 .endif
-.if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)
+.if defined(WITH_POSTGRESQL)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index e6ca8c2788b2..d1f0a974a147 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -56,8 +56,7 @@ OPTIONS+=	MYSQL40 "Use MySQL 4.0.x as back-end" off
 OPTIONS+=	MYSQL41 "Use MySQL 4.1.x as back-end" off
 OPTIONS+=	MYSQL50 "Use MySQL 5.0.x as back-end" off
 OPTIONS+=	MYSQL_COMPRESS "Compress dspam <--> MySQL" off
-OPTIONS+=	POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off
-OPTIONS+=	POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off
+OPTIONS+=	POSTGRESQL "Use PostgreSQL as back-end" off
 OPTIONS+=	ORACLE "Use Oracle as back-end (BROKEN)" off
 OPTIONS+=	BDB4 "Use BDB4 as back-end (not recomanded)" off
 OPTIONS+=	SQLITE2 "Use SQLite v2.x as back-end" on
@@ -221,9 +220,8 @@ CONFIGURE_ARGS+=	--enable-client-compression
 .endif
 .endif
 
-.if defined(WITH_POSTGRESQL73)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql73
-#BUILD_DEPENDS= ${LIB_DEPENDS}
+.if defined(WITH_POSTGRESQL)
+USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
 		--with-pgsql-includes=${LOCALBASE}/include \
 		--with-pgsql-libraries=${LOCALBASE}/lib
@@ -234,24 +232,7 @@ PLIST_SUB+=	SQLITE="@comment "
 SED_SCRIPT+=	-e '/%%MYSQL%%/D'
 SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
 SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-#PKGNAMESUFFIX=	-pgsql73
-DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
-.endif
-
-.if defined(WITH_POSTGRESQL74)
-LIB_DEPENDS+=	ecpg.4:${PORTSDIR}/databases/postgresql7
-#BUILD_DEPENDS=	${LIB_DEPENDS}
-CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv \
-		--with-pgsql-includes=${LOCALBASE}/include \
-		--with-pgsql-libraries=${LOCALBASE}/lib
-PLIST_SUB+=	DB4="@comment "
-PLIST_SUB+=	MYSQL="@comment "
-PLIST_SUB+=	PGSQL=""
-PLIST_SUB+=	SQLITE="@comment "
-SED_SCRIPT+=	-e '/%%MYSQL%%/D'
-SED_SCRIPT+=	-e 's,%%PGSQL%%,,g'
-SED_SCRIPT+=	-e '/%%SQLITE%%/D'
-#PKGNAMESUFFIX=	-pgsql74
+#PKGNAMESUFFIX=	-pgsql
 DBDRV_COUNT:=	${DBDRV_COUNT:S/o//}
 .endif
 
@@ -329,10 +310,7 @@ LDA_COUNT:=	${LDA_COUNT:S/o//}
 .if defined(WITH_EXIM_LDA)
 .	if defined(WITH_MYSQL40) || (WITH_MYSQL41)
 _EXIM_EXT=	-mysql
-.	elseif defined(WITH_POSTGRESQL74) || defined(WITH_POSTGRESQL73)
-####
-### fix me for pg 7.3: how to pass the db option to exim port ?
-###
+.	elseif defined(WITH_POSTGRESQL)
 _EXIM_EXT=	-postgresql
 .	endif
 RUN_DEPENDS+=	exim:${PORTSDIR}/mail/exim${_EXIM_EXT}
@@ -433,17 +411,6 @@ post-fetch:
 .endif
 
 pre-extract:
-.if defined(WITH_EXIM_LDA) && defined(WITH_POSTGRESQL73)
-	@${ECHO_CMD} "******************************************************************"
-	@${ECHO_CMD} "You have both EXIM_LDA and POSTGRESQL73 defined. To have exim"
-	@${ECHO_CMD} "built with the right pgsql please hit Ctrl-C now and do:"
-	@${ECHO_CMD} "cd ${PORTSDIR}/mail/exim-postgresql && make POSTGRESQL_PORT=postgresql73 install"
-	@${ECHO_CMD} "then return here and do:"
-	@${ECHO_CMD} "make clean && make install"
-	@${ECHO_CMD} "******************************************************************"
-	@${ECHO_CMD} ""
-.endif
-
 	@${ECHO_CMD} "Define vars below before make-ing if you need:"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SIGNATURE_LIFE=${SIGNATURE_LIFE} (default 15)"
@@ -512,17 +479,17 @@ pre-configure:
 	@${ECHO_CMD} "You can use one and only one database back-end at once."
 	@${FALSE}
 .endif
-.if defined(WITH_NEURAL_NET) && !(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74))
+.if defined(WITH_NEURAL_NET) && !(defined(HAVE_MYSQL) || defined(WITH_POSTGRESQL))
 	@${ECHO_CMD} "You need MySQL or POSTGRESQL to use neural networking."
 	@${FALSE}
 .endif
 .if defined(WITH_VIRT_USERS) && !(defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE))
+	defined(WITH_POSTGRESQL) || defined(WITH_ORACLE))
 	@${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users."
 	@${FALSE}
 .endif
 .if defined(WITH_PREF_EXT) && !( defined(USE_MYSQL) || \
-	defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) )
+	defined(WITH_POSTGRESQL) )
 	@${ECHO_CMD} "You need MySQL or Postgres for preferences extension"
 	@${FALSE}
 .endif
@@ -549,7 +516,7 @@ post-install:
 	@${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
 	@${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql
 .endif
-.if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)
+.if defined(WITH_POSTGRESQL)
 	@${MKDIR} ${EXAMPLESDIR}/pgsql
 	@cd ${WRKSRC}/tools.pgsql_drv && \
 		${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9d29dc2bba5c..54a701e8cc82 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -420,14 +420,8 @@ IGNORE=		WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,,'
 .endif
 
-.if defined(WITH_POSTGRESQL_PORT) && ${WITH_POSTGRESQL_PORT:L} != "auto"
-POSTGRESQL_PORT=	${WITH_POSTGRESQL_PORT}
-.else
-POSTGRESQL_PORT?=	databases/postgresql7
-.endif
-
 .if defined(WITH_PGSQL)
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	yes
 SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \
 		-e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \
 		-e 's,^\# (LOOKUP_PGSQL=),\1,'
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index a74f5a7fca09..83190a56855e 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -40,8 +40,7 @@ EXTRACT_INCLUDE+=	-I${LOCALBASE}/include/mysql
 EXTRACT_LIB+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lm
 .elif defined(WITH_POSTGRESQL)
 ALL_TARGET=	pgsql it ${LANGUAGE}
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=	yes
 EXTRACT_INCLUDE+=	-I${LOCALBASE}/include
 EXTRACT_LIB+=	-L${LOCALBASE}/lib -lpq -lcrypt
 .else
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index c311ff7a1492..af46a72e48f7 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -111,7 +111,7 @@ PLIST_SUB+=		MYSQL="@comment "
 
 .if defined(WITH_PGSQL)
 CONFIGURE_ARGS+=	--enable-pg
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
+USE_PGSQL=		yes
 PLIST_SUB+=		PGSQL=""
 MAN8+=			perditiondb_postgresql_makedb.8
 .else
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index f9ecd211c8a4..1a40f56e8efa 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -66,8 +66,8 @@ MAN8=		teapop.8
 ##
 
 .if defined(WITH_PGSQL)
+USE_PGSQL=		YES
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 4984792f0245..2a55f350c0b1 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -64,8 +64,8 @@ MAN8=		teapop.8
 ##
 
 .if defined(WITH_PGSQL)
+USE_PGSQL=		YES
 CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql7
 .endif
 
 .if defined(WITH_MYSQL)
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index bdda209ab4c6..e4dab9ec5028 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -160,8 +160,7 @@ WITH_PGSQL=	yes
 .endif
 
 .if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--enable-auth-module=pgsql
 
 .if defined(WITH_PGSQL_LOG)
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 3295e05413db..5a46eb883be0 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -161,8 +161,7 @@ WITH_PGSQL=	yes
 .endif
 
 .if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--enable-auth-module=pgsql
 
 .if defined(WITH_PGSQL_LOG)