Tue Sep 9 00:14:06 2008 UTC ()
Fix subversion shared libraries search paths when configuring the
Perl modules. Fix problem like the following and as seen in
bulk build logs:
$ perl -MSVN::Ra -e '1'
/usr/pkg/lib/perl5/vendor_perl/5.8.0/i386-netbsd-thread-multi/auto/SVN/_Ra/_Ra.so: Undefined PLT symbol "svn_ra_init_ra_libs" (symnum = 13)

Approved by maintainer.
Bump PKGREVISION of the p5-subversion package to 2.


(seb)
diff -r1.41 -r1.42 pkgsrc/devel/p5-subversion/Makefile
diff -r1.64 -r1.65 pkgsrc/devel/subversion/distinfo
diff -r0 -r1.17 pkgsrc/devel/subversion/patches/patch-ae
cvs diff -r1.41 -r1.42 pkgsrc/devel/p5-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-subversion/Makefile 2008/09/06 20:54:32 1.41
+++ pkgsrc/devel/p5-subversion/Makefile 2008/09/09 00:14:06 1.42
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.41 2008/09/06 20:54:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.42 2008/09/09 00:14:06 seb Exp $
2 2
3PKGNAME= p5-subversion-${SVNVER} 3PKGNAME= p5-subversion-${SVNVER}
4PKGREVISION= 1 4PKGREVISION= 2
5COMMENT= Perl bindings for Subversion 5COMMENT= Perl bindings for Subversion
6 6
7PKG_INSTALLATION_TYPES= overwrite pkgviews 7PKG_INSTALLATION_TYPES= overwrite pkgviews
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10MAKE_JOBS_SAFE= no 10MAKE_JOBS_SAFE= no
11 11
12.include "../../devel/subversion/Makefile.common" 12.include "../../devel/subversion/Makefile.common"
13 13
14SHLIBTOOL_OVERRIDE= # empty 14SHLIBTOOL_OVERRIDE= # empty
15 15
16USE_TOOLS+= perl 16USE_TOOLS+= perl
17PERL5_CONFIGURE= no 17PERL5_CONFIGURE= no
18PERL5_OPTIONS+= threads 18PERL5_OPTIONS+= threads
19PERL5_PACKLIST= auto/SVN/_Core/.packlist 19PERL5_PACKLIST= auto/SVN/_Core/.packlist
20 20
21BUILD_TARGET= swig-pl 21BUILD_TARGET= swig-pl
22INSTALL_TARGET= install-swig-pl 22INSTALL_TARGET= install-swig-pl
23TEST_TARGET= check-swig-pl 23TEST_TARGET= check-swig-pl
 24MAKE_ENV+= SUBVERSION_BASE_PREFIX=${BUILDLINK_PREFIX.subversion-base}
24 25
25post-patch: 26post-patch:
26 ${RM} ${WRKSRC}/build-outputs.mk 27 ${RM} ${WRKSRC}/build-outputs.mk
27 ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk 28 ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk
28 29
29.include "../../devel/subversion-base/buildlink3.mk" 30.include "../../devel/subversion-base/buildlink3.mk"
30.include "../../lang/perl5/module.mk" 31.include "../../lang/perl5/module.mk"
31.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.64 -r1.65 pkgsrc/devel/subversion/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/subversion/distinfo 2008/09/06 05:30:57 1.64
+++ pkgsrc/devel/subversion/distinfo 2008/09/09 00:14:06 1.65
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.64 2008/09/06 05:30:57 epg Exp $ 1$NetBSD: distinfo,v 1.65 2008/09/09 00:14:06 seb Exp $
2 2
3SHA1 (subversion-1.5.2.tar.gz) = 10274c7c3d3a7bce11d5d470bdf110d4ff3cd6bd 3SHA1 (subversion-1.5.2.tar.gz) = 10274c7c3d3a7bce11d5d470bdf110d4ff3cd6bd
4RMD160 (subversion-1.5.2.tar.gz) = a5210af327006f15a08f750bdd3a6af2852d8c48 4RMD160 (subversion-1.5.2.tar.gz) = a5210af327006f15a08f750bdd3a6af2852d8c48
5Size (subversion-1.5.2.tar.gz) = 6646636 bytes 5Size (subversion-1.5.2.tar.gz) = 6646636 bytes
6SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6 6SHA1 (patch-ad) = 52da52e60e4d70266081d98ab0bf4ec312427bd6
 7SHA1 (patch-ae) = 55982ded0a7cbb09a91545c7580021e8ed4947f0
File Added: pkgsrc/devel/subversion/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.17 2008/09/09 00:14:06 seb Exp $

--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2008-03-21 23:44:46.000000000 +0000
+++ subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -14,9 +14,10 @@ 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 = ("$swig_builddir/perl/libsvn_swig_perl/.libs",
+my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", $subversion_base_lib,
                map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr
                                                                       ra_local
                                                                       ra_svn