From 475cbe5281ff44f7b13454f24fc7d64c2a338df2 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 5 Jan 2003 20:14:20 +0000
Subject: Bump PKGREVISION due to increase in the major number of libpq.so
 between version 7.2.3 and 7.3.1 of databases/postgresql-lib.

---
 databases/gtksql/Makefile            |  3 ++-
 databases/gtranscript/Makefile       |  8 ++++----
 databases/guile-pg/Makefile          |  7 ++++---
 databases/kpsql/Makefile             | 11 +++--------
 databases/p5-DBD-postgresql/Makefile |  6 +++---
 databases/p5-postgresql/Makefile     |  3 ++-
 databases/php3-pgsql/Makefile        |  6 +++---
 databases/php4-pgsql/Makefile        |  4 ++--
 databases/py-postgresql/Makefile     |  3 ++-
 databases/py-psycopg/Makefile        |  5 +++--
 databases/ruby-postgresql/Makefile   |  7 ++++---
 mail/courier-authpgsql/Makefile      |  6 +++---
 net/netsaint-plugins/Makefile        |  6 +++---
 net/snort-pgsql/Makefile             |  3 ++-
 www/ap-aolserver/Makefile            |  6 +++---
 www/ap-auth-postgresql/Makefile      |  7 ++++---
 www/openacs/Makefile                 |  4 ++--
 x11/qt3-psql/Makefile                |  4 ++--
 18 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index aec65a257fc..969e8de6449 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2002/09/21 08:10:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/01/05 20:14:20 jlam Exp $
 #
 
 DISTNAME=		gtksql-0.3
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		http://www.multimania.com/bbrox/GtkSQL/ \
 			${MASTER_SITE_SUNSITE:=X11/gtkbuffet/apps/gtksql/} \
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index 407d8a475c1..a167819ab32 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:44 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/05 20:14:22 jlam Exp $
 #
 
 DISTNAME=	gtranscript-0.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://gtranscript.linuxbox.com/ \
 		ftp://ftp.matrix.com.br/pub/linuxberg/files/gnome/office/ \
@@ -19,11 +19,11 @@ HOMEPAGE=	http://gtranscript.linuxbox.com/
 COMMENT=	SQL Database Client with GNOME frontend
 
 DEPENDS+=	gnome-core>=1.4.0.4nb1:../../x11/gnome-core
-DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
+DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
 
-CPPFLAGS+=	-I${LOCALBASE}/include		# pgsql/*.h
+CPPFLAGS+=	-I${LOCALBASE}/include		# <postgresql/*.h>
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 09f1fa9b0ca..f8ec3c77e77 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/27 01:14:09 cjones Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/05 20:14:22 jlam Exp $
 #
 
 DISTNAME=	guile-pg-0.07
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=guile-pg/}
 
@@ -9,14 +10,14 @@ MAINTAINER=	cjones@netbsd.org
 HOMEPAGE=	http://guile-pg.sourceforge.net/
 COMMENT=	PostgreSQL interface for Guile
 
-DEPENDS+=	postgresql-lib>=7:../../databases/postgresql-lib
+DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 DEPENDS+=	guile>=1.3:../../lang/guile
 
 USE_LIBTOOL=	YES
 USE_GMAKE=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-libpq-includes=${PREFIX}/include/pgsql
+CONFIGURE_ARGS+=	--with-libpq-includes=${PREFIX}/include/postgresql
 
 #INFO_FILES=	guile-pg.info
 
diff --git a/databases/kpsql/Makefile b/databases/kpsql/Makefile
index 4701b3e22b0..d481d713469 100644
--- a/databases/kpsql/Makefile
+++ b/databases/kpsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:36:45 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/05 20:14:23 jlam Exp $
 #
 
 DISTNAME=	kpsql-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mutinybaysoftware.com/downloads/
 EXTRACT_SUFX=	.tgz
@@ -12,12 +12,7 @@ HOMEPAGE=	http://www.mutinybaysoftware.com/kpsql.html
 COMMENT=	Interactive Query Tool for PostgreSQL
 
 DEPENDS+=	kdebase-1.1.2nb1:../../x11/kdebase
-DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
-
-#
-# PostgreSQL is currently not supported by all platforms
-#
-NOT_FOR_PLATFORM=       *-*-mips
+DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile
index 5ca9864d64d..0b951502232 100644
--- a/databases/p5-DBD-postgresql/Makefile
+++ b/databases/p5-DBD-postgresql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2002/10/27 19:39:01 seb Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/05 20:14:24 jlam Exp $
 #
 
 VER=		1.13
 DISTNAME=	DBD-Pg-${VER}
 PKGNAME=	p5-DBD-postgresql-${VER}
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	p5dpo
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/JBAKER/}
@@ -19,7 +19,7 @@ PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/DBD/Pg/.packlist
 PGUSER?=	pgsql
 PGPREFIX=	${PREFIX}/${PGUSER}
 
-MAKE_ENV+=	POSTGRES_INCLUDE=${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+MAKE_ENV+=	POSTGRES_INCLUDE=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 MAKE_ENV+=	POSTGRES_LIB=${BUILDLINK_PREFIX.postgresql-lib}/lib
 
 .include "../../databases/p5-DBI/buildlink2.mk"
diff --git a/databases/p5-postgresql/Makefile b/databases/p5-postgresql/Makefile
index 646b3ea80f6..6c209418810 100644
--- a/databases/p5-postgresql/Makefile
+++ b/databases/p5-postgresql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/10/21 11:56:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/05 20:14:24 jlam Exp $
 
 DISTNAME=	pgsql_perl5-1.9.0
 PKGNAME=	p5-postgresql-1.9.0
+PKGREVISION=	1
 SVR4_PKGNAME=	p5pgs
 CATEGORIES=	databases devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Pg/}
diff --git a/databases/php3-pgsql/Makefile b/databases/php3-pgsql/Makefile
index 03d894fa838..b5253e5c322 100644
--- a/databases/php3-pgsql/Makefile
+++ b/databases/php3-pgsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 11:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/05 20:14:25 jlam Exp $
 
 MODNAME=		pgsql
 CATEGORIES+=		databases
-PKGREVISION=		# empty
+PKGREVISION=		1
 COMMENT=		PHP3 extension for PostgreSQL database access
 
 USE_BUILDLINK2=		yes
@@ -10,7 +10,7 @@ USE_BUILDLINK2=		yes
 .include "../../www/php3/Makefile.module"
 
 CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+MOD_CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 MOD_LIBS+=		-lpq -lcrypt
 
 .include "../../databases/postgresql-lib/buildlink2.mk"
diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile
index 82055fd5eab..5b1df1b80d0 100644
--- a/databases/php4-pgsql/Makefile
+++ b/databases/php4-pgsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/21 12:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/05 20:14:26 jlam Exp $
 
 MODNAME=		pgsql
 CATEGORIES+=		databases
-PKGREVISION=		# empty
+PKGREVISION=		1
 COMMENT=		PHP4 extension for PostgreSQL databases
 
 USE_BUILDLINK2=		YES
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index ef14a68f3ca..b5aafdade04 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2003/01/05 19:26:16 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/05 20:14:26 jlam Exp $
 
 DISTNAME=	postgresql-${DIST_VERS}
 DIST_VERS=	7.2.3
 BASE_VERS=	${DIST_VERS}
 PKGNAME=	${PYPKGPREFIX}-postgresql-3.3
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
 		ftp://ftp.postgresql.org/pub/source/v${DIST_VERS}/ \
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 17f88bca6c9..2cd2d60a0fc 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/25 14:17:24 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/05 20:14:28 jlam Exp $
 #
 
 DISTNAME=	psycopg-1.0.13
 PKGNAME=	${PYPKGPREFIX}-psycopg-1.0.13
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 
@@ -13,7 +14,7 @@ COMMENT=	PostgreSQL database adapter for Python
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
 CONFIGURE_ARGS+= \
- --with-postgres-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql \
+ --with-postgres-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql\
  --with-postgres-libraries=${BUILDLINK_PREFIX.postgresql-lib}/lib
 # XXX ${PYSITELIB}/... doesn't get transformed by buildlink2
 CONFIGURE_ARGS+= --with-mxdatetime-includes=${BUILDLINK_DIR}/include
diff --git a/databases/ruby-postgresql/Makefile b/databases/ruby-postgresql/Makefile
index 1a3e6aaf8a9..1f9ff0face9 100644
--- a/databases/ruby-postgresql/Makefile
+++ b/databases/ruby-postgresql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/01/19 11:03:20 taca Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/05 20:14:29 jlam Exp $
 
 DISTNAME=		ruby-postgres-${VERSION}
 PKGNAME=		${RUBY_PKGNAMEPREFIX}postgresql-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		http://www.postgresql.jp/interfaces/ruby/archive/
 
