Use the new mk/pgsql.buildlink3.mk to select the correct PostgreSQL

version.

6 files changed, 23 insertions, 23 deletions

diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index ce5e463ce94..bc78b8f4593 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/14 21:43:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
 
 PKGNAME=	courier-authpgsql-${BASE_VERS}
 COMMENT=	Courier PostgreSQL authentication module
@@ -11,8 +11,8 @@ USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL=	${.CURDIR}/../courier-auth/INSTALL
 
 CONFIGURE_ARGS+=	--with-authpgsql
-CONFIGURE_ARGS+=	--with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
-CONFIGURE_ARGS+=	--with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib
+CONFIGURE_ARGS+=	--with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql
+CONFIGURE_ARGS+=	--with-pgsql-libs=${PGSQL_PREFIX}/lib
 
 GEN_FILES=		authpgsqlrc
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
@@ -23,7 +23,7 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
 			${ROOT_USER} ${ROOT_GROUP} 0600
 .endfor
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 
 post-build:
 	cd ${WRKSRC}/authlib;						\
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 4bb70e2f363..4c1a972d39d 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/07/14 18:09:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=		dovecot-0.99.10.7
 CATEGORIES=		mail
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	--with-mysql
 .if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--with-pgsql
 CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
-.  include "../../databases/postgresql-lib/buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 .if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index bead532fe44..97f848f12b0 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/10 03:08:32 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	2
@@ -59,11 +59,11 @@ MAKE_ENV+=		LOOKUP_MYSQL=YES
 .  include "../../databases/mysql-client/buildlink3.mk"
 .endif
 .if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES"
-LOOKUP_INCLUDE+=	-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
-LOOKUP_LIBS+=		-L${BUILDLINK_PREFIX.postgresql-lib}/lib
-LOOKUP_LIBS+=		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq
+LOOKUP_INCLUDE+=	-I${PGSQL_PREFIX}/include/postgresql
+LOOKUP_LIBS+=		-L${PGSQL_PREFIX}/lib
+LOOKUP_LIBS+=		-Wl,${RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
 MAKE_ENV+=		LOOKUP_PGSQL=YES
-.  include "../../databases/postgresql-lib/buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 .endif
 
 # buildlink3 decides which libdb to use on this platform.
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 204fc6feb67..026aba7e08b 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/21 22:58:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -49,10 +49,10 @@ post-configure:
 .endif
 
 .if !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 post-configure:
-	${ECHO} -I${BUILDLINK_PREFIX.postgresql-lib}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
-	${ECHO} -L${BUILDLINK_PREFIX.postgresql-lib}/lib -Wl,-R${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
+	${ECHO} -I${PGSQL_PREFIX}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
+	${ECHO} -L${PGSQL_PREFIX}/lib -Wl,-R${PGSQL_PREFIX}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pgsql
 .endif
 
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 626df4348f0..a4951caad9b 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/07/21 23:30:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.35 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=	postfix-2.2-20040628
 CATEGORIES=	mail
@@ -98,14 +98,14 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
 .endif
 
 ## .if defined(POSTFIX_USE_PGSQL) && ${POSTFIX_USE_PGSQL} == "YES"
-## .  include "../../databases/postgresql-lib/buildlink3.mk"
+## .  include "../../mk/pgsql.buildlink3.mk"
 ## .  include "../../security/openssl/buildlink3.mk"
 ## PATCHFILES+=		postfix-pg.postfix-2.0.0.2.patch
 ## PATCH_SITES+=		http://www.mat.cc/postfix/
 ## PATCH_DIST_STRIP=	-p1
 ##
-## CCARGS+=	-DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
-## AUXLIBS+=	-L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
+## CCARGS+=	-DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql
+## AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ##		-L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
 ## .endif
 
diff --git a/mail/postfix/Makefile.options b/mail/postfix/Makefile.options
index b7efb2bb0db..a871cc437de 100644
--- a/mail/postfix/Makefile.options
+++ b/mail/postfix/Makefile.options
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.options,v 1.3 2004/07/23 15:00:29 jlam Exp $
+# $NetBSD: Makefile.options,v 1.4 2004/07/24 22:45:15 recht Exp $
 #
 # POSTFIX_ALL_OPTIONS lists all of the currently-supported optional modules
 # that may be built into Postfix.
@@ -89,14 +89,14 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
 ## ### Support using a PostgreSQL database server for table lookups.
 ## ###
 ## .if !empty(_POSTFIX_OPTIONS:Mpgsql)
-## .  include "../../databases/postgresql-lib/buildlink3.mk"
+## .  include "../../mk/pgsql.buildlink3.mk"
 ## .  include "../../security/openssl/buildlink3.mk"
 ## PATCHFILES+=		postfix-pg.postfix-2.0.0.2.patch
 ## PATCH_SITES+=		http://www.mat.cc/postfix/
 ## PATCH_DIST_STRIP=	-p1
 ##
-## CCARGS+=	-DHAS_PGSQL -I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
-## AUXLIBS+=	-L${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq \
+## CCARGS+=	-DHAS_PGSQL -I${PGSQL_PREFIX}/include/pgsql
+## AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ##		-L${BUILDLINK_PREFIX.openssl}/lib -lcrypt
 ## .endif