Update postgresql to 7.0.2. Relevant changes from 7.0:

* Enhance rc.d/pgsql.sh script to accept start/stop/restart.
* Add fixes for alpha from Kevin P. Neal <kpn@neutralgood.org> in PR#10543.

  XXX Includes a patch which removes inlining of the alpha's TAS function.
  XXX This is apparently some code-gen bug in GCC for alpha.

* Fix many CLUSTER failures (Tom)
* Allow ALTER TABLE RENAME works on indexes (Tom)
* Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
* New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
* Fix the off by one errors in ResultSet from 6.5.3, and more.
* jdbc ResultSet fixes (Joseph Shraibman)
* optimizer tunings (Tom)
* Fix create user for pgaccess
* Fix for UNLISTEN failure
* Reduce COPY IN lock level (Tom)
* Change libpqeasy to use PQconnectdb() style parameters (Bruce)
* Fix pg_dump to handle OID indexes (Tom)
* Fix small memory leak (Tom)
* Solaris fix for createdb/dropdb (Tatsuo)
* Fix for non-blocking connections (Alfred Perlstein)
* Fix improper recovery after RENAME TABLE failures (Tom)
* Copy pg_ident.conf.sample into /lib directory in install (Bruce)
* Add SJIS UDC (NEC selection IBM kanji) support (Eiji Tokuya)
* Fix too long syslog message (Tatsuo)
* Fix problem with quoted indexes that are too long (Tom)
* JDBC ResultSet.getTimestamp() fix (Gregory Krasnow & Floyd Marinescu)
* ecpg changes (Michael)

11 files changed, 78 insertions, 67 deletions

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index e9d0f6c484a..4fc76cdbc78 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2000/05/29 15:29:11 fredb Exp $
+# $NetBSD: Makefile,v 1.51 2000/07/14 04:44:11 jlam Exp $
 # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
 #
 
@@ -33,10 +33,9 @@ BUILD_DEFS=		PGUSER PGROUP
 PLIST_SUBST=		PGUSER=${PGUSER}
 
 CONFIGURE_ARGS+=	--without-perl --without-odbc --without-tcl
+CONFIGURE_ARGS+=	--with-includes="${LOCALBASE}/include"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
-CPPFLAGS+=		-I${LOCALBASE}/include	# readline.h
-
 pre-install:
 	@case "X${PGUSER}" in						\
 	Xbin|Xetc|Xinclude|Xinfo|Xlib|Xlibdata|Xlibexec|Xman|Xsbin|Xshare) \
@@ -50,7 +49,8 @@ pre-install:
 		;;							\
 	esac
 
-	${SED}	-e 's|@PGHOME@|${PGHOME}|g' \
+	${SED}	-e 's|@PGUSER@|${PGUSER}|g' \
+		-e 's|@PGHOME@|${PGHOME}|g' \
 		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	${SED}	-e 's|@PGUSER@|${PGUSER}|g' \
 		-e 's|@PGGROUP@|${PGGROUP}|g' \
@@ -90,9 +90,8 @@ post-install:
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all
 	cd ${WRKDIR}/${DISTNAME}/doc; ${INSTALL_DATA} \
 		FAQ FAQ_DEV README.Charsets README.fsync README.inet \
-		README.locale README.mb README.mb.jp TODO admin.ps.gz \
-		bug.template internals.ps programmer.ps.gz tutorial.ps.gz \
-		user.ps.gz \
+		README.locale README.mb README.mb.jp TODO \
+		bug.template internals.ps \
 		${PREFIX}/share/doc/postgresql
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/postgresql
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/html/postgresql
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index cd81a5e08fc..e0bfd26b80d 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,32 +1,36 @@
-# $NetBSD: Makefile.common,v 1.3 2000/05/24 09:11:24 rh Exp $
+# $NetBSD: Makefile.common,v 1.4 2000/07/14 04:44:11 jlam Exp $
 
 DISTNAME=		postgresql-${PG_VERS}
