summaryrefslogtreecommitdiff
path: root/devel/subversion
diff options
context:
space:
mode:
authorobache <obache>2013-09-18 12:15:57 +0000
committerobache <obache>2013-09-18 12:15:57 +0000
commitb2f3095b50a1ca1deae454f0af3906854d589087 (patch)
tree89671948e5498b0429891439851c1dac39b6a4df /devel/subversion
parent6bdfee42c036f8086298197666384c037f5398f1 (diff)
downloadpkgsrc-b2f3095b50a1ca1deae454f0af3906854d589087.tar.gz
fixes a patch related to perl binding:
* Update comment, `Second hunk' had been removed. * fixes patch migration at updated to 1.8.0, original part had been changed, but still using old part + additional part.
Diffstat (limited to 'devel/subversion')
-rw-r--r--devel/subversion/distinfo4
-rw-r--r--devel/subversion/patches/patch-ae11
2 files changed, 7 insertions, 8 deletions
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 129e867b7e5..079a1cf19c3 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.87 2013/09/05 07:07:46 adam Exp $
+$NetBSD: distinfo,v 1.88 2013/09/18 12:15:57 obache Exp $
SHA1 (subversion-1.8.3.tar.bz2) = e328e9f1c57f7c78bea4c3af869ec5d4503580cf
RMD160 (subversion-1.8.3.tar.bz2) = 9e27b43cdff0c4c6e3c80fee56a332ad4bfa9982
Size (subversion-1.8.3.tar.bz2) = 6773731 bytes
SHA1 (patch-ad) = ae54d77447c2ef746bca21f755aa7c255c9521b9
-SHA1 (patch-ae) = eb348506865a465cc5d123ffacd2778b02b0adc8
+SHA1 (patch-ae) = 0e9816be14d0fa33e88e12c8087f7d53dead4ed8
SHA1 (patch-subversion_include_svn_auth.h) = d39e2063c253016ba75bc44102d1655459849f8f
SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
index 2cc56510047..058e30480f2 100644
--- a/devel/subversion/patches/patch-ae
+++ b/devel/subversion/patches/patch-ae
@@ -1,19 +1,18 @@
-$NetBSD: patch-ae,v 1.20 2013/07/04 19:31:15 wiz Exp $
+$NetBSD: patch-ae,v 1.21 2013/09/18 12:15:57 obache Exp $
-Second hunk is subversion Revision 1145203. Ensure the
-Perl extension is built using the Perl compiler flags.
+* tell location of libraries from subversion base package.
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2012-12-14 06:05:48.000000000 +0000
+++ subversion/bindings/swig/perl/native/Makefile.PL.in
-@@ -35,9 +35,10 @@ my $svnlib_srcdir = "${top_srcdir}/subve
+@@ -35,9 +35,11 @@ my $svnlib_srcdir = "${top_srcdir}/subve
my $svnlib_builddir = "${top_builddir}/subversion";
my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+my $subversion_base_lib = $ENV{SUBVERSION_BASE_PREFIX} . "/lib";
my @modules = qw/client delta fs ra repos wc/;
--my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
-+my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", $subversion_base_lib,
+ my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
++ $subversion_base_lib,
map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
@modules, qw/diff subr ra_local ra_svn ra_serf
fs_base fs_util fs_fs/);