Update of /cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24483/crypto/finkinfo
Modified Files:
libapache2-ssl-mod-svn.info svn-ssl-javahl.info
svn-ssl-swig-pm.info svn-ssl.info svn-ssl.patch
Log Message:
Move latest version (1.1.4-11) to stable on 10.4-transitional based on
positive feedback
Index: svn-ssl-javahl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/svn-ssl-javahl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svn-ssl-javahl.info 27 Apr 2005 03:29:15 -0000 1.1
+++ svn-ssl-javahl.info 13 May 2005 09:06:06 -0000 1.2
@@ -1,6 +1,6 @@
Info2: <<
Package: svn-ssl-javahl
-Version: 1.1.3
+Version: 1.1.4
Revision: 11
Description: Subversion - Java bindings (with SSL)
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-ssl.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-ssl-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-ssl-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-ssl-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-ssl-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar:subversion/bindings/java/javahl/classes
org.tigris.subversion.javahl.tests.BasicTests
<<
# Additional Info
Index: libapache2-ssl-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/libapache2-ssl-mod-svn.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libapache2-ssl-mod-svn.info 27 Apr 2005 03:29:14 -0000 1.1
+++ libapache2-ssl-mod-svn.info 13 May 2005 09:06:06 -0000 1.2
@@ -1,5 +1,5 @@
Package: libapache2-ssl-mod-svn
-Version: 1.1.3
+Version: 1.1.4
Revision: 11
Description: Subversion - mod_svn (with SSL)
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-ssl.patch
Index: svn-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/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:23:15 -0000 1.2
+++ svn-ssl.patch 13 May 2005 09:06:06 -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@"
Index: svn-ssl.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/svn-ssl.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svn-ssl.info 28 Apr 2005 14:23:15 -0000 1.2
+++ svn-ssl.info 13 May 2005 09:06:06 -0000 1.3
@@ -1,29 +1,25 @@
Package: svn-ssl
-Version: 1.1.1
-Revision: 15
+Version: 1.1.4
+Revision: 11
Description: Subversion - svnserve, tools (with SSL)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: %N-shlibs (= %v-%r), daemonic
-BuildDepends: apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl,
gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), python23 (>= 1:2.3.3-23) |
python23-nox (>= 1:2.3.3-23), fink (>= 0.16.0-1), neon24-ssl (>= 0.24.7-11),
openldap-ssl-dev (>= 2.1.22-24), cyrus-sasl2-dev (>= 2.1.15-23),
openssl097-dev, swig (>= 1.3.20-2), texinfo (>= 4.2-22), libiconv-dev (>=
1.9.1-11), apache2-ssl-dev (>= 2.0.50-10), system-java14-dev, perl586-core,
gettext-bin, gettext-tools, gettext-dev, io-string-pm, libtool14 (>= 1.5.10-1),
autoconf2.5, automake1.9, gcc3.3
-# Only needs to be enabled for 'make check-javahl':
-#, junit
+BuildDepends: apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl,
gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), fink (>= 0.16.0-1),
neon24-ssl (>= 0.24.7-11), openldap-ssl-dev (>= 2.1.22-24), cyrus-sasl2-dev (>=
2.1.15-23), openssl097-dev, swig (>= 1.3.20-2), texinfo (>= 4.2-22),
libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools, gettext-dev,
io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9, gcc3.3
Conflicts: svn-client, svn-client-ssl (<= 0.26.0-2), apache2 (<< 2.0.47-1)
Replaces: svn-client, svn-client-ssl (<= 1.1.1-11)
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: a180c3fe91680389c210c99def54d9e0
+Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
# Patch Phase:
Patch: %n.patch
# Compile Phase:
-ConfigureParams: --libexecdir='${prefix}/lib/svn'
--mandir='${prefix}/share/man' --infodir='${prefix}/share/info' --with-neon=%p
--with-apr=%p --with-apr-util=%p --enable-shared --with-apxs=%p/sbin/apxs
--without-apache --disable-mod-activation
--with-jdk=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
--enable-javahl --with-jikes=no --enable-swig-bindings=java,perl,python
--with-swig=%p --with-python=%p/bin/python2.3 --with-perl=perl5.8.6
PYTHON2=%p/bin/python2.3 PERL=perl5.8.6
-# Only needs to be enabled for 'make check-javahl':
-# --with-junit=%p/share/java/junit/junit.jar
+ConfigureParams: --libexecdir='${prefix}/lib/svn'
--mandir='${prefix}/share/man' --infodir='${prefix}/share/info' --with-neon=%p
--with-apr=%p --with-apr-util=%p --enable-shared --without-apxs
--without-apache --disable-mod-activation --without-jdk --disable-javahl
--with-jikes=no --disable-swig-bindings --with-swig=%p --without-python
--without-perl
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
CompileScript: <<
@@ -33,14 +29,17 @@
rm -rf apr
rm -rf apr-util
- # recreate configure with libtool 1.5. The javahl bindings fail to build
- # correctly with libtool 1.4
+ # recreate configure with libtool 1.5.
./autogen.sh
+
### Configure shared
- ./configure %c
+ export CC=gcc-3.3; export CXX=g++-3.3; export F77=no; ./configure %c
+
+ ### force SWIG to use gcc 3.3 too
+ perl -pi.bak -e 's|(SWIG.*)gcc|${1}gcc-3.3|g' Makefile
### make everything shared
- make
+ make CC=gcc-3.3 CXX=g++-3.3
### Run tests over ra_local:
# echo "Running tests over ra_local using BDB..."
@@ -62,41 +61,10 @@
# echo "Running tests over ra_dav..."
# make check BASE_URL=http://localhost
- ### Build swig python bindings
- make swig-py
-
- ### Build swig perl bindings
- make swig-pl-lib
- (cd subversion/bindings/swig/perl/native && perl5.8.6 Makefile.PL
PERL=perl5.8.6 FULLPERL=perl5.8.6 INSTALLDIRS=vendor PREFIX=%p
LIB=%p/lib/perl5/5.8.6 INSTALLBIN=%i/bin INSTALLSCRIPT=%i/bin
INSTALLPRIVLIB=%p/lib/perl5/5.8.6
INSTALLARCHLIB=%p/lib/perl5/5.8.6/darwin-thread-multi-2level
INSTALLSITELIB=%p/lib/perl5/5.8.6
INSTALLSITEARCH=%p/lib/perl5/5.8.6/darwin-thread-multi-2level
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3
INSTALLVENDORMAN1DIR=%p/share/man/man1 INSTALLVENDORMAN3DIR=%p/share/man/man3 )
- curdir=`pwd`
- dylibs=`find $curdir -name "*.dylib"`
- for dylib in $dylibs
- do
- install_name=`otool -XD $dylib`
- case "$dylibfile" in
- *"$install_name:"*) ;;
- *) dylibfile="$dylibfile -dylib_file $install_name:$dylib" ;;
- esac
- done
- PERL_DYLIB_FLAGS=$dylibfile
- export PERL_DYLIB_FLAGS
- (cd subversion/bindings/swig/perl/native && PERL=perl5.8.6 FULLPERL=perl5.8.6
INSTALLDIRS=vendor PREFIX=%p LIB=%p/lib/perl5/5.8.6 INSTALLBIN=%i/bin
INSTALLSCRIPT=%i/bin INSTALLPRIVLIB=%p/lib/perl5/5.8.6
INSTALLARCHLIB=%p/lib/perl5/5.8.6/darwin-thread-multi-2level
INSTALLSITELIB=%p/lib/perl5/5.8.6
INSTALLSITEARCH=%p/lib/perl5/5.8.6/darwin-thread-multi-2level
INSTALLMAN1DIR=%p/share/man/man1 INSTALLMAN3DIR=%p/share/man/man3
INSTALLSITEMAN1DIR=%p/share/man/man1 INSTALLSITEMAN3DIR=%p/share/man/man3
INSTALLVENDORMAN1DIR=%p/share/man/man1 INSTALLVENDORMAN3DIR=%p/share/man/man3
make 'OTHERLDFLAGS=$(PERL_DYLIB_FLAGS)')
-# (cd subversion/bindings/swig/perl/native && make test)
-
### Build swig java bindings (they don't build yet!)
+ ### need to add --enable-swig-bindings=java to configure
#make swig-java-lib
#make swig-java-java
-
- ### Build javahl bindings
- # this makdir should no longer be necessary once svn issue #2032 is released
- mkdir -p subversion/bindings/java/javahl/classes/org/tigris/subversion/javahl
- make javahl
- # On Mac OS X jni libraries have to be named libfoo.jnilib
- # We are doing it with a symlink here.
- (cd subversion/bindings/java/javahl/native/.libs && ln -s
libsvnjavahl-1.dylib libsvnjavahl-1.jnilib)
- ### The javahl tests don't work yet without already installed packages
- # see svn issue #2040 for more info
-# make check-javahl
<<
# Install Phase:
@@ -141,33 +109,14 @@
### Install binaries
/usr/bin/install -d %i/bin
/usr/bin/install -m 755 svn-config %i/bin
+
+ # Install default directory for repositories
/usr/bin/install -d %i/var
/usr/bin/install -m 770 -d %i/var/svn
chown www:admin %i/var/svn
- ### Install swig python bindings
- make install-swig-py DESTDIR=%d DISTUTIL_PARAM=--prefix=%d
swig_pydir=%p/lib/python2.3/site-packages/libsvn
swig_pydir_extra=%p/lib/python2.3/site-packages/svn
- cp subversion/bindings/swig/INSTALL INSTALL.swig
- cp subversion/bindings/swig/README README.swig
-
- ### Install swig perl bindings
- make install-swig-pl DESTDIR=%d
-
### Install swig java bindings
#make install-swig-java DESTDIR=%d swig_javadir=%p/share/java/svn-swig-java
-
- ### Install javahl bindings
- # INSTALL_EXTRA_JAVAHL_LIB is set to nothing since it would generate
- # a symbolic link directly in %p instead of %i
- make install-javahl INSTALL_EXTRA_JAVAHL_LIB="" DESTDIR=%d
javahl_javadir=%p/share/java/svn-ssl-javahl
javahl_javahdir=%p/include/svn-ssl-javahl
- #### make a symlink for the jnilib
- ln -sf libsvnjavahl-1.dylib %i/lib/libsvnjavahl-1.jnilib
- ln -sf %p/lib/libsvnjavahl-1.dylib
%i/share/java/svn-ssl-javahl/libsvnjavahl-1.jnilib
-
- ### 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-ssl-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-ssl-javahl/svn-javahl.jar:%p/share/java/junit/junit.jar:subversion/bindings/java/javahl/classes
org.tigris.subversion.javahl.tests.BasicTests
<<
DaemonicName: svnserve
@@ -287,8 +236,8 @@
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
DescUsage: <<
This installs the subversion client.
- Type 'svn help' for usage and look in /sw/share/svn-ssl/tools and
- /sw/share/svn-ssl/contrib.
+ Type 'svn help' for usage and look in %p/share/svn-ssl/tools and
+ %p/share/svn-ssl/contrib.
WARNING:
This client may be incompatible with ra_dav servers <= 0.35
@@ -299,144 +248,6 @@
moved to the client split off in 1.0.2-11.
<<
<<
-SplitOff4: <<
- Package: libapache2-ssl-mod-svn
- Depends: %N-shlibs (= %v-%r), apache2-ssl (>= 2.0.50-10), apr-ssl-common
- Files: <<
- lib/apache2
- var/svn
- <<
- DocFiles: COPYING HACKING INSTALL
- Description: Subversion - mod_svn (with SSL)
- DescUsage: <<
- This installs the subversion network server for apache2.
- Please read section III C in the file
- /sw/share/doc/libapache2-ssl-mod-svn/INSTALL
- for informations on how to run a subversion server via apache2.
-
- You could install the repositories under the preconfigured directory
- /sw/var/svn
- which should have the correct permissions. Make sure that all files
- in the new repository have the correct permissions for apache (and
svnserve)
- to read and write. E.g. run 'chown -R www /sw/var/svn/yourrepos' and
- 'chmod -R go-rwx /sw/var/svn/yourrepos'.
-
- You then need to add the following lines to your /sw/etc/apache2/httpd.conf
- file:
- <Location /svn/yourrepos>
- DAV svn
- SVNPath /sw/var/svn/yourrepos
- </Location>
-
- Your repository should show up at <http://localhost/svn/yourrepos>. If it
- does not check your apache2 logs at /sw/var/apache2/logs/error_log
-
- If you need the examples or the tools (e.g. svnadmin) install the
- 'svn-ssl' package.
- <<
- PostInstScript: <<
- APXS=%p/sbin/apxs
- MOD_PREFIX=`$APXS -q LIBEXECDIR`
-
- # Enable svn modules
- MODULENAME=dav_svn
- MODULE=$MOD_PREFIX/mod_$MODULENAME.so
- echo "Enabling mod_$MODULENAME module..."
- $APXS -e -a -n $MODULENAME $MODULE
-
- MODULENAME=authz_svn
- MODULE=$MOD_PREFIX/mod_$MODULENAME.so
- echo "Enabling mod_$MODULENAME module..."
- $APXS -e -a -n $MODULENAME $MODULE
-
- if test `ps -U www | grep -c %p/sbin/httpd` -ge 1; then
- echo "Restarting apache2..."
- %p/sbin/apachectl graceful
- fi
- <<
- PreRmScript: <<
- if [ "$1" != "remove" -a "$1" != "purge" ]; then
- exit 0
- fi
-
- # Disable svn modules
- APXS=%p/sbin/apxs
- MOD_PREFIX=`$APXS -q LIBEXECDIR`
-
- MODULENAME=dav_svn
- MODULE=$MOD_PREFIX/mod_$MODULENAME.so
- echo "Disabling mod_$MODULENAME module..."
- $APXS -e -A -n $MODULENAME $MODULE
-
- MODULENAME=authz_svn
- MODULE=$MOD_PREFIX/mod_$MODULENAME.so
- echo "Disabling mod_$MODULENAME module..."
- $APXS -e -A -n $MODULENAME $MODULE
-
- if %p/sbin/apachectl configtest > /dev/null 2>&1; then
- # httpd.conf is correct, e.g. doesn't contain any DAV provider
- if test `ps -U www | grep -c %p/sbin/httpd` -ge 1; then
- echo "Restarting apache2..."
- %p/sbin/apachectl graceful
- fi
- else
- # httpd.conf has syntax errors, e.g. remaining DAV providers
- echo
"#####################################################################"
- echo "The subversion apache modules are now disabled in the"
- echo "%p/etc/apache2/httpd.conf file and will be removed. Please make
sure"
- echo "that you haven't any svn repositories still enabled in your"
- echo "%p/etc/apache2/httpd.conf file. You then should restart apache by"
- echo "typing '%p/sbin/apachectl graceful'."
- echo
"#####################################################################"
- fi
- <<
-<<
-SplitOff5: <<
- Package: %N-swig-pm586
- Depends: %N-shlibs (= %v-%r), perl586-core, swig-shlibs (>= 1.3.20-2)
- Files: <<
- lib/perl5
- share/man/man3
- lib/libsvn_swig_perl-1.0.0.0.dylib
- lib/libsvn_swig_perl-1.0.dylib
- lib/libsvn_swig_perl-1.dylib
- <<
- Shlibs: <<
- %p/lib/libsvn_swig_perl-1.0.dylib 1.0.0 %n (>= 0.37.0-11)
- <<
- DocFiles: COPYING HACKING INSTALL.swig README.swig
- Description: Subversion - Swig Perl bindings (with SSL)
- DescDetail: <<
- Bindings to call svn functions from perl 5.8.6.
- <<
- DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-swig-pm586/'.
- <<
-<<
-SplitOff6: <<
- Package: %N-swig-py23
- Depends: %N-shlibs (= %v-%r), python23 (>= 1:2.3.3-23) | python23-nox (>=
1:2.3.3-23), swig-shlibs (>= 1.3.20-2)
- Replaces: svn-ssl-shlibs (<< 1.0.4-11)
- Files: <<
- lib/python2.3
- lib/libsvn_swig_py*
- <<
- Shlibs: <<
- %p/lib/libsvn_swig_py-1.0.dylib 1.0.0 %n (>= 1.0.4-11)
- <<
- DocFiles: COPYING HACKING INSTALL.swig README.swig
- Description: Subversion - Swig Python bindings (with SSL)
- DescDetail: <<
- Bindings to call svn functions from python 2.3.
- <<
- DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-swig-py23/'.
- <<
- DescPackaging: <<
- The "Replaces: svn-ssl-shlibs (<< 1.0.4-11)" is needed since the
- libsvn_swig_py-1.0.dylib was (incorrectly) in the svn-ssl-shlibs package.
- <<
-<<
SplitOff8: <<
Package: %N-doc
Description: Subversion - Documentation
@@ -446,46 +257,6 @@
<<
DocFiles: COPYING
<<
-SplitOff9: <<
- Package: %N-javahl
- Depends: %N-shlibs (= %v-%r), system-java14, libiconv
- Files: <<
- share/java
- lib/libsvnjavahl*
- <<
- JarFiles: subversion/bindings/java/javahl/svn-javahl.jar
- Shlibs: <<
- %p/lib/libsvnjavahl-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
- <<
- DocFiles: <<
- subversion/bindings/java/javahl/AUTHORS
- subversion/bindings/java/javahl/README
- subversion/bindings/java/javahl/README-HIGH-LEVEL-API.txt
- COPYING HACKING INSTALL
- <<
- Description: Subversion - Java bindings (with SSL)
- DescDetail: <<
- Bindings to call svn functions from java 1.4.
- <<
- DescUsage: <<
- Please read the files in '/sw/share/doc/svn-ssl-javahl/'.
-
- If you get a java.lang.UnsatisfiedLinkError exception in java check
- to make sure that the path /sw/share/java/svn-ssl-javahl is in your
- 'java.library.path' or make a simbolic link to
- /sw/lib/libsvnjavahl-1.dylib that is called 'libsvnjavahl-1.jnilib'
- in your working directory.
-
- To use the bindings together with Subclipse (an SVN plugin for Eclipse)
- do the following:
-
- cd
/Developer/Applications/eclipse/plugins/org.tigris.subversion.subclipse.core_0.9.22
- cp /sw/share/java/svn-ssl-javahl/svn-javahl.jar .
- ln -sf /sw/lib/libsvnjavahl-1.jnilib
-
- (Adjust the path to your subclise plugin accordingly.)
- <<
-<<
# SplitOff7: <<
# Package: %N-swig-java
# Depends: %N-shlibs (= %v-%r), system-java14, swig-shlibs (>= 1.3.20-2)
@@ -502,7 +273,7 @@
# Bindings to call svn functions from java 1.4.
# <<
# DescUsage: <<
-# Please read the files in '/sw/share/doc/svn-ssl-swig-java/'.
+# Please read the files in '%p/share/doc/svn-ssl-swig-java/'.
# <<
# <<
@@ -548,8 +319,8 @@
- The "svn-ssl-dev" package contains the development headers and libraries.
It is installed automatically by fink when needed.
-- The "svn-ssl-swig-pm586" package contains the swig perl bindings to call
- svn from perl. Type 'fink describe svn-ssl-swig-pm586' to get usage help.
+- The "svn-ssl-swig-pm581" package contains the swig perl bindings to call
+ svn from perl. Type 'fink describe svn-ssl-swig-pm581' to get usage help.
- The "svn-ssl-swig-py23" package contains the swig python bindings to call
svn from python. Type 'fink describe svn-ssl-swig-py23' to get usage help.
@@ -559,44 +330,44 @@
For More Information, check the main Subversion website below and read the book
at <http://svnbook.red-bean.com/>. Also check out the documentation in
-/sw/share/doc/svn-ssl. These files are in the "svn-ssl-doc" package.
+%p/share/doc/svn-ssl. These files are in the "svn-ssl-doc" package.
<<
DescUsage: <<
Type 'svnserve --help', 'man svnserve', 'svnadmin help', or 'man svnadmin'
for usage.
Some tools (e.g. hook and back-up scripts) and examples are stored in
- /sw/share/svn-ssl/tools and /sw/share/svn-ssl/contrib
+ %p/share/svn-ssl/tools and %p/share/svn-ssl/contrib
You can start the Subversion server manually using a command similar to
- '/usr/bin/sudo -u www /sw/bin/svnserve -d -r /sw/var/svn' or you can
+ '/usr/bin/sudo -u www %p/bin/svnserve -d -r %p/var/svn' or you can
run 'daemonic enable svnserve' as root to create a StartupItem for it.
'svnserve' is run as user 'www' in order that apache and svnserve can
- access the same repositories at the same time under '/sw/var/svn'
+ access the same repositories at the same time under '%p/var/svn'
You could install the repositories under the preconfigured directory
- /sw/var/svn
+ %p/var/svn
which should have the correct permissions. Make sure that all files
in the new repository have the correct permissions for svnserve (and apache)
- to read and write. E.g. run 'chown -R www /sw/var/svn/yourrepos' and
- 'chmod -R go-rwx /sw/var/svn/yourrepos'.
+ to read and write. E.g. run 'chown -R www %p/var/svn/yourrepos' and
+ 'chmod -R go-rwx %p/var/svn/yourrepos'.
<<
DescPackaging: <<
To run the tests over ra_dav apache2 must be running with (an older)
fink 'libapache2-ssl-mod-svn' already installed. You need to add the
- following to your '/sw/etc/apache2/httpd.conf' file:
+ following to your '%p/etc/apache2/httpd.conf' file:
<Location /repositories>
DAV svn
- SVNParentPath
/sw/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
+ SVNParentPath
%p/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
</Location>
<Location /local_tmp/repos>
DAV svn
- SVNPath
/sw/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/local_tmp/repos
+ SVNPath
%p/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/local_tmp/repos
</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-ssl (<= 1.1.1-11)" is needed since svnlook was
(incorrectly) in the svn-client-ssl package < 1.1.1 and was
@@ -626,5 +397,11 @@
The swig java bindings don't work currently. Check out this thread:
<http://www.contactor.se/~dast/svn/archive-2004-05/index.shtml#1055>
+
+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/
Index: svn-ssl-swig-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/crypto/finkinfo/svn-ssl-swig-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svn-ssl-swig-pm.info 27 Apr 2005 03:29:15 -0000 1.1
+++ svn-ssl-swig-pm.info 13 May 2005 09:06:06 -0000 1.2
@@ -1,7 +1,7 @@
Info2: <<
Package: svn-ssl-swig-pm%type_pkg[perl]
-Version: 1.1.3
-Revision: 12
+Version: 1.1.4
+Revision: 11
Description: Subversion - Swig Perl bindings (with SSL)
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-ssl.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
-------------------------------------------------------
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