-PG_VERS=		7.0
+PG_VERS=		7.0.2
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		databases
-MASTER_SITES=		ftp://ftp.PostgreSQL.org/pub/v7.0/ \
-			ftp://ftp.de.postgresql.org/v7.0/ \
-			ftp://ch.postgresql.org/mirror/postgresql/pub/v7.0/ \
-			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v7.0/ \
-			ftp://looking-glass.usask.ca/pub/postgresql/v7.0/ \
-			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v7.0/ \
-			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v7.0/
+MASTER_SITES=		ftp://ftp.PostgreSQL.org/pub/v${PG_VERS}/ \
+			ftp://ftp.de.postgresql.org/v${PG_VERS}/ \
+			ftp://ch.postgresql.org/mirror/postgresql/pub/v${PG_VERS}/ \
+			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/v${PG_VERS}/ \
+			ftp://looking-glass.usask.ca/pub/postgresql/v${PG_VERS}/ \
+			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/v${PG_VERS}/ \
+			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/v${PG_VERS}/
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.PostgreSQL.ORG/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
 USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
+#
+# We don't USE_LIBTOOL for the shared libs since libtool doesn't seem to
+# support inter-library dependencies across all platforms yet.
 
 FILESDIR=		${.CURDIR}/../../databases/postgresql/files
 PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}" \
-			--enable-locale
+CONFIGURE_ARGS+=	--with-template="${LOWER_OPSYS}"
+CONFIGURE_ARGS+=	--with-setproctitle
+CONFIGURE_ARGS+=	--enable-locale
 
 # PG_MB_ENCODING may be set to any of:
 #
@@ -45,6 +49,6 @@ post-extract:
 	${CP} ${FILESDIR}/Makefile.custom ${WRKSRC}
 
 pre-configure:
-	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf
+	cd ${WRKSRC} && autoreconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql/files/md5 b/databases/postgresql/files/md5
index 82b45da8e5e..1f59286fae3 100644
--- a/databases/postgresql/files/md5
+++ b/databases/postgresql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2000/05/20 19:32:22 jlam Exp $
+$NetBSD: md5,v 1.9 2000/07/14 04:44:12 jlam Exp $
 
-MD5 (postgresql-7.0.tar.gz) = 7fefc2f9d9430a4012aac6c78497db85
+MD5 (postgresql-7.0.2.tar.gz) = fc512e38394256e2749299fdd69a937e
diff --git a/databases/postgresql/files/patch-sum b/databases/postgresql/files/patch-sum
index 1dc8811891d..8aa739fa367 100644
--- a/databases/postgresql/files/patch-sum
+++ b/databases/postgresql/files/patch-sum
@@ -1,9 +1,11 @@
-$NetBSD: patch-sum,v 1.11 2000/06/20 06:06:46 jlam Exp $
+$NetBSD: patch-sum,v 1.12 2000/07/14 04:44:12 jlam Exp $
 
-MD5 (patch-aa) = f64a0fc59be9b4aaed41376ac8870a4f
 MD5 (patch-ab) = f81b6a1f8459eae323dbf141f6d617ab
-MD5 (patch-ac) = eb26d0e3cec52fa4b17d6486314ebd05
-MD5 (patch-ad) = 1eff11ecb293cf8817851708cb4f5a5b
+MD5 (patch-ac) = 8695ae7642af54ad366216e950008dec
+MD5 (patch-ad) = aaca10c3dd93ced6fc488baa59c5f614
 MD5 (patch-ae) = 86929b61d882df8993d54b69e481fbbe
-MD5 (patch-af) = fb46bcb6524f8479f50e07bf9fc5d516
+MD5 (patch-af) = 292c524543cfddd2096ae2f0b53a4175
 MD5 (patch-ag) = 2f84eebb4bae8a017e8cd727879ea2b3
