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

version.

14 files changed, 40 insertions, 43 deletions

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 43c990446d8..5ba7fcd6d5b 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/05/09 06:48:40 snj Exp $
+# $NetBSD: Makefile,v 1.29 2004/07/24 22:45:14 recht Exp $
 #
 
 DISTNAME=		gtksql-0.3
@@ -17,7 +17,7 @@ USE_BUILDLINK3=		yes
 USE_X11BASE=		# defined
 MAKE_ENV+=		MCFLAGS="${CFLAGS}"
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index c0e143d870d..45af9b42e90 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/27 02:04:06 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/07/24 22:45:14 recht Exp $
 #
 
 DISTNAME=	gtranscript-0.0.1
@@ -23,6 +23,6 @@ USE_X11BASE=	YES
 
 #CPPFLAGS+=	-I${LOCALBASE}/include		# <postgresql/*.h>
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../x11/gnome-core/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index a2804588f6d..3163e2da011 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $
 #
 
 DISTNAME=	guile-pg-0.07
@@ -10,16 +10,14 @@ MAINTAINER=	cjones@NetBSD.org
 HOMEPAGE=	http://guile-pg.sourceforge.net/
 COMMENT=	PostgreSQL interface for Guile
 
-DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
-
 USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
+CONFIGURE_ARGS+=	--with-libpq-includes=${PGSQL_PREFIX}/include/postgresql
 
 INFO_FILES=	guile-pg.info
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/guile14/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda-postgres/Makefile b/databases/libgda-postgres/Makefile
index 3b6589eba3c..b5f33558728 100644
--- a/databases/libgda-postgres/Makefile
+++ b/databases/libgda-postgres/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/06 11:17:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:15 recht Exp $
 #
 
 LIBGDA_PROVIDER=	postgres
 
 .include "../../databases/libgda/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-postgres=${BUILDLINK_PREFIX.postgresql-lib}
+CONFIGURE_ARGS+=	--with-postgres=${PGSQL_PREFIX}
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index fb9dae47e24..87c14bbf745 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/05/08 05:25:12 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
 #
 
 .include "../../databases/libpqxx/Makefile.common"
@@ -15,12 +15,11 @@ USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	libpqxx.pc.in
 
 GNU_CONFIGURE=		yes
-PG_PREFIX=		${BUILDLINK_PREFIX.postgresql-lib}
-CONFIGURE_ARGS+=	--with-postgres-lib=${PG_PREFIX}/lib
-CONFIGURE_ARGS+=	--with-postgres-include=${PG_PREFIX}/include/postgresql
+CONFIGURE_ARGS+=	--with-postgres-lib=${PGSQL_PREFIX}/lib
+CONFIGURE_ARGS+=	--with-postgres-include=${PGSQL_PREFIX}/include/postgresql
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile
index 63332294eb9..a9852952d64 100644
--- a/databases/p5-DBD-postgresql/Makefile
+++ b/databases/p5-DBD-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/07/24 22:45:15 recht Exp $
 #
 
 VER=		1.22
@@ -21,12 +21,12 @@ PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/DBD/Pg/.packlist
 PGUSER?=	pgsql
 PGPREFIX=	${PREFIX}/${PGUSER}
 
-POSTGRES_INCLUDE=	${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
-POSTGRES_LIB=		${BUILDLINK_PREFIX.postgresql-lib}/lib
+POSTGRES_INCLUDE=	${PGSQL_PREFIX}/include/postgresql
+POSTGRES_LIB=		${PGSQL_PREFIX}/lib
 MAKE_ENV+=		POSTGRES_INCLUDE="${POSTGRES_INCLUDE}"
 MAKE_ENV+=		POSTGRES_LIB="${POSTGRES_LIB}"
 
 .include "../../databases/p5-DBI/buildlink3.mk"
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-postgresql/Makefile b/databases/p5-postgresql/Makefile
index 4a15d7a92c4..d57a2b1e99d 100644
--- a/databases/p5-postgresql/Makefile
+++ b/databases/p5-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/27 02:27:36 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=	pgsql_perl5-1.9.0
 PKGNAME=	p5-postgresql-1.9.0
@@ -17,8 +17,8 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Pg/.packlist
 # Until the source catches up to the current Perl API, we need PERL_POLLUTE
 # to look like an older perl.
 MAKE_PARAMS=	DEFINE="-DPERL_POLLUTE=1"
-MAKE_ENV+=	POSTGRES_HOME="${BUILDLINK_PREFIX.postgresql-lib}"
+MAKE_ENV+=	POSTGRES_HOME=${PGSQL_PREFIX:Q}
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile
index 17df39e38e7..59315f2e0e7 100644
--- a/databases/php4-pgsql/Makefile
+++ b/databases/php4-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/06 19:52:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
 
 MODNAME=		pgsql
 PKGREVISION=		# empty
@@ -9,7 +9,7 @@ USE_BUILDLINK3=		YES
 
 .include "../../www/php4/Makefile.module"
 
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_PREFIX.postgresql-lib}
+CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${PGSQL_PREFIX}
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile
index 7a301467de3..89acdf0b50a 100644
--- a/databases/py-PgSQL/Makefile
+++ b/databases/py-PgSQL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/22 19:30:35 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $
 #
 
 DISTNAME=	pyPgSQL-2.4
