Patch Makefile.shlib so that when creating shared libraries, we don't

only pass only the -L* LDFLAGS to the linker.  This is correct for
pkgsrc since the wrapper scripts take care of correctly passing the
rpath info to the linker, so we don't need to filter those out.  This
allows plpgsql.so to find libintl.so if we are using the pkgsrc version
of it.  Bump the PKGREVISION of postgresql*-lib to 7.3.8nb1 and
7.4.6nb2.

Link the postgres binary with the necessary flags to allow it to
dlopen() modules that use pthreads[*].  This should allow postgres to
open a plperl.so module built on a system with perl+threads.  Bump
the PKGREVISION of postgresql*-server to 7.3.8nb2 and 7.4.6nb2.

[*] Note that this behavior can be tweaked globally by setting
    DLOPEN_REQUIRE_PTHREADS to "yes" or "no" in /etc/mk.conf.

10 files changed, 69 insertions, 17 deletions

diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile
index 24778e6c275..004f7be389b 100644
--- a/databases/postgresql73-lib/Makefile
+++ b/databases/postgresql73-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/11/28 19:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/18 15:59:55 jlam Exp $
 
 PKGNAME=		postgresql73-lib-${BASE_VERS}
-PKGREVISION=		# empty
+PKGREVISION=		1
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 9f751de46fb..657b14ac1f0 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/11/28 19:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/18 15:59:55 jlam Exp $
 
 PKGNAME=		postgresql73-server-${BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		pstgs
 COMMENT=		PostgreSQL database server programs
 
diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index b5274109f78..79ab984d8a4 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/10/25 17:40:01 jdolecek Exp $
+$NetBSD: distinfo,v 1.5 2004/12/18 15:59:55 jlam Exp $
 
 SHA1 (postgresql-7.3.8.tar.gz) = bd27703cbcc219d36521a0e57233408a6f70b342
 Size (postgresql-7.3.8.tar.gz) = 11293472 bytes
 SHA1 (patch-aa) = 61fbeb664b0d89c83a36c79cca3fbdc78d6f5059
+SHA1 (patch-ab) = d45df2da17b1ff67f5f82b4ff743afe350500786
 SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7
 SHA1 (patch-ad) = a7bdfab69fdc9063d03adae7229f55ba356f2282
 SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559
@@ -11,3 +12,4 @@ SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da
 SHA1 (patch-ah) = 210c0dda3c32481280fe5f2a9525d33f1d989c6d
 SHA1 (patch-ai) = d7889e05ab7963f2b93b46c953cbf1a44e9c0fe5
 SHA1 (patch-aj) = 4c46173cba1dd36296d8b3fcca8cdfebcc717162
+SHA1 (patch-ak) = a983f23b5e47a4c2f31ba284ff3db51b53cf8414
diff --git a/databases/postgresql73/patches/patch-ab b/databases/postgresql73/patches/patch-ab
new file mode 100644
index 00000000000..957eac3b0e8
--- /dev/null
+++ b/databases/postgresql73/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/12/18 15:59:55 jlam Exp $
+
+--- src/Makefile.shlib.orig	2003-01-11 12:22:34.000000000 -0500
++++ src/Makefile.shlib
+@@ -204,7 +204,7 @@ ifeq ($(PORTNAME), beos)
+   SHLIB_LINK		+= -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
+ endif
+ 
+-SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
++SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK)
+ ifeq ($(enable_rpath), yes)
+ SHLIB_LINK += $(rpath)
+ endif
diff --git a/databases/postgresql73/patches/patch-ak b/databases/postgresql73/patches/patch-ak
new file mode 100644
index 00000000000..10f5a8311fb
--- /dev/null
+++ b/databases/postgresql73/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2004/12/18 15:59:55 jlam Exp $
+
+--- src/backend/Makefile.orig	2003-03-21 12:18:34.000000000 -0500
++++ src/backend/Makefile
+@@ -12,6 +12,10 @@ subdir = src/backend
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
++CFLAGS+= $(DL_CFLAGS)
++LDFLAGS+= $(DL_LDFLAGS)
++LIBS+= $(DL_LIBS)
++
+ DIRS := access bootstrap catalog parser commands executor lib libpq \
+ 	main nodes optimizer port postmaster regex rewrite \
+ 	storage tcop utils
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 688c4c75b54..75403791883 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/12/18 14:26:15 darcy Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/18 15:59:55 jlam Exp $
 
 PKGNAME=		postgresql74-lib-${BASE_VERS}