@@ -9,12 +10,12 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.postgresql.jp/interfaces/ruby/
 COMMENT=		Ruby extension for postgresql
 
-DEPENDS+=		postgresql-lib>=7.1:../../databases/postgresql-lib
+DEPENDS+=		postgresql-lib>=7.3.1:../../databases/postgresql-lib
 
 VERSION=		0.6.5
 DIST_SUBDIR=		ruby
 USE_RUBY_EXTCONF= 	yes
-CONFIGURE_ARGS+=	--with-pgsql-include-dir=${PREFIX}/include/pgsql \
+CONFIGURE_ARGS+=	--with-pgsql-include-dir=${PREFIX}/include/postgresql \
 			--with-pgsql-lib-dir=${PREFIX}/lib
 INSTALL_TARGET=		site-install
 
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index 9242f25edef..bd053be1010 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/08 23:16:00 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/05 20:14:30 jlam Exp $
 
 PKGNAME=		courier-authpgsql-${BASE_VERS}
-PKGREVISION?=		# empty
+PKGREVISION=		1
 COMMENT=		Courier PostgreSQL authentication module
 
 DEPENDS+=		courier-auth>=${BASE_VERS}:../../mail/courier-auth
@@ -9,7 +9,7 @@ DEPENDS+=		courier-auth>=${BASE_VERS}:../../mail/courier-auth
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
 CONFIGURE_ARGS+=	--with-authpgsql
-CONFIGURE_ARGS+=	--with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+CONFIGURE_ARGS+=	--with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 CONFIGURE_ARGS+=	--with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib
 
 GEN_FILES=		authpgsqlrc
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 677e42424fc..c673a4f9ee0 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2002/10/25 10:21:33 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/05 20:14:31 jlam Exp $
 #
 
 DISTNAME=		netsaint-plugins-1.2.9-4
 PKGNAME=		netsaint-plugins-1.2.9.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netsaintplug/}
 
@@ -18,7 +18,7 @@ DEPENDS+=		{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh
 
 USE_BUILDLINK2=		YES
 CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-lib}
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 
 .include "../../net/netsaint-base/Makefile.common"
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile
index d43fb875066..ada78b4086a 100644
--- a/net/snort-pgsql/Makefile
+++ b/net/snort-pgsql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/10/10 12:26:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/05 20:14:32 jlam Exp $
 #
 
 .include "../../net/snort/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-pgsql-/}
+PKGREVISION=	1
 
 COMMENT=	Libpcap-based packet sniffer/logger using a PostgreSQL database
 
diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile
index 15101f41c38..da61033726c 100644
--- a/www/ap-aolserver/Makefile
+++ b/www/ap-aolserver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/10/25 12:56:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/05 20:14:32 jlam Exp $
 #
 
 DISTNAME=		mod_aolserver-1.1
 PKGNAME=		ap-aolserver-1.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 
 CONFIGURE_ARGS+=	--with-database=postgres --with-mm=${BUILDLINK_PREFIX.libmm}
-CONFIGURE_ENV+=		CPPFLAGS="-I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql -I${BUILDLINK_PREFIX.apache}/include/httpd"
+CONFIGURE_ENV+=		CPPFLAGS="-I${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql -I${BUILDLINK_PREFIX.apache}/include/httpd"
 
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
 
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 9aabc6d6311..81934a1fd28 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/07/24 19:45:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/05 20:14:33 jlam Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
+PKGREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://home.bawi.org/~minskim/authpg/
 
@@ -10,10 +11,10 @@ HOMEPAGE=	http://home.bawi.org/~minskim/authpg/
 COMMENT=	Module to allow apache authentication against a Postgresql database
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
+DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 USE_PERL5=	build	# for "apxs"
 
-CPPFLAGS+=	-I${LOCALBASE}/include/pgsql
+CPPFLAGS+=	-I${LOCALBASE}/include/postgresql
 LIBS=		-lpq -lcrypt
 
 do-build:
diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index dad5fa295ad..07180e8e48a 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/08/01 09:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/05 20:14:34 jlam Exp $
 #
 
 DISTNAME=		openacs-3.2.5
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		# none
 EXTRACT_SUFX=		.tgz
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index d0e66ef6d9b..a062ee4594c 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/05 20:14:35 jlam Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
-- 
cgit v1.2.3