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

version.

4 files changed, 12 insertions, 12 deletions

diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile
index 3f1d0e6744f..393ef7b9e9f 100644
--- a/www/ap-aolserver/Makefile
+++ b/www/ap-aolserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/05/08 19:48:27 snj Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/24 22:45:16 recht Exp $
 #
 
 DISTNAME=		mod_aolserver-1.1
@@ -17,7 +17,7 @@ USE_BUILDLINK3=	YES
 CONFIGURE_ARGS+=	--with-database=postgres
 CONFIGURE_ARGS+=	--with-mm=${BUILDLINK_PREFIX.libmm}
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
+CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
 CFLAGS+=	`${APXS} -q CFLAGS CFLAGS_SHLIB`
 
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
@@ -28,8 +28,8 @@ post-install:
 		${WRKSRC}/tcl_modules/nsd.ini.sample \
 		${PREFIX}/share/examples/mod_aolserver
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../devel/libmm/buildlink3.mk"
 .include "../../lang/tcl83/buildlink3.mk"
 .include "../../www/apache/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile
index 78bd28b29d5..770be48d6fc 100644
--- a/www/ap-auth-pgsql/Makefile
+++ b/www/ap-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/05/08 19:48:27 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/24 22:45:16 recht Exp $
 
 DISTNAME=	mod_auth_pgsql-0.9.12
 PKGNAME=	ap-auth-pgsql-0.9.12
@@ -15,7 +15,7 @@ USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_auth_pgsql.so
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
+CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
 LDFLAGS+=	-lpq -lcrypt
 
 post-install:
@@ -26,5 +26,5 @@ post-install:
 
 .include "../../www/apache/module.mk"
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 14d1dfd580a..27da9520265 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/05/08 19:48:27 snj Exp $
+# $NetBSD: Makefile,v 1.22 2004/07/24 22:45:16 recht Exp $
 
 DISTNAME=	AuthPG-1.4
 PKGNAME=	ap-auth-postgresql-1.4
@@ -16,7 +16,7 @@ USE_BUILDLINK3=	YES
 
 APACHE_MODULE_NAME=	mod_auth_pg.so
 
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
+CPPFLAGS+=	-I${PGSQL_PREFIX}/include/postgresql
 LDFLAGS+=	-lpq -lcrypt
 
 DOCDIR=	${PREFIX}/share/doc/mod_auth_pg
@@ -34,5 +34,5 @@ post-install:
 
 .include "../../www/apache/module.mk"
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index 882876bd983..a5f7222f313 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/21 16:06:22 darcy Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:16 recht Exp $
 # FreeBSD Id: ports/www/mod_auth_pgsql2/Makefile,v 1.5 2004/02/06 11:21:00 clement Exp
 
 DISTNAME=		mod_auth_pgsql-2.0.2b1
@@ -19,7 +19,7 @@ APACHE_MODULE_NAME =	ap2-auth-pgsql
 do-build:
 	cd ${WRKSRC} && \
 		${APXS} -c -n ${APACHE_MODULE_NAME} \
-		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql \
+		-I${PGSQL_PREFIX}/include/postgresql \
 		-L${LOCALBASE}/lib \
 		-Wl,${RPATH_FLAG} -Wl,${LOCALBASE}/lib \
 		-lpq ${DISTNAME:C/-[^-]*$//}.c
@@ -30,7 +30,7 @@ do-install:
 	#${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR}
 
 .include "../../www/apache2/buildlink3.mk"
-.include "../../databases/postgresql-lib/buildlink3.mk"
 
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"