This commit was manufactured by cvs2git to create branch 'subversion-1_0'.

Sprout from master 2004-07-07 14:27:33 UTC Patryk Zawadzki <patrys@room-303.com> '- added default repo path to %dir'
Delete:
    subversion-DESTDIR.patch
    subversion-bindings.patch
    subversion-hot_backup_num.patch
    subversion-perl.patch
    subversion-svnlook.patch

diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
deleted file mode 100644 (file)
index 0f87aed..0000000
--- a/subversion-DESTDIR.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urN subversion-r2817.org/build/gen_base.py subversion-r2817/build/gen_base.py
---- subversion-r2817.org/build/gen_base.py     Wed Jul 31 14:44:14 2002
-+++ subversion-r2817/build/gen_base.py Wed Jul 31 14:46:50 2002
-@@ -265,14 +265,14 @@
-         # Construct a .libs directory within the Apache area and populate it
-         # with the appropriate files. Also drop the .la file in the target dir.
-         self.ofile.write('\ninstall-mods-static: %s\n'
--                         '\t$(MKDIR) %s\n'
-+                         '\t$(MKDIR) $(DESTDIR)%s\n'
-                          % (string.join(la_tweaked + s_files),
-                             os.path.join('$(APACHE_TARGET)', '.libs')))
-         for file in la_tweaked:
-           dirname, fname = os.path.split(file)
-           base = os.path.splitext(fname)[0]
--          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
--                           '\t$(INSTALL_MOD_STATIC) %s %s\n'
-+          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-+                           '\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-                            % (os.path.join(dirname, '.libs', base + '.a'),
-                               os.path.join('$(APACHE_TARGET)',
-                                            '.libs',
-@@ -282,7 +282,7 @@
- 
-         # copy the other files to the target dir
-         for file in s_files:
--          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
-+          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-                            % (file, os.path.join('$(APACHE_TARGET)',
-                                                  os.path.basename(file))))
-         self.ofile.write('\n')
-@@ -290,12 +290,12 @@
-       elif area != 'test' and area != 'fs-test':
-         area_var = string.replace(area, '-', '_')
-         self.ofile.write('install-%s: %s\n'
--                         '\t$(MKDIR) $(%sdir)\n'
-+                         '\t$(MKDIR) $(DESTDIR)$(%sdir)\n'
-                          % (area, string.join(files), area_var))
-         for file in files:
-           # cd to dirname before install to work around libtool 1.4.2 bug.
-           dirname, fname = os.path.split(file)
--          self.ofile.write('\tcd %s ; $(INSTALL_%s) %s %s\n'
-+          self.ofile.write('\tcd %s ; $(INSTALL_%s) %s $(DESTDIR)%s\n'
-                            % (dirname,
-                               string.upper(area_var),
-                               fname,
-@@ -313,10 +313,10 @@
- 
-     includedir = os.path.join('$(includedir)', 'subversion-%s' % self.version)
-     self.ofile.write('install-include: %s\n'
--                     '\t$(MKDIR) %s\n'
-+                     '\t$(MKDIR) $(DESTDIR)%s\n'
-                      % (string.join(self.includes), includedir))
-     for file in self.includes:
--      self.ofile.write('\t$(INSTALL_INCLUDE) %s %s\n'
-+      self.ofile.write('\t$(INSTALL_INCLUDE) %s $(DESTDIR)%s\n'
-                        % (os.path.join('$(top_srcdir)', file),
-                           os.path.join(includedir, os.path.basename(file))))
- 

diff --git a/subversion-bindings.patch b/subversion-bindings.patch
deleted file mode 100644 (file)
index f808dad..0000000
--- a/subversion-bindings.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN subversion-0.35.0.org/Makefile.in subversion-0.35.0/Makefile.in
---- subversion-0.35.0.org/Makefile.in  2003-12-20 00:04:45.942677312 +0100
-+++ subversion-0.35.0/Makefile.in      2003-12-20 00:07:14.926667242 +0100
-@@ -94,7 +94,9 @@
- SWIG = @SWIG@
- SWIG_INCLUDES = -I$(SWIG_SRC_DIR) \
-                 -I$(abs_srcdir)/subversion/include \
--                $(SVN_APR_INCLUDES)
-+                $(SVN_APR_INCLUDES) \
-+              $(SVN_APRUTIL_INCLUDES)
-+
- SWIG_LDFLAGS = @SWIG_LDFLAGS@
- SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@
- SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
-@@ -109,6 +111,8 @@
- SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
- SVN_APR_PREFIX = @SVN_APR_PREFIX@
- 
-+SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
-+
- MKDIR = @MKDIR@
- 
- # the EXTRA_ exist so that extra flags can be passed at 'make' time
-diff -urN subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL
---- subversion-0.35.0.org/subversion/bindings/swig/perl/Makefile.PL    2003-12-07 18:25:10.000000000 +0100
-+++ subversion-0.35.0/subversion/bindings/swig/perl/Makefile.PL        2003-12-20 00:36:41.326711208 +0100
-@@ -8,19 +8,23 @@
- 
- my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config';
- $apr_config = 'apr-config' unless -e $apr_config;
-+my $apu_config = $ENV{APU_CONFIG} || '/usr/local/lib/apache2/apu-config';
-+$apu_config = 'apu-config' unless -e $apu_config;
- 
- my $apr_shlib_path_var = `$apr_config --shlib-path-var`;
- my $apr_cflags = `$apr_config --includes`;
-+my $apu_cflags = `$apu_config --includes`;
- my $apr_ldflags = `$apr_config --cflags --link-ld --libs`
-    if $^O eq 'darwin';
- 
- chomp $apr_shlib_path_var;
- chomp $apr_cflags;
-+chomp $apu_cflags;
- chomp $apr_ldflags;
- 
- my %config = (
-     ABSTRACT => 'Perl bindings for Subversion',
--    CCFLAGS  => join(' ', $apr_cflags, `perl -MExtUtils::Embed -e ccopts`,
-+    CCFLAGS  => join(' ', $apr_cflags, $apu_cflags, `perl -MExtUtils::Embed -e ccopts`,
-                    ' -I.. -I../../../include -g'),
-     OBJECT => q/$(O_FILES)/,
-     dynamic_lib => {

diff --git a/subversion-hot_backup_num.patch b/subversion-hot_backup_num.patch
deleted file mode 100644 (file)
index 5ac75cd..0000000
--- a/subversion-hot_backup_num.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -dur subversion-0.37.0.orig/tools/backup/hot-backup.py.in subversion-0.37.0/tools/backup/hot-backup.py.in
---- subversion-0.37.0.orig/tools/backup/hot-backup.py.in       2004-01-09 23:07:57.000000000 +0100
-+++ subversion-0.37.0/tools/backup/hot-backup.py.in    2004-02-16 13:53:21.942581931 +0100
-@@ -40,10 +40,14 @@
- # Command line arguments
- 
- 
--if len(sys.argv) != 3:
--  print "Usage: ", os.path.basename(sys.argv[0]), " <repos_path> <backup_path>"
-+if not (sys.argv[1:2]==["-n"] and len(sys.argv)==5 or len(sys.argv)==3):
-+  print "Usage: ", os.path.basename(sys.argv[0]), " [-n <num_backups>] <repos_path> <backup_path>"
-   sys.exit(1)
- 
-+if sys.argv[1]=="-n":
-+  num_backups=int(sys.argv[2])
-+  sys.argv[1:]=sys.argv[3:]
-+
- # Path to repository
- repo_dir = sys.argv[1]
- repo = os.path.basename(os.path.abspath(repo_dir))

diff --git a/subversion-perl.patch b/subversion-perl.patch
deleted file mode 100644 (file)
index a5a1d68..0000000
--- a/subversion-perl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN subversion-0.34.0.org/subversion/bindings/swig/perl/Makefile.PL subversion-0.34.0/subversion/bindings/swig/perl/Makefile.PL
---- subversion-0.34.0.org/subversion/bindings/swig/perl/Makefile.PL    2003-12-04 14:17:49.244647569 +0100
-+++ subversion-0.34.0/subversion/bindings/swig/perl/Makefile.PL        2003-12-04 14:19:39.765599240 +0100
-@@ -2,14 +2,17 @@
- use ExtUtils::MakeMaker;
- 
- my @modules = qw/client delta fs ra repos wc/;
-+my @ldpaths = ('../.libs', map {"../../../libsvn_$_/.libs"} (@modules, qw/diff subr/));
- my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
- 
- my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config';
- $apr_config = 'apr-config' unless -e $apr_config;
- 
-+my $apr_shlib_path_var = `$apr_config --shlib-path-var`;
- my $apr_cflags = `$apr_config --includes`;
- my $apr_ldflags = `$apr_config --cflags --libs`;
- 
-+chomp $apr_shlib_path_var;
- chomp $apr_cflags;
- chomp $apr_ldflags;
- 
-@@ -19,7 +22,7 @@
-                    ' -I.. -I../../../include -g'),
-     OBJECT => q/$(O_FILES)/,
-     dynamic_lib => {
--      OTHERLDFLAGS => join(' ', $apr_ldflags, '-L/usr/local/lib',
-+      OTHERLDFLAGS => join(' ', $apr_ldflags, (map {"-L$_"} @ldpaths),
-                            @ldmodules, '-lsvn_swig_perl-1',
-                            `swig -perl -ldflags`),
-     },
-@@ -66,6 +69,7 @@
-              (map {"\nsvn_$_.c : ../svn_$_.i ra_plugin.hi ra_reporter.hi delta_editor.hi\n".
-                       "\tswig -c -nopm -perl -I.. -I../../../include $apr_cflags -module SVN::_".main::perlish($_)." -o svn_$_.c ../svn_$_.i\n"}
-              @modules),
--
-+               "\nFULLPERLRUN=$apr_shlib_path_var=",join(':',@ldpaths),
-+               " \$(FULLPERL)\n",
-             );
- }
-

diff --git a/subversion-svnlook.patch b/subversion-svnlook.patch
deleted file mode 100644 (file)
index da60526..0000000
--- a/subversion-svnlook.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: subversion/libsvn_repos/repos.c
-===================================================================
---- subversion/libsvn_repos/repos.c    (revision 6695)
-+++ subversion/libsvn_repos/repos.c    (working copy)
-@@ -413,7 +413,7 @@ create_hooks (svn_repos_t *repos, const 
-       APR_EOL_STR
-       "# Make sure that the log message contains some text."
-       APR_EOL_STR
--      "SVNLOOK=/usr/local/bin/svnlook"
-+      "SVNLOOK=/usr/bin/svnlook"
-       APR_EOL_STR
-       "LOG=`$SVNLOOK log -t \"$TXN\" \"$REPOS\"`"
-       APR_EOL_STR