8 files changed, 110 insertions, 125 deletions

diff --git a/devel/subversion/files/build-outputs.mk.patch b/devel/subversion/files/build-outputs.mk.patch
index 3612f626c7ce..a7c191b652b5 100644
--- a/devel/subversion/files/build-outputs.mk.patch
+++ b/devel/subversion/files/build-outputs.mk.patch
@@ -1,11 +1,11 @@
---- build-outputs.mk.orig	Wed Oct  8 16:01:40 2003
-+++ build-outputs.mk	Wed Oct  8 16:02:00 2003
-@@ -447,7 +447,7 @@
- 	cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT)
- 	cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT)
- 	cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT)
--	cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT)
-+	cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.bin$(EXEEXT)
+--- build-outputs.mk.orig	2004-10-22 22:13:15.000000000 +0400
++++ build-outputs.mk	2004-11-05 11:15:30.265625000 +0300
+@@ -500,7 +500,7 @@
+ 	cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT)
+ 	cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
+ 	cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
+-	cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
++	cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
+ 	cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)
  
- install-fs-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la
- 	$(MKDIR) $(DESTDIR)$(fs_libdir)
+ install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib
diff --git a/devel/subversion/files/patch-ac-helpers::ltmain.sh b/devel/subversion/files/patch-ac-helpers::ltmain.sh
index 4de20aae8a99..ba6fe13c1cdb 100644
--- a/devel/subversion/files/patch-ac-helpers::ltmain.sh
+++ b/devel/subversion/files/patch-ac-helpers::ltmain.sh
@@ -1,6 +1,6 @@
---- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
-+++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
-@@ -1072,7 +1072,7 @@
+--- ac-helpers/ltmain.sh.orig	2004-10-22 22:13:13.000000000 +0400
++++ ac-helpers/ltmain.sh	2004-11-05 11:30:39.328125000 +0300
+@@ -1061,7 +1061,7 @@
  	  esac
  	 elif test "X$arg" = "X-lc_r"; then
  	  case $host in
@@ -9,4 +9,3 @@
  	    # Do not include libc_r directly, use -pthread flag.
  	    continue
  	    ;;
-
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
deleted file mode 100644
index ff40c1342847..000000000000
--- a/devel/subversion/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Thu Oct  9 09:10:22 2003
-+++ configure	Thu Oct  9 09:10:30 2003
-@@ -2952,9 +2952,9 @@
- 
- 
- 
--APR_VER_REGEX="0\.9\.[5-9]"
-+APR_VER_REGEX="0\.9\.[4-9]"
- APR_VER_REGEX_TOO="1\.0"
--APU_VER_REGEX="0\.9\.[5-9]"
-+APU_VER_REGEX="0\.9\.[4-9]"
- APU_VER_REGEX_TOO="1\.0"
- 
- 
diff --git a/devel/subversion/files/patch-book-Makefile b/devel/subversion/files/patch-doc::book::Makefile
index 662b08245c1b..dce562b68f18 100644
--- a/devel/subversion/files/patch-book-Makefile
+++ b/devel/subversion/files/patch-doc::book::Makefile
@@ -1,5 +1,5 @@
---- doc/book/Makefile.orig	Fri Feb 20 01:57:40 2004
-+++ doc/book/Makefile	Wed Jul  7 19:58:29 2004
+--- doc/book/Makefile.orig	2004-09-14 06:50:26.000000000 +0400
++++ doc/book/Makefile	2004-11-05 11:33:23.265625000 +0300
 @@ -1,5 +1,5 @@
  XSLTPROC = xsltproc
 -INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
@@ -7,7 +7,7 @@
  INSTALL = install
  
  ## You shouldn't normally need to edit anything below here.
-@@ -114,7 +114,7 @@
+@@ -118,7 +118,7 @@
  $(BOOK_INSTALL_DIR):
  	$(INSTALL) -d $(BOOK_INSTALL_DIR)
  