+MD5 (patch-ah) = 0d044e374adda3c9ab73851defcf8bda
+MD5 (patch-ai) = 2ae7d1af7673c9d28803a4e92085954b
+MD5 (patch-aj) = b2f2225a47dae851122423450874e660
diff --git a/databases/postgresql/files/pgsql.sh.tmpl b/databases/postgresql/files/pgsql.sh.tmpl
index 2549bf49080..8b7c4c05158 100644
--- a/databases/postgresql/files/pgsql.sh.tmpl
+++ b/databases/postgresql/files/pgsql.sh.tmpl
@@ -1,12 +1,35 @@
 #!/bin/sh
 
-# $NetBSD: pgsql.sh.tmpl,v 1.5 2000/03/18 17:43:16 jlam Exp $
+# $NetBSD: pgsql.sh.tmpl,v 1.6 2000/07/14 04:44:12 jlam Exp $
 # FreeBSD Id: pgsql.sh.tmpl,v 1.3 1997/10/05 21:00:49 andreas Exp
 
 # pgsql.sh - postgresql startup file for NetBSD
 
-if [ -x @PREFIX@/bin/postmaster ]; then
-	echo -n ' pgsql' 
-	su -l @PGUSER@ -c 'exec @PREFIX@/bin/postmaster \
-		-S -o -F > @PGHOME@/errlog'
+CMD=${1:-start}
+USER=@PGUSER@
+
+if [ -x /usr/pkg/bin/postmaster -a -x /usr/pkg/bin/pg_ctl ]
+then
+	case ${CMD} in
+	start)
+		echo -n ' pgsql' 
+		su -l ${USER} -c 'exec /usr/pkg/bin/pg_ctl \
+			-p /usr/pkg/bin/postmaster -o "-S -o -F" start \
+			> @PGHOME@/errlog'
+		;;
+	stop)
+		su -l ${USER} -c 'exec /usr/pkg/bin/pg_ctl stop \
+			>> @PGHOME@/errlog'
+		;;
+	restart)
+		su -l ${USER} -c 'exec /usr/pkg/bin/pg_ctl restart \
+			>> @PGHOME@/errlog'
+		;;
+	status)
+		su -l ${USER} -c 'exec /usr/pkg/bin/pg_ctl status'
+		;;
+	*)
+		echo "Unexpected argument: ${CMD}"
+		;;
+	esac
 fi
diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
deleted file mode 100644
index faed2788462..00000000000
--- a/databases/postgresql/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2000/05/20 19:34:16 jlam Exp $
-
---- Makefile.global.in.orig	Sun Apr 16 23:44:56 2000
-+++ Makefile.global.in	Sat May 20 00:14:18 2000
-@@ -208,8 +208,9 @@
- YACC= @YACC@
- LEX= @LEX@
- AROPT= @AROPT@
--CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend @CPPFLAGS@ @CFLAGS@
-+CFLAGS= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(CPPFLAGS) @CFLAGS@
- CFLAGS_SL= @SHARED_LIB@
-+CPPFLAGS= @CPPFLAGS@
- LIBS= @LIBS@
- LDFLAGS= @LDFLAGS@ $(LIBS)
- LDREL= -r
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
index f8025882034..c5357f95d32 100644
--- a/databases/postgresql/patches/patch-ac
+++ b/databases/postgresql/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2000/05/20 19:34:18 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2000/07/14 04:44:13 jlam Exp $
 
---- configure.in.orig	Wed May  3 15:10:55 2000
-+++ configure.in	Sat May 20 00:14:18 2000
-@@ -655,10 +655,6 @@
+--- configure.in.orig	Wed May 24 18:43:59 2000
++++ configure.in	Mon Jul 10 22:20:00 2000
+@@ -675,10 +675,6 @@
  AC_SUBST(YFLAGS)
  
  AC_CHECK_LIB(sfio,     main)
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
index c963cbec05e..3cdfe38aee5 100644
--- a/databases/postgresql/patches/patch-ad
+++ b/databases/postgresql/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.8 2000/05/20 19:34:19 jlam Exp $
+$NetBSD: patch-ad,v 1.9 2000/07/14 04:44:13 jlam Exp $
 
