Update postgresql and related packages to 7.2. Thanks to Michael Graff

<explorer@flame.org> for most of the work on this update.

Pkgsrc changes from the previous version include removing Makefile.ssl and
some patches that have been integrated into this release of PostgreSQL.  We
leave open the question of when to byte-compile the Python modules for the
PyGreSQL interface and just do it as before, although we should consider
doing the compilation as a post-install step to ensure that the timestamps
are correct.  We also reorder some lines in the Makefile to include
Makefile.common below certain definitions (GNU_CONFIGURE, USE_BUILDLINK_ONLY)
as they may possibly trigger different portions of Makefile.common.

*** Please note that a dump/restore is required to migrate an existing ***
*** PostgreSQL installation to 7.2.                                    ***

Major changes from version 7.1.3 are geared toward improving use in
high-volume applications and include:

   VACUUM
	   Vacuuming no longer locks tables, thus allowing normal user access
           during the vacuum. A new "VACUUM FULL" command does old-style
           vacuum by locking the table and shrinking the on-disk copy of the
           table.

   Transactions
           There is no longer a problem with installations that exceed four
           billion transactions.

   OID's
           OID's are now optional. Users can now create tables without OID's
           for cases where OID usage is excessive.

   Optimizer
           The system now computes histogram column statistics during
           "ANALYZE", allowing much better optimizer choices.

   Security
           A new MD5 encryption option allows more secure storage and
           transfer of passwords. A new Unix-domain socket authentication
           option is available on Linux and BSD systems. PAM authentication
           is also available.

   Statistics
           Administrators can use the new table access statistics module to
           get fine-grained information about table and index usage.

15 files changed, 263 insertions, 474 deletions

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 5ec2a774c1c..b4475ccc4ec 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.66 2001/12/03 08:06:25 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2002/04/04 07:48:18 jlam Exp $
 
-.include "../../databases/postgresql/Makefile.common"
-
-PKGNAME=	postgresql-${PG_BASE_VERS}
+PKGNAME=	postgresql-${BASE_VERS}
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client
-DEPENDS+=	postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
-DEPENDS+=	postgresql-docs>=${PG_BASE_VERS}:../../databases/postgresql-docs
+DEPENDS+=	postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
+DEPENDS+=	postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
+DEPENDS+=	postgresql-docs>=${BASE_VERS}:../../databases/postgresql-docs
+
+.include "../../databases/postgresql/Makefile.common"
 
 EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	# defined
-NO_PATCH=	# defined
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
+NO_CHECKSUM=	YES
+NO_PATCH=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
 do-install:	# empty
 
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 1d9bef42b98..9a95df20435 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2002/03/12 22:09:35 tv Exp $
+# $NetBSD: Makefile.common,v 1.26 2002/04/04 07:48:20 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -9,36 +9,40 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-DISTNAME=		postgresql-${PG_DIST_VERS}
+DISTNAME?=		postgresql-${DIST_VERS}
 CATEGORIES+=		databases
-MASTER_SITES=		http://www.postgresql.org/ftpsite/source/v${PG_DIST_VERS}/ \
-			ftp://ftp.PostgreSQL.org/pub/source/v${PG_DIST_VERS}/ \
-			ftp://ftp.de.postgresql.org/pub/source/v${PG_DIST_VERS}/ \
-			ftp://ch.postgresql.org/mirror/postgresql/source/v${PG_DIST_VERS}/ \
-			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/v${PG_DIST_VERS}/ \
-			ftp://looking-glass.usask.ca/pub/postgresql/source/v${PG_DIST_VERS}/ \
-			ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/v${PG_DIST_VERS}/ \
-			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/v${PG_DIST_VERS}/
+PGSQL_SITES=		http://www.postgresql.org/ftpsite/ \
+			ftp://ftp.postgresql.org/pub/ \
+			ftp://ftp.de.postgresql.org/pub/ \
+			ftp://ch.postgresql.org/mirror/postgresql/ \
+			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/ \
+			ftp://looking-glass.usask.ca/pub/postgresql/ \
+			ftp://ftp.sunsite.auc.dk/mirrors/postgresql/ \
+			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/
+MASTER_SITES?=		${PGSQL_SITES:=source/v${DIST_VERS}/}
 
-MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.postgresql.org/
+MAINTAINER?=		jlam@netbsd.org
+HOMEPAGE?=		http://www.postgresql.org/
 
 CONFLICTS+=		postgresql-[0-6]* postgresql-7.0*
 
-DISTINFO_FILE=		${.CURDIR}/../../databases/postgresql/distinfo
-COMMON_FILESDIR=	${.CURDIR}/../../databases/postgresql/files
-PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
+DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql/distinfo
+COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql/files
+PATCHDIR?=		${.CURDIR}/../../databases/postgresql/patches
 
 # Version numbering scheme:
 #
-# PG_DIST_VERS		version number on the postgresql distfile
-# PG_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
+# DIST_VERS		version number on the postgresql distfile
+# BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
 #