@@ -16,7 +16,7 @@
  	$(INSTALL) -d $(BOOK_INSTALL_DIR)/images
  	$(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR)
  	$(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
-@@ -126,10 +126,10 @@
+@@ -130,10 +130,10 @@
  	$(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
  	$(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images
  
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL b/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL
deleted file mode 100644
index 8fd38e8ae647..000000000000
--- a/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL
+++ /dev/null
@@ -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 --git a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Base.pm b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Base.pm
new file mode 100644
index 000000000000..143db2f1ce38
--- /dev/null
+++ b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Base.pm
@@ -0,0 +1,10 @@
+--- subversion/bindings/swig/perl/native/Base.pm.orig	2004-10-20 10:46:59.000000000 +0400
++++ subversion/bindings/swig/perl/native/Base.pm	2004-11-05 11:43:35.578125000 +0300
+@@ -60,6 +60,7 @@
+ package SVN::_$pkg;
+ require DynaLoader;
+ bootstrap SVN::_$pkg;
++sub dl_load_flags { 0x01 }
+ 1;
+     ' or die $@;
+     };
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
new file mode 100644
index 000000000000..868ff9a558e4
--- /dev/null
+++ b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
@@ -0,0 +1,83 @@
+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	2004-09-14 20:32:08.000000000 +0400
++++ subversion/bindings/swig/perl/native/Makefile.PL.in	2004-11-05 11:51:01.000000000 +0300
+@@ -1,4 +1,5 @@
+-#!/usr/bin/perl
++#!/usr/bin/perl -w
++use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+@@ -15,6 +16,12 @@
+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+ my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+ 
++my $top_builddir = '../../../../..';
++my $top_srcdir = '@top_srcdir@';
++my $svnlib_srcdir = "${top_srcdir}/subversion";
++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
++
++
+ my $swig_version = @SWIG_VERSION@;
+ my $swig = '@SWIG@';
+ 
+@@ -41,15 +48,14 @@
+ 
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+-    INC  => join(' ',$apr_cflags, $apu_cflags, 
++    INC  => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",
+                  " -I$swig_srcdir -g"),
+     OBJECT => q/$(O_FILES)/,
+     LIBS => [join(' ', $apr_ldflags,
+                   (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+-                  @ldmodules, '-lsvn_swig_perl-1',
+-                  `$swig -perl -ldflags`)],
++                  @ldmodules)],
+     test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+ 
+@@ -64,6 +70,7 @@
+                       "\$(INST_LIBDIR)/$_.pm") }
+          map { perlish $_ }
+          ('base', 'core', @modules)},
++        LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
+         MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
+                             "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
+          map { perlish $_ }
+@@ -88,18 +95,22 @@
+    my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+    my $module_make_commands = join ('',map {"\t\$(MAKE) -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 " .
++   my ($swig_command, $swig_command_runtime) =
++                 map {"$swig $_ -nopm -perl " .
+                       "-I$swig_srcdir " .
+                       "-I$swig_srcdir/perl/libsvn_swig_perl".
+                       " -I$svnlib_srcdir/include" .
+-                      $apr_cflags;
++                      $apr_cflags}
++                      ($flags, $flags_runtime);
+ 
+    my $swig_modules_command = join ('',
+                               map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+@@ -137,7 +148,7 @@
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+ 
+ core.c :: $swig_srcdir/core.i
+-\t$swig_command -o core.c $swig_srcdir/core.i
++\t$swig_command_runtime -o core.c $swig_srcdir/core.i
+ 
+ $swig_modules_command
+ 
diff --git a/devel/subversion/files/patch-svnperl-noruntime b/devel/subversion/files/patch-svnperl-noruntime
deleted file mode 100644
index 26ada812435b..000000000000
--- a/devel/subversion/files/patch-svnperl-noruntime
+++ /dev/null
@@ -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.','',@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
-