rework p5-subversion workaround to deal with netbsd issue found by wiz@

instead of creating LDFLAGS for SWIG_PL, just reuse SWIG_PL_INCLUDES
which contains already any -fstack-protector* flag necessary to link.

4 files changed, 7 insertions, 58 deletions

diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index f3ca7027644..d0db21d0c26 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.100 2015/09/29 11:52:48 richard Exp $
+$NetBSD: distinfo,v 1.101 2015/10/07 05:48:10 richard Exp $
 
 SHA1 (subversion-1.9.2.tar.bz2) = fb9db3b7ddf48ae37aa8785872301b59bfcc7017
 RMD160 (subversion-1.9.2.tar.bz2) = f713ed3687d7e92bb72c935ac5a2f3c25fafec4a
 Size (subversion-1.9.2.tar.bz2) = 7910994 bytes
-SHA1 (patch-ad) = b724797c793b64875b72ad0c6fb120a2c9632b32
+SHA1 (patch-ad) = 2c158d03d6636309f97fb785bb244b150c4ec8c3
 SHA1 (patch-ae) = a9cd7d26fb5f9da8ff81413ef32948ccd6c4290e
-SHA1 (patch-configure) = 1dfb781af8c59e3b9fbdc2350c0123260a2f7203
+SHA1 (patch-configure) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
diff --git a/devel/subversion/files/build-outputs.mk b/devel/subversion/files/build-outputs.mk
index bcebc4f4abc..b67b08587fe 100644
--- a/devel/subversion/files/build-outputs.mk
+++ b/devel/subversion/files/build-outputs.mk
@@ -487,9 +487,8 @@ subversion/libsvn_subr/libsvn_subr-1.la: $(libsvn_subr_DEPS)
 libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl
 libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo
 libsvn_swig_perl_OBJECTS = swigutil_pl.lo
-libsvn_swig_perl_LDFLAGS = $(SWIG_PL_LDFLAGS)
 subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
-	cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS)
+	cd subversion/bindings/swig/perl/libsvn_swig_perl && $(LINK_LIB) $(SWIG_PL_INCLUDES) $(libsvn_swig_perl_LDFLAGS) -o libsvn_swig_perl-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_perl_OBJECTS) -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PERL_LIBS) $(SVN_SWIG_LIBS) $(LIBS)
 
 libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py
 libsvn_swig_py_DEPS = subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index ca8350f198a..bce8cec159e 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.18 2015/09/29 11:52:48 richard Exp $
+$NetBSD: patch-ad,v 1.19 2015/10/07 05:48:10 richard Exp $
 
 apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes
 
@@ -13,15 +13,7 @@ apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes
  
  javahl_javadir = @libdir@/svn-javahl
  javahl_javahdir = @libdir@/svn-javahl/include
-@@ -145,6 +145,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
- SWIG_PY_LINK = @SWIG_PY_LINK@
- SWIG_PY_LIBS = @SWIG_PY_LIBS@
- SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
-+SWIG_PL_LDFLAGS = @SWIG_PL_LDFLAGS@
- SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
- SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
- SWIG_RB_LINK = @SWIG_RB_LINK@
-@@ -832,11 +833,11 @@ clean-swig-headers:
+@@ -832,11 +832,11 @@ clean-swig-headers:
  extraclean-swig-headers: clean-swig-headers
  	$(EXTRACLEAN_SWIG_HEADERS)
  
diff --git a/devel/subversion/patches/patch-configure b/devel/subversion/patches/patch-configure
index 59fa4ef3b4d..b52444802ab 100644
--- a/devel/subversion/patches/patch-configure
+++ b/devel/subversion/patches/patch-configure
@@ -1,44 +1,2 @@
-$NetBSD: patch-configure,v 1.1 2015/09/29 11:52:48 richard Exp $
+$NetBSD: patch-configure,v 1.2 2015/10/07 05:48:10 richard Exp $
 
---- configure.orig	2015-09-18 13:18:38.000000000 +0000
-+++ configure
-@@ -658,6 +658,7 @@ SWIG_RB_INCLUDES
- SWIG_RB_LIBS
- SWIG_RB_LINK
- SWIG_PL_INCLUDES
-+SWIG_PL_LDFLAGS
- SWIG_PY_LIBS
- SWIG_PY_LINK
- SWIG_PY_COMPILE
-@@ -23950,6 +23951,7 @@ $as_echo_n "checking perl version... " >
- $as_echo "$PERL_VERSION" >&6; }
-     if test "$PERL_VERSION" -ge "5008000"; then
-       SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
- $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
-@@ -24439,6 +24441,7 @@ $as_echo_n "checking perl version... " >
- $as_echo "$PERL_VERSION" >&6; }
-     if test "$PERL_VERSION" -ge "5008000"; then
-       SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
- $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
-@@ -24928,6 +24931,7 @@ $as_echo_n "checking perl version... " >
- $as_echo "$PERL_VERSION" >&6; }
-     if test "$PERL_VERSION" -ge "5008000"; then
-       SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
- $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}
-@@ -25420,6 +25424,7 @@ $as_echo_n "checking perl version... " >
- $as_echo "$PERL_VERSION" >&6; }
-     if test "$PERL_VERSION" -ge "5008000"; then
-       SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts`"
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl bindings require perl 5.8.0 or newer." >&5
- $as_echo "$as_me: WARNING: perl bindings require perl 5.8.0 or newer." >&2;}