Subject: subversion-base 1.3.0 patch
To: None <epg@NetBSD.org>
From: Masao Uebayashi <uebayasi@gmail.com>
List: tech-pkg
Date: 01/03/2006 00:24:44
Install / deinstall OK. Basic commands work for me.
Masao
Index: subversion/Makefile.version
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/Makefile.version,v
retrieving revision 1.31
diff -u -r1.31 Makefile.version
--- subversion/Makefile.version 6 Sep 2005 17:35:17 -0000 1.31
+++ subversion/Makefile.version 2 Jan 2006 15:19:32 -0000
@@ -1,5 +1,5 @@
# $NetBSD: Makefile.version,v 1.31 2005/09/06 17:35:17 jlam Exp $
.if !defined(SVNVER)
-SVNVER= 1.2.3
+SVNVER= 1.3.0
.endif
Index: subversion/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/distinfo,v
retrieving revision 1.48
diff -u -r1.48 distinfo
--- subversion/distinfo 6 Sep 2005 17:35:17 -0000 1.48
+++ subversion/distinfo 2 Jan 2006 15:19:32 -0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.48 2005/09/06 17:35:17 jlam Exp $
+$NetBSD$
-SHA1 (subversion-1.2.3.tar.gz) = 790cfc94db98799a48a157fef22a13c878e74345
-RMD160 (subversion-1.2.3.tar.gz) = 4a39e2b9f4dcd39023e785ce0a31b3bd493d6a85
-Size (subversion-1.2.3.tar.gz) = 8868156 bytes
-SHA1 (patch-ad) = 38bc62998284e5c7393fdc450aee4801176a0693
-SHA1 (patch-ag) = e9fa5f95fd35740ac38a182cbf975b8206ae8b9a
-SHA1 (patch-ah) = 195aeabc711b229cb402312357cad143c19d7b53
-SHA1 (patch-ai) = 9b209d2d436a5ed3ac2ca02a2dac80c8cad0e98c
-SHA1 (patch-aj) = 18a90663e2abd2ea2ad5f9d3f0e76a3d937d3e64
+SHA1 (subversion-1.3.0.tar.gz) = 98cb017844750d4ed26e2a811c581a644e3ad585
+RMD160 (subversion-1.3.0.tar.gz) = e00cc422636b74df8c8821c136e9eacb8caa42d4
+Size (subversion-1.3.0.tar.gz) = 8773294 bytes
+SHA1 (patch-ad) = c65c37538f28c2e3d3f31ef934a13fd21bfcdf1b
+SHA1 (patch-ag) = b7305170bb5f214d6aca7d5040ac0a7251c36a1d
+SHA1 (patch-ah) = d1b17f1ba8e4618752c2a2c6dd2f36f9aaeb6d57
+SHA1 (patch-ai) = bbe28091b13c103b50180dc4ac2daa2c6045c030
+SHA1 (patch-aj) = 28d5741ac98f4ec2fa98f40a1872de1fc1ca2538
Index: subversion/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/patches/patch-ad,v
retrieving revision 1.11
diff -u -r1.11 patch-ad
--- subversion/patches/patch-ad 8 Aug 2005 18:13:13 -0000 1.11
+++ subversion/patches/patch-ad 2 Jan 2006 15:19:32 -0000
@@ -2,14 +2,16 @@
--- Makefile.in.orig 2005-05-09 01:56:09.000000000 -0400
+++ Makefile.in
-@@ -575,9 +575,9 @@ install-swig-py: install-swig-py-lib
- install-swig-rb: install-swig-rb-lib
+@@ -618,11 +618,9 @@
+ ./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
+ cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
--swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
+-swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
+- libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
+- $(SWIG_PL_DIR)/native/Makefile
+swig-pl_DEPS = libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
swig-pl: $(swig-pl_DEPS)
cd $(SWIG_PL_DIR)/native; $(MAKE)
Index: subversion/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/patches/patch-ag,v
retrieving revision 1.7
diff -u -r1.7 patch-ag
--- subversion/patches/patch-ag 6 Sep 2005 17:35:17 -0000 1.7
+++ subversion/patches/patch-ag 2 Jan 2006 15:19:32 -0000
@@ -2,7 +2,7 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig Tue Mar 22 09:31:58 2005
+++ subversion/bindings/swig/perl/native/Makefile.PL.in
-@@ -46,7 +46,7 @@ my %config = (
+@@ -43,7 +43,7 @@
" -I$svnlib_srcdir/include",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
@@ -11,11 +11,3 @@
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
@ldmodules, '-lsvn_swig_perl-1',
`$swig -perl -ldflags`)],
-@@ -105,7 +105,6 @@ sub MY::postamble {
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-- "$svnlib_builddir/libsvn_$_/libsvn_$_-1.la ".
- "ra_plugin.hi ra_reporter.hi ".
- "delta_editor.hi\n" .
- "\t$swig_command".
Index: subversion/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/patches/patch-ah,v
retrieving revision 1.2
diff -u -r1.2 patch-ah
--- subversion/patches/patch-ah 23 May 2005 22:58:26 -0000 1.2
+++ subversion/patches/patch-ah 2 Jan 2006 15:19:32 -0000
@@ -2,30 +2,6 @@
--- build/generator/gen_make.py.orig 2005-03-22 10:08:25.000000000 -0500
+++ build/generator/gen_make.py
-@@ -5,6 +5,7 @@
- import os
- import sys
- import string
-+import ConfigParser
-
- import gen_base
-
-@@ -39,6 +40,13 @@ class Generator(gen_base.GeneratorBase):
- install_deps = self.graph.get_deps(gen_base.DT_INSTALL)
- install_sources = self.graph.get_all_sources(gen_base.DT_INSTALL)
-
-+ cp = ConfigParser.ConfigParser()
-+ cp.read('gen-make.opts')
-+ if cp.has_option('options', '--installed-libs'):
-+ self.installed_libs = cp.get('options', '--installed-libs').split(',')
-+ else:
-+ self.installed_libs = []
-+
- # ensure consistency between runs
- install_deps.sort()
- install_sources.sort(lambda s1, s2: cmp(s1.name, s2.name))
-@@ -54,11 +62,17 @@ class Generator(gen_base.GeneratorBase):
-
# construct a list of the other .la libs to link against
retreat = build_path_retreat(target.path)
- deps = [ target.filename ]
@@ -44,7 +20,7 @@
deps.append(source.filename)
link.append(build_path_join(retreat, source.filename))
-@@ -136,6 +150,8 @@ class Generator(gen_base.GeneratorBase):
+@@ -251,6 +265,8 @@
elif isinstance(link_dep, gen_base.TargetLinked):
if link_dep.external_lib:
libs.append(link_dep.external_lib)
Index: subversion/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/patches/patch-ai,v
retrieving revision 1.2
diff -u -r1.2 patch-ai
--- subversion/patches/patch-ai 23 May 2005 22:58:26 -0000 1.2
+++ subversion/patches/patch-ai 2 Jan 2006 15:19:32 -0000
@@ -2,9 +2,9 @@
--- gen-make.py.orig 2005-01-31 07:11:57.000000000 -0500
+++ gen-make.py
-@@ -81,6 +81,13 @@ def _usage_exit():
+@@ -81,6 +81,13 @@
print
- print " The default generator type is 'make'"
+ print " The default generator type is 'make'"
print
+ print " UNIX-specific options:"
+ print
@@ -16,7 +16,7 @@
print " Windows-specific options:"
print
print " --with-apr=DIR"
-@@ -176,6 +183,7 @@ if __name__ == '__main__':
+@@ -181,6 +188,7 @@
'enable-nls',
'enable-bdb-in-apr-util',
'vsnet-version=',
Index: subversion/patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/patches/patch-aj,v
retrieving revision 1.4
diff -u -r1.4 patch-aj
--- subversion/patches/patch-aj 6 Sep 2005 17:35:17 -0000 1.4
+++ subversion/patches/patch-aj 2 Jan 2006 15:19:32 -0000
@@ -4,7 +4,7 @@
--- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig Wed Aug 17 02:59:23 2005
+++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
-@@ -69,7 +69,8 @@ typedef struct hash_to_apr_hash_data_t
+@@ -93,7 +93,8 @@
static VALUE
rb_ary_aref1(VALUE ary, VALUE arg)
{
Index: subversion-base/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion-base/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- subversion-base/PLIST 25 Jun 2005 12:23:21 -0000 1.10
+++ subversion-base/PLIST 2 Jan 2006 15:19:32 -0000
@@ -22,6 +22,7 @@
include/subversion-1/svn_hash.h
include/subversion-1/svn_io.h
include/subversion-1/svn_md5.h
+include/subversion-1/svn_nls.h
include/subversion-1/svn_opt.h
include/subversion-1/svn_path.h
include/subversion-1/svn_pools.h
@@ -33,7 +34,6 @@
include/subversion-1/svn_sorts.h
include/subversion-1/svn_string.h
include/subversion-1/svn_subst.h
-include/subversion-1/svn_test.h
include/subversion-1/svn_time.h
include/subversion-1/svn_types.h
include/subversion-1/svn_utf.h