Tue Sep 29 11:52:48 2015 UTC ()
Shelling perl in the Makefile can be problematic since pbulk-index may
invoke the Makefile prior to having the perl dependency installed.

Instead, gather ldopts during configure and pass them to libsvn_swig_perl
in order to build with the necessary ldflags.


(richard)
diff -r1.86 -r1.87 pkgsrc/devel/p5-subversion/Makefile
diff -r1.99 -r1.100 pkgsrc/devel/subversion/distinfo
diff -r1.29 -r1.30 pkgsrc/devel/subversion/files/build-outputs.mk
diff -r1.17 -r1.18 pkgsrc/devel/subversion/patches/patch-ad
diff -r0 -r1.1 pkgsrc/devel/subversion/patches/patch-configure
cvs diff -r1.86 -r1.87 pkgsrc/devel/p5-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-subversion/Makefile 2015/09/25 08:43:03 1.86
+++ pkgsrc/devel/p5-subversion/Makefile 2015/09/29 11:52:48 1.87
@@ -1,31 +1,26 @@ @@ -1,31 +1,26 @@
1# $NetBSD: Makefile,v 1.86 2015/09/25 08:43:03 richard Exp $ 1# $NetBSD: Makefile,v 1.87 2015/09/29 11:52:48 richard Exp $
2 2
3PKGNAME= p5-subversion-${SVNVER} 3PKGNAME= p5-subversion-${SVNVER}
4COMMENT= Perl bindings for Subversion 4COMMENT= Perl bindings for Subversion
5 5
6.include "../../devel/subversion/Makefile.common" 6.include "../../devel/subversion/Makefile.common"
7 7
8SHLIBTOOL_OVERRIDE= # empty 8SHLIBTOOL_OVERRIDE= # empty
9 9
10USE_TOOLS+= perl 10USE_TOOLS+= perl
11PERL5_CONFIGURE= no 11PERL5_CONFIGURE= no
12PERL5_OPTIONS+= threads 12PERL5_OPTIONS+= threads
13PERL5_PACKLIST= auto/SVN/_Core/.packlist 13PERL5_PACKLIST= auto/SVN/_Core/.packlist
14 14
15BUILD_TARGET= swig-pl 15BUILD_TARGET= swig-pl
16INSTALL_TARGET= install-swig-pl 16INSTALL_TARGET= install-swig-pl
17TEST_TARGET= check-swig-pl 17TEST_TARGET= check-swig-pl
18MAKE_ENV+= SUBVERSION_BASE_PREFIX=${BUILDLINK_PREFIX.subversion-base} 18MAKE_ENV+= SUBVERSION_BASE_PREFIX=${BUILDLINK_PREFIX.subversion-base}
19 19
20PERL_LDOPTS!= perl -MExtUtils::Embed -e ldopts 
21.if !empty(PERL_LDOPTS:M-fstack-protector*) 
22LDFLAGS.SunOS+= ${PERL_LDOPTS:M-fstack-protector*} 
23.endif 
24 
25post-patch: 20post-patch:
26 ${RM} ${WRKSRC}/build-outputs.mk 21 ${RM} ${WRKSRC}/build-outputs.mk
27 ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk 22 ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
28 23
29.include "../../devel/subversion-base/buildlink3.mk" 24.include "../../devel/subversion-base/buildlink3.mk"
30.include "../../lang/perl5/module.mk" 25.include "../../lang/perl5/module.mk"
31.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.99 -r1.100 pkgsrc/devel/subversion/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/subversion/distinfo 2015/09/26 06:32:17 1.99
+++ pkgsrc/devel/subversion/distinfo 2015/09/29 11:52:48 1.100
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.99 2015/09/26 06:32:17 adam Exp $ 1$NetBSD: distinfo,v 1.100 2015/09/29 11:52:48 richard Exp $
2 2
3SHA1 (subversion-1.9.2.tar.bz2) = fb9db3b7ddf48ae37aa8785872301b59bfcc7017 3SHA1 (subversion-1.9.2.tar.bz2) = fb9db3b7ddf48ae37aa8785872301b59bfcc7017
4RMD160 (subversion-1.9.2.tar.bz2) = f713ed3687d7e92bb72c935ac5a2f3c25fafec4a 4RMD160 (subversion-1.9.2.tar.bz2) = f713ed3687d7e92bb72c935ac5a2f3c25fafec4a
5Size (subversion-1.9.2.tar.bz2) = 7910994 bytes 5Size (subversion-1.9.2.tar.bz2) = 7910994 bytes
6SHA1 (patch-ad) = 5a11156f0af26e1dff64ddb247fee94b1e67dd9a 6SHA1 (patch-ad) = b724797c793b64875b72ad0c6fb120a2c9632b32
7SHA1 (patch-ae) = a9cd7d26fb5f9da8ff81413ef32948ccd6c4290e 7SHA1 (patch-ae) = a9cd7d26fb5f9da8ff81413ef32948ccd6c4290e
 8SHA1 (patch-configure) = 1dfb781af8c59e3b9fbdc2350c0123260a2f7203
8SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a 9SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
cvs diff -r1.29 -r1.30 pkgsrc/devel/subversion/files/build-outputs.mk (expand / switch to unified diff)

--- pkgsrc/devel/subversion/files/build-outputs.mk 2015/09/26 06:32:17 1.29
+++ pkgsrc/devel/subversion/files/build-outputs.mk 2015/09/29 11:52:48 1.30
@@ -477,26 +477,27 @@ libsvn_repos_DEPS = subversion/libsvn_re @@ -477,26 +477,27 @@ libsvn_repos_DEPS = subversion/libsvn_re
477libsvn_repos_OBJECTS = authz.lo authz_pool.lo commit.lo config_pool.lo delta.lo deprecated.lo dump.lo fs-wrap.lo hooks.lo load-fs-vtable.lo load.lo log.lo node_tree.lo notify.lo replay.lo reporter.lo repos.lo rev_hunt.lo 477libsvn_repos_OBJECTS = authz.lo authz_pool.lo commit.lo config_pool.lo delta.lo deprecated.lo dump.lo fs-wrap.lo hooks.lo load-fs-vtable.lo load.lo log.lo node_tree.lo notify.lo replay.lo reporter.lo repos.lo rev_hunt.lo
478subversion/libsvn_repos/libsvn_repos-1.la: $(libsvn_repos_DEPS) 478subversion/libsvn_repos/libsvn_repos-1.la: $(libsvn_repos_DEPS)
479 cd subversion/libsvn_repos && $(LINK_LIB) $(libsvn_repos_LDFLAGS) -o libsvn_repos-1.la $(LT_NO_UNDEFINED) $(libsvn_repos_OBJECTS) -lsvn_fs-1 -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS) 479 cd subversion/libsvn_repos && $(LINK_LIB) $(libsvn_repos_LDFLAGS) -o libsvn_repos-1.la $(LT_NO_UNDEFINED) $(libsvn_repos_OBJECTS) -lsvn_fs-1 -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
480 480
481libsvn_subr_PATH = subversion/libsvn_subr 481libsvn_subr_PATH = subversion/libsvn_subr
482libsvn_subr_DEPS = subversion/libsvn_subr/adler32.lo subversion/libsvn_subr/atomic.lo subversion/libsvn_subr/auth.lo subversion/libsvn_subr/base64.lo subversion/libsvn_subr/bit_array.lo subversion/libsvn_subr/cache-inprocess.lo subversion/libsvn_subr/cache-membuffer.lo subversion/libsvn_subr/cache-memcache.lo subversion/libsvn_subr/cache.lo subversion/libsvn_subr/cache_config.lo subversion/libsvn_subr/checksum.lo subversion/libsvn_subr/cmdline.lo subversion/libsvn_subr/compat.lo subversion/libsvn_subr/compress.lo subversion/libsvn_subr/config.lo subversion/libsvn_subr/config_auth.lo subversion/libsvn_subr/config_file.lo subversion/libsvn_subr/config_win.lo subversion/libsvn_subr/crypto.lo subversion/libsvn_subr/ctype.lo subversion/libsvn_subr/date.lo subversion/libsvn_subr/debug.lo subversion/libsvn_subr/deprecated.lo subversion/libsvn_subr/dirent_uri.lo subversion/libsvn_subr/dso.lo subversion/libsvn_subr/eol.lo subversion/libsvn_subr/error.lo subversion/libsvn_subr/fnv1a.lo subversion/libsvn_subr/gpg_agent.lo subversion/libsvn_subr/hash.lo subversion/libsvn_subr/io.lo subversion/libsvn_subr/iter.lo subversion/libsvn_subr/lock.lo subversion/libsvn_subr/log.lo subversion/libsvn_subr/macos_keychain.lo subversion/libsvn_subr/magic.lo subversion/libsvn_subr/md5.lo subversion/libsvn_subr/mergeinfo.lo subversion/libsvn_subr/mutex.lo subversion/libsvn_subr/nls.lo subversion/libsvn_subr/object_pool.lo subversion/libsvn_subr/opt.lo subversion/libsvn_subr/packed_data.lo subversion/libsvn_subr/path.lo subversion/libsvn_subr/pool.lo subversion/libsvn_subr/prefix_string.lo subversion/libsvn_subr/prompt.lo subversion/libsvn_subr/properties.lo subversion/libsvn_subr/quoprint.lo subversion/libsvn_subr/root_pools.lo subversion/libsvn_subr/simple_providers.lo subversion/libsvn_subr/skel.lo subversion/libsvn_subr/sorts.lo subversion/libsvn_subr/spillbuf.lo subversion/libsvn_subr/sqlite.lo subversion/libsvn_subr/sqlite3wrapper.lo subversion/libsvn_subr/ssl_client_cert_providers.lo subversion/libsvn_subr/ssl_client_cert_pw_providers.lo subversion/libsvn_subr/ssl_server_trust_providers.lo subversion/libsvn_subr/stream.lo subversion/libsvn_subr/string.lo subversion/libsvn_subr/subst.lo subversion/libsvn_subr/sysinfo.lo subversion/libsvn_subr/target.lo subversion/libsvn_subr/temp_serializer.lo subversion/libsvn_subr/time.lo subversion/libsvn_subr/token.lo subversion/libsvn_subr/types.lo subversion/libsvn_subr/user.lo subversion/libsvn_subr/username_providers.lo subversion/libsvn_subr/utf.lo subversion/libsvn_subr/utf8proc.lo subversion/libsvn_subr/utf_validate.lo subversion/libsvn_subr/utf_width.lo subversion/libsvn_subr/validate.lo subversion/libsvn_subr/version.lo subversion/libsvn_subr/win32_crashrpt.lo subversion/libsvn_subr/win32_crypto.lo subversion/libsvn_subr/win32_xlate.lo subversion/libsvn_subr/x509info.lo subversion/libsvn_subr/x509parse.lo subversion/libsvn_subr/xml.lo 482libsvn_subr_DEPS = subversion/libsvn_subr/adler32.lo subversion/libsvn_subr/atomic.lo subversion/libsvn_subr/auth.lo subversion/libsvn_subr/base64.lo subversion/libsvn_subr/bit_array.lo subversion/libsvn_subr/cache-inprocess.lo subversion/libsvn_subr/cache-membuffer.lo subversion/libsvn_subr/cache-memcache.lo subversion/libsvn_subr/cache.lo subversion/libsvn_subr/cache_config.lo subversion/libsvn_subr/checksum.lo subversion/libsvn_subr/cmdline.lo subversion/libsvn_subr/compat.lo subversion/libsvn_subr/compress.lo subversion/libsvn_subr/config.lo subversion/libsvn_subr/config_auth.lo subversion/libsvn_subr/config_file.lo subversion/libsvn_subr/config_win.lo subversion/libsvn_subr/crypto.lo subversion/libsvn_subr/ctype.lo subversion/libsvn_subr/date.lo subversion/libsvn_subr/debug.lo subversion/libsvn_subr/deprecated.lo subversion/libsvn_subr/dirent_uri.lo subversion/libsvn_subr/dso.lo subversion/libsvn_subr/eol.lo subversion/libsvn_subr/error.lo subversion/libsvn_subr/fnv1a.lo subversion/libsvn_subr/gpg_agent.lo subversion/libsvn_subr/hash.lo subversion/libsvn_subr/io.lo subversion/libsvn_subr/iter.lo subversion/libsvn_subr/lock.lo subversion/libsvn_subr/log.lo subversion/libsvn_subr/macos_keychain.lo subversion/libsvn_subr/magic.lo subversion/libsvn_subr/md5.lo subversion/libsvn_subr/mergeinfo.lo subversion/libsvn_subr/mutex.lo subversion/libsvn_subr/nls.lo subversion/libsvn_subr/object_pool.lo subversion/libsvn_subr/opt.lo subversion/libsvn_subr/packed_data.lo subversion/libsvn_subr/path.lo subversion/libsvn_subr/pool.lo subversion/libsvn_subr/prefix_string.lo subversion/libsvn_subr/prompt.lo subversion/libsvn_subr/properties.lo subversion/libsvn_subr/quoprint.lo subversion/libsvn_subr/root_pools.lo subversion/libsvn_subr/simple_providers.lo subversion/libsvn_subr/skel.lo subversion/libsvn_subr/sorts.lo subversion/libsvn_subr/spillbuf.lo subversion/libsvn_subr/sqlite.lo subversion/libsvn_subr/sqlite3wrapper.lo subversion/libsvn_subr/ssl_client_cert_providers.lo subversion/libsvn_subr/ssl_client_cert_pw_providers.lo subversion/libsvn_subr/ssl_server_trust_providers.lo subversion/libsvn_subr/stream.lo subversion/libsvn_subr/string.lo subversion/libsvn_subr/subst.lo subversion/libsvn_subr/sysinfo.lo subversion/libsvn_subr/target.lo subversion/libsvn_subr/temp_serializer.lo subversion/libsvn_subr/time.lo subversion/libsvn_subr/token.lo subversion/libsvn_subr/types.lo subversion/libsvn_subr/user.lo subversion/libsvn_subr/username_providers.lo subversion/libsvn_subr/utf.lo subversion/libsvn_subr/utf8proc.lo subversion/libsvn_subr/utf_validate.lo subversion/libsvn_subr/utf_width.lo subversion/libsvn_subr/validate.lo subversion/libsvn_subr/version.lo subversion/libsvn_subr/win32_crashrpt.lo subversion/libsvn_subr/win32_crypto.lo subversion/libsvn_subr/win32_xlate.lo subversion/libsvn_subr/x509info.lo subversion/libsvn_subr/x509parse.lo subversion/libsvn_subr/xml.lo
483libsvn_subr_OBJECTS = adler32.lo atomic.lo auth.lo base64.lo bit_array.lo cache-inprocess.lo cache-membuffer.lo cache-memcache.lo cache.lo cache_config.lo checksum.lo cmdline.lo compat.lo compress.lo config.lo config_auth.lo config_file.lo config_win.lo crypto.lo ctype.lo date.lo debug.lo deprecated.lo dirent_uri.lo dso.lo eol.lo error.lo fnv1a.lo gpg_agent.lo hash.lo io.lo iter.lo lock.lo log.lo macos_keychain.lo magic.lo md5.lo mergeinfo.lo mutex.lo nls.lo object_pool.lo opt.lo packed_data.lo path.lo pool.lo prefix_string.lo prompt.lo properties.lo quoprint.lo root_pools.lo simple_providers.lo skel.lo sorts.lo spillbuf.lo sqlite.lo sqlite3wrapper.lo ssl_client_cert_providers.lo ssl_client_cert_pw_providers.lo ssl_server_trust_providers.lo stream.lo string.lo subst.lo sysinfo.lo target.lo temp_serializer.lo time.lo token.lo types.lo user.lo username_providers.lo utf.lo utf8proc.lo utf_validate.lo utf_width.lo validate.lo version.lo win32_crashrpt.lo win32_crypto.lo win32_xlate.lo x509info.lo x509parse.lo xml.lo 483libsvn_subr_OBJECTS = adler32.lo atomic.lo auth.lo base64.lo bit_array.lo cache-inprocess.lo cache-membuffer.lo cache-memcache.lo cache.lo cache_config.lo checksum.lo cmdline.lo compat.lo compress.lo config.lo config_auth.lo config_file.lo config_win.lo crypto.lo ctype.lo date.lo debug.lo deprecated.lo dirent_uri.lo dso.lo eol.lo error.lo fnv1a.lo gpg_agent.lo hash.lo io.lo iter.lo lock.lo log.lo macos_keychain.lo magic.lo md5.lo mergeinfo.lo mutex.lo nls.lo object_pool.lo opt.lo packed_data.lo path.lo pool.lo prefix_string.lo prompt.lo properties.lo quoprint.lo root_pools.lo simple_providers.lo skel.lo sorts.lo spillbuf.lo sqlite.lo sqlite3wrapper.lo ssl_client_cert_providers.lo ssl_client_cert_pw_providers.lo ssl_server_trust_providers.lo stream.lo string.lo subst.lo sysinfo.lo target.lo temp_serializer.lo time.lo token.lo types.lo user.lo username_providers.lo utf.lo utf8proc.lo utf_validate.lo utf_width.lo validate.lo version.lo win32_crashrpt.lo win32_crypto.lo win32_xlate.lo x509info.lo x509parse.lo xml.lo
484subversion/libsvn_subr/libsvn_subr-1.la: $(libsvn_subr_DEPS) 484subversion/libsvn_subr/libsvn_subr-1.la: $(libsvn_subr_DEPS)
485 cd subversion/libsvn_subr && $(LINK_LIB) $(libsvn_subr_LDFLAGS) -o libsvn_subr-1.la $(LT_NO_UNDEFINED) $(libsvn_subr_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_XML_LIBS) $(SVN_ZLIB_LIBS) $(SVN_APR_MEMCACHE_LIBS) $(SVN_SQLITE_LIBS) $(SVN_MAGIC_LIBS) $(SVN_INTL_LIBS) $(LIBS) 485 cd subversion/libsvn_subr && $(LINK_LIB) $(libsvn_subr_LDFLAGS) -o libsvn_subr-1.la $(LT_NO_UNDEFINED) $(libsvn_subr_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_XML_LIBS) $(SVN_ZLIB_LIBS) $(SVN_APR_MEMCACHE_LIBS) $(SVN_SQLITE_LIBS) $(SVN_MAGIC_LIBS) $(SVN_INTL_LIBS) $(LIBS)
486 486
487libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl 487libsvn_swig_perl_PATH = subversion/bindings/swig/perl/libsvn_swig_perl
488libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo 488libsvn_swig_perl_DEPS = subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.lo
489libsvn_swig_perl_OBJECTS = swigutil_pl.lo 489libsvn_swig_perl_OBJECTS = swigutil_pl.lo
 490libsvn_swig_perl_LDFLAGS = $(SWIG_PL_LDFLAGS)
490subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS) 491subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
491 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) 492 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)
492 493
493libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py 494libsvn_swig_py_PATH = subversion/bindings/swig/python/libsvn_swig_py
494libsvn_swig_py_DEPS = subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo 495libsvn_swig_py_DEPS = subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo
495libsvn_swig_py_OBJECTS = swigutil_py.lo 496libsvn_swig_py_OBJECTS = swigutil_py.lo
496subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la: $(libsvn_swig_py_DEPS) 497subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la: $(libsvn_swig_py_DEPS)
497 cd subversion/bindings/swig/python/libsvn_swig_py && $(LINK) $(libsvn_swig_py_LDFLAGS) -o libsvn_swig_py-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_py_OBJECTS) -lsvn_client-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PYTHON_LIBS) $(SVN_SWIG_LIBS) $(LIBS) 498 cd subversion/bindings/swig/python/libsvn_swig_py && $(LINK) $(libsvn_swig_py_LDFLAGS) -o libsvn_swig_py-1.la $(LT_NO_UNDEFINED) $(libsvn_swig_py_OBJECTS) -lsvn_client-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_delta-1 -lsvn_subr-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(SVN_PYTHON_LIBS) $(SVN_SWIG_LIBS) $(LIBS)
498 499
499libsvn_swig_ruby_PATH = subversion/bindings/swig/ruby/libsvn_swig_ruby 500libsvn_swig_ruby_PATH = subversion/bindings/swig/ruby/libsvn_swig_ruby
500libsvn_swig_ruby_DEPS = subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo 501libsvn_swig_ruby_DEPS = subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo
501libsvn_swig_ruby_OBJECTS = swigutil_rb.lo 502libsvn_swig_ruby_OBJECTS = swigutil_rb.lo
502subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la: $(libsvn_swig_ruby_DEPS) 503subversion/bindings/swig/ruby/libsvn_swig_ruby/libsvn_swig_ruby-1.la: $(libsvn_swig_ruby_DEPS)
cvs diff -r1.17 -r1.18 pkgsrc/devel/subversion/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/subversion/patches/Attic/patch-ad 2015/09/25 08:43:04 1.17
+++ pkgsrc/devel/subversion/patches/Attic/patch-ad 2015/09/29 11:52:48 1.18
@@ -1,29 +1,37 @@ @@ -1,29 +1,37 @@
1$NetBSD: patch-ad,v 1.17 2015/09/25 08:43:04 richard Exp $ 1$NetBSD: patch-ad,v 1.18 2015/09/29 11:52:48 richard Exp $
2 2
3apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes 3apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes
4 4
5--- Makefile.in.orig 2015-07-26 23:03:10.000000000 +0000 5--- Makefile.in.orig 2015-09-18 12:56:29.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -89,7 +89,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv 7@@ -89,7 +89,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv
8 toolsdir = @bindir@/svn-tools 8 toolsdir = @bindir@/svn-tools
9  9
10 # where to install pkg-config files 10 # where to install pkg-config files
11-pkgconfig_dir = $(datadir)/pkgconfig 11-pkgconfig_dir = $(datadir)/pkgconfig
12+pkgconfig_dir = $(libdir)/pkgconfig 12+pkgconfig_dir = $(libdir)/pkgconfig
13  13
14 javahl_javadir = @libdir@/svn-javahl 14 javahl_javadir = @libdir@/svn-javahl
15 javahl_javahdir = @libdir@/svn-javahl/include 15 javahl_javahdir = @libdir@/svn-javahl/include
16@@ -833,11 +833,11 @@ clean-swig-headers: 16@@ -145,6 +145,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
 17 SWIG_PY_LINK = @SWIG_PY_LINK@
 18 SWIG_PY_LIBS = @SWIG_PY_LIBS@
 19 SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
 20+SWIG_PL_LDFLAGS = @SWIG_PL_LDFLAGS@
 21 SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
 22 SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
 23 SWIG_RB_LINK = @SWIG_RB_LINK@
 24@@ -832,11 +833,11 @@ clean-swig-headers:
17 extraclean-swig-headers: clean-swig-headers 25 extraclean-swig-headers: clean-swig-headers
18 $(EXTRACLEAN_SWIG_HEADERS) 26 $(EXTRACLEAN_SWIG_HEADERS)
19  27
20-$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in 28-$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
21+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl 29+$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl
22 ./config.status subversion/bindings/swig/perl/native/Makefile.PL 30 ./config.status subversion/bindings/swig/perl/native/Makefile.PL
23  31
24 $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL 32 $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
25- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) 33- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
26+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor 34+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor
27  35
28 # There is a "readlink -f" command on some systems for the same purpose, 36 # There is a "readlink -f" command on some systems for the same purpose,
29 # but it's not as portable (e.g. Mac OS X doesn't have it). These should 37 # but it's not as portable (e.g. Mac OS X doesn't have it). These should
File Added: pkgsrc/devel/subversion/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2015/09/29 11:52:48 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;}