Update of /cvsroot/fink/dists/10.3/stable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6769
Added Files:
libapache2-ssl-mod-svn.info svn-ssl-javahl.info
svn-ssl-swig-py.info svn-ssl.info svn-ssl.patch
Log Message:
Reinstantiate accidentially removed stable version (1.4.2)
--- NEW FILE: svn-ssl-swig-py.info ---
Info2: <<
Package: svn-ssl-swig-py%type_pkg[python]
Version: 1.4.2
Revision: 1
Description: Subversion - Swig Python %type_raw[python] bindings (with SSL)
Type: python (2.3 2.4)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: python%type_pkg[python] | python%type_pkg[python]-nox, %{Ni}-shlibs
BuildDepends: fink (>= 0.25.0-1), svn-ssl-dev (>= %v-1), apr-ssl (>= 0.9.12-1),
apr-ssl-common (>= 0.9.12-1), db43-ssl, gdbm3, expat (>= 1.95.6-2), libxml2 (>=
2.5.10-12), neon26, openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23),
openssl097-dev, libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools,
libgettext3-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf (>= 2.60-1),
automake1.9, gcc3.3
Conflicts: %{Ni}23, %{Ni}24
Replaces: %{Ni}23, %{Ni}24, svn-ssl-shlibs (<< 1.0.4-11)
# Unpack Phase:
Source: http://subversion.tigris.org/downloads/subversion-%v.tar.bz2
Source-MD5: edebb06afb3266d09e75f728a8259677
# Patch Phase:
PatchFile: svn-ssl.patch
PatchFile-MD5: 78a6c8f6362fa505a3079fcd5f8e660c
PatchScript: <<
%{default_script}
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
<<
# Compile Phase:
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
CompileScript: <<
#! /bin/sh -ev
# recreate configure with libtool 1.5
./autogen.sh
### Recreate build-outputs.mk to not include already installed libs
./gen-make.py --installed-libs
libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_base,libsvn_fs_fs,libsvn_ra,libsvn_ra_dav,libsvn_ra_local,libsvn_ra_svn,libsvn_repos,libsvn_subr,libsvn_wc
### Configure shared
export CC=gcc-3.3; export CXX=g++-3.3; export F77=no; ./configure --prefix=%p
--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
--enable-swig-bindings=python --with-python=%p/bin/python%type_raw[python]
--without-perl PYTHON2=%p/bin/python%type_raw[python] --without-ruby
--with-berkeley-db=%p/include/db4:%p/lib --disable-dependency-tracking
--disable-keychain
### Build swig python bindings
make CC=gcc-3.3 CXX=g++-3.3 swig-py
<<
InfoTest: <<
TestScript: make check-swig-py || exit 2
<<
# Install Phase:
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/NOTES NOTES.swig
### Remove unneeded archives
rm %i/lib/*.a
rm %i/lib/*.la
<<
SplitOff: <<
Description: Subversion - Swig Python Shared libraries
Package: %N-shlibs
Depends: svn-ssl-shlibs (>= %v-1)
Replaces: %{Ni}23-shlibs, %{Ni}24-shlibs
Provides: %{Ni}-shlibs
Files: <<
lib/libsvn_swig_py-1.0.0.0.dylib
lib/libsvn_swig_py-1.0.dylib
lib/libsvn_swig_py-1.dylib
<<
Shlibs: <<
%p/lib/libsvn_swig_py-1.0.dylib 1.0.0 %n (>= 1.4.0-1)
<<
DocFiles: COPYING HACKING INSTALL.swig NOTES.swig
<<
# Additional Info
DescDetail: <<
Bindings to call svn functions from python.
<<
DescUsage: <<
Please read the files in '%p/share/doc/svn-ssl-swig-py%type_pkg[python]/'.
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
from the svn-ssl-shlibs package. Borrowed from the netbsd
pkgsrc/devel/subversion/ package
Added 'export F77=no;' to configure in order not to fail if the
fort77 package is installed.
<<
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.
<<
Homepage: http://subversion.tigris.org/
<<
--- NEW FILE: svn-ssl-javahl.info ---
Info2: <<
Package: svn-ssl-javahl
Version: 1.4.2
Revision: 1
Description: Subversion - Java bindings (with SSL)
Type: java(1.4)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: system-java%type_pkg[java], svn-ssl-shlibs (>= %v-1)
BuildDepends: fink (>= 0.25.0-1), svn-ssl-dev (>= %v-1), apr-ssl (>= 0.9.12-1),
apr-ssl-common (>= 0.9.12-1), db43-ssl, gdbm3, expat (>= 1.95.6-2), libxml2 (>=
2.5.10-12), neon26, openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23),
openssl097-dev, libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools,
libgettext3-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf (>= 2.60-1),
automake1.9, system-java%type_pkg[java]-dev, gcc3.3
# Unpack Phase:
Source: http://subversion.tigris.org/downloads/subversion-%v.tar.bz2
Source-MD5: edebb06afb3266d09e75f728a8259677
# Patch Phase:
PatchFile: svn-ssl.patch
PatchFile-MD5: 78a6c8f6362fa505a3079fcd5f8e660c
PatchScript: <<
%{default_script}
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
<<
# 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 --without-apxs
--without-apache --disable-mod-activation
--with-jdk=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
--enable-javahl --with-jikes=no --disable-swig-bindings --without-swig
--without-python --without-perl --without-ruby
--with-berkeley-db=%p/include/db4:%p/lib --disable-dependency-tracking
--disable-keychain
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
CompileScript: <<
#! /bin/sh -ev
# recreate configure with libtool 1.5
./autogen.sh
### Recreate build-outputs.mk to not include already installed libs
./gen-make.py --installed-libs
libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_base,libsvn_fs_fs,libsvn_ra,libsvn_ra_dav,libsvn_ra_local,libsvn_ra_svn,libsvn_repos,libsvn_subr,libsvn_wc
### Configure shared
export CC=gcc-3.3; export CXX=g++-3.3; export F77=no; ./configure %c
### Build javahl bindings
make CC=gcc-3.3 CXX=g++-3.3 javahl
<<
InfoTest: <<
# There is one test failing because of permissions while running as root
TestDepends: junit
TestScript: make check-javahl || exit 2
TestConfigureParams: --with-junit=%p/share/java/junit/junit.jar
<<
# Install Phase:
DocFiles: <<
subversion/bindings/java/javahl/README
COPYING HACKING INSTALL
<<
JarFiles: subversion/bindings/java/javahl/svn-javahl.jar
Shlibs: <<
%p/lib/libsvnjavahl-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
<<
InstallScript: <<
### 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/%n javahl_javahdir=%p/include/%n
#### 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/%n/libsvnjavahl-1.jnilib
### Remove unneeded include dir and archives
rm -rf %i/include
rm %i/lib/*.a
rm %i/lib/*.la
<<
# Additional Info
DescDetail: <<
Subversion bindings to call svn functions from java 1.4.
<<
DescUsage: <<
Please read the files in '%p/share/doc/%n/'.
If you get a java.lang.UnsatisfiedLinkError exception in java check
to make sure that the path %p/share/java/%n is in your
'java.library.path' or make a simbolic link to
%p/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 %p/share/java/%n/svn-javahl.jar .
ln -sf %p/lib/libsvnjavahl-1.jnilib
(Adjust the path to your subclise plugin accordingly.)
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
from the svn-ssl-shlibs package. Borrowed from the netbsd
pkgsrc/devel/subversion/ package
Added 'export F77=no;' to configure in order not to fail if the
fort77 package is installed.
<<
Homepage: http://subversion.tigris.org/
<<
--- NEW FILE: libapache2-ssl-mod-svn.info ---
Package: libapache2-ssl-mod-svn
Version: 1.4.2
Revision: 1
Description: Subversion - mod_svn (with SSL)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: apache2-ssl (>= 2.0.58-1), apr-ssl-common (>= 0.9.12-1),
svn-ssl-shlibs (>= %v-1)
BuildDepends: fink (>= 0.24.12-1), svn-ssl-dev (>= %v-1), apr-ssl (>=
0.9.12-1), apr-ssl-common (>= 0.9.12-1), db43-ssl, gdbm3, expat (>= 1.95.6-2),
libxml2 (>= 2.5.10-12), neon26, openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23),
openssl097-dev, libiconv-dev (>= 1.9.1-11), apache2-ssl-dev (>= 2.0.58-1),
gettext-bin, gettext-tools, libgettext3-dev, io-string-pm, libtool14 (>=
1.5.10-1), autoconf (>= 2.60-1), automake1.9
Conflicts: svn-client-ssl (<= 0.26.0-2), apache2 (<< 2.0.47-1)
# Unpack Phase:
Source: http://subversion.tigris.org/downloads/subversion-%v.tar.bz2
Source-MD5: edebb06afb3266d09e75f728a8259677
# Patch Phase:
PatchFile: svn-ssl.patch
PatchFile-MD5: 78a6c8f6362fa505a3079fcd5f8e660c
PatchScript: <<
sed 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
<<
# 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 --without-jdk --disable-javahl
--with-jikes=no --disable-swig-bindings --without-swig --without-python
--without-perl --without-ruby --with-berkeley-db=%p/include/db4:%p/lib
--disable-dependency-tracking --disable-keychain
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
CompileScript: <<
#! /bin/sh -ev
# recreate configure with libtool 1.5
./autogen.sh
### Recreate build-outputs.mk to not include already installed libs
./gen-make.py --installed-libs
libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_base,libsvn_fs_fs,libsvn_ra,libsvn_ra_dav,libsvn_ra_local,libsvn_ra_svn,libsvn_repos,libsvn_subr,libsvn_wc
### Configure shared
export F77=no; ./configure %c
### make mod_svn shared
make apache-mod
<<
# Install Phase:
DocFiles: <<
COPYING HACKING INSTALL
<<
InstallScript: <<
make install-mods-shared DESTDIR=%d
# Install default directory for repositories
/usr/bin/install -d %i/var
/usr/bin/install -m 770 -d %i/var/svn
<<
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
echo ""
echo "WARNING: Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43)."
echo "If you are upgrading from an earlier version and you are using"
echo "BDB repositories please read"
echo ""
echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
echo ""
echo "and"
echo ""
echo " http://subversion.tigris.org/faq.html#dumpload";
echo ""
echo "To install svnadmin binary linked to an older Berkeley DB version"
echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
echo ""
echo " fink install svnadmin-db42"
echo "and following the documentation of svnadmin-dbXX, e.g.:"
echo ""
echo " fink info svnadmin-db42"
echo ""
echo -n "Do you want to continue [Y/n] ? ";
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
* ) exit 1 ;;
esac
else
echo "Time-out."
fi
fi
fi
exit 0
<<
PostInstScript: <<
chown www:admin %p/var/svn
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
<<
# Additional Info
DescDetail: <<
WebDAV server (Apache 2 module) for Subversion.
<<
DescUsage: <<
This installs the subversion network server for apache2.
Please read section III C in the file
%p/share/doc/%n/INSTALL
for informations on how to run a subversion server via apache2.
You could install the repositories under the preconfigured directory
%p/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 %p/var/svn/yourrepos' and
'chmod -R go-rwx %p/var/svn/yourrepos'.
You then need to add the following lines to your
%p/etc/apache2/httpd.conf
file:
<Location /svn/yourrepos>
DAV svn
SVNPath %p/var/svn/yourrepos
# The following allows for basic http authentication. Basic
# authentication should not be considered secure for any particularly
# rigorous definition of secure.
# to create a passwd file
# # rm -f %p/etc/apache2/dav_svn.passwd
# # htpasswd2 -c %p/etc/apache2/dav_svn.passwd newuser
# New password:
# Re-type new password:
# Adding password for user newuser
# #
# Uncomment the following 3 lines to enable Basic Authentication
# AuthType Basic
# AuthName "Subversion Repository"
# AuthUserFile %p/etc/apache2/dav_svn.passwd
# Uncomment the following line to enable Authz Authentication
# AuthzSVNAccessFile %p/etc/apache2/dav_svn.authz
# The following three lines allow anonymous read, but make
# committers authenticate themselves.
# <LimitExcept GET PROPFIND OPTIONS REPORT>
# Require valid-user
# </LimitExcept>
</Location>
Your repository should show up at <http://localhost/svn/yourrepos>.
If it does not check your apache2 logs at %p/var/apache2/logs/error_log
If you need the examples or the tools (e.g. svnadmin) install the
'svn-ssl' package.
WARNING:
Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43).
If you are upgrading from an earlier version and you are using
BDB repositories please read
http://subversion.tigris.org/faq.html#bdb43-upgrade
and
http://subversion.tigris.org/faq.html#dumpload
To install svnadmin binary linked to an older Berkeley DB version
please install the fink package 'svnadmin-dbXX', e.g. by typing
fink install svnadmin-db42
and following the documentation of svnadmin-dbXX, e.g.:
fink info svnadmin-db42
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
from the svn-ssl-shlibs package. Borrowed from the netbsd
pkgsrc/devel/subversion/ package
Added 'export F77=no;' to configure in order not to fail if the
fort77 package is installed.
Keychain disabled on Mac OS X 10.3
<<
Homepage: http://subversion.tigris.org/
--- NEW FILE: svn-ssl.patch ---
diff -Naur subversion-1.4.0_orig/Makefile.in subversion-1.4.0/Makefile.in
--- subversion-1.4.0_orig/Makefile.in 2006-08-08 09:56:13.000000000 -0500
+++ subversion-1.4.0/Makefile.in 2006-08-08 09:57:42.000000000 -0500
@@ -603,8 +603,7 @@
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-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_DEPS = libsvn_swig_perl \
$(SWIG_PL_DIR)/native/Makefile
swig-pl: $(swig-pl_DEPS)
if test "$(SWIG_PL_DIR)" != "$(SWIG_PL_SRC_DIR)"; then \
diff -Naur subversion-1.4.0_orig/build/generator/gen_make.py
subversion-1.4.0/build/generator/gen_make.py
--- subversion-1.4.0_orig/build/generator/gen_make.py 2006-08-08
09:56:10.000000000 -0500
+++ subversion-1.4.0/build/generator/gen_make.py 2006-08-08
10:03:52.000000000 -0500
@@ -5,6 +5,7 @@
import os
import sys
import string
+import ConfigParser
import gen_base
import generator.swig.header_wrappers
@@ -53,6 +54,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,11 +76,17 @@
# 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.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
+ elif source.name in self.installed_libs:
+ continue
deps.append(source.filename)
link.append(build_path_join(retreat, source.filename))
@@ -211,6 +225,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))
elif link_dep.external_project:
# FIXME: This is a temporary workaround to fix build breakage
# expeditiously. It is of questionable validity for a build
diff -Naur subversion-1.4.0_orig/build/ltmain.sh
subversion-1.4.0/build/ltmain.sh
--- subversion-1.4.0_orig/build/ltmain.sh 2006-08-08 09:56:11.000000000
-0500
+++ subversion-1.4.0/build/ltmain.sh 2006-08-08 09:59:02.000000000 -0500
@@ -5257,7 +5257,7 @@
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command=\"$relink_command\"
+relink_command=\"\"
# This environment variable determines our operation mode.
if test \"\$libtool_install_magic\" = \"$magic\"; then
@@ -5698,7 +5698,7 @@
libdir='$install_libdir'"
if test "$installed" = no && test "$need_relink" = yes; then
$echo >> $output "\
-relink_command=\"$relink_command\""
+relink_command=\"\""
fi
done
fi
diff -Naur subversion-1.4.0_orig/gen-make.py subversion-1.4.0/gen-make.py
--- subversion-1.4.0_orig/gen-make.py 2006-08-08 09:56:13.000000000 -0500
+++ subversion-1.4.0/gen-make.py 2006-08-08 10:06:40.000000000 -0500
@@ -81,6 +81,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 " Makefile-specific options:"
print
print " --assume-shared-libs"
@@ -196,6 +203,7 @@
'enable-nls',
'enable-bdb-in-apr-util',
'vsnet-version=',
+ 'installed-libs=',
])
if len(args) > 1:
_usage_exit()
diff -Naur
subversion-1.4.0_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion-1.4.0/subversion/bindings/swig/perl/native/Makefile.PL.in
--- subversion-1.4.0_orig/subversion/bindings/swig/perl/native/Makefile.PL.in
2006-08-08 09:56:12.000000000 -0500
+++ subversion-1.4.0/subversion/bindings/swig/perl/native/Makefile.PL.in
2006-08-08 10:09:00.000000000 -0500
@@ -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;
}
diff -ruN subversion-1.4.0_orig/fink/dav_svn.conf
subversion-1.4.0/fink/dav_svn.conf
--- subversion-1.4.0_orig/fink/dav_svn.conf 1969-12-31 17:00:00.000000000
-0700
+++ subversion-1.4.0/fink/dav_svn.conf 2006-06-15 12:28:59.000000000 -0600
diff -ruN subversion-1.4.0_orig/fink/httpd.conf
subversion-1.4.0_orig/fink/httpd.conf
--- subversion-1.4.0_orig/fink/httpd.conf 1969-12-31 19:00:00.000000000
-0500
+++ subversion-1.4.0/fink/httpd.conf 2006-10-13 17:30:32.000000000 -0400
@@ -0,0 +1,31 @@
+ServerRoot "@FINKBUILD@/fink/apache2"
+LockFile @FINKBUILD@/fink/apache2/accept.lock
+PidFile @FINKBUILD@/fink/apache2/apache2.pid
+AcceptMutex flock
+ErrorLog @FINKBUILD@/fink/apache2/error.log
+Listen 127.0.0.1:52080
+ServerName localhost:52080
+AddDefaultCharset UTF-8
+LoadModule auth_module @FINKPREFIX@/lib/apache2/modules/mod_auth.so
+LoadModule dav_module @FINKPREFIX@/lib/apache2/modules/mod_dav.so
+LoadModule dav_svn_module @FINKPREFIX@/lib/apache2/modules/mod_dav_svn.so
+LoadModule authz_svn_module @FINKPREFIX@/lib/apache2/modules/mod_authz_svn.so
+<Location /svn-test-work/repositories>
+ DAV svn
+ SVNParentPath @FINKBUILD@/subversion/tests/cmdline/svn-test-work/repositories
+ AuthzSVNAccessFile @FINKBUILD@/subversion/tests/cmdline/svn-test-work/authz
+ AuthType Basic
+ AuthName "Subversion Repository"
+ AuthUserFile @FINKBUILD@/tools/test-scripts/svntest/dav_svn.passwd
+ Require valid-user
+</Location>
+
+<Location /svn-test-work/local_tmp/repos>
+ DAV svn
+ SVNPath @FINKBUILD@/subversion/tests/cmdline/svn-test-work/local_tmp/repos
+ AuthzSVNAccessFile @FINKBUILD@/subversion/tests/cmdline/svn-test-work/authz
+ AuthType Basic
+ AuthName "Subversion Repository"
+ AuthUserFile @FINKBUILD@/tools/test-scripts/svntest/dav_svn.passwd
+ Require valid-user
+</Location>
--- NEW FILE: svn-ssl.info ---
Package: svn-ssl
Version: 1.4.2
Revision: 1
Description: Subversion - svnserve, tools (with SSL)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
Depends: %N-shlibs (= %v-%r), daemonic
BuildDepends: fink (>= 0.24.12-1), apr-ssl (>= 0.9.12-1), apr-ssl-common (>=
0.9.12-1), db43-ssl, gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12),
neon26, openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, texinfo
(>= 4.2-22), libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools,
libgettext3-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf (>= 2.60-1),
automake1.9
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/downloads/subversion-%v.tar.bz2
Source-MD5: edebb06afb3266d09e75f728a8259677
# Patch Phase:
PatchFile: %n.patch
PatchFile-MD5: 78a6c8f6362fa505a3079fcd5f8e660c
PatchScript: <<
sed -e 's|@FINKBUILD@|%b|g' -e 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
perl -pi.bak -e 's| 0\.26\.1| 0.26.1 0.26.2|' configure.in
<<
# 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 --without-apxs
--without-apache --disable-mod-activation --without-jdk --disable-javahl
--with-jikes=no --disable-swig-bindings --without-swig --without-python
--without-perl --without-ruby --with-berkeley-db=%p/include/db4:%p/lib
--disable-dependency-tracking --disable-keychain
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
CompileScript: <<
#! /bin/sh -ev
# recreate configure with libtool 1.5
./autogen.sh
### Configure shared
export F77=no; ./configure %c
### make everything shared
make
### Run tests over ra_local using BDB:
# echo "Running tests over ra_local using BDB..."
# make check CLEANUP=true FS_TYPE=bdb
### Run tests over ra_local using fs_fs:
# echo "Running tests over ra_local using fs_fs..."
# make check CLEANUP=true FS_TYPE=fsfs
### Run tests over ra_svn using BDB:
# echo "Running tests over ra_svn using BDB..."
# killall -v -u `whoami` svnserve || true
# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
# sleep 1
# make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=bdb
# killall -v -u `whoami` svnserve || true
### Run tests over ra_svn using fs_fs:
# echo "Running tests over ra_svn using fs_fs..."
# killall -v -u `whoami` svnserve || true
# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
# sleep 1
# make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=fsfs
# killall -v -u `whoami` svnserve || true
### Run tests over ra_dav using BDB:
# See DescPackaging on how to set up for tests over ra_dav
# echo "Running tests over ra_dav using BDB..."
# /usr/bin/install -d %b/fink/apache2
# %p/sbin/apachectl -f %b/fink/httpd.conf -k start
# sleep 1
# make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=bdb
# %p/sbin/apachectl -f %b/fink/httpd.conf -k stop
# sleep 3
### Run tests over ra_dav using fs_fs:
# See DescPackaging on how to set up for tests over ra_dav
# echo "Running tests over ra_dav using fs_fs..."
# /usr/bin/install -d %b/fink/apache2
# %p/sbin/apachectl -f %b/fink/httpd.conf -k start
# sleep 1
# make check CLEANUP=true BASE_URL=http://localhost:52080 FS_TYPE=fsfs
# %p/sbin/apachectl -f %b/fink/httpd.conf -k stop
# sleep 3
<<
# Install Phase:
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
InstallScript: <<
make -j1 install DESTDIR=%d
### Install docu and notes
/usr/bin/install -d %i/share
/usr/bin/install -d %i/share/doc
/usr/bin/install -d %i/share/doc/%n
cp -r www %i/share/doc/%n
cp -r doc/user %i/share/doc/%n
cp -r notes %i/share/doc/%n
### Configure and install examples, tools and notes
/usr/bin/install -d %i/share/%n
cp -r tools/backup %i/share/%n/tools
cp -r tools/bdb %i/share/%n/tools
cp -r tools/client-side %i/share/%n/tools
cp -r tools/dev %i/share/%n/tools
cp -r tools/diff %i/share/%n/tools
cp -r tools/examples %i/share/%n/tools
cp -r tools/hook-scripts %i/share/%n/tools
cp -r tools/test-scripts %i/share/%n/tools
cp -r tools/xslt %i/share/%n/tools
cp -r contrib %i/share/%n
# Remove unneeded .in files
find %i/share/%n -name \*.in -print0 | xargs -0 rm -f
# Install default directory for repositories
/usr/bin/install -d %i/var
/usr/bin/install -m 770 -d %i/var/svn
<<
DaemonicName: svnserve
DaemonicFile: <<
<service>
<description>Subversion server</description>
<message>Subversion server</message>
<daemon name="svnserve">
<executable background="no">/usr/bin/sudo</executable>
<parameters>-u www %p/bin/svnserve -d -r %p/var/svn</parameters>
</daemon>
</service>
<<
PostInstScript: <<
chown www:admin %p/var/svn
daemonic install svnserve
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
daemonic remove svnserve
fi
<<
PreInstScript: <<
if [ "$1" = upgrade ]; then
if dpkg --compare-versions "$2" lt "1.2.0"; then
echo ""
echo "WARNING: Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43)."
echo "If you are upgrading from an earlier version and you are using"
echo "BDB repositories please read"
echo ""
echo " http://subversion.tigris.org/faq.html#bdb43-upgrade";
echo ""
echo "and"
echo ""
echo " http://subversion.tigris.org/faq.html#dumpload";
echo ""
echo "To install svnadmin binary linked to an older Berkeley DB version"
echo "please install the fink package 'svnadmin-dbXX', e.g. by typing"
echo ""
echo " fink install svnadmin-db42"
echo "and following the documentation of svnadmin-dbXX, e.g.:"
echo ""
echo " fink info svnadmin-db42"
echo ""
echo -n "Do you want to continue [Y/n] ? ";
if read -t 3600 CONTINUECHOICE; then
case $CONTINUECHOICE in
y|Y|'' ) ;;
* ) exit 1 ;;
esac
else
echo "Time-out."
fi
fi
fi
exit 0
<<
SplitOff: <<
Description: Subversion - Development headers and libraries (with SSL)
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: True
Conflicts: svn-client-ssl (<= 0.26.0-2)
Replaces: svn-client-ssl (<= 0.26.0-2)
Files: <<
include
lib/*.a
lib/*.la
lib/libsvn_client-1.dylib
lib/libsvn_delta-1.dylib
lib/libsvn_diff-1.dylib
lib/libsvn_fs-1.dylib
lib/libsvn_fs_base-1.dylib
lib/libsvn_fs_fs-1.dylib
lib/libsvn_ra-1.dylib
lib/libsvn_ra_dav-1.dylib
lib/libsvn_ra_local-1.dylib
lib/libsvn_ra_svn-1.dylib
lib/libsvn_repos-1.dylib
lib/libsvn_subr-1.dylib
lib/libsvn_wc-1.dylib
<<
DocFiles: COPYING HACKING
<<
SplitOff2: <<
Description: Subversion - Shared libraries (with SSL)
Package: %N-shlibs
Conflicts: svn-client-ssl (<= 0.26.0-2)
Replaces: svn-client-ssl (<= 0.26.0-2)
Depends: apr-ssl-shlibs (>= 0.9.12-1), db43-ssl-shlibs, gdbm3-shlibs,
expat-shlibs (>= 1.95.6-2), libiconv, libxml2-shlibs (>= 2.5.10-12),
neon26-shlibs, openldap23-shlibs, cyrus-sasl2-shlibs (>= 2.1.15-23),
openssl097-shlibs, libgettext3-shlibs
Files: <<
lib/libsvn_client-1.0.0.0.dylib
lib/libsvn_delta-1.0.0.0.dylib
lib/libsvn_diff-1.0.0.0.dylib
lib/libsvn_fs-1.0.0.0.dylib
lib/libsvn_fs_base-1.0.0.0.dylib
lib/libsvn_fs_fs-1.0.0.0.dylib
lib/libsvn_ra-1.0.0.0.dylib
lib/libsvn_ra_dav-1.0.0.0.dylib
lib/libsvn_ra_local-1.0.0.0.dylib
lib/libsvn_ra_svn-1.0.0.0.dylib
lib/libsvn_repos-1.0.0.0.dylib
lib/libsvn_subr-1.0.0.0.dylib
lib/libsvn_wc-1.0.0.0.dylib
lib/libsvn_client-1.0.dylib
lib/libsvn_delta-1.0.dylib
lib/libsvn_diff-1.0.dylib
lib/libsvn_fs-1.0.dylib
lib/libsvn_fs_base-1.0.dylib
lib/libsvn_fs_fs-1.0.dylib
lib/libsvn_ra-1.0.dylib
lib/libsvn_ra_dav-1.0.dylib
lib/libsvn_ra_local-1.0.dylib
lib/libsvn_ra_svn-1.0.dylib
lib/libsvn_repos-1.0.dylib
lib/libsvn_subr-1.0.dylib
lib/libsvn_wc-1.0.dylib
<<
Shlibs: <<
%p/lib/libsvn_client-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_delta-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_diff-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_fs-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_fs_base-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
%p/lib/libsvn_fs_fs-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
%p/lib/libsvn_ra-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_ra_dav-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_ra_local-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_ra_svn-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_repos-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_subr-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
%p/lib/libsvn_wc-1.0.dylib 1.0.0 %n (>= 0.30.0-11)
<<
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README TRANSLATING
<<
SplitOff3: <<
Description: Subversion - Client (with SSL)
Package: svn-client-ssl
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 1.0.2-11)
Files: <<
bin/svn
bin/svnversion
bin/svnsync
share/locale
share/man/man1/svn.1
share/man/man1/svnversion.1
share/man/man1/svnsync.1
share/%N/contrib/client-side
share/%N/tools/client-side
<<
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
DescUsage: <<
This installs the subversion client.
Type 'svn help' for usage and look in %p/share/%N/tools and
%p/share/%N/contrib.
<<
DescPackaging: <<
The "Replaces: %N (<= 1.0.2-11)" is needed since the man page of
svnversion was (incorrectly) in the %N package < 1.0.2 and was
moved to the client split off in 1.0.2-11.
<<
<<
SplitOff8: <<
Package: %N-doc
Description: Subversion - Documentation
Files: <<
share/doc
<<
DocFiles: COPYING
<<
# Additional Info
DescDetail: <<
The goal of the Subversion project is to build a version control system that is
a compelling replacement for CVS in the open source community.
Subversion's Features:
- Most current CVS features
- Directories, renames, and file meta-data are versioned
- Commits are truly atomic
- Branching and tagging are cheap (constant time) operations
- Client/server protocol sends diffs in both directions
- Time costs are proportional to change size, not data size
- Efficient handling of binary files - it uses a binary diffing algorithm to
transmit and store successive revisions
- Versioning of symbolic links
- Choice of database or plain-file repository implementations
- Apache network server option, with WebDAV/DeltaV protocol
- Standalone server option
Subversion is broken into these packages in fink:
(The -ssl variants enable ssl encryption.)
- The "svn-client-ssl" package installs a command-line client program for using
subversion. Type 'fink describe svn-client-ssl' to get usage help.
- The "%N" package installs a stand-alone server 'svnserve'.
Install this package if you want to maintain a stand-alone server.
Type 'fink describe %N' to get usage help.
- The "%N-doc" package installs html documentation, and notes from the
developers of svn.
- The "libapache2-ssl-mod-svn" package contains an apache2 module to enable
serving a repository via web-dav. Type 'fink describe libapache2-ssl-mod-svn'
to get usage help.
- The "%N-shlibs" package contains the shared libraries for the other
packages. It is installed automatically by fink when needed.
- The "%N-dev" package contains the development headers and libraries.
It is installed automatically by fink when needed.
- The "%N-swig-pm581" package contains the swig perl bindings to call
svn from perl. Type 'fink describe %N-swig-pm581' to get usage help.
- The "%N-swig-py24" package contains the swig python bindings to call
svn from python. Type 'fink describe %N-swig-py24' to get usage help.
- The "%N-javahl" package contains the java bindings to call
svn from java. Type 'fink describe %N-javahl' to get usage help.
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
%p/share/doc/%N. These files are in the "%N-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
%p/share/%N/tools and %p/share/%N/contrib
You can start the Subversion server manually using a command similar to
'/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 '%p/var/svn'
You could install the repositories under the preconfigured directory
%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 %p/var/svn/yourrepos' and
'chmod -R go-rwx %p/var/svn/yourrepos'.
WARNING:
Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43).
If you are upgrading from an earlier version and you are using
BDB repositories please read
http://subversion.tigris.org/faq.html#bdb43-upgrade
and
http://subversion.tigris.org/faq.html#dumpload
To install svnadmin binary linked to an older Berkeley DB version
please install the fink package 'svnadmin-dbXX', e.g. by typing
fink install svnadmin-db42
and following the documentation of svnadmin-dbXX, e.g.:
fink info svnadmin-db42
<<
DescPackaging: <<
To run the tests over ra_dav 'libapache2-ssl-mod-svn' needs to be already
built.
The ra_dav tests only work with --build-as-nobody.
The "Replaces: %N (<= 1.1.1-11)" is needed since svnlook was
(incorrectly) in the svn-client-ssl package < 1.1.1 and was
moved to the main package in 1.1.1-11.
<<
DescPort: <<
Patch needed to stop relinking a .dylib in the install path,
but hardcoding the %p/lib path in the link command (i.e. %p) instead
of using %i
The patch also fixes problem with dependency_libs in other packages
having -ldb-4.1 or libdb-4.1.la in there, so that libtool ignores
these.
Many thanks to Peter O'Gorman for the help with the libtool patch.
Many thanks to Ben Reser for fixing the perl bindings. The patch is
alredy included in the upstream development tree.
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.
svn-config is no longer available as of svn 1.4.
Keychain disabled on Mac OS X 10.3
<<
Homepage: http://subversion.tigris.org/
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
