Update postgresql to 7.0. Also closes PR#8616. Changes from 6.5.3:

   A HUGE number of bug/performance fixes and minor enhancements.

   Foreign Keys
          Foreign keys are now implemented, with the exception of PARTIAL
          MATCH foreign keys. Many users have been asking for this
          feature, and we are pleased to offer it.

   Optimizer Overhaul
          Continuing on work started a year ago, the optimizer has been
          overhauled, allowing improved query execution and better
          performance with less memory usage.

   Updated psql
          psql, our interactive terminal monitor, has been updated with a
          variety of new features. See the psql manual page for details.

   Upcoming Features
          In 7.1 or 7.2, we plan to have outer joins, storage for very
          long rows, and a write-ahead logging system.

   A dump/restore using pg_dump is required for those wishing to migrate
   data from any previous release. For those upgrading from 6.5.*, you
   can use pg_upgrade to upgrade to this release.

20 files changed, 0 insertions, 444 deletions

diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
deleted file mode 100644
index 58c4bd78cb7..00000000000
--- a/databases/postgresql/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/03/18 17:43:17 jlam Exp $
-
---- Makefile.global.in.orig	Mon Nov  1 23:45:47 1999
-+++ Makefile.global.in	Thu Mar 16 17:49:44 2000
-@@ -54,6 +54,11 @@
- ELF_SYSTEM= @ELF_SYS@
- 
- LIBPQDIR:= $(SRCDIR)/interfaces/libpq
-+LIBPGTCLDIR:= $(SRCDIR)/interfaces/libpgtcl
-+
-+LIBPQ:= -L$(LIBPQDIR) -lpq
-+LIBPGTCL:= -L$(LIBPGTCLDIR) -lpgtcl
-+
- 
- # For convenience, POSTGRESDIR is where BINDIR, and LIBDIR
- # and other target destinations are rooted.  Of course, each of these is
-@@ -69,6 +74,10 @@
- # can just put the absolute pathname to the library at the end of your
- # command line.
- LIBDIR= $(POSTGRESDIR)/lib
-+
-+# Where the database templates are stored
-+#
-+TEMPLATEDIR= $(POSTGRESDIR)/lib
- 
- # This is the directory where IPC utilities ipcs and ipcrm are located
- #
diff --git a/databases/postgresql/patches/patch-ab b/databases/postgresql/patches/patch-ab
deleted file mode 100644
index 488e1434207..00000000000
--- a/databases/postgresql/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2000/03/18 17:43:17 jlam Exp $
-
---- Makefile.shlib.orig	Fri Jul 30 00:13:44 1999
-+++ Makefile.shlib	Thu Mar 16 17:49:44 2000
-@@ -109,6 +109,24 @@
-   endif
- endif
- 
-+ifeq ($(PORTNAME), netbsd)
-+  ifdef BSD_SHLIB
-+    install-shlib-dep  := install-shlib
-+    soname             := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-+    shlib              := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-+    ifdef ELF_SYSTEM
-+      LD               := $(CC)
-+      LDFLAGS_SL       := -shared -Wl,-soname -Wl,$(soname)
-+      ifneq ($(SHLIB_LINK),)
-+        LDFLAGS_SL     += -Wl,-R$(LIBDIR)
-+      endif
-+    else
-+      LDFLAGS_SL       := -x -Bshareable -Bforcearchive
-+    endif
-+    CFLAGS             += $(CFLAGS_SL)
-+  endif
-+endif
-+
- ifeq ($(PORTNAME), hpux)
-   install-shlib-dep	:= install-shlib
- # HPUX doesn't believe in version numbers for shlibs
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
deleted file mode 100644
index 5c0ddf2dce8..00000000000
--- a/databases/postgresql/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2000/03/18 17:43:17 jlam Exp $
-
---- backend/Makefile.orig	Sun Mar  7 18:05:56 1999
-+++ backend/Makefile	Thu Mar 16 17:56:36 2000
-@@ -156,10 +156,11 @@
- # and (2) the parameters of a database system should be set at initdb time,
- # not at postgres build time.
- 
--.PHONY: install install-bin install-lib install-headers
-+.PHONY: install install-bin install-templates install-headers
- 
--install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) \
--         install-bin install-lib install-headers
-+install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \
-+         postgres $(POSTGRES_IMP) \
-+         install-bin install-templates install-headers
- 
- install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP)
- 	$(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X)
-@@ -175,22 +176,22 @@
- endif
- endif
- 
--install-lib: $(LIBDIR) \
-+install-templates: $(TEMPLATEDIR) \
-          global1.bki.source local1_template1.bki.source \
-          global1.description local1_template1.description \
-          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
- 	$(INSTALL) $(INSTLOPTS) global1.bki.source \
--	  $(LIBDIR)/global1.bki.source
-+	  $(TEMPLATEDIR)/global1.bki.source
- 	$(INSTALL) $(INSTLOPTS) global1.description \
--	  $(LIBDIR)/global1.description
-+	  $(TEMPLATEDIR)/global1.description
- 	$(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
--	  $(LIBDIR)/local1_template1.bki.source
-+	  $(TEMPLATEDIR)/local1_template1.bki.source
- 	$(INSTALL) $(INSTLOPTS) local1_template1.description \
--	  $(LIBDIR)/local1_template1.description
-+	  $(TEMPLATEDIR)/local1_template1.description
- 	$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
--	  $(LIBDIR)/pg_hba.conf.sample
-+	  $(TEMPLATEDIR)/pg_hba.conf.sample
- 	$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
--	  $(LIBDIR)/pg_geqo.sample
-+	  $(TEMPLATEDIR)/pg_geqo.sample
- 
- install-headers: fmgr.h $(SRCDIR)/include/config.h
- 	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-@@ -253,6 +254,8 @@
- $(LIBDIR):
- 	mkdir $@
- $(HEADERDIR):
-+	mkdir $@
-+$(TEMPLATEDIR):
- 	mkdir $@
- 
- #############################################################################
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
deleted file mode 100644
index ec71d3a6e89..00000000000
--- a/databases/postgresql/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2000/03/18 17:43:17 jlam Exp $
-
---- bin/pg_dump/Makefile.in.orig	Sun Jan 17 01:19:05 1999
-+++ bin/pg_dump/Makefile.in	Thu Mar 16 17:49:44 2000
-@@ -29,7 +29,7 @@
- all: submake pg_dump
- 
- pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
--	$(CC) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
-+	$(CC) -o pg_dump $(OBJS) $(LIBPQ) $(LDFLAGS)
- 
- ../../utils/strdup.o:
- 	$(MAKE) -C ../../utils strdup.o
diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae
deleted file mode 100644
index 41b07c34431..00000000000
--- a/databases/postgresql/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2000/03/18 17:43:17 jlam Exp $
-
---- bin/pg_encoding/Makefile.orig	Sat Jun  5 06:27:31 1999
-+++ bin/pg_encoding/Makefile	Thu Mar 16 17:49:44 2000
-@@ -20,7 +20,7 @@
- all: pg_encoding
- 
- pg_encoding: $(OBJS) $(LIBPQDIR)/libpq.a
--	$(CC) -o pg_encoding $(OBJS) -L$(LIBPQDIR) -lpq $(LDFLAGS)
-+	$(CC) -o pg_encoding $(OBJS) $(LIBPQ) $(LDFLAGS)
- 
- install: pg_encoding
- 	$(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X)
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
deleted file mode 100644
index 769f799c0e2..00000000000
--- a/databases/postgresql/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.7 2000/03/18 17:43:17 jlam Exp $
-
---- bin/pg_id/Makefile.orig	Sun Jan 17 01:19:10 1999
-+++ bin/pg_id/Makefile	Thu Mar 16 17:49:44 2000
-@@ -27,7 +27,7 @@
- all: pg_id
- 
- pg_id: $(OBJS) $(LIBPQDIR)/libpq.a
--	$(CC) -o pg_id -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
-+	$(CC) -o pg_id $(OBJS) $(LIBPQ) $(LDFLAGS)
- 
- $(LIBPQDIR)/libpq.a:
- 	$(MAKE) -C $(LIBPQDIR) libpq.a
diff --git a/databases/postgresql/patches/patch-ag b/databases/postgresql/patches/patch-ag
deleted file mode 100644
index 8e6a94c7da6..00000000000
--- a/databases/postgresql/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2000/03/18 17:43:17 jlam Exp $
-
---- bin/pgtclsh/Makefile.orig	Tue Oct 27 16:51:54 1998
-+++ bin/pgtclsh/Makefile	Thu Mar 16 17:49:44 2000
-@@ -22,15 +22,12 @@
- include Makefile.tkdefs
- endif
- 
--CFLAGS+= $(X_CFLAGS) -I$(SRCDIR)/interfaces/libpgtcl 
-+CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
- 
- ifdef KRBVERS
- LDFLAGS+= $(KRBLIBS)
- CFLAGS+= $(KRBFLAGS)
- endif
--
--LIBPGTCL= -L$(SRCDIR)/interfaces/libpgtcl -lpgtcl
--LIBPQ= -L$(LIBPQDIR) -lpq
- 
- # If we are here then TCL is available
- PGMS = pgtclsh
diff --git a/databases/postgresql/patches/patch-ah b/databases/postgresql/patches/patch-ah
deleted file mode 100644
index a42371a607b..00000000000
--- a/databases/postgresql/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2000/03/18 17:43:17 jlam Exp $
-
---- bin/psql/Makefile.in.orig	Sun Jan 17 01:19:19 1999
-+++ bin/psql/Makefile.in	Thu Mar 16 17:49:44 2000
-@@ -33,7 +33,7 @@
- all: submake psql
- 
- psql: $(OBJS) $(LIBPQDIR)/libpq.a
--	$(CC) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LDFLAGS)
-+	$(CC) -o psql $(OBJS) $(LIBPQ) $(LDFLAGS)
- 
- ../../utils/strdup.o:
- 	$(MAKE) -C ../../utils strdup.o
diff --git a/databases/postgresql/patches/patch-ai b/databases/postgresql/patches/patch-ai
deleted file mode 100644
index ab742d258e4..00000000000
--- a/databases/postgresql/patches/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2000/03/18 17:43:55 jlam Exp $
-
---- bin/psql/psql.c.orig	Fri Jun  4 17:21:13 1999
-+++ bin/psql/psql.c	Thu Mar 16 17:49:44 2000
-@@ -45,28 +45,23 @@
- #endif
- 
- #ifdef HAVE_LIBREADLINE
--#ifdef HAVE_READLINE_H
--#include <readline.h>
--#define USE_READLINE 1
--#if defined(HAVE_HISTORY_H)
--#include <history.h>
--#define USE_HISTORY 1
--#endif
--#else
- #if defined(HAVE_READLINE_READLINE_H)
- #include <readline/readline.h>
- #define USE_READLINE 1
-+#elif defined(HAVE_READLINE_H)
-+#include <readline.h>
-+#define USE_READLINE 1
-+#endif
-+#endif
-+#if defined(HAVE_HISTORY)
- #if defined(HAVE_READLINE_HISTORY_H)
- #include <readline/history.h>
- #define USE_HISTORY 1
--#endif
--#endif
--#endif
--#if defined(HAVE_HISTORY) && !defined(USE_HISTORY)
-+#elif defined(HAVE_HISTORY_H)
-+#include <history.h>
- #define USE_HISTORY 1
- #endif
- #endif
--
- 
- #ifdef WIN32
- #define popen(x,y) _popen(x,y)
diff --git a/databases/postgresql/patches/patch-aj b/databases/postgresql/patches/patch-aj
deleted file mode 100644
index 0c9ca6428bd..00000000000
--- a/databases/postgresql/patches/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2000/03/18 17:43:17 jlam Exp $
-
---- configure.in.orig	Mon Nov  1 19:24:29 1999
-+++ configure.in	Thu Mar 16 17:49:44 2000
-@@ -23,11 +23,7 @@
-     bsdi*) os=bsdi need_tas=no ;;
-  freebsd1*|freebsd2*) os=freebsd need_tas=no ;;
-  freebsd*) os=freebsd need_tas=no elf=yes ;;
--  netbsd*)
--	os=bsd need_tas=no
--	case "$host_cpu" in
--	  powerpc) elf=yes ;;
--	esac ;;
-+  netbsd*) os=netbsd need_tas=no ;;
-   openbsd*) os=bsd need_tas=no ;;
-     dgux*) os=dgux need_tas=no ;;
-      aix*) os=aix need_tas=no ;;
diff --git a/databases/postgresql/patches/patch-ak b/databases/postgresql/patches/patch-ak
deleted file mode 100644
index 6f6622b61db..00000000000
--- a/databases/postgresql/patches/patch-ak
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/03/18 17:43:17 jlam Exp $
-
---- include/port/bsd.h.orig	Tue May 25 12:14:29 1999
-+++ include/port/bsd.h	Thu Mar 16 17:49:44 2000
-@@ -1,16 +1,16 @@
- #define USE_POSIX_TIME
- 
--#if defined(i386)
-+#if defined(__i386__)
- #define NEED_I386_TAS_ASM
- #define HAS_TEST_AND_SET
- #endif
- 
--#if defined(sparc)
-+#if defined(__sparc__)
- #define NEED_SPARC_TAS_ASM
- #define HAS_TEST_AND_SET
- #endif
- 
--#if defined(vax)
-+#if defined(__vax__)
- #define NEED_VAX_TAS_ASM
- #define HAS_TEST_AND_SET
- #endif
diff --git a/databases/postgresql/patches/patch-al b/databases/postgresql/patches/patch-al
deleted file mode 100644
index 47ef39f83c4..00000000000
--- a/databases/postgresql/patches/patch-al
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-al,v 1.3 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/ecpg/lib/Makefile.in.orig	Wed Jun 30 19:57:23 1999
-+++ interfaces/ecpg/lib/Makefile.in	Thu Mar 16 17:49:44 2000
-@@ -12,12 +12,12 @@
- 
- NAME= ecpg
- SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 0.0
-+SO_MINOR_VERSION= 0
- 
- SRCDIR= @top_srcdir@
- include $(SRCDIR)/Makefile.global
- 
--CFLAGS+= -I../include -I$(SRCDIR)/interfaces/libpq
-+CFLAGS+= -I../include -I$(LIBPQDIR)
- 
- ifdef KRBVERS
- CFLAGS+= $(KRBFLAGS)
-@@ -25,7 +25,7 @@
- 
- OBJS= ecpglib.o typename.o
- 
--SHLIB_LINK= -L../../libpq -lpq
-+SHLIB_LINK= $(LIBPQ)
- 
- # Shared library stuff, also default 'all' target
- include $(SRCDIR)/Makefile.shlib
diff --git a/databases/postgresql/patches/patch-am b/databases/postgresql/patches/patch-am
deleted file mode 100644
index 130f17704ff..00000000000
--- a/databases/postgresql/patches/patch-am
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-am,v 1.4 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/jdbc/Makefile.orig	Wed Jun 23 01:56:17 1999
-+++ interfaces/jdbc/Makefile	Thu Mar 16 17:49:44 2000
-@@ -27,7 +27,7 @@
- # In 6.5, the all rule builds the makeVersion class which then calls make using
- # the jdbc1 or jdbc2 rules
- all:	makeVersion.class
--	make $$($(JAVA) makeVersion)
-+	$(MAKE) $$($(JAVA) makeVersion)
- 	@echo ------------------------------------------------------------
- 	@echo The JDBC driver has now been built. To make it available to
- 	@echo other applications, copy the postgresql.jar file to a public
-@@ -45,10 +45,10 @@
- 	@echo
- 	@echo ------------------------------------------------------------
- 	@echo To build the examples, type:
--	@echo "  make examples"
-+	@echo "  $(MAKE) examples"
- 	@echo
- 	@echo "To build the CORBA example (requires Java2):"
--	@echo "  make corba"
-+	@echo "  $(MAKE) corba"
- 	@echo ------------------------------------------------------------
- 	@echo
- 
-@@ -121,10 +121,10 @@
- 	@echo JDBC 1 specification, and one to the JDBC 2 specification.
- 	@echo
- 	@echo To build the driver for JDBC 1 (usually for JDK 1.1 thru 1.1.7)
--	@echo then type: make jdbc1
-+	@echo then type: $(MAKE) jdbc1
- 	@echo
- 	@echo To build the driver for JDBC 2 (usually for JDK 1.2 and later)
--	@echo then type: make jdbc2
-+	@echo then type: $(MAKE) jdbc2
- 	@echo
- 	@echo If you still have problems, then please email the interfaces
- 	@echo or bugs lists, or better still to me direct (peter@retep.org.uk)
diff --git a/databases/postgresql/patches/patch-an b/databases/postgresql/patches/patch-an
deleted file mode 100644
index 0c54cccfa74..00000000000
--- a/databases/postgresql/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/libpgtcl/Makefile.in.orig	Wed Jun 30 19:57:24 1999
-+++ interfaces/libpgtcl/Makefile.in	Thu Mar 16 17:49:44 2000
-@@ -27,7 +27,7 @@
- 
- OBJS= pgtcl.o pgtclCmds.o pgtclId.o
- 
--SHLIB_LINK+= -L../libpq -lpq
-+SHLIB_LINK+= $(LIBPQ)
- 
- # If crypt is a separate library, rather than part of libc, it may need
- # to be referenced separately to keep (broken) linkers happy.  (This is
diff --git a/databases/postgresql/patches/patch-ao b/databases/postgresql/patches/patch-ao
deleted file mode 100644
index 63229e8b86e..00000000000
--- a/databases/postgresql/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/libpq++/Makefile.in.orig	Tue Sep  7 14:11:35 1999
-+++ interfaces/libpq++/Makefile.in	Thu Mar 16 17:49:44 2000
-@@ -43,9 +43,9 @@
- OBJS = pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o 
- 
- ifeq ($(PORTNAME), win)
--SHLIB_LINK+= --driver-name g++ -L../libpq -lpq
-+SHLIB_LINK+= --driver-name g++ $(LIBPQ)
- else
--SHLIB_LINK= -L../libpq -lpq
-+SHLIB_LINK= $(LIBPQ)
- endif
- 
- # For CC on IRIX, must use CC as linker/archiver of C++ libraries
diff --git a/databases/postgresql/patches/patch-ap b/databases/postgresql/patches/patch-ap
deleted file mode 100644
index 35d155357f4..00000000000
--- a/databases/postgresql/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/odbc/GNUmakefile.in.orig	Wed Jun 30 19:57:29 1999
-+++ interfaces/odbc/GNUmakefile.in	Thu Mar 16 17:49:44 2000
-@@ -37,8 +37,6 @@
-         pgtypes.o psqlodbc.o qresult.o results.o socket.o parse.o statement.o \
-         gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
- 
--SHLIB_LINK= $(LIBS)
--
- # Shared library stuff, also default 'all' target
- include $(SRCDIR)/Makefile.shlib
- 
diff --git a/databases/postgresql/patches/patch-aq b/databases/postgresql/patches/patch-aq
deleted file mode 100644
index 9686d56ab5b..00000000000
--- a/databases/postgresql/patches/patch-aq
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/odbc/dlg_specific.h.orig	Wed Jan  6 15:44:07 1999
-+++ interfaces/odbc/dlg_specific.h	Thu Mar 16 17:49:45 2000
-@@ -35,9 +35,9 @@
- #ifdef ODBCINST
- #define xstr(s)         str(s)
- #define str(s)          #s
--#define ODBCINST_INI    xstr(ODBCINST) "/odbcinst.ini"
-+#define ODBCINST_INI    xstr(ODBCINST) "/odbc.ini"
- #else
--#define ODBCINST_INI    "/etc/odbcinst.ini"
-+#define ODBCINST_INI    "/etc/odbc.ini"
- #endif
- #else
- #define ODBC_INI        "ODBC.INI"         /* ODBC initialization file */
diff --git a/databases/postgresql/patches/patch-ar b/databases/postgresql/patches/patch-ar
deleted file mode 100644
index f7fa377898e..00000000000
--- a/databases/postgresql/patches/patch-ar
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/03/18 17:43:17 jlam Exp $
-
---- interfaces/odbc/psqlodbc.c.orig	Mon Dec 28 20:49:57 1998
-+++ interfaces/odbc/psqlodbc.c	Thu Mar 16 17:49:45 2000
-@@ -33,8 +33,8 @@
- 
- GLOBAL_VALUES globals;
- 
--BOOL _init(void);
--BOOL _fini(void);
-+static BOOL _init(void);
-+static BOOL _fini(void);
- RETCODE SQL_API SQLDummyOrdinal(void);
- 
- #ifdef WIN32
-@@ -98,7 +98,7 @@
- #endif
- 
- /* These two functions do shared library initialziation on UNIX, well at least
-- * on Linux. I don't know about other systems.
-+ * on Linux and NetBSD. I don't know about other systems.
-  */
- BOOL
- _init(void)
diff --git a/databases/postgresql/patches/patch-as b/databases/postgresql/patches/patch-as
deleted file mode 100644
index 745622c0a4d..00000000000
--- a/databases/postgresql/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2000/03/18 17:43:17 jlam Exp $
-
---- pl/plpgsql/src/Makefile.in.orig	Wed Jun 30 19:57:31 1999
-+++ pl/plpgsql/src/Makefile.in	Thu Mar 16 17:49:45 2000
-@@ -27,7 +27,7 @@
- 
- OBJS=	pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o
- 
--SHLIB_LINK+= -L$(LIBPQDIR) -lpq
-+SHLIB_LINK+= $(LIBPQ)
- 
- # If crypt is a separate library, rather than part of libc, it may need
- # to be referenced separately to keep (broken) linkers happy.  (This is
diff --git a/databases/postgresql/patches/patch-at b/databases/postgresql/patches/patch-at
deleted file mode 100644
index 2f1cd55c3a9..00000000000
--- a/databases/postgresql/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2000/03/18 17:43:17 jlam Exp $
-
---- pl/tcl/Makefile.orig	Sun Dec 13 18:46:49 1998
-+++ pl/tcl/Makefile	Thu Mar 16 17:49:45 2000
-@@ -75,7 +75,7 @@
- 
- CFLAGS+= $(TCL_DEFS)
- 
--LDADD+= -L$(LIBPQDIR) -lpq
-+LDADD+= $(LIBPQ)
-         
- #
- # DLOBJS is the dynamically-loaded object file.