-PG_DIST_VERS=		7.1.3
-PG_BASE_VERS=		${PG_DIST_VERS}
+DIST_VERS?=		7.2
+BASE_VERS?=		${DIST_VERS}
 
-USE_GMAKE=		# defined
-GNU_CONFIGURE=		# defined
+BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=${BASE_VERS}
+BUILDLINK_DEPENDS.tcl-postgresql?=	tcl-postgresql>=${BASE_VERS}
+
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -63,7 +67,7 @@ CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ARGS+=	--without-tk
 
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/pgsql
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/html/postgresql
+CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/postgresql
 
 CONFIGURE_ARGS+=	--disable-readline
 CONFIGURE_ARGS+=	--enable-locale
@@ -71,8 +75,6 @@ CONFIGURE_ARGS+=	--enable-syslog
 CONFIGURE_ARGS+=	--with-CXX
 CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
 
-MAKE_ENV+=		CUSTOM_COPT="${CFLAGS}"
-
 post-extract:
 	if [ -d ${WRKSRC}/src ]; then					\
 		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
diff --git a/databases/postgresql/Makefile.ssl b/databases/postgresql/Makefile.ssl
deleted file mode 100644
index 774b6a3f891..00000000000
--- a/databases/postgresql/Makefile.ssl
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile.ssl,v 1.2 2001/06/21 21:40:07 jlam Exp $
-#
-# This Makefile fragment *must* be included by PostgreSQL packages built from
-# the main sources of the PostgreSQL distribution that use the PostgreSQL
-# libraries.
-
-USE_SSL=		# defined
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
-
-.include "../../security/openssl/buildlink.mk"
diff --git a/databases/postgresql/distinfo b/databases/postgresql/distinfo
index be522152181..f68792c23cb 100644
--- a/databases/postgresql/distinfo
+++ b/databases/postgresql/distinfo
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.9 2001/12/06 03:46:21 jlam Exp $
+$NetBSD: distinfo,v 1.10 2002/04/04 07:48:23 jlam Exp $
 
-SHA1 (postgresql-7.1.3.tar.gz) = d969d73af499e87a7ad052cab5efe6ca9d1d7085
-Size (postgresql-7.1.3.tar.gz) = 8124455 bytes
-SHA1 (patch-aa) = e3b4c556c2a389ae5a27d4ecfe3809652faf4c8f
-SHA1 (patch-ab) = 5e83cfb8825b700782405504d56ec87016caf0ff
-SHA1 (patch-ac) = feb9ea73626e131ed9bdb926a36ba312de1d6890
-SHA1 (patch-ad) = 0c55c66003603c688d727ca7de8fb73fdfdc88ac
+SHA1 (postgresql-7.2.tar.gz) = eddf80bd8dae48aaa766d70fb7c2be6de314855f
+Size (postgresql-7.2.tar.gz) = 9180168 bytes
+SHA1 (patch-aa) = 598f14b74b0dc54680ed85f4c26b6396898f5a7e
+SHA1 (patch-ab) = 0d1dee0d7c8b3bbff8507e18b9561c0b198f409f
+SHA1 (patch-ac) = af1b49f846031aa86b9e37a679bafc1ef170e149
+SHA1 (patch-ad) = 581a5311c9197efd4fbd4182a2c9d906fbac3074
 SHA1 (patch-ae) = ea4f680544bbdae36945b6393f50a0c15df38046
-SHA1 (patch-af) = 79f9153c463e6ea81bacc0ec8ba941b0e96e2745
-SHA1 (patch-ag) = 64279ce6b8677563e5b6c200fb22c46d5f964f42
-SHA1 (patch-ah) = 7b280f06009bb5b64526bbf50950ff62abd31766
+SHA1 (patch-af) = fb4994293ee5fa5aeb06cd0d9463b3b11ae0747e
+SHA1 (patch-ah) = 1c25241c808c70a59c93ef4536aa962c91957b3b
 SHA1 (patch-ai) = 02b84f52941e7cb939388137392df18d53eecfb2
-SHA1 (patch-aj) = 251c0f20ca90f6d613f37c0a31d80f3bf38f2bdc
-SHA1 (patch-ak) = 96f555cfb72a7f263f763afad0120ab45e50d6b6
-SHA1 (patch-al) = d1da4a0bd321b5dd683dadaaf0edc452c2292d0b
-SHA1 (patch-am) = c2c01409b56c7c14ccaf66b7f1bdd809bb879062
+SHA1 (patch-al) = 3479fe6f0077cd9db7e13f6e3443209007342550
+SHA1 (patch-am) = 22a73cc84e28a0d45923311aa5fb3d57cdd0d8e5
diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
index 408707ae336..9efab02b180 100644
--- a/databases/postgresql/patches/patch-aa
+++ b/databases/postgresql/patches/patch-aa
@@ -1,11 +1,21 @@
-$NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2002/04/04 07:48:24 jlam Exp $
 
---- configure.in.orig	Sat May  5 16:05:37 2001
+--- configure.in.orig	Sun Feb  3 16:04:12 2002
 +++ configure.in
