Update of /cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21057
Modified Files:
svn-ssl.patch
Log Message:
Forgot to also change the patch for version 1.1.4-11
Index: svn-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/crypto/finkinfo/svn-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svn-ssl.patch 28 Apr 2005 14:26:02 -0000 1.2
+++ svn-ssl.patch 12 May 2005 07:40:25 -0000 1.3
@@ -1,6 +1,18 @@
-diff -urN subversion-1.0.1.orig/ac-helpers/ltmain.sh
subversion-1.0.1/ac-helpers/ltmain.sh
---- subversion-1.0.1.orig/ac-helpers/ltmain.sh Sat Dec 20 12:02:12 2003
-+++ subversion-1.0.1/ac-helpers/ltmain.sh Thu Dec 25 20:21:10 2003
+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
+
+-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 = libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
+ 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
@@ -15,7 +27,7 @@
if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-relink_command=\"$relink_command\"
-+relink_command=""
++relink_command=\"\""
# This environment variable determines our operation mode.
if test \"\$libtool_install_magic\" = \"$magic\"; then
@@ -28,3 +40,130 @@
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
+@@ -5,6 +5,7 @@
+ import os
+ import sys
+ import string
++import ConfigParser
+
+ import gen_base
+
+@@ -27,6 +28,13 @@
+ 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))
+@@ -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 @@
+
+ # construct a list of the other .la libs to link against
+ retreat = build_path_retreat(target.path)
+- deps = [ target.filename ]
+- 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) ]
++ else:
++ 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))
++ 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 @@
+ print
+ print " The default generator type is 'make'"
+ print
++ print " UNIX-specific options:"
++ print
++ print " --installed-libs"
++ print " Comma-separated list of Subversion libraries to find"
++ print " pre-installed instead of building (probably only"
++ print " useful for packagers)"
++ print
+ print " Windows-specific options:"
+ print
+ print " --with-apr=DIR"
+@@ -140,7 +147,8 @@
+ 'enable-purify',
+ 'enable-quantify',
+ 'enable-nls',
+- 'enable-bdb-in-apr-util'
++ 'enable-bdb-in-apr-util',
++ '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
+@@ -3,7 +3,7 @@
+ use Config;
+ use Cwd 'abs_path';
+
+-my $perl_path = $Config{perlpath};
++my $perl_path = $^X;
+ if ($^O ne 'VMS') {
+ $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i;
+ }
+@@ -105,7 +105,6 @@
+
+ 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".
+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@"
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
