Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13679/main/finkinfo/devel
Modified Files:
libapache2-mod-svn.info svn-javahl.info svn-swig-pm.info
svn-swig-py.info svn.info svn.patch
Log Message:
Moving svn 1.1.4 to stable
Index: svn-swig-pm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/svn-swig-pm.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- svn-swig-pm.info 2 Apr 2005 18:56:50 -0000 1.5
+++ svn-swig-pm.info 6 May 2005 15:37:57 -0000 1.6
@@ -1,7 +1,7 @@
Info2: <<
Package: svn-swig-pm%type_pkg[perl]
-Version: 1.1.3
-Revision: 12
+Version: 1.1.4
+Revision: 11
Description: Subversion - Swig Perl bindings
Type: perl (5.8.1 5.8.6)
License: BSD
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a09c2b2fa1a09566c024547954a48478
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: svn.patch
@@ -49,12 +49,12 @@
# Install Phase:
UpdatePOD: true
-DocFiles: COPYING HACKING INSTALL.swig README.swig
+DocFiles: COPYING HACKING INSTALL.swig NOTES.swig
InstallScript: <<
### Install swig perl bindings
make install-swig-pl DESTDIR=%d
cp subversion/bindings/swig/INSTALL INSTALL.swig
- cp subversion/bindings/swig/README README.swig
+ cp subversion/bindings/swig/NOTES NOTES.swig
### Remove unneeded archives
rm %i/lib/*.a
Index: svn-javahl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/svn-javahl.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svn-javahl.info 20 Mar 2005 15:47:14 -0000 1.3
+++ svn-javahl.info 6 May 2005 15:37:57 -0000 1.4
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-javahl
-Version: 1.1.3
+Version: 1.1.4
Revision: 11
Description: Subversion - Java bindings
Type: java(1.4)
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a09c2b2fa1a09566c024547954a48478
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: svn.patch
@@ -77,8 +77,8 @@
### Check the javahl bindings (needs to be done after installation)
# see svn issue #2040 for more info
- javac -d subversion/bindings/java/javahl/classes -classpath
%i/share/java/svn-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar
subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/tests/*.java
- java -Djava.library.path=%i/lib -classpath
%i/share/java/svn-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar:subversion/bindings/java/javahl/classes
org.tigris.subversion.javahl.tests.BasicTests
+# javac -d subversion/bindings/java/javahl/classes -classpath
%i/share/java/svn-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar
subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/tests/*.java
+# java -Djava.library.path=%i/lib -classpath
%i/share/java/svn-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar:subversion/bindings/java/javahl/classes
org.tigris.subversion.javahl.tests.BasicTests
<<
# Additional Info
Index: svn-swig-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/svn-swig-py.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- svn-swig-py.info 1 May 2005 08:46:10 -0000 1.4
+++ svn-swig-py.info 6 May 2005 15:37:57 -0000 1.5
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-swig-py%type_pkg[python]
-Version: 1.1.3
+Version: 1.1.4
Revision: 11
Description: Subversion - Swig Python bindings
Type: python (2.3)
@@ -15,7 +15,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a09c2b2fa1a09566c024547954a48478
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: svn.patch
@@ -45,12 +45,12 @@
<<
# Install Phase:
-DocFiles: COPYING HACKING INSTALL.swig README.swig
+DocFiles: COPYING HACKING INSTALL.swig NOTES.swig
InstallScript: <<
### Install swig python bindings
make install-swig-py DESTDIR=%d DISTUTIL_PARAM=--prefix=%d
swig_pydir=%p/lib/python%type_raw[python]/site-packages/libsvn
swig_pydir_extra=%p/lib/python%type_raw[python]/site-packages/svn
cp subversion/bindings/swig/INSTALL INSTALL.swig
- cp subversion/bindings/swig/README README.swig
+ cp subversion/bindings/swig/NOTES NOTES.swig
### Remove unneeded archives
rm %i/lib/*.a
Index: libapache2-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/libapache2-mod-svn.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libapache2-mod-svn.info 20 Mar 2005 15:47:14 -0000 1.3
+++ libapache2-mod-svn.info 6 May 2005 15:37:57 -0000 1.4
@@ -1,5 +1,5 @@
Package: libapache2-mod-svn
-Version: 1.1.3
+Version: 1.1.4
Revision: 11
Description: Subversion - mod_svn
License: BSD
@@ -12,7 +12,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a09c2b2fa1a09566c024547954a48478
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: svn.patch
Index: svn.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/svn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- svn.patch 27 Jan 2005 15:05:37 -0000 1.4
+++ svn.patch 6 May 2005 15:37:57 -0000 1.5
@@ -1,7 +1,7 @@
-diff -udr subversion-1.1.1.orig/Makefile.in subversion-1.1.1/Makefile.in
---- subversion-1.1.1.orig/Makefile.in 2004-09-11 17:45:29.000000000 +0200
-+++ subversion-1.1.1/Makefile.in 2004-12-06 15:04:25.000000000 +0100
-@@ -578,7 +578,7 @@
+diff -Naur subversion-1.1.4_orig/Makefile.in subversion-1.1.4/Makefile.in
+--- subversion-1.1.4_orig/Makefile.in 2005-03-26 21:03:11.000000000 +0100
++++ subversion-1.1.4/Makefile.in 2005-04-05 09:39:37.000000000 +0200
+@@ -583,7 +583,7 @@
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
@@ -10,9 +10,9 @@
swig-pl: $(swig-pl_DEPS)
cd $(SWIG_PL_DIR)/native; $(MAKE)
-diff -udr subversion-1.1.1.orig/ac-helpers/ltmain.sh
subversion-1.1.1/ac-helpers/ltmain.sh
---- subversion-1.1.1.orig/ac-helpers/ltmain.sh 2004-10-22 20:13:13.000000000
+0200
-+++ subversion-1.1.1/ac-helpers/ltmain.sh 2004-12-06 15:11:16.000000000
+0100
+diff -Naur subversion-1.1.4_orig/ac-helpers/ltmain.sh
subversion-1.1.4/ac-helpers/ltmain.sh
+--- subversion-1.1.4_orig/ac-helpers/ltmain.sh 2005-04-01 22:44:11.000000000
+0200
++++ subversion-1.1.4/ac-helpers/ltmain.sh 2005-04-05 09:41:07.000000000
+0200
@@ -1395,6 +1395,8 @@
lib=
found=no
@@ -40,9 +40,9 @@
fi
done
fi
-diff -udr subversion-1.1.1.orig/build/generator/gen_make.py
subversion-1.1.1/build/generator/gen_make.py
---- subversion-1.1.1.orig/build/generator/gen_make.py 2004-08-10
00:30:31.000000000 +0200
-+++ subversion-1.1.1/build/generator/gen_make.py 2004-12-06
15:16:54.000000000 +0100
+diff -Naur subversion-1.1.4_orig/build/generator/gen_make.py
subversion-1.1.4/build/generator/gen_make.py
+--- subversion-1.1.4_orig/build/generator/gen_make.py 2005-03-26
21:03:11.000000000 +0100
++++ subversion-1.1.4/build/generator/gen_make.py 2005-04-05
09:43:55.000000000 +0200
@@ -5,6 +5,7 @@
import os
import sys
@@ -74,7 +74,7 @@
else:
# append the output of the target to our stated dependencies
deps.append(source.filename)
-@@ -184,6 +194,8 @@
+@@ -189,6 +199,8 @@
for target in inst_targets:
for target_dep in self.graph.get_sources(gen_base.DT_LINK,
target.name,
gen_base.TargetLib):
@@ -83,7 +83,7 @@
if target_dep.install and target_dep.install != area:
install_deps['install-%s' % target_dep.install] = None
install_deps = install_deps.keys()
-@@ -356,11 +368,18 @@
+@@ -361,11 +373,18 @@
# construct a list of the other .la libs to link against
retreat = build_path_retreat(target.path)
@@ -104,9 +104,9 @@
deps.append(source.filename)
link.append(build_path_join(retreat, source.filename))
-diff -udr subversion-1.1.1.orig/gen-make.py subversion-1.1.1/gen-make.py
---- subversion-1.1.1.orig/gen-make.py 2004-08-10 19:26:26.000000000 +0200
-+++ subversion-1.1.1/gen-make.py 2004-12-06 15:08:00.000000000 +0100
+diff -Naur subversion-1.1.4_orig/gen-make.py subversion-1.1.4/gen-make.py
+--- subversion-1.1.4_orig/gen-make.py 2004-08-10 19:26:26.000000000 +0200
++++ subversion-1.1.4/gen-make.py 2005-04-05 09:45:01.000000000 +0200
@@ -62,6 +62,13 @@
print
print " The default generator type is 'make'"
@@ -131,9 +131,9 @@
])
if len(args) > 1:
_usage_exit()
-diff -udr
subversion-1.1.1.orig/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion-1.1.1/subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion-1.1.1.orig/subversion/bindings/swig/perl/native/Makefile.PL.in
2004-09-14 18:32:08.000000000 +0200
-+++ subversion-1.1.1/subversion/bindings/swig/perl/native/Makefile.PL.in
2004-12-06 15:14:23.000000000 +0100
+diff -Naur
subversion-1.1.4_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion-1.1.4/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.1.4_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
2005-03-20 23:12:33.000000000 +0100
++++ subversion-1.1.4/subversion/bindings/swig/perl/native/Makefile.PL.in
2005-04-05 09:45:43.000000000 +0200
@@ -3,7 +3,7 @@
use Config;
use Cwd 'abs_path';
@@ -143,7 +143,7 @@
if ($^O ne 'VMS') {
$perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
}
-@@ -103,7 +103,6 @@
+@@ -105,7 +105,6 @@
my $swig_modules_command = join ('',
map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
@@ -151,3 +151,19 @@
"ra_plugin.hi ra_reporter.hi ".
"delta_editor.hi\n" .
"\t$swig_command".
+diff -Naur subversion-1.1.4_orig/svn-config.in subversion-1.1.4/svn-config.in
+--- subversion-1.1.4_orig/svn-config.in 2003-12-16 17:41:14.000000000
+0100
++++ subversion-1.1.4/svn-config.in 2005-04-05 09:49:04.000000000 +0200
+@@ -22,10 +22,10 @@
+ libdir="@libdir@"
+ includedir="@includedir@"
+
+-LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@
@SVN_DB_LIBS@ @LIBS@"
++LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @LIBS@"
+ CFLAGS="@CFLAGS@"
+ CPPFLAGS="@CPPFLAGS@"
+-INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@
@SVN_APRUTIL_INCLUDES@"
++INCLUDES="@SVN_NEON_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@"
+ LDFLAGS="@LDFLAGS@"
+
+ SVN_SOURCE_DIR="@abs_srcdir@"
Index: svn.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel/svn.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- svn.info 5 Apr 2005 08:34:54 -0000 1.17
+++ svn.info 6 May 2005 15:37:57 -0000 1.18
@@ -1,6 +1,6 @@
Package: svn
-Version: 1.1.3
-Revision: 12
+Version: 1.1.4
+Revision: 11
Description: Subversion - svnserve, tools
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
@@ -13,7 +13,7 @@
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a09c2b2fa1a09566c024547954a48478
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: %n.patch
@@ -32,9 +32,6 @@
# recreate configure with libtool 1.5.
./autogen.sh
-## remove garbage from the svn-config file
- perl -pi -e 's|[EMAIL PROTECTED]@||g;s|[EMAIL PROTECTED]@||g' svn-config.in
-
### Configure shared
export CC=gcc-3.3; export CXX=g++-3.3; export F77=no; ./configure %c
@@ -370,7 +367,7 @@
</Location>
where %v and %r are replaced with the correct versions. Then do
- 'sudo apachectl graceful' to enable the mod_svn support.
+ 'sudo %p/sbin/apachectl graceful' to enable the mod_svn support.
The "Replaces: svn (<= 1.1.1-11)" is needed since svnlook was
(incorrectly) in the svn-client package < 1.1.1 and was
@@ -403,5 +400,8 @@
Added 'export F77=no;' to configure in order not to fail if the
fort77 package is installed.
+
+ Patched svn-config.in to remove no longer used values. NOTE: svn-config
+ is not officially supported by the subversion team.
<<
Homepage: http://subversion.tigris.org/
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