-@@ -150,6 +150,15 @@
+@@ -150,6 +150,25 @@
  
  
  #
++# Location for HTML documentation
++#
++htmldir='${docdir}/html'
++PGAC_ARG_REQ(with, htmldir,
++             [  --with-htmldir=DIR      HTML documentation in DIR],
++             [htmldir=$withval])
++AC_SUBST(htmldir)
++
++
++#
 +# Readline support
 +#
 +AC_MSG_CHECKING([whether to build with readline support])
@@ -18,8 +28,8 @@ $NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $
  # Locale (--enable-locale)
  #
  AC_MSG_CHECKING([whether to build with locale support])
-@@ -401,6 +410,18 @@
- [AC_MSG_RESULT(no)])
+@@ -398,6 +417,18 @@
+ AC_MSG_RESULT([$with_python])
  AC_SUBST(with_python)
  
 +# If python is enabled (above), then optionally byte-compile the modules.
@@ -37,7 +47,7 @@ $NetBSD: patch-aa,v 1.8 2001/05/14 14:52:38 jlam Exp $
  #
  # Optionally build the Java/JDBC tools
  #
-@@ -649,8 +670,10 @@
+@@ -682,8 +713,10 @@
  ## Libraries
  ##
  
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
index 3d8a389c9bd..69e25287260 100644
--- a/databases/postgresql/patches/patch-ab
+++ b/databases/postgresql/patches/patch-ab
@@ -1,13 +1,38 @@
-$NetBSD: patch-ab,v 1.12 2001/07/27 17:52:33 jlam Exp $
+$NetBSD: patch-ab,v 1.13 2002/04/04 07:48:24 jlam Exp $
 
---- config/programs.m4.orig	Sat Feb 10 14:31:42 2001
+--- config/programs.m4.orig	Tue Aug 28 10:59:11 2001
 +++ config/programs.m4
-@@ -85,7 +85,7 @@
-   for pgac_rllib in -lreadline -ledit ; do
+@@ -80,6 +80,14 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_MSG_CHECKING([for readline])
+ 
++case $host_os in netbsd* | openbsd* )
++  if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then
++    objformat=a.out
++  else
++    objformat=ELF
++  fi
++esac
++
+ AC_CACHE_VAL([pgac_cv_check_readline],
+ [pgac_cv_check_readline=no
+ for pgac_lib in "" " -ltermcap" " -lncurses" " -lcurses" ; do
+@@ -87,12 +95,14 @@
      pgac_save_LIBS=$LIBS
      LIBS="${pgac_rllib}${pgac_lib} $LIBS"
--    AC_TRY_LINK_FUNC([readline], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2])
-+    AC_TRY_LINK_FUNC([readline], AC_TRY_RUN([int main() { return 0; }], [pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2]))
-     LIBS=$pgac_save_LIBS
-   done
- done
+     AC_TRY_LINK_FUNC([readline], [[
+-      # NetBSD and OpenBSD have a broken linker that does not
++      # NetBSD and OpenBSD have a broken a.out linker that does not
+       # recognize dependent libraries
+       case $host_os in netbsd* | openbsd* )
+-        case $pgac_lib in
+-          *curses*) ;;
+-          *) pgac_lib=" -lcurses" ;;
++        case $objformat in a.out )
++          case $pgac_lib in
++            *curses*) ;;
++            *) pgac_lib=" -lcurses" ;;
++          esac
+         esac
+       esac
+ 
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
index 472864c350d..09cd925f186 100644
--- a/databases/postgresql/patches/patch-ac
+++ b/databases/postgresql/patches/patch-ac
@@ -1,33 +1,31 @@
-$NetBSD: patch-ac,v 1.9 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-ac,v 1.10 2002/04/04 07:48:25 jlam Exp $
 
---- doc/Makefile.orig	Sat Jan  6 21:03:22 2001
+--- doc/Makefile.orig	Wed Aug 29 15:14:39 2001
 +++ doc/Makefile
-@@ -37,7 +37,7 @@
+@@ -68,7 +68,7 @@
  
  install: all installdirs
  ifdef found_html
 -	gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir)/html && $(TAR) xf - )
-+	gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(docdir) && $(TAR) xf - )
++	gzip -d -c postgres.tar.gz | ( cd $(DESTDIR)$(htmldir) && $(TAR) xf - )
  endif
  ifdef found_man
