Don't bother stripping out the contents of "ccdlflags" from the contents

of "ldopts" used to link in the embedded perl interpreter.  This fixes
PR pkg/31293.

The PostgreSQL configure code tries to be extra-clever with only using
its own logic for determining which directories to add to the rpath.
However, we don't really need PostgreSQL's configure to do this since
the Perl config already provides the full set of flags for linking,
including the appropriate rpath flags, and the rpaths flags determined
by Perl (at least in pkgsrc) are guaranteed to match the ones needed
PostgreSQL to link the plperl.so module.

Bump the PKGREVISION of databases/postgresql80-plperl to 1.

3 files changed, 32 insertions, 1 deletions

diff --git a/databases/postgresql80/distinfo b/databases/postgresql80/distinfo
index d93a774a404..f01adb4c6e1 100644
--- a/databases/postgresql80/distinfo
+++ b/databases/postgresql80/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/08/05 19:43:45 jlam Exp $
+$NetBSD: distinfo,v 1.8 2005/09/19 05:52:18 jlam Exp $
 
 SHA1 (postgresql-8.0.3.tar.bz2) = 45f9a739e414e617d1e5f43779046546ee1a0d3a
 RMD160 (postgresql-8.0.3.tar.bz2) = 62e6a28c0041a3f0d456efe1e985f03778e4bdfa
@@ -15,3 +15,5 @@ SHA1 (patch-af) = ebe7996d07b17d39b9853fc8ad6978edd5acfab4
 SHA1 (patch-ag) = 6a7b3eab5a5f2911d75a32ad8f47570a7d6414e8
 SHA1 (patch-ah) = 840c5e4f76317314b0f37c346076eb48c26541f9
 SHA1 (patch-ai) = d480379c41b73da6eaa7914a557292d4124c8bbf
+SHA1 (patch-aj) = 6f2a9ad8fab9312aef71cc9c39ed8c4478a76fea
+SHA1 (patch-ak) = 3609a313fd8969995b4fd680dd10521a0ab7ece4
diff --git a/databases/postgresql80/patches/patch-aj b/databases/postgresql80/patches/patch-aj
new file mode 100644
index 00000000000..87e9d37f98a
--- /dev/null
+++ b/databases/postgresql80/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2005/09/19 05:52:18 jlam Exp $
+
+--- config/perl.m4.orig	2003-11-29 19:51:17.000000000 +0000
++++ config/perl.m4
+@@ -28,8 +28,6 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
+ AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
+ [AC_REQUIRE([PGAC_PATH_PERL])
+ AC_MSG_CHECKING(for flags to link embedded Perl)
+-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
++perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+ AC_SUBST(perl_embed_ldflags)dnl
+ AC_MSG_RESULT([$perl_embed_ldflags])])
diff --git a/databases/postgresql80/patches/patch-ak b/databases/postgresql80/patches/patch-ak
new file mode 100644
index 00000000000..eb386f58a68
--- /dev/null
+++ b/databases/postgresql80/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2005/09/19 05:52:18 jlam Exp $
+
+--- configure.orig	2005-09-18 22:06:16.000000000 +0000
++++ configure
+@@ -4298,9 +4298,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6
+ 
+ echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
+ echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
+-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
++perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
+ echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
+ echo "${ECHO_T}$perl_embed_ldflags" >&6
+ fi