Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9718/unstable/crypto/finkinfo
Modified Files:
svn-ssl.patch
Log Message:
Forgot the patches for svn 1.2.0 on 10.4
Index: svn-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/svn-ssl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svn-ssl.patch 12 May 2005 07:40:25 -0000 1.3
+++ svn-ssl.patch 10 Jun 2005 20:30:43 -0000 1.4
@@ -1,7 +1,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 @@
+diff -Naur subversion-1.2.0_orig/Makefile.in subversion-1.2.0/Makefile.in
+--- subversion-1.2.0_orig/Makefile.in 2005-03-31 01:48:42.000000000 +0200
++++ subversion-1.2.0/Makefile.in 2005-04-08 14:21:52.000000000 +0200
+@@ -577,7 +577,7 @@
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
@@ -10,39 +10,30 @@
swig-pl: $(swig-pl_DEPS)
cd $(SWIG_PL_DIR)/native; $(MAKE)
-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
- case $deplib in
-+ -ldb-4.1*) continue ;;
-+ libdb-4.1*) continue ;;
- -l*)
- if test $linkmode = oldlib && test $linkmode = obj; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects:
$deplib" 1>&2
-@@ -3649,7 +3651,7 @@
+diff -Naur subversion-1.2.0_orig/ac-helpers/ltmain.sh
subversion-1.2.0/ac-helpers/ltmain.sh
+--- subversion-1.2.0_orig/ac-helpers/ltmain.sh 2005-04-05 01:45:29.000000000
+0200
++++ subversion-1.2.0/ac-helpers/ltmain.sh 2005-04-08 14:25:27.000000000
+0200
+@@ -4906,7 +4906,7 @@
# if CDPATH is set.
- if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command=\"$relink_command\"
-+relink_command=\"\""
++relink_command=\"\"
# This environment variable determines our operation mode.
if test \"\$libtool_install_magic\" = \"$magic\"; then
-@@ -4020,7 +4022,7 @@
+@@ -5303,7 +5303,7 @@
libdir='$install_libdir'"
- if test "$installed" = no && test $need_relink = yes; then
+ if test "$installed" = no && test "$need_relink" = yes; then
$echo >> $output "\
-relink_command=\"$relink_command\""
+relink_command=\"\""
fi
done
fi
-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
+diff -Naur subversion-1.2.0_orig/build/generator/gen_make.py
subversion-1.2.0/build/generator/gen_make.py
+--- subversion-1.2.0_orig/build/generator/gen_make.py 2005-03-22
16:08:25.000000000 +0100
++++ subversion-1.2.0/build/generator/gen_make.py 2005-04-08
15:24:29.000000000 +0200
@@ -5,6 +5,7 @@
import os
import sys
@@ -51,7 +42,7 @@
import gen_base
-@@ -27,6 +28,13 @@
+@@ -39,6 +40,13 @@
install_deps = self.graph.get_deps(gen_base.DT_INSTALL)
install_sources = self.graph.get_all_sources(gen_base.DT_INSTALL)
@@ -65,25 +56,7 @@
# ensure consistency between runs
install_deps.sort()
install_sources.sort(lambda s1, s2: cmp(s1.name, s2.name))
-@@ -68,6 +76,8 @@
- elif isinstance(source, gen_base.TargetLinked):
- if source.external_lib:
- libs.append(source.external_lib)
-+ elif source.name in self.installed_libs:
-+ libs.append('-l%s-%s' % (source.name[3:], self.cfg.version))
- else:
- # append the output of the target to our stated dependencies
- deps.append(source.filename)
-@@ -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):
-+ if target_dep.name in self.installed_libs:
-+ continue
- if target_dep.install and target_dep.install != area:
- install_deps['install-%s' % target_dep.install] = None
- install_deps = install_deps.keys()
-@@ -361,11 +373,18 @@
+@@ -54,11 +62,17 @@
# construct a list of the other .la libs to link against
retreat = build_path_retreat(target.path)
@@ -91,23 +64,31 @@
- link = [ build_path_join(retreat, target.filename) ]
+ if target.name in self.installed_libs:
+ deps = []
-+ link = [ '-l%s-%s' % (target.name[3:], self.cfg.version) ]
++ link = [ '-l%s-%s' % (target.name[3:], self.version) ]
+ else:
-+ deps = [ target.filename ]
-+ link = [ build_path_join(retreat, target.filename) ]
++ deps = [ target.filename ]
++ link = [ build_path_join(retreat, target.filename) ]
for source in self.graph.get_sources(gen_base.DT_LINK, target.name):
if not isinstance(source, gen_base.TargetLib) or
source.external_lib:
continue
-+ if source.name in self.installed_libs:
-+ link.append('-l%s-%s' % (source.name[3:], self.cfg.version))
++ elif source.name in self.installed_libs:
+ continue
deps.append(source.filename)
link.append(build_path_join(retreat, source.filename))
-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 @@
+@@ -136,6 +150,8 @@
+ elif isinstance(link_dep, gen_base.TargetLinked):
+ if link_dep.external_lib:
+ libs.append(link_dep.external_lib)
++ elif link_dep.name in self.installed_libs:
++ libs.append('-l%s-%s' % (link_dep.name[3:], self.version))
+ else:
+ # append the output of the target to our stated dependencies
+ deps.append(link_dep.filename)
+diff -Naur subversion-1.2.0_orig/gen-make.py subversion-1.2.0/gen-make.py
+--- subversion-1.2.0_orig/gen-make.py 2005-01-31 13:11:57.000000000 +0100
++++ subversion-1.2.0/gen-make.py 2005-04-08 14:45:18.000000000 +0200
+@@ -81,6 +81,13 @@
print
print " The default generator type is 'make'"
print
@@ -121,19 +102,17 @@
print " Windows-specific options:"
print
print " --with-apr=DIR"
-@@ -140,7 +147,8 @@
- 'enable-purify',
- 'enable-quantify',
+@@ -176,6 +183,7 @@
'enable-nls',
-- 'enable-bdb-in-apr-util'
-+ 'enable-bdb-in-apr-util',
+ 'enable-bdb-in-apr-util',
+ 'vsnet-version=',
+ 'installed-libs=',
])
if len(args) > 1:
_usage_exit()
-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
+diff -Naur
subversion-1.2.0_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion-1.2.0/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.2.0_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
2005-03-22 10:31:58.000000000 +0100
++++ subversion-1.2.0/subversion/bindings/swig/perl/native/Makefile.PL.in
2005-04-08 15:12:47.000000000 +0200
@@ -3,7 +3,7 @@
use Config;
use Cwd 'abs_path';
@@ -151,9 +130,9 @@
"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
+diff -Naur subversion-1.2.0_orig/svn-config.in subversion-1.2.0/svn-config.in
+--- subversion-1.2.0_orig/svn-config.in 2003-12-16 17:41:14.000000000
+0100
++++ subversion-1.2.0/svn-config.in 2005-04-08 14:46:56.000000000 +0200
@@ -22,10 +22,10 @@
libdir="@libdir@"
includedir="@includedir@"
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