- 	gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - )
-@@ -45,12 +45,17 @@
- 
+ 	for file in man1/*.1 man$(sqlmansectnum)/*.$(sqlmansect) ; do \
+@@ -79,7 +79,7 @@
  
  installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(mandir) $(DESTDIR)$(docdir)/html
-+ifdef found_html
-+	$(mkinstalldirs) $(DESTDIR)$(docdir)
-+endif
-+ifdef found_man
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)
-+endif
- 
+ ifdef found_html
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
++	$(mkinstalldirs) $(DESTDIR)$(htmldir)
+ endif
+ ifdef found_man
+ 	$(mkinstalldirs) $(addprefix $(DESTDIR)$(mandir)/man, 1 $(sqlmansectnum))
+@@ -88,7 +88,7 @@
  
  uninstall:
  ifdef found_html
 -	-rm -f $(addprefix $(DESTDIR)$(docdir)/html/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
-+	-rm -f $(addprefix $(DESTDIR)$(docdir)/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
++	-rm -f $(addprefix $(DESTDIR)$(htmldir)/, $(shell gunzip -c $(srcdir)/postgres.tar.gz | tar tf -))
  endif
  ifdef found_man
- 	-rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf -))
+ 	-rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c $(srcdir)/man.tar.gz | tar tf - | sed -e 's,man$(sqlmansect_dummy)/,man$(sqlmansectnum)/,' -e 's/.$(sqlmansect_dummy)$$/.$(sqlmansect)/'))
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
index 902087cf339..1ed06912a80 100644
--- a/databases/postgresql/patches/patch-ad
+++ b/databases/postgresql/patches/patch-ad
@@ -1,8 +1,22 @@
-$NetBSD: patch-ad,v 1.10 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-ad,v 1.11 2002/04/04 07:48:25 jlam Exp $
 
---- src/Makefile.global.in.orig	Fri Mar 16 16:50:39 2001
+--- src/Makefile.global.in.orig	Thu Dec 20 16:23:05 2001
 +++ src/Makefile.global.in
-@@ -110,6 +110,7 @@
+@@ -107,6 +107,13 @@
+ endif
+ endif
+ 
++htmldir := @htmldir@
++ifeq "$(findstring pgsql, $(htmldir))" ""
++ifeq "$(findstring postgres, $(htmldir))" ""
++override htmldir := $(htmldir)/postgresql
++endif
++endif
++
+ odbcinst_ini_dir = @odbcinst_ini_dir@
+ 
+ javadir := $(DESTDIR)$(datadir)/java
+@@ -123,6 +130,7 @@
  with_java	= @with_java@
  with_perl	= @with_perl@
  with_python	= @with_python@
@@ -10,7 +24,7 @@ $NetBSD: patch-ad,v 1.10 2001/05/14 14:52:38 jlam Exp $
  with_tcl	= @with_tcl@
  with_tk		= @with_tk@
  enable_odbc	= @enable_odbc@
-@@ -242,6 +243,10 @@
+@@ -279,6 +287,10 @@
  libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
index b860340095a..29d5c876c27 100644
--- a/databases/postgresql/patches/patch-af
+++ b/databases/postgresql/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.13 2001/05/14 14:52:38 jlam Exp $
+$NetBSD: patch-af,v 1.14 2002/04/04 07:48:26 jlam Exp $
 
 --- src/interfaces/ecpg/lib/Makefile.orig	Fri Feb 23 13:12:20 2001
 +++ src/interfaces/ecpg/lib/Makefile
@@ -6,8 +6,8 @@ $NetBSD: patch-af,v 1.13 2001/05/14 14:52:38 jlam Exp $
  
  NAME= ecpg
  SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 2.0
-+SO_MINOR_VERSION= 2
+-SO_MINOR_VERSION= 3.0
++SO_MINOR_VERSION= 3
  
  override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS)
  
diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag
deleted file mode 100644
index fc87f0fdcbc..00000000000
--- a/databases/postgresql/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2001/05/14 14:52:38 jlam Exp $
-
---- src/interfaces/odbc/GNUmakefile.orig	Sun Apr  1 15:17:32 2001
-+++ src/interfaces/odbc/GNUmakefile
-@@ -44,7 +44,6 @@
- 
- install: all installdirs
- 	for i in $(odbc_headers); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(odbc_includedir)/$$i || exit 1; done
--	$(INSTALL_DATA) $(srcdir)/odbcinst.ini $(DESTDIR)$(odbcinst_ini_dir)/odbcinst.ini
- 	$(INSTALL_DATA) $(srcdir)/odbc.sql $(DESTDIR)$(datadir)/odbc.sql
- 	$(MAKE) install-lib
- 
diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah
index 8ecc7335556..0c3cafeed44 100644
--- a/databases/postgresql/patches/patch-ah
+++ b/databases/postgresql/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $
+$NetBSD: patch-ah,v 1.10 2002/04/04 07:48:28 jlam Exp $
 
---- src/interfaces/python/GNUmakefile.orig	Sun Mar 25 14:44:03 2001
-+++ src/interfaces/python/GNUmakefile
-@@ -12,9 +12,22 @@
- top_builddir = ../../..
- include $(top_builddir)/src/Makefile.global
+--- src/interfaces/python/GNUmakefile.orig	Thu Dec 13 18:39:04 2001
++++ src/interfaces/python/GNUmakefile	Tue Feb 12 17:37:45 2002
+@@ -19,7 +19,14 @@
  
--all: Makefile pgmodule.c libpq-all
+ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec)
+ 
+-all: all-lib
 +PY_SCRIPTS = pg.py pgdb.py
 +ifeq ($(with_python_compile), yes)
 +PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo)
@@ -14,8 +14,13 @@ $NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $
 +PY_COMPILED_SCRIPTS =
 +endif
 +
-+all: Makefile pgmodule.c libpq-all $(PY_COMPILED_SCRIPTS)
- 	$(MAKE) -f Makefile
++all: all-lib $(PY_COMPILED_SCRIPTS)
+ 
+ all-lib: libpq-all
+ 
+@@ -27,6 +34,12 @@
+ libpq-all:
+ 	$(MAKE) -C $(libpq_builddir) all
  
 +%.pyc: %.py
 +	$(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")"
@@ -23,25 +28,16 @@ $NetBSD: patch-ah,v 1.9 2001/12/06 03:46:22 jlam Exp $
 +%.pyo: %.py
 +	$(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")"
 +
- .PHONY: libpq-all
- libpq-all:
- 	$(MAKE) -C $(libpq_builddir) all
-@@ -28,13 +41,16 @@
- Setup.in: Setup.in.raw
- 	sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \
- 	    -e 's,@libpq_builddir@,$(libpq_builddir),g' \
--	    -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \
-+	    -e 's,@libpq@,$(libpq),g' \
-+	    -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(filter -Wl%, $(LDFLAGS)) $(LIBS)%g' \
- 	    -e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \
- 	    $< > $@
+ install-warning-msg := { \
+ echo "*** Skipping the installation of the Python interface module for lack"; \
+ echo "*** of permissions.  To install it, change to the directory"; \
+@@ -35,6 +48,9 @@
  
- install: all
- 	@echo "Installing Python module"
--	@if ( $(INSTALL_DATA) pg.py $(python_moduledir) && \
-+	@if ( ( for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \
-+		$(INSTALL_DATA) $$i $(python_moduledir); \
-+	    done ) && \
- 	    $(MAKE) -f Makefile install ); then : ; else \
- 		echo "*****" ;\
- 		echo "* Skipping the installation of the Python interface module for lack"; \
+ install: all installdirs
+ 	@if test -w $(DESTDIR)$(python_moduleexecdir) && test -w $(DESTDIR)$(python_moduledir); then \
++	  for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \
++		$(INSTALL_DATA) $$i $(python_moduledir) ; \
++	  done ; \
+ 	  echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \
+ 	  $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \
+ 	\
diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj
deleted file mode 100644
index 0048f137589..00000000000
--- a/databases/postgresql/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.10 2001/09/07 08:49:10 jlam Exp $
-
---- src/makefiles/Makefile.netbsd.orig	Sat Dec 16 13:14:25 2000
-+++ src/makefiles/Makefile.netbsd	Fri Sep  7 03:04:28 2001
-@@ -3,7 +3,9 @@
- ifdef ELF_SYSTEM
- export_dynamic = -Wl,-E
- rpath = -Wl,-R$(libdir)
--shlib_symbolic = -Wl,-Bsymbolic
-+shlib_symbolic = -Wl,-Bsymbolic -lc
-+else
-+rpath = -R$(libdir)
- endif
- 
- DLSUFFIX = .so
diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak
deleted file mode 100644
index 99e7c4c2b50..00000000000
--- a/databases/postgresql/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2001/09/07 08:49:10 jlam Exp $
-
---- src/pl/plperl/Makefile.PL.orig	Sat Jun 10 14:02:12 2000
-+++ src/pl/plperl/Makefile.PL
-@@ -52,7 +52,7 @@
- 
- }
- 
--my $perllib = "-L$Config{archlibexp}/CORE -lperl";
-+my $perllib = "-L$Config{archlibexp}/CORE \${RPATH_LDFLAGS} -lperl";
- 
- WriteMakefile( 'NAME' => 'plperl', 
- 	dynamic_lib => { 'OTHERLDFLAGS' => "$opcode $perllib" } ,
diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al
index 74896304f8f..f0701eb56cd 100644
--- a/databases/postgresql/patches/patch-al
+++ b/databases/postgresql/patches/patch-al
@@ -1,17 +1,19 @@
-$NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
+$NetBSD: patch-al,v 1.6 2002/04/04 07:48:30 jlam Exp $
 
---- configure.orig	Thu May 10 18:35:47 2001
+--- configure.orig	Sun Feb  3 16:04:11 2002
 +++ configure
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,10 @@
  ac_help="$ac_help
    --with-libs=DIRS        alternative spelling of --with-libraries"
  ac_help="$ac_help
++  --with-htmldir=DIR      HTML documentation in DIR"
++ac_help="$ac_help
 +  --disable-readline      disable readline support"
 +ac_help="$ac_help
    --enable-locale         enable locale support"
  ac_help="$ac_help
    --enable-recode         enable character set recode support"
-@@ -53,6 +55,8 @@
+@@ -53,6 +57,8 @@
  ac_help="$ac_help
    --with-python           build Python interface module"
  ac_help="$ac_help
@@ -20,14 +22,36 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
    --with-java             build JDBC interface and Java tools"
  ac_help="$ac_help
    --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]"
-@@ -811,10 +815,36 @@
+@@ -817,6 +823,54 @@
  
  
  #
++# Location for HTML documentation
++#
++htmldir='${docdir}/html'
++# Check whether --with-htmldir was given
++if test x"${with_htmldir+set}" = xset; then
++  case $with_htmldir in
++    yes)
++      { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; }
++      ;;
++    no)
++      { echo "configure: error: argument required for --with-htmldir option" 1>&2; exit 1; }
++      ;;
++    *)
++      withval=$with_htmldir
++      htmldir=$withval
++      ;;
++  esac # $with_htmldir
++fi
++
++
++
++#
 +# Readline support
 +#
 +echo $ac_n "checking whether to build with readline support""... $ac_c" 1>&6
-+echo "configure:822: checking whether to build with readline support" >&5
++echo "configure:852: checking whether to build with readline support" >&5
 +# Check whether --enable-readline was given
 +if test x"${enable_readline+set}" = xset; then
 +  case $enable_readline in
@@ -53,18 +77,13 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
  # Locale (--enable-locale)
  #
  echo $ac_n "checking whether to build with locale support""... $ac_c" 1>&6
--echo "configure:818: checking whether to build with locale support" >&5
-+echo "configure:848: checking whether to build with locale support" >&5
- # Check whether --enable-locale was given
- if test x"${enable_locale+set}" = xset; then
-   case $enable_locale in
-@@ -1905,11 +1935,40 @@
- fi
+@@ -1859,6 +1913,35 @@
+ echo "$ac_t""$with_python" 1>&6
  
  
 +# If python is enabled (above), then optionally byte-compile the modules.
 +echo $ac_n "checking whether to byte-compile Python modules""... $ac_c" 1>&6
-+echo "configure:1941: checking whether to byte-compile Python modules" >&5
++echo "configure:1919: checking whether to byte-compile Python modules" >&5
 +if test "$with_python" = yes; then
 +  # Check whether --with-python_compile was given
 +if test x"${with_python_compile+set}" = xset; then
@@ -94,56 +113,50 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
  #
  # Optionally build the Java/JDBC tools
  #
- echo $ac_n "checking whether to build Java/JDBC tools""... $ac_c" 1>&6
--echo "configure:1913: checking whether to build Java/JDBC tools" >&5
-+echo "configure:1972: checking whether to build Java/JDBC tools" >&5
- # Check whether --with-java was given
- if test x"${with_java+set}" = xset; then
-   case $with_java in
-@@ -3095,8 +3154,9 @@
+@@ -3282,9 +3365,18 @@
  ## Libraries
  ##
  
 +if test "$enable_readline" = yes; then
+ 
  echo $ac_n "checking for readline""... $ac_c" 1>&6
--echo "configure:3100: checking for readline" >&5
-+echo "configure:3160: checking for readline" >&5
+-echo "configure:3288: checking for readline" >&5
++echo "configure:3372: checking for readline" >&5
++
++case $host_os in netbsd* | openbsd* )
++  if echo __ELF__ | $CPP - 2>/dev/null | grep __ELF__ >/dev/null; then
++    objformat=a.out
++  else
++    objformat=ELF
++  fi
++esac
  
  if eval "test \"`echo '$''{'pgac_cv_check_readline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3118,13 +3178,30 @@
+@@ -3306,15 +3398,17 @@
  readline()
  ; return 0; }
  EOF
--if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
-+  if test "$cross_compiling" = yes; then
-+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3188 "configure"
-+#include "confdefs.h"
-+int main() { return 0; }
-+EOF
-+if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-   pgac_cv_check_readline="${pgac_rllib}${pgac_lib}"; break 2
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
- fi
-+rm -fr conftest*
-+fi
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
- rm -f conftest*
-     LIBS=$pgac_save_LIBS
-   done
-@@ -3208,11 +3285,12 @@
+   
+-      # NetBSD and OpenBSD have a broken linker that does not
++      # NetBSD and OpenBSD have a broken a.out linker that does not
+       # recognize dependent libraries
+       case $host_os in netbsd* | openbsd* )
+-        case $pgac_lib in
+-          *curses*) ;;
+-          *) pgac_lib=" -lcurses" ;;
++        case $objformat in a.out )
++          case $pgac_lib in
++            *termcap*) ;;
++            *) pgac_lib=" -ltermcap" ;;
++          esac
+         esac
+       esac
+ 
+@@ -3408,6 +3502,7 @@
  else :
    
  fi
@@ -151,15 +164,17 @@ $NetBSD: patch-al,v 1.5 2001/07/27 17:52:33 jlam Exp $
  
  if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
  then
- 	echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
--echo "configure:3216: checking for main in -lbsd" >&5
-+echo "configure:3294: checking for main in -lbsd" >&5
- ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8103,6 +8181,7 @@
- s%@python_moduledir@%$python_moduledir%g
- s%@python_extmakefile@%$python_extmakefile%g
+@@ -8991,6 +9086,7 @@
+ s%@host_os@%$host_os%g
+ s%@PORTNAME@%$PORTNAME%g
+ s%@TAS@%$TAS%g
++s%@htmldir@%$htmldir%g
+ s%@MULTIBYTE@%$MULTIBYTE%g
+ s%@enable_nls@%$enable_nls%g
+ s%@WANTED_LANGUAGES@%$WANTED_LANGUAGES%g
+@@ -9007,6 +9103,7 @@
+ s%@with_tk@%$with_tk%g
+ s%@with_perl@%$with_perl%g
  s%@with_python@%$with_python%g
 +s%@with_python_compile@%$with_python_compile%g
  s%@ANT@%$ANT%g
diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am
index 4644e44acca..289868dcb07 100644
--- a/databases/postgresql/patches/patch-am
+++ b/databases/postgresql/patches/patch-am
@@ -1,258 +1,40 @@
-$NetBSD: patch-am,v 1.6 2001/11/04 21:25:48 darcy Exp $
+$NetBSD: patch-am,v 1.7 2002/04/04 07:48:31 jlam Exp $
 
---- src/interfaces/python/pgmodule.c.orig	Thu Aug 16 14:36:44 2001
+--- src/interfaces/python/pgmodule.c.orig	Mon Dec  3 04:39:44 2001
 +++ src/interfaces/python/pgmodule.c
-@@ -27,25 +27,16 @@
-  */
+@@ -343,7 +343,7 @@
+ 		PQclear(self->last_result);
  