@@ -20,5 +20,5 @@ PY_PATCHPLIST=	YES
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
-.include "../../databases/postgresql-lib/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index ca28730e112..d4897325e6f 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/07/22 09:16:01 recht Exp $
+# $NetBSD: Makefile,v 1.34 2004/07/24 22:45:15 recht Exp $
 
 PKGNAME=	${PYPKGPREFIX}-postgresql-3.3
 PKGREVISION=	3
@@ -32,8 +32,8 @@ post-install:
 		${INSTALL_DATA} $${file} ${DOCDIR}/tutorial;		\
 	done
 
-.include "../postgresql-lib/buildlink3.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index d3cc18edc8b..8cbcca5feb7 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/07/22 18:00:37 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $
 #
 
 DISTNAME=	psycopg-1.1.14
@@ -13,16 +13,16 @@ COMMENT=	PostgreSQL database adapter for Python
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
 CONFIGURE_ARGS+= \
- --with-postgres-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql\
- --with-postgres-libraries=${BUILDLINK_PREFIX.postgresql-lib}/lib
+ --with-postgres-includes=${PGSQL_PREFIX}/include/postgresql\
+ --with-postgres-libraries=${PGSQL_PREFIX}/lib
 ALL_TARGET=	default
 USE_BUILDLINK3=	yes
 
 PYTHON_VERSIONS_ACCEPTED= 23pth 22pth 21pth
 PY_PATCHPLIST=	yes
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile
index 4c52e2d8327..8c895224dad 100644
--- a/databases/ruby-postgresql/Makefile
+++ b/databases/ruby-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/27 05:44:22 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=		ruby-postgres-${VERSION}
 PKGNAME=		${RUBY_PKGNAMEPREFIX}postgresql-${VERSION}
@@ -15,8 +15,8 @@ USE_BUILDLINK3=		yes
 VERSION=		0.7.1
 DIST_SUBDIR=		ruby
 USE_RUBY_EXTCONF= 	yes
-CONFIGURE_ARGS+=	--with-pgsql-include-dir=${PREFIX}/include/postgresql \
-			--with-pgsql-lib-dir=${PREFIX}/lib
+CONFIGURE_ARGS+=	--with-pgsql-include-dir=${PGSQL_PREFIX}/include/postgresql \
+			--with-pgsql-lib-dir=${PGSQL_PREFIX}/lib
 INSTALL_TARGET=		site-install
 
 DOC=			README README.ja doc/postgres.html doc/postgres.ja.html
@@ -42,7 +42,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/$f ${RUBY_EXAMPLESDIR}/postgresql
 .endfor
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/ruby-base/Makefile.common"
 .include "../../lang/ruby-base/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index 05b7a357252..a61e8e9822e 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/05/11 04:40:59 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=		vapor-0.7.0
 PKGNAME=		${RUBY_PKGNAMEPREFIX}${DISTNAME}
@@ -22,6 +22,6 @@ post-install:
 	${CP} -R ${WRKSRC}/doc ${RUBY_DOCDIR}/vapor
 	${LN} -s ${RUBY_DOCDIR}/vapor/examples ${RUBY_EXAMPLESDIR}/vapor
 
-.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/ruby-base/Makefile.common"
+.include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 0176d8ae9af..6b15837efd5 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/15 10:44:53 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/24 22:45:15 recht Exp $
 
 DISTNAME=		sqlrelay-0.33.1
 CATEGORIES=		databases
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_DIR}
 .endif
 
 .if defined(SQLRELAY.postgresql) && ${SQLRELAY.postgresql} == "YES"
-.  include "../../databases/postgresql-lib/buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-postgresql=${BUILDLINK_DIR}
 .endif