7 files changed, 24 insertions, 28 deletions
diff --git a/databases/postgresql/files/Makefile.custom b/databases/postgresql/files/Makefile.custom
index a72e6f4454e..f33b59b6f7b 100644
--- a/databases/postgresql/files/Makefile.custom
+++ b/databases/postgresql/files/Makefile.custom
@@ -4,17 +4,17 @@
 # sub-Makefile in the build tree.  Makefiles for shared libraries include
 # Makefile.global then Makefile.shlib.
 #
-# $NetBSD: Makefile.custom,v 1.3 2000/04/09 03:53:17 jlam Exp $
+# $NetBSD: Makefile.custom,v 1.4 2000/05/20 19:32:19 jlam Exp $
 
 # Where the database templates are stored
 #
-TEMPLATEDIR= $(POSTGRESDIR)/share/postgresql
+TEMPLATEDIR=	$(POSTGRESDIR)/share/postgresql
 
 # installation directory for documentation
-PGDOCS=		$(POSTGRESDIR)/share/doc/postgresql
+PGDOCS=		$(POSTGRESDIR)/share/doc/html/postgresql
 
 # Where the header files necessary to build frontend programs get installed.
-HEADERDIR= $(POSTGRESDIR)/include/pgsql
+HEADERDIR=	$(POSTGRESDIR)/include/pgsql
 
 # Where the ODBC installation-wide configuration file gets installed.
 ODBCINST=	etc
diff --git a/databases/postgresql/files/exclude b/databases/postgresql/files/exclude
new file mode 100644
index 00000000000..54dea442922
--- /dev/null
+++ b/databases/postgresql/files/exclude
@@ -0,0 +1,4 @@
+# $NetBSD: exclude,v 1.1 2000/05/20 19:32:20 jlam Exp $
+#
+man1/pgaccess.1
+man1/pgadmin.1
diff --git a/databases/postgresql/files/man.tcl b/databases/postgresql/files/man.tcl
new file mode 100644
index 00000000000..33531307e7f
--- /dev/null
+++ b/databases/postgresql/files/man.tcl
@@ -0,0 +1,3 @@
+# $NetBSD: man.tcl,v 1.1 2000/05/20 19:32:21 jlam Exp $
+#
+man1/pgtclsh.1
diff --git a/databases/postgresql/files/man.tk b/databases/postgresql/files/man.tk
new file mode 100644
index 00000000000..eb0ced3e863
--- /dev/null
+++ b/databases/postgresql/files/man.tk
@@ -0,0 +1,3 @@
+# $NetBSD: man.tk,v 1.1 2000/05/20 19:32:22 jlam Exp $
+#
+man1/pgtksh.1
diff --git a/databases/postgresql/files/md5 b/databases/postgresql/files/md5
index 20df663ac1b..82b45da8e5e 100644
--- a/databases/postgresql/files/md5
+++ b/databases/postgresql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1999/12/02 01:47:06 darcy Exp $
+$NetBSD: md5,v 1.8 2000/05/20 19:32:22 jlam Exp $
 
-MD5 (postgresql-6.5.3.tar.gz) = 098d1ee4316500a2d033ced3ebd5b831
+MD5 (postgresql-7.0.tar.gz) = 7fefc2f9d9430a4012aac6c78497db85
diff --git a/databases/postgresql/files/odbc.ini b/databases/postgresql/files/odbcinst.ini
index 2176ca4d3f8..0449a249dab 100644
--- a/databases/postgresql/files/odbc.ini
+++ b/databases/postgresql/files/odbcinst.ini
@@ -1,4 +1,4 @@
-; $NetBSD: odbc.ini,v 1.1 2000/03/18 17:43:16 jlam Exp $
+; $NetBSD: odbcinst.ini,v 1.1 2000/05/20 19:32:26 jlam Exp $
 ;
 ; /etc/odbc.ini - site-wide ODBC configuration file
 
diff --git a/databases/postgresql/files/patch-sum b/databases/postgresql/files/patch-sum
index 4b11ee57434..ab3f415563d 100644
--- a/databases/postgresql/files/patch-sum
+++ b/databases/postgresql/files/patch-sum
@@ -1,22 +1,8 @@
-$NetBSD: patch-sum,v 1.9 2000/03/18 17:43:16 jlam Exp $
+$NetBSD: patch-sum,v 1.10 2000/05/20 19:32:27 jlam Exp $
 
-MD5 (patch-aa) = bc49aa9d9fce8df90213078d92761249
-MD5 (patch-ab) = 8ca4b77d8e1b817ebc034572fbe2b1fc
-MD5 (patch-ac) = 70fd9e904ad4991a9f69f1e8afcc3d4a
-MD5 (patch-ad) = c9065a8a153f76ae8d673847d94a307b
-MD5 (patch-ae) = c5e24d270c84b2578e2a401ff21f8741
-MD5 (patch-af) = f83f4fe4788297ce80961a3bbe80d5ab
-MD5 (patch-ag) = bd973c4082172fee6ec5d4e27bd2efc5
-MD5 (patch-ah) = 4a61e815a957790c494ff8465ef2c706
-MD5 (patch-ai) = eb34208242c64709ebaa569368a8693d
-MD5 (patch-aj) = 936e6e472154183587af08a273dd5596
-MD5 (patch-ak) = a4dd0fa1e1854007f452a45e79a83436
-MD5 (patch-al) = cfbc7e6e7929bd9d97dd1333e06bc97f
-MD5 (patch-am) = 20bdf8b311fad190c40b35a27d0d0f35
-MD5 (patch-an) = 5896789239612120cb87d218b375c921
-MD5 (patch-ao) = 1705f355ea045f2742115a8035333df9
-MD5 (patch-ap) = 56a512c3e9aef5e09c37eef18097fcd8
-MD5 (patch-aq) = 9c3500fe79d72d4417af9137c76540d6
-MD5 (patch-ar) = fc00fb16650ec4c68f74d39b7f03a3e9
-MD5 (patch-as) = 4df43103e0a4346e2cf0ec7724192844
-MD5 (patch-at) = 0cef1d02ee234cc9a8a0a9db26810e3b
+MD5 (patch-aa) = f64a0fc59be9b4aaed41376ac8870a4f
+MD5 (patch-ab) = f81b6a1f8459eae323dbf141f6d617ab
+MD5 (patch-ac) = eb26d0e3cec52fa4b17d6486314ebd05
+MD5 (patch-ad) = 1eff11ecb293cf8817851708cb4f5a5b
+MD5 (patch-ae) = 86929b61d882df8993d54b69e481fbbe
+MD5 (patch-af) = fb46bcb6524f8479f50e07bf9fc5d516