- #include <Python.h>
--#include <postgres.h>
--#include <libpq-fe.h>
--#include <libpq/libpq-fs.h>
-+#include "postgres.h"
-+#include "libpq-fe.h"
-+#include "libpq/libpq-fs.h"
-+#include "catalog/pg_type.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- 
--/* really bad stuff here - I'm so naughty */
--/* If you need to you can run mkdefines to get */
--/* current defines but it should not have changed */
--#define INT2OID		21
--#define INT4OID		23
--#define OIDOID		26
--#define FLOAT4OID	700
--#define FLOAT8OID	701
--#define CASHOID		790
--
- static PyObject *PGError;
--static const char *PyPgVersion = "3.1";
-+static const char *PyPgVersion = "3.2";
- 
- /* taken from fileobject.c */
- #define BUF(v) PyString_AS_STRING((PyStringObject *)(v))
-@@ -103,14 +94,16 @@
- 
- static PyObject *pg_default_host;		/* default database host */
- static PyObject *pg_default_base;		/* default database name */
--static PyObject *pg_default_opt;/* default connection options */
--static PyObject *pg_default_tty;/* default debug tty */
-+static PyObject *pg_default_opt;	/* default connection options */
-+static PyObject *pg_default_tty;	/* default debug tty */
- static PyObject *pg_default_port;		/* default connection port */
- static PyObject *pg_default_user;		/* default username */
- static PyObject *pg_default_passwd;		/* default password */
--
- #endif	 /* DEFAULT_VARS */
- 
-+DL_EXPORT(void) init_pg(void);
-+int		   *get_type_array(PGresult *result, int nfields);
-+
- /* --------------------------------------------------------------------- */
- /* OBJECTS DECLARATION */
- 
-@@ -242,7 +235,6 @@
- 
- 	return 1;
+ 	Py_XDECREF(self->pgcnx);
+-	PyMem_DEL(self);
++	PyObject_DEL(self);
  }
