From 115a6ab5c29756e43686fd63cb268ee09d8905c7 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Sun, 10 Oct 2004 18:26:00 +0000
Subject: add patches to make it possible to compile PL/Python

---
 databases/postgresql73/distinfo         |  5 +++--
 databases/postgresql73/patches/patch-ad | 15 ++++++++++++---
 databases/postgresql73/patches/patch-aj | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 databases/postgresql73/patches/patch-aj

(limited to 'databases/postgresql73')

diff --git a/databases/postgresql73/distinfo b/databases/postgresql73/distinfo
index c45d099d218..0c2d10e7a8e 100644
--- a/databases/postgresql73/distinfo
+++ b/databases/postgresql73/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.2 2004/10/10 17:46:07 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2004/10/10 18:26:00 jdolecek Exp $
 
 SHA1 (postgresql-7.3.7.tar.gz) = 5c3c865146a531cb49427672483c9cba6f14ddf8
 Size (postgresql-7.3.7.tar.gz) = 11284024 bytes
 SHA1 (patch-aa) = 61fbeb664b0d89c83a36c79cca3fbdc78d6f5059
 SHA1 (patch-ac) = 5a647cc31873ae81a5bd5a6cf4ec6f44a43448e7
-SHA1 (patch-ad) = d9e010b38855bf9f1d7b85404ea6770066831093
+SHA1 (patch-ad) = a7bdfab69fdc9063d03adae7229f55ba356f2282
 SHA1 (patch-ae) = 5b46ea9782da574ee0c4b1c02534e0f74d640559
 SHA1 (patch-af) = 8268b66b062f0228e73ecaf928104f0c9bdc02f5
 SHA1 (patch-ag) = 6d12184b8401e63b8a05c620beb27f28248c22da
 SHA1 (patch-ah) = 210c0dda3c32481280fe5f2a9525d33f1d989c6d
 SHA1 (patch-ai) = d7889e05ab7963f2b93b46c953cbf1a44e9c0fe5
+SHA1 (patch-aj) = 4c46173cba1dd36296d8b3fcca8cdfebcc717162
diff --git a/databases/postgresql73/patches/patch-ad b/databases/postgresql73/patches/patch-ad
index 6ce91a0ac71..ef6022a4c55 100644
--- a/databases/postgresql73/patches/patch-ad
+++ b/databases/postgresql73/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
+$NetBSD: patch-ad,v 1.2 2004/10/10 18:26:00 jdolecek Exp $
 
---- src/Makefile.global.in.orig	Thu Sep  5 07:54:18 2002
-+++ src/Makefile.global.in
+--- src/Makefile.global.in.orig	2002-09-05 00:54:18.000000000 +0200
++++ src/Makefile.global.in	2004-10-10 20:20:34.000000000 +0200
 @@ -111,6 +111,13 @@
  endif
  endif
@@ -24,6 +24,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/07/24 22:14:40 recht Exp $
  with_tcl	= @with_tcl@
  with_tk		= @with_tk@
  enable_shared	= @enable_shared@
+@@ -135,7 +143,7 @@
+ python_includespec	= @python_includespec@
+ python_moduledir	= @python_moduledir@
+ python_moduleexecdir	= @python_moduleexecdir@
+-python_libspec		= @python_libspec@
++python_libspec		= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib @python_libspec@
+ python_configdir	= @python_configdir@
+ 
+ krb_srvtab = @krb_srvtab@
 @@ -285,13 +293,20 @@
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  libpq = -L$(libpq_builddir) -lpq
diff --git a/databases/postgresql73/patches/patch-aj b/databases/postgresql73/patches/patch-aj
new file mode 100644
index 00000000000..49c521a953b
--- /dev/null
+++ b/databases/postgresql73/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2004/10/10 18:26:00 jdolecek Exp $
+
+--- src/pl/plpython/Makefile.orig	2004-10-10 20:14:13.000000000 +0200
++++ src/pl/plpython/Makefile	2004-10-10 20:14:20.000000000 +0200
+@@ -8,9 +8,7 @@
+ # On some platforms we can only build PL/Python if libpython is a
+ # shared library.  Since there is no official way to determine this,
+ # we see if there is a file that is named like a shared library.
+-ifneq (,$(wildcard $(python_configdir)/libpython*$(DLSUFFIX)*))
+ shared_libpython = yes
+-endif
+ 
+ # If we don't have a shared library and the platform doesn't allow it
+ # to work without, we have to skip it.
-- 
cgit v1.2.3