Add these patches back

6 files changed, 99 insertions, 0 deletions

diff --git a/databases/postgresql/patches/patch-aa b/databases/postgresql/patches/patch-aa
new file mode 100644
index 00000000000..faed2788462
--- /dev/null
+++ b/databases/postgresql/patches/patch-aa
@@ -0,0 +1,15 @@
+$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-ab b/databases/postgresql/patches/patch-ab
new file mode 100644
index 00000000000..1e05ae81158
--- /dev/null
+++ b/databases/postgresql/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.10 2000/05/20 19:34:17 jlam Exp $
+
+--- bin/pgtclsh/Makefile.orig	Tue Mar  7 20:58:21 2000
++++ bin/pgtclsh/Makefile	Sat May 20 00:14:18 2000
+@@ -22,7 +22,7 @@
+ include Makefile.tkdefs
+ endif
+ 
+-CFLAGS+= $(X_CFLAGS) -I$(LIBPGTCLDIR)
++CFLAGS+= $(X_CFLAGS) -I$(LIBPQDIR) -I$(LIBPGTCLDIR)
+ 
+ ifdef KRBVERS
+ LDFLAGS+= $(KRBLIBS)
diff --git a/databases/postgresql/patches/patch-ac b/databases/postgresql/patches/patch-ac
new file mode 100644
index 00000000000..f8025882034
--- /dev/null
+++ b/databases/postgresql/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.7 2000/05/20 19:34:18 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 @@
+ AC_SUBST(YFLAGS)
+ 
+ AC_CHECK_LIB(sfio,     main)
+-for curses in ncurses curses ; do
+-	AC_CHECK_LIB(${curses}, main,
+-		[LIBS="-l${curses} $LIBS"; break])
+-done
+ AC_CHECK_LIB(termcap,  main)
+ AC_CHECK_LIB(readline, main)
+ AC_CHECK_LIB(readline, using_history, AC_DEFINE(HAVE_HISTORY_IN_READLINE),
diff --git a/databases/postgresql/patches/patch-ad b/databases/postgresql/patches/patch-ad
new file mode 100644
index 00000000000..c963cbec05e
--- /dev/null
+++ b/databases/postgresql/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.8 2000/05/20 19:34:19 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
+@@ -12,7 +12,7 @@
+ 
+ NAME= ecpg
+ SO_MAJOR_VERSION= 3
+-SO_MINOR_VERSION= 1.0
++SO_MINOR_VERSION= 1
+ 
+ SRCDIR= @top_srcdir@
+ include $(SRCDIR)/Makefile.global
diff --git a/databases/postgresql/patches/patch-ae b/databases/postgresql/patches/patch-ae
new file mode 100644
index 00000000000..90431794fb9
--- /dev/null
+++ b/databases/postgresql/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.12 2000/05/20 19:34:20 jlam Exp $
+
+--- interfaces/odbc/psqlodbc.c.orig	Mon Dec 28 20:49:57 1998
++++ interfaces/odbc/psqlodbc.c	Sat May 20 00:14:18 2000
+@@ -33,8 +33,14 @@
+ 
+ GLOBAL_VALUES globals;
+ 
+-BOOL _init(void);
+-BOOL _fini(void);
++#ifdef linux
++#  define STATIC
++#else
++#  define STATIC	static
++#endif
++
++STATIC BOOL _init(void);
++STATIC BOOL _fini(void);
+ RETCODE SQL_API SQLDummyOrdinal(void);
+ 
+ #ifdef WIN32
+@@ -98,7 +104,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 some of the BSDs. I don't know about other systems.
+  */
+ BOOL
+ _init(void)
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
new file mode 100644
index 00000000000..15b66c40d2b
--- /dev/null
+++ b/databases/postgresql/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.9 2000/05/20 19:34:21 jlam Exp $
+
+--- pl/tcl/Makefile.orig	Sat Apr 29 13:45:42 2000
++++ pl/tcl/Makefile	Sat May 20 00:14:18 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)
+         
+ #
+ # Uncomment the following to enable the unknown command lookup