--
- #endif	 /* LARGE_OBJECTS */
- 
- /* checks source object validity */
-@@ -292,12 +284,14 @@
- 		{
- 			case INT2OID:
- 			case INT4OID:
-+			case INT8OID:
- 			case OIDOID:
- 				typ[j] = 1;
- 				break;
- 
- 			case FLOAT4OID:
- 			case FLOAT8OID:
-+			case NUMERICOID:
- 				typ[j] = 2;
- 				break;
- 
-@@ -484,7 +478,6 @@
- pgsource_oidstatus(pgsourceobject * self, PyObject * args)
- {
- 	long		oid;
--	const char *status;
- 
- 	/* checks validity */
- 	if (!check_source_obj(self, CHECK_RESULT))
-@@ -566,6 +559,7 @@
- 		}
- 
- 		PyList_Append(reslist, rowtuple);
-+		Py_DECREF(rowtuple);
- 		self->current_row++;
- 	}
- 
-@@ -947,11 +941,7 @@
- 
- /* query type definition */
- staticforward PyTypeObject PgSourceType = {
--#ifndef MS_WIN32
--	PyObject_HEAD_INIT(&PyType_Type)
--#else
- 	PyObject_HEAD_INIT(NULL)
--#endif
- 
- 	0,							/* ob_size */
- 	"pgsourceobject",			/* tp_name */
-@@ -1460,7 +1450,6 @@
- 	0,							/* tp_as_mapping */
- 	0,							/* tp_hash */
- };
--
- #endif	 /* LARGE_OBJECTS */
- 
  
