From 25864f4b031ff8999e85e82e6a13957bef7bbc7f Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 9 Oct 2007 20:17:08 +0000 Subject: Fix for PR#36447. --- databases/postgresql82/distinfo | 7 +++--- databases/postgresql82/patches/patch-ab | 44 +++++++++++++++++++++++++++++++-- databases/postgresql82/patches/patch-am | 10 +++++--- databases/postgresql82/patches/patch-ao | 44 --------------------------------- 4 files changed, 52 insertions(+), 53 deletions(-) delete mode 100644 databases/postgresql82/patches/patch-ao diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo index 79613afddff..f87eab68263 100644 --- a/databases/postgresql82/distinfo +++ b/databases/postgresql82/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2007/09/19 20:02:12 adam Exp $ +$NetBSD: distinfo,v 1.9 2007/10/09 20:17:08 adam Exp $ SHA1 (postgresql-8.2.5.tar.bz2) = 45ddb77b542e8b279013f374edab65a8860a636d RMD160 (postgresql-8.2.5.tar.bz2) = 90e4afd6a2ae5f7203ff8409970c73401171e0ff Size (postgresql-8.2.5.tar.bz2) = 12510411 bytes SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d -SHA1 (patch-ab) = c602b4c381c730368c19fb5ab765c69c7b5573bb +SHA1 (patch-ab) = d952d47918f0294cdc1462233b1cfd39e3bc2f73 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9 SHA1 (patch-ad) = ce322ef8b279e1e25b4ed018ab975a25e82a69a1 SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6 @@ -15,6 +15,5 @@ SHA1 (patch-ai) = 6f7f5c1182ded751650e0ae7858c5784dfa96987 SHA1 (patch-aj) = 0ffb4c0aa8a32a61cd753d0e7cf67fdc5ae94195 SHA1 (patch-ak) = 3009e020dc5f9397846dd3339c2bdd15269bb332 SHA1 (patch-al) = 32818ae8de92ef66d839d4891f4f686db732f7b6 -SHA1 (patch-am) = 507252fc50ce59e1d6f596367f12338a8892bfd2 +SHA1 (patch-am) = 1436c3e9d3c74b9ef7c81c8dfde1c270ba5372f1 SHA1 (patch-an) = ca4caddde9ea68e4f8648f5abf9369e407874702 -SHA1 (patch-ao) = f832a8abe94293de334ad9c325440a410b5e074c diff --git a/databases/postgresql82/patches/patch-ab b/databases/postgresql82/patches/patch-ab index 4b781eab3cc..63e3f22c29d 100644 --- a/databases/postgresql82/patches/patch-ab +++ b/databases/postgresql82/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $ +$NetBSD: patch-ab,v 1.2 2007/10/09 20:17:08 adam Exp $ ---- configure.orig 2006-12-02 09:36:39.000000000 +0100 +--- configure.orig 2007-10-09 22:07:59.000000000 +0200 +++ configure @@ -1504,6 +1504,7 @@ case $host_os in darwin*) template=darwin ;; @@ -21,3 +21,43 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $ echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5 echo "${ECHO_T}$perl_embed_ldflags" >&6 fi +@@ -21910,16 +21909,12 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char gettext (); ++#include ++ + int + main () + { +-gettext (); ++gettext (""); + ; + return 0; + } +@@ -21965,16 +21960,12 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + /* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char gettext (); ++#include ++ + int + main () + { +-gettext (); ++gettext (""); + ; + return 0; + } diff --git a/databases/postgresql82/patches/patch-am b/databases/postgresql82/patches/patch-am index ede92aa57ef..430201aa7d9 100644 --- a/databases/postgresql82/patches/patch-am +++ b/databases/postgresql82/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $ +$NetBSD: patch-am,v 1.2 2007/10/09 20:17:08 adam Exp $ --- contrib/tsearch2/Makefile.orig 2006-09-11 17:14:46.000000000 +0200 +++ contrib/tsearch2/Makefile @@ -28,7 +28,7 @@ $NetBSD: patch-am,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $ endif -@@ -40,7 +41,7 @@ $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) +@@ -40,10 +41,10 @@ $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) .PHONY: $(SUBDIRS:%=%-recursive) $(SUBDIRS:%=%-recursive): @@ -36,4 +36,8 @@ $NetBSD: patch-am,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $ + $(MAKE) -C $(subst -recursive,,$@) libSUBSYS.la tsearch2.sql: tsearch.sql.in - sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@ +- sed -e 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >$@ ++ sed -e 's,MODULE_PATHNAME,$$libdir/lib$(MODULE_big),g' $< >$@ + + uninstall_tsearch2.sql: untsearch.sql.in + cp $< $@ diff --git a/databases/postgresql82/patches/patch-ao b/databases/postgresql82/patches/patch-ao deleted file mode 100644 index e221a565d29..00000000000 --- a/databases/postgresql82/patches/patch-ao +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2007/01/12 22:13:44 joerg Exp $ - ---- configure.orig 2007-01-10 15:08:14.000000000 +0000 -+++ configure -@@ -21851,16 +21851,12 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gettext (); -+#include -+ - int - main () - { --gettext (); -+gettext (""); - ; - return 0; - } -@@ -21906,16 +21902,12 @@ cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - - /* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gettext (); -+#include -+ - int - main () - { --gettext (); -+gettext (""); - ; - return 0; - } -- cgit v1.2.3