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)

3 files changed, 37 insertions, 12 deletions

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