-PKGREVISION=	1
+PKGREVISION=		2
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index c0c6121c32e..317711a2739 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/11/28 19:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/18 15:59:55 jlam Exp $
 
 PKGNAME=		postgresql74-server-${BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 SVR4_PKGNAME=		pstgs
 COMMENT=		PostgreSQL database server programs
 
diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo
index 9bc6657e4b6..bc88c13029c 100644
--- a/databases/postgresql74/distinfo
+++ b/databases/postgresql74/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.11 2004/11/04 20:06:12 recht Exp $
+$NetBSD: distinfo,v 1.12 2004/12/18 15:59:55 jlam Exp $
 
-SHA1 (postgresql-7.4.6.tar.bz2) = 54e9126053579285b29a3a30e3055d1784a28b0a
-Size (postgresql-7.4.6.tar.bz2) = 10200107 bytes
-SHA1 (hier-Pg7.4-0.5.3.tar.gz) = 5b99167a9a87130cc2b7f582e28e3aef6f7f67b3
-Size (hier-Pg7.4-0.5.3.tar.gz) = 34662 bytes
-SHA1 (patch-aa) = e9b99b04c02b3f04d21144a22489618948c378a8
+SHA1 (patch-aa) = 626b4b4bf0d47913072399535c55d413b90675a4
 SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c
 SHA1 (patch-ac) = 39ce96f3ea9fc1167c8d21168fd1536077898d58
 SHA1 (patch-ad) = fae5e82e0943ea982c9d3aace290b56c6a7629f9
 SHA1 (patch-ae) = f0e0ad98ebdc972e7c40afd805fbb0d909d5ef3b
+SHA1 (patch-af) = 7373db75fda125b980f2ead990719798c0d22a48
+SHA1 (patch-ag) = a983f23b5e47a4c2f31ba284ff3db51b53cf8414
diff --git a/databases/postgresql74/patches/patch-aa b/databases/postgresql74/patches/patch-aa
index bba209f4b73..c9a08b53975 100644
--- a/databases/postgresql74/patches/patch-aa
+++ b/databases/postgresql74/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/19 00:07:13 recht Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/18 15:59:55 jlam Exp $
 
---- src/Makefile.shlib.orig	Sat Mar  6 05:59:18 2004
+--- src/Makefile.shlib.orig	2003-10-19 21:34:33.000000000 -0400
 +++ src/Makefile.shlib
 @@ -108,7 +108,7 @@ endif
  
@@ -29,3 +29,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/19 00:07:13 recht Exp $
    LINK.shared		= $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
  endif
  
+@@ -207,7 +207,7 @@ ifeq ($(PORTNAME), beos)
+   SHLIB_LINK		+= -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
+ endif
+ 
+-SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK)
++SHLIB_LINK := $(LDFLAGS) $(SHLIB_LINK)
+ ifeq ($(enable_rpath), yes)
+ SHLIB_LINK += $(rpath)
+ endif
diff --git a/databases/postgresql74/patches/patch-ag b/databases/postgresql74/patches/patch-ag
new file mode 100644
index 00000000000..b63bda49e5d
--- /dev/null
+++ b/databases/postgresql74/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2004/12/18 15:59:55 jlam Exp $
+
+--- src/backend/Makefile.orig	2003-03-21 12:18:34.000000000 -0500
++++ src/backend/Makefile
+@@ -12,6 +12,10 @@ subdir = src/backend
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
++CFLAGS+= $(DL_CFLAGS)
++LDFLAGS+= $(DL_LDFLAGS)
++LIBS+= $(DL_LIBS)
++
+ DIRS := access bootstrap catalog parser commands executor lib libpq \
+ 	main nodes optimizer port postmaster regex rewrite \
+ 	storage tcop utils