ports/71758: [PATCH] devel/subversion: update to 1.1.0
June-Yen Huang
jihuang at gate.sinica.edu.tw
Wed Sep 15 09:40:31 UTC 2004
>Number: 71758
>Category: ports
>Synopsis: [PATCH] devel/subversion: update to 1.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 15 09:40:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: June-Yen Huang
>Release: FreeBSD 5.2.1-RELEASE-p1 i386
>Organization:
Institute of Information Science, Academia Sinica
>Environment:
System: FreeBSD itspc24.iis.sinica.edu.tw 5.2.1-RELEASE-p1 FreeBSD 5.2.1-RELEASE-p1 #0: Fri Mar 5 10:43:10 CST
>Description:
- Update to 1.1.0 , RC3 should be the last RC for 1.1 Release
Removed file(s):
- files/patch-subversion::bindings::swig::perl::Makefile.PL
- files/patch-svnperl-memoryleak
- files/patch-svnperl-noruntime
Port maintainer (lev at freebsd.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- subversion-1.1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/subversion/Makefile /tmp/subversion/Makefile
--- /usr/ports/devel/subversion/Makefile Sun Aug 22 02:33:26 2004
+++ /tmp/subversion/Makefile Wed Sep 15 16:37:08 2004
@@ -5,10 +5,10 @@
# $FreeBSD: ports/devel/subversion/Makefile,v 1.68 2004/08/21 18:33:26 lev Exp $
PORTNAME= subversion
-PORTVERSION= 1.0.6
-PORTREVISION= 2
+PORTVERSION= 1.1.0
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
+DISTNAME= ${PORTNAME}-${PORTVERSION}-rc3
MAINTAINER= lev at freebsd.org
COMMENT= Version control system
@@ -17,7 +17,7 @@
INSTALLS_SHLIB= yes
-USE_SIZE= yes
+#USE_SIZE= yes
USE_BZIP2= yes
USE_LIBTOOL_VER=15
USE_REINPLACE= yes
@@ -73,7 +73,7 @@
.endif
.if defined(WITH_PYTHON)
-USE_PYTHON= yes
+#USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
SWIG_BINDINGS+= python
PLIST_SUB+= WITH_PYTHON=""
@@ -244,13 +244,7 @@
post-build:
.if defined(WITH_PERL)
cd ${WRKSRC} ; \
- ${MAKE} swig-pl-lib
- cd ${WRKSRC}/subversion/bindings/swig/perl ; \
- ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \
- CCFLAGS="${CCFLAGS}" CC="${CC}" \
- ${PERL} Makefile.PL PREFIX="${PREFIX}" \
- INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \
- ${MAKE} all
+ ${MAKE} swig-pl
.endif
.if defined(WITH_PYTHON)
cd ${WRKSRC} ; \
@@ -281,9 +275,7 @@
.endif
.if defined(WITH_PERL)
cd ${WRKSRC} ; \
- ${MAKE} install-swig-pl-lib
- cd ${WRKSRC}/subversion/bindings/swig/perl ; \
- ${MAKE} install
+ ${MAKE} install-swig-pl
.endif
.if defined(WITH_PYTHON)
cd ${WRKSRC} ; \
diff -ruN --exclude=CVS /usr/ports/devel/subversion/distinfo /tmp/subversion/distinfo
--- /usr/ports/devel/subversion/distinfo Fri Jul 30 20:37:58 2004
+++ /tmp/subversion/distinfo Wed Sep 15 16:37:08 2004
@@ -1,2 +1,2 @@
-MD5 (subversion-1.0.6.tar.bz2) = bb05fe041fef7491b3555904d97f5e1c
-SIZE (subversion-1.0.6.tar.bz2) = 6022074
+MD5 (subversion-1.1.0-rc3.tar.bz2) = 9612af0f7f38963884776337b4c8d023
+SIZE (subversion-1.1.0-rc3.tar.gz2) = 6673517
diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL /tmp/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL
--- /usr/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL Thu Feb 5 23:20:42 2004
+++ /tmp/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL Thu Jan 1 08:00:00 1970
@@ -1,11 +0,0 @@
---- subversion/bindings/swig/perl/Makefile.PL.orig Sat Jan 24 20:46:46 2004
-+++ subversion/bindings/swig/perl/Makefile.PL Sat Jan 31 21:40:23 2004
-@@ -41,7 +41,7 @@
-
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
-- CCFLAGS => join(' ', $apr_cflags, $apu_cflags,
-+ CCFLAGS => join(' ', $ENV{'CCFLAGS'} || '', $apr_cflags, $apu_cflags,
- `$perl_path -MExtUtils::Embed -e ccopts`,
- ' -I.. -I../../../include -g'),
- OBJECT => q/$(O_FILES)/,
diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-svnperl-memoryleak /tmp/subversion/files/patch-svnperl-memoryleak
--- /usr/ports/devel/subversion/files/patch-svnperl-memoryleak Fri Aug 20 04:40:29 2004
+++ /tmp/subversion/files/patch-svnperl-memoryleak Thu Jan 1 08:00:00 1970
@@ -1,195 +0,0 @@
---- subversion/bindings/swig/svn_types.i (revision 10171)
-+++ subversion/bindings/swig/svn_types.i (revision 10172)
-@@ -316,7 +316,7 @@
- %typemap(perl5, in) (svn_commit_callback_t callback, void *callback_baton) {
- $1 = svn_swig_pl_thunk_commit_callback;
- $2 = (void *)$input;
-- SvREFCNT_inc($input);
-+ svn_swig_pl_hold_ref_in_pool (_global_pool, $input);
- };
-
- /* -----------------------------------------------------------------------
---- subversion/bindings/swig/swigutil_pl.c (revision 10171)
-+++ subversion/bindings/swig/swigutil_pl.c (revision 10172)
-@@ -1385,3 +1385,16 @@ apr_file_t *svn_swig_pl_make_file (SV *f
- }
- return apr_file;
- }
-+
-+static apr_status_t cleanup_refcnt (void *data)
-+{
-+ SV *sv = data;
-+ SvREFCNT_dec (sv);
-+ return APR_SUCCESS;
-+}
-+
-+void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv)
-+{
-+ SvREFCNT_inc(sv);
-+ apr_pool_cleanup_register (pool, sv, cleanup_refcnt, apr_pool_cleanup_null);
-+}
---- subversion/bindings/swig/swigutil_pl.h (revision 10171)
-+++ subversion/bindings/swig/swigutil_pl.h (revision 10172)
-@@ -231,6 +231,7 @@ SV *svn_swig_pl_from_stream (svn_stream_
- /* apr_file_t * */
- apr_file_t *svn_swig_pl_make_file (SV *file, apr_pool_t *pool);
-
-+void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv);
-
- #ifdef __cplusplus
- }
---- subversion/bindings/swig/perl/t/5delta.t (revision 10171)
-+++ subversion/bindings/swig/perl/t/5delta.t (revision 10172)
-@@ -4,27 +4,19 @@ use Test::More tests => 2;
- require SVN::Core;
- require SVN::Delta;
-
--SKIP: {
-- eval { require IO::String };
-+my ($srctext, $tgttext, $result) = ('abcd===eflfjgjkx', 'abcd=--ef==lfjffgjx', '');
-
-- skip "IO::String not installed", 2 if $@;
-- my $srctext = 'abcd===eflfjgjkx';
-- my $tgttext = 'abcd=--ef==lfjffgjx';
-+open my $source, '<', \$srctext;
-+open my $target, '<', \$tgttext;
-+open my $aresult, '>', \$result;
-
-- my $source = IO::String->new ($srctext);
-- my $target = IO::String->new ($tgttext);
-+my $txstream = SVN::TxDelta::new ($source, $target);
-
-- my $result = '';
-- my $aresult = IO::String->new (\$result);
-+isa_ok ($txstream, '_p_svn_txdelta_stream_t');
-+open my $asource, '<', \$srctext;
-+my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)];
-
-- my $txstream = SVN::TxDelta::new ($source, $target);
-+SVN::TxDelta::send_txstream ($txstream, @$handle);
-
-- isa_ok ($txstream, '_p_svn_txdelta_stream_t');
-- my $handle = [SVN::TxDelta::apply (IO::String->new ($srctext),
-- $aresult, undef, undef)];
-+is ($result, $tgttext, 'delta self test');
-
-- SVN::TxDelta::send_txstream ($txstream, @$handle);
--
-- is ($result, $tgttext, 'delta self test');
--
--}
---- subversion/bindings/swig/perl/t/1repos.t (revision 10171)
-+++ subversion/bindings/swig/perl/t/1repos.t (revision 10172)
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl -w
-
--use Test::More tests => 5;
-+use Test::More tests => 6;
- use File::Temp qw(tempdir);
- use File::Path qw(rmtree);
- use strict;
-@@ -64,15 +64,20 @@ is_deeply (\@history, [['/tags/foo/filea
- 'repos_history');
-
- {
-+my $pool = SVN::Pool->new_default;
-+my $something = bless {}, 'something';
- $editor = SVN::Delta::Editor->
- new (SVN::Repos::get_commit_editor($repos, "file://$repospath",
-- '/', 'root', 'FOO', \&committed));
-+ '/', 'root', 'FOO', sub {committed(@_);
-+ $something;
-+ }));
-
- my $rootbaton = $editor->open_root(2);
- $editor->delete_entry('tags', 2, $rootbaton);
-
- $editor->close_edit();
- }
-+ok ($main::something_destroyed, 'callback properly destroyed');
-
- cmp_ok($fs->youngest_rev, '==', 3);
-
-@@ -80,3 +85,11 @@ END {
- diag "cleanup";
- rmtree($repospath);
- }
-+
-+package something;
-+
-+sub DESTROY {
-+ $main::something_destroyed++;
-+}
-+
-+1;
---- subversion/bindings/swig/perl/Delta.pm (revision 10171)
-+++ subversion/bindings/swig/perl/Delta.pm (revision 10172)
-@@ -143,8 +143,8 @@ sub AUTOLOAD {
- return unless $_[0]->{_editor};
- my $class = ref($_[0]);
- my $func = $AUTOLOAD;
-- $func =~ s/^${class}::(SUPER::)?//;
-- return if $func =~ m/^[A-Z]/;
-+ $func =~ s/.*:://;
-+ return unless $func =~ m/[^A-Z]/;
-
- my %ebaton = ( set_target_revision => 1,
- open_root => 1,
---- subversion/bindings/swig/perl/Base.pm (revision 10171)
-+++ subversion/bindings/swig/perl/Base.pm (revision 10172)
-@@ -7,7 +7,7 @@ SVN::Base - Base class for importing sym
- =head1 SYNOPSIS
-
- # Load the svn_ra_* functions into the SVN::Ra namespace.
-- pacakge SVN::Ra;
-+ package SVN::Ra;
- use SVN::Base qw(Ra svn_ra_);
-
- # Load svn_config_t structure accessors in the magic namcespace
---- subversion/bindings/swig/perl/Ra.pm (revision 10171)
-+++ subversion/bindings/swig/perl/Ra.pm (revision 10172)
-@@ -63,26 +63,25 @@ require SVN::Client;
-
- my $ralib = init_ra_libs;
-
-+# Ra methods that returns reporter
-+my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update);
- our $AUTOLOAD;
-
- sub AUTOLOAD {
- my $class = ref($_[0]);
-- $AUTOLOAD =~ s/^${class}::(SUPER::)?//;
-- return if $AUTOLOAD =~ m/^[A-Z]/;
-+ my $method = $AUTOLOAD;
-+ $method =~ s/.*:://;
-+ return unless $method =~ m/[^A-Z]/;
-
- my $self = shift;
- no strict 'refs';
-
- die "no such method $AUTOLOAD"
-- unless $self->can("plugin_invoke_$AUTOLOAD");
-+ unless $self->can("plugin_invoke_$method");
-
-- my @ret = &{"plugin_invoke_$AUTOLOAD"}(@{$self}{qw/ra session/}, @_,
-- $self->{pool});
--
-- return $ret[0] unless $#ret;
--
-- return ($AUTOLOAD eq 'get_commit_editor') ? @ret :
-- bless [@ret], 'SVN::Ra::Reporter';
-+ my @ret = &{"plugin_invoke_$method"}(@{$self}{qw/ra session/}, @_);
-+ return bless [@ret], 'SVN::Ra::Reporter' if $reporter{$method};
-+ return $#ret == 0 ? $ret[0] : @ret;
- }
-
- sub new {
-@@ -106,7 +105,7 @@ sub new {
- [SVN::Client::get_username_provider()]);
- }
-
-- my $pool = $self->{pool} ||= SVN::Core::pool_create(undef);
-+ my $pool = $self->{pool} ||= SVN::Pool->new;
-
- $self->{ra} = get_ra_library ($ralib, $self->{url});
- my $callback = 'SVN::Ra::Callbacks';
diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-svnperl-noruntime /tmp/subversion/files/patch-svnperl-noruntime
--- /usr/ports/devel/subversion/files/patch-svnperl-noruntime Fri Aug 20 04:40:29 2004
+++ /tmp/subversion/files/patch-svnperl-noruntime Thu Jan 1 08:00:00 1970
@@ -1,82 +0,0 @@
---- subversion/bindings/swig/perl/Base.pm (revision 10173)
-+++ subversion/bindings/swig/perl/Base.pm (revision 10174)
-@@ -60,6 +60,7 @@ sub import {
- package SVN::_$pkg;
- require DynaLoader;
- bootstrap SVN::_$pkg;
-+sub dl_load_flags { 0x01 }
- 1;
- ' or die $@;
- };
---- subversion/bindings/swig/perl/Makefile.PL (revision 10173)
-+++ subversion/bindings/swig/perl/Makefile.PL (revision 10174)
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
-+use strict;
- use ExtUtils::MakeMaker;
- use Cwd 'abs_path';
- use Config;
-@@ -8,6 +9,12 @@ if ($^O ne 'VMS') {
- $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
- }
-
-+my $top_builddir = '../../../..';
-+my $top_srcdir = '@top_srcdir@';
-+my $svnlib_srcdir = "${top_srcdir}/subversion";
-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
-+
-+
- my $swig_version;
- open TOPMAKE, "<../../../../Makefile";
- while (<TOPMAKE>) {
-@@ -50,8 +57,7 @@ my %config = (
- OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
- (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-- @ldmodules, '-lsvn_swig_perl-1',
-- `swig -perl -ldflags`)],
-+ @ldmodules)],
- );
-
- sub perlish {
-@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co
- PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") }
- map { perlish $_ }
- ('base', 'core', @modules)},
-+ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a",
- clean => { FILES => "*.hi *.c *.bs".
- join(' Makefile.','', at modules) }
- );
-@@ -84,15 +91,19 @@ sub MY::postamble {
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\tmake -f Makefile.$_\n"} @modules);
-
-- my $flags;
-+ my ($flags, $flags_runtime);
- if ($swig_version >= 103020) {
- $flags = '-noruntime -noproxy';
-+ $flags_runtime = '-runtime -noproxy';
- } else {
-+ # XXX: prehaps deprecated
- $flags = '-c';
- }
-
-- my $swig_command = "swig $flags -nopm -perl " .
-- "-I.. -I../../../include $apr_cflags";
-+ my ($swig_command, $swig_command_runtime) =
-+ map {"swig $_ -nopm -perl " .
-+ "-I.. -I../../../include $apr_cflags" }
-+ ($flags, $flags_runtime);
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : ../svn_$_.i ".
-@@ -127,7 +138,7 @@ modules :: $module_c_files
- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
-
- core.c :: ../core.i
--\t$swig_command -module SVN::_Core -o core.c ../core.i
-+\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i
-
- $swig_modules_command
-
diff -ruN --exclude=CVS /usr/ports/devel/subversion/pkg-plist /tmp/subversion/pkg-plist
--- /usr/ports/devel/subversion/pkg-plist Sun Aug 22 02:33:26 2004
+++ /tmp/subversion/pkg-plist Wed Sep 15 16:37:08 2004
@@ -73,6 +73,14 @@
lib/libsvn_wc-1.a
lib/libsvn_wc-1.so
lib/libsvn_wc-1.so.0
+share/locale/de/LC_MESSAGES/subversion.mo
+share/locale/es/LC_MESSAGES/subversion.mo
+share/locale/ja/LC_MESSAGES/subversion.mo
+share/locale/nb/LC_MESSAGES/subversion.mo
+share/locale/pl/LC_MESSAGES/subversion.mo
+share/locale/pt_BR/LC_MESSAGES/subversion.mo
+share/locale/sv/LC_MESSAGES/subversion.mo
+share/locale/zh_TW/LC_MESSAGES/subversion.mo
%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
--- subversion-1.1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list