---- interfaces/ecpg/lib/Makefile.in.orig	Thu Mar 30 06:41:34 2000
-+++ interfaces/ecpg/lib/Makefile.in	Sat May 20 00:18:02 2000
+--- interfaces/ecpg/lib/Makefile.in.orig	Wed May 17 02:03:13 2000
++++ interfaces/ecpg/lib/Makefile.in	Mon Jul 10 22:21:20 2000
 @@ -12,7 +12,7 @@
  
  NAME= ecpg
  SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 1.0
+-SO_MINOR_VERSION= 1.1
 +SO_MINOR_VERSION= 1
  
  SRCDIR= @top_srcdir@
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
index 15b66c40d2b..2722c0ac431 100644
--- a/databases/postgresql/patches/patch-af
+++ b/databases/postgresql/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.9 2000/05/20 19:34:21 jlam Exp $
+$NetBSD: patch-af,v 1.10 2000/07/14 04:44:13 jlam Exp $
 
---- pl/tcl/Makefile.orig	Sat Apr 29 13:45:42 2000
-+++ pl/tcl/Makefile	Sat May 20 00:14:18 2000
+--- pl/tcl/Makefile.orig	Mon May 22 22:12:44 2000
++++ pl/tcl/Makefile	Mon Jul 10 22:31:20 2000
 @@ -70,7 +70,7 @@
  
  CFLAGS+= $(TCL_SHLIB_CFLAGS) $(TCL_DEFS)
  
--CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend
-+CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend -I$(LIBPQDIR) $(CPPFLAGS)
+-CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend $(PGSQL_INCLUDES)
++CFLAGS+= -I$(SRCDIR)/include -I$(SRCDIR)/backend -I$(LIBPQDIR) $(PGSQL_INCLUDES)
          
  #
  # Uncomment the following to enable the unknown command lookup
diff --git a/databases/postgresql/pkg/DEINSTALL b/databases/postgresql/pkg/DEINSTALL
index c3410eeae30..f8b759f4efc 100644
--- a/databases/postgresql/pkg/DEINSTALL
+++ b/databases/postgresql/pkg/DEINSTALL
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2000/03/18 17:43:17 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2000/07/14 04:44:13 jlam Exp $
 #
 
 PKGNAME=$1
 STAGE=$2
 
+USER=@PGUSER@
 PGHOME=@PGHOME@
 
 case ${STAGE} in
@@ -15,7 +16,7 @@ POST-DEINSTALL)
 	cat << EOF
 ===========================================================================
 If you won't be using ${PKGNAME} any longer, you may want to
-remove the following directories:
+remove the \`${USER}' user and the following directories:
 
 	${PGHOME}
 ===========================================================================
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
index 49b0ab60528..c68d565decb 100644
--- a/databases/postgresql/pkg/PLIST
+++ b/databases/postgresql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2000/05/20 19:33:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2000/07/14 04:44:13 jlam Exp $
 ${PGUSER}/.profile.pgsql
 ${PGUSER}/post-install-notes
 bin/createdb
@@ -1018,18 +1018,15 @@ share/doc/postgresql/README.locale
 share/doc/postgresql/README.mb
 share/doc/postgresql/README.mb.jp
 share/doc/postgresql/TODO
-share/doc/postgresql/admin.ps.gz
 share/doc/postgresql/bug.template
 share/doc/postgresql/internals.ps
-share/doc/postgresql/programmer.ps.gz
-share/doc/postgresql/tutorial.ps.gz
-share/doc/postgresql/user.ps.gz
 share/postgresql/global1.bki.source
 share/postgresql/global1.description
 share/postgresql/local1_template1.bki.source
 share/postgresql/local1_template1.description
 share/postgresql/pg_geqo.sample
 share/postgresql/pg_hba.conf.sample
+share/postgresql/pg_ident.conf.sample
 share/postgresql/pg_options.sample
 share/postgresql/postmaster.opts.default.sample
 @dirrm share/postgresql