-@@ -1803,12 +1792,14 @@
- 		{
- 			case INT2OID:
- 			case INT4OID:
-+			case INT8OID:
- 			case OIDOID:
- 				typ[j] = 1;
- 				break;
+ /* closes object */
+@@ -990,7 +990,7 @@
+ 		lo_close(self->pgcnx->cnx, self->lo_fd);
  
- 			case FLOAT4OID:
- 			case FLOAT8OID:
-+			case NUMERICOID:
- 				typ[j] = 2;
- 				break;
- 
-@@ -1853,21 +1844,33 @@
- 						val = PyFloat_FromDouble(strtod(s, NULL));
- 						break;
- 
--					case 3:		/* get rid of the '$' and commas */
--						if (*s == '$')	/* there's talk of getting rid of
--										 * it */
-+					case 3:
-+						{
-+							int			mult = 1;
-+
-+							if (*s == '$')		/* there's talk of getting
-+												 * rid of it */
- 							s++;
- 
--						if ((s[0] == '-' || s[0] == '(') && s[1] == '$')
--							*(++s) = '-';
-+							if (*s == '-' || *s == '(')
-+							{
-+								s++;
-+								mult = -1;
-+							}
-+
-+							/* get rid of the '$' and commas */
-+							if (*s == '$')		/* Just in case we exposed
-+												 * one */
-+								s++;
- 
- 						for (k = 0; *s; s++)
- 							if (*s != ',')
- 								cashbuf[k++] = *s;
- 
- 						cashbuf[k] = 0;
--						val = PyFloat_FromDouble(strtod(cashbuf, NULL));
-+							val = PyFloat_FromDouble(strtod(cashbuf, NULL) * mult);
- 						break;
-+						}
- 
- 					default:
- 						val = PyString_FromString(s);
-@@ -1938,12 +1941,14 @@
- 		{
- 			case INT2OID:
- 			case INT4OID:
-+			case INT8OID:
- 			case OIDOID:
- 				typ[j] = 1;
- 				break;
- 
- 			case FLOAT4OID:
- 			case FLOAT8OID:
-+			case NUMERICOID:
- 				typ[j] = 2;
- 				break;
- 
-@@ -1988,21 +1993,33 @@
- 						val = PyFloat_FromDouble(strtod(s, NULL));
- 						break;
- 
--					case 3:		/* get rid of the '$' and commas */
--						if (*s == '$')	/* there's talk of getting rid of
--										 * it */
-+					case 3:
-+						{
-+							int			mult = 1;
-+
-+							if (*s == '$')		/* there's talk of getting
-+												 * rid of it */
- 							s++;
- 
--						if ((s[0] == '-' || s[0] == '(') && s[1] == '$')
--							*(++s) = '-';
-+							if (*s == '-' || *s == '(')
-+							{
-+								s++;
-+								mult = -1;
-+							}
-+
-+							/* get rid of the '$' and commas */
-+							if (*s == '$')		/* Just in case we exposed
-+												 * one */
-+								s++;
- 
- 						for (k = 0; *s; s++)
- 							if (*s != ',')
- 								cashbuf[k++] = *s;
- 
- 						cashbuf[k] = 0;
--						val = PyFloat_FromDouble(strtod(cashbuf, NULL));
-+							val = PyFloat_FromDouble(strtod(cashbuf, NULL) * mult);
- 						break;
-+						}
- 
- 					default:
- 						val = PyString_FromString(s);
-@@ -2318,7 +2335,6 @@
- 	Py_INCREF(Py_None);
- 	return Py_None;
+ 	Py_XDECREF(self->pgcnx);
+-	PyMem_DEL(self);
++	PyObject_DEL(self);
  }
--
- #endif	 /* DIRECT_ACCESS */
- 
  
-@@ -2622,7 +2638,6 @@
- static PyObject *
- pg_getattr(pgobject * self, char *name)
- {
--
- 	/*
- 	 * Although we could check individually, there are only a few
- 	 * attributes that don't require a live connection and unless someone
-@@ -3104,7 +3119,6 @@
+ /* opens large object */
+@@ -1546,7 +1546,7 @@
+ 	if (self->cnx)
+ 		PQfinish(self->cnx);
  
- 	return old;
+-	PyMem_DEL(self);
++	PyObject_DEL(self);
  }
--
- #endif	 /* DEFAULT_VARS */
  
- /* List of functions defined in the module */
-@@ -3141,7 +3155,8 @@
- 			   *v;
+ /* close without deleting */
+@@ -1579,7 +1579,7 @@
+ 	if (self->last_result)
+ 		PQclear(self->last_result);
  
- 	/* Initialize here because some WIN platforms get confused otherwise */
--	PglargeType.ob_type = PgType.ob_type = PgQueryType.ob_type = &PyType_Type;
-+	PglargeType.ob_type = PgType.ob_type = PgQueryType.ob_type =
-+		PgSourceType.ob_type = &PyType_Type;
+-	PyMem_DEL(self);
++	PyObject_DEL(self);
+ }
  
- 	/* Create the module and add the functions */
- 	mod = Py_InitModule4("_pg", pg_methods, pg__doc__, NULL, PYTHON_API_VERSION);
+ /* resets connection */