OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Oct-2008 19:42:02
Branch: HEAD Handle: 2008102718420200
Modified files:
openpkg-src/subversion subversion.patch subversion.spec
Log:
next round in getting the f*cking Perl bindings to work
Summary:
Revision Changes Path
1.24 +16 -9 openpkg-src/subversion/subversion.patch
1.151 +1 -1 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 subversion.patch
--- openpkg-src/subversion/subversion.patch 26 Oct 2008 22:20:13 -0000
1.23
+++ openpkg-src/subversion/subversion.patch 27 Oct 2008 18:42:02 -0000
1.24
@@ -1,6 +1,6 @@
Index: Makefile.in
--- Makefile.in.orig 2008-08-26 19:27:56 +0200
-+++ Makefile.in 2008-10-26 19:57:16 +0100
++++ Makefile.in 2008-10-27 19:18:32 +0100
@@ -156,7 +156,7 @@
LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
@@ -30,7 +30,7 @@
$(SWIG_PL_DIR)/native/Makefile
Index: apr-util/crypto/getuuid.c
--- apr-util/crypto/getuuid.c.orig 2008-10-22 15:55:26 +0200
-+++ apr-util/crypto/getuuid.c 2008-10-26 19:57:16 +0100
++++ apr-util/crypto/getuuid.c 2008-10-27 19:18:32 +0100
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -42,7 +42,7 @@
return rand() & 0x0FFFF;
Index: build-outputs.mk
--- build-outputs.mk.orig 2008-10-22 15:55:50 +0200
-+++ build-outputs.mk 2008-10-26 19:57:16 +0100
++++ build-outputs.mk 2008-10-27 19:18:32 +0100
@@ -333,7 +333,7 @@
mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo
subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo
subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo
subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo
subversion/mod_dav_svn/mod_dav_svn.lo
subversion/mod_dav_svn/reports/dated-rev.lo
subversion/mod_dav_svn/reports/file-revs.lo
subversion/mod_dav_svn/reports/get-location-segments.lo
subversion/mod_dav_svn/reports/get-locations.lo
subversion/mod_dav_svn/reports/get-locks.lo
subversion/mod_dav_svn/reports/log.lo
subversion/mod_dav_svn/reports/mergeinfo.lo
subversion/mod_dav_svn/reports/replay.lo
subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo
subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la
subversion/libsvn_delta/libsvn_delta-1.la
subversion/libsvn_subr/libsvn_subr-1.la
mod_dav_svn_OBJECTS = activity.lo authz.lo deadprops.lo liveprops.lo
lock.lo merge.lo mirror.lo mod_dav_svn.lo reports/dated-rev.lo
reports/file-revs.lo reports/get-location-segments.lo reports/get-locations.lo
reports/get-locks.lo reports/log.lo reports/mergeinfo.lo reports/replay.lo
reports/update.lo repos.lo util.lo version.lo
@@ -54,7 +54,7 @@
opt_test_DEPS = subversion/tests/libsvn_subr/opt-test.o
subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
Index: configure
--- configure.orig 2008-10-22 15:55:52 +0200
-+++ configure 2008-10-26 19:57:16 +0100
++++ configure 2008-10-27 19:18:32 +0100
@@ -5092,6 +5092,11 @@
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
@@ -69,13 +69,13 @@
then :
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-03-22
00:44:46 +0100
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-10-26
19:58:05 +0100
++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-10-27
19:19:57 +0100
@@ -25,17 +25,13 @@
fs_base
fs_util
fs_fs/));
-my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
-+my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta client
subr ra_local ra_serf ra_neon ra_svn fs_base fs_fs fs_util wc/);
++my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr delta client
subr ra_local ra_neon ra_svn fs_base fs_fs fs_util wc/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
my $cppflags = '@CPPFLAGS@';
@@ -86,23 +86,30 @@
-# the build on FreeBSD if not conditionalized.
-my $apr_ldflags = '@SVN_APR_EXPORT_LIBS@'
- if $^O eq 'darwin' or $^O eq 'cygwin';
-+my $apr_ldflags = '@SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ -liconv
-lz '.`neon-config --libs`.' -lssl -lcrypto -lxml2';
++my $apr_ldflags = '@SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ -lneon
-lssl -lcrypto -lxml2 -liconv -lz -lm';
chomp $apr_shlib_path_var;
-@@ -48,9 +44,9 @@
+@@ -43,14 +39,16 @@
+ ABSTRACT => 'Perl bindings for Subversion',
+ DEFINE => $cppflags,
+ INC => join(' ',$apr_cflags, $apu_cflags,
++ " -I$top_builddir/neon/src",
+ " -I$swig_srcdir/perl/libsvn_swig_perl",
+ " -I$svnlib_srcdir/include",
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
+ LIBS => [join(' ', "[EMAIL PROTECTED]@/lib",
++ "-L$top_builddir/neon/src/.libs",
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
- @ldmodules, '-lsvn_swig_perl-1',
+ '-lsvn_swig_perl-1', @ldmodules, @ldmodules, @ldmodules,
@ldmodules, @ldmodules, @ldmodules, '-lsvn_swig_perl-1', $apr_ldflags,
`$swig -perl -ldflags`)],
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
-@@ -79,6 +75,7 @@
+@@ -79,6 +77,7 @@
MAKEFILE=> "Makefile.$_",
NAME => "SVN::_".perlish($_),
C => ["svn_$_.c"],
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.150 -r1.151 subversion.spec
--- openpkg-src/subversion/subversion.spec 26 Oct 2008 22:22:48 -0000
1.150
+++ openpkg-src/subversion/subversion.spec 27 Oct 2008 18:42:02 -0000
1.151
@@ -40,7 +40,7 @@
Group: SCM
License: Apache/BSD
Version: %{V_opkg}
-Release: 20081026
+Release: 20081027
# package options
%option with_cvs2svn no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
