Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9222
Modified Files:
svn.info
Log Message:
Now works with new apr and is unified
Index: svn.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/svn.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svn.info 1 Feb 2006 19:58:35 -0000 1.3
+++ svn.info 5 Jul 2006 16:03:05 -0000 1.4
@@ -1,15 +1,15 @@
Package: svn
Version: 1.2.3
-Revision: 1013
+Revision: 1014
Description: Subversion - svnserve, tools
-License: BSD
+License: Restrictive
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
-Depends: %N-shlibs (= %v-%r), daemonic
-BuildDepends: apr (>= 0.9.7-1011), apr-common (>= 0.9.7-1011), db43 (>=
4.3.29-1001), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), fink (>=
0.16.0-1), neon24 (>= 0.24.7-11), swig (>= 1.3.20-1012), texinfo (>= 4.2-22),
libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools, libgettext3-dev,
io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9
-Conflicts: svn-client-ssl, svn-client (<= 0.26.0-2), apache2 (<< 2.0.47-1)
-Replaces: svn-client-ssl, svn-client (<= 1.1.1-11)
+Depends: cyrus-sasl2-shlibs, db44-aes-shlibs, expat-shlibs, libapr0-shlibs,
libaprutil0-shlibs, libgettext3-shlibs, libiconv, openldap23-shlibs, %N-shlibs
(= %v-%r), daemonic
+BuildDepends: aprutil-dev, apr-dev (>= 0.9.12-10), db44-aes, expat (>=
1.95.6-2), libxml2 (>= 2.5.10-12), fink (>= 0.16.0-1), neon24-ssl (>=
0.24.7-11), openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23), system-openssl-dev,
swig (>= 1.3.20-1012), texinfo (>= 4.2-22), libiconv-dev (>= 1.9.1-11),
gettext-bin, gettext-tools, libgettext3-dev, io-string-pm, libtool14 (>=
1.5.10-1), autoconf2.5, automake1.9
+Conflicts: apache2 (<< 2.0.47-1)
+Replaces: svn-client, svn-client-ssl (<= 1.1.1-11), svn-ssl
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
@@ -17,10 +17,16 @@
# Patch Phase:
Patch: %n.patch
+PatchScript: perl -pi -e 's;\[5\-9\];\\($&\\|[0-9]\\{2,\\}\\);' configure.in
+
+# Needed for unifiedness
+SetCPPFLAGS: -no-cpp-precomp
+NoSetLDFLAGS: true
+NoSetLIBS: true
+SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib
# 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 --with-swig=%p --without-python
--without-perl --without-ruby
-SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
+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 --without-ruby --with-berkeley-db=%p/include/db4:%p/lib
GCC: 4.0
CompileScript: <<
#! /bin/sh -ev
@@ -35,37 +41,8 @@
### Configure shared
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
-
- ### 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..."
-# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline
-# make svncheck CLEANUP=true FS_TYPE=bdb
-# killall -v -u root svnserve
-
- ### Run tests over ra_svn using fs_fs:
-# echo "Running tests over ra_svn using fs_fs..."
-# ./subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/clients/cmdline
-# make check CLEANUP=true BASE_URL=svn://localhost FS_TYPE=fsfs
-# killall -v -u root svnserve
-
- ### Run tests over ra_dav:
- # NOTE: The update_tests.py fails if tested against 1.0.x server
- # See DescPackaging on how to set up for tests over ra_dav
-# echo "Running tests over ra_dav..."
-# make check BASE_URL=http://localhost
+ make
<<
# Install Phase:
@@ -131,18 +108,18 @@
PreInstScript: <<
if [ "$1" = upgrade ]; then
- if dpkg --compare-versions "$2" lt "1.2.0"; then
+ if dpkg --compare-versions "$2" lt "1.2.3"; then
echo ""
- echo "WARNING: Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43)."
+ echo "WARNING: Subversion (svn) 1.2.3 or later uses Berkeley DB4.4
(db44)."
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 " http://subversion.tigris.org/faq.html#bdb44-upgrade";
echo ""
echo "To install an older svnadmin binary linked to db42 please install"
- echo "the fink package 'svn-1.1.4-11', e.g. by typing"
+ echo "the fink package 'svn-ssl-1.1.4-11', e.g. by typing"
echo ""
- echo " fink install svn-1.1.4-11"
+ echo " fink install svn-ssl-1.1.4-11"
echo ""
echo -n "Do you want to continue [Y/n] ? ";
if read -t 3600 CONTINUECHOICE; then
@@ -158,13 +135,18 @@
exit 0
<<
+SplitOff100: <<
+ Package: svn-ssl-dev
+ Depends: svn-dev (= %v-%r)
+ DocFiles: COPYING
+<<
SplitOff: <<
Description: Subversion - Development headers and libraries
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: True
- Conflicts: svn-client (<= 0.26.0-2)
- Replaces: svn-client (<= 0.26.0-2)
+ Conflicts: svn-client-ssl (<= 0.26.0-2)
+ Replaces: svn-ssl-dev, svn-client-ssl (<= 0.26.0-2)
Files: <<
bin/svn-config
include
@@ -186,20 +168,25 @@
<<
DocFiles: COPYING HACKING
<<
+SplitOff101: <<
+ Package: svn-ssl-shlibs
+ Depends: svn-shlibs (= %v-%r)
+ DocFiles: COPYING
+<<
SplitOff2: <<
Description: Subversion - Shared libraries
Package: %N-shlibs
- Conflicts: svn-client (<= 0.26.0-2)
- Replaces: svn-client (<= 0.26.0-2)
- Depends: apr-shlibs (>= 0.9.7-1011), db43-shlibs (>= 4.3.29-1001),
gdbm3-shlibs, expat-shlibs (>= 1.95.6-2), libxml2-shlibs (>= 2.5.10-12),
neon24-shlibs (>= 0.24.7-11), libgettext3-shlibs
+ Conflicts: svn-client-ssl (<= 0.26.0-2)
+ Replaces: svn-ssl-shlibs, svn-client-ssl (<= 0.26.0-2)
+ Depends: cyrus-sasl2-shlibs, db44-aes-shlibs, expat-shlibs, libapr0-shlibs,
libaprutil0-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1),
neon24-ssl-shlibs, openldap23-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_fs_base-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
@@ -221,27 +208,32 @@
lib/libsvn_wc-1.0.dylib
<<
Shlibs: <<
- %p/lib/libsvn_client-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_delta-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_diff-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_fs-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_fs_base-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
+ %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_fs-1.0.dylib 1.0.0 %n (>= 1.1.0-11)
- %p/lib/libsvn_ra-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_ra_dav-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_ra_local-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_ra_svn-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_repos-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_subr-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
- %p/lib/libsvn_wc-1.0.dylib 1.0.0 %n (>= 0.33.0-11)
+ %p/lib/libsvn_ra-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_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
<<
+SplitOff102: <<
+ Package: svn-client-ssl
+ Depends: svn-client (= %v-%r)
+ DocFiles: COPYING
+<<
SplitOff3: <<
Description: Subversion - Client
Package: svn-client
- Depends: %N-shlibs (= %v-%r)
- Replaces: svn (<= 1.0.2-11)
+ Depends: cyrus-sasl2-shlibs, db44-aes-shlibs, expat-shlibs, libapr0-shlibs,
libaprutil0-shlibs, libgettext3-shlibs, libiconv, libxml2-shlibs (>= 2.6.1-1),
neon24-ssl-shlibs, openldap23-shlibs, %N-shlibs (= %v-%r)
+ Replaces: svn-client-ssl, svn-ssl (<= 1.0.2-11)
Files: <<
bin/svn
bin/svnversion
@@ -254,20 +246,26 @@
DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
DescUsage: <<
This installs the subversion client.
- Type 'svn help' for usage and look in %p/share/svn/tools and
- %p/share/svn/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
<<
DescPackaging: <<
- The "Replaces: svn (<= 1.0.2-11)" is needed since the man page of
- svnversion was (incorrectly) in the svn package < 1.0.2 and was
+ The "Replaces: svn-ssl (<= 1.0.2-11)" is needed since the man page of
+ svnversion was (incorrectly) in the svn-ssl package < 1.0.2 and was
moved to the client split off in 1.0.2-11.
<<
<<
+SplitOff103: <<
+ Package: svn-ssl-doc
+ Depends: svn-doc (= %v-%r)
+ DocFiles: COPYING
+<<
SplitOff8: <<
Package: %N-doc
+ Replaces: svn-ssl-doc
Description: Subversion - Documentation
Files: <<
share/doc
@@ -286,12 +284,12 @@
# %p/lib/libsvn_swig_java-1.0.dylib 1.0.0 %n (>= 1.0.4-11)
# <<
# DocFiles: COPYING HACKING INSTALL.swig README.swig
-# Description: Subversion - Swig Java bindings
+# Description: Subversion - Swig Java bindings (with SSL)
# DescDetail: <<
# Bindings to call svn functions from java 1.4.
# <<
# DescUsage: <<
-# Please read the files in '%p/share/doc/svn-swig-java/'.
+# Please read the files in '%p/share/doc/svn-ssl-swig-java/'.
# <<
# <<
@@ -317,44 +315,44 @@
Subversion is broken into these packages in fink:
(The -ssl variants enable ssl encryption.)
-- The "svn-client" package installs a command-line client program for using
- subversion. Type 'fink describe svn-client' to get usage help.
+- 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 "svn" package installs a stand-alone server 'svnserve'.
+- The "svn-ssl" package installs a stand-alone server 'svnserve'.
Install this package if you want to maintain a stand-alone server.
- Type 'fink describe svn' to get usage help.
+ Type 'fink describe svn-ssl' to get usage help.
-- The "svn-doc" package installs html documentation, the pdf book,
+- The "svn-ssl-doc" package installs html documentation, the pdf book,
and notes from the developers of svn.
-- The "libapache2-mod-svn" package contains an apache2 module to enable
- serving a repository via web-dav. Type 'fink describe libapache2-mod-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 "svn-shlibs" package contains the shared libraries for the other
+- The "svn-ssl-shlibs" package contains the shared libraries for the other
packages. It is installed automatically by fink when needed.
-- The "svn-dev" package contains the development headers and libraries.
+- The "svn-ssl-dev" package contains the development headers and libraries.
It is installed automatically by fink when needed.
-- The "svn-swig-pm581" package contains the swig perl bindings to call
- svn from perl. Type 'fink describe svn-swig-pm581' 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-swig-py24" package contains the swig python bindings to call
- svn from python. Type 'fink describe svn-swig-py24' to get usage help.
+- The "svn-ssl-swig-py24" package contains the swig python bindings to call
+ svn from python. Type 'fink describe svn-ssl-swig-py24' to get usage help.
-- The "svn-javahl" package contains the java bindings to call
- svn from java. Type 'fink describe svn-javahl' to get usage help.
+- The "svn-ssl-javahl" package contains the java bindings to call
+ svn from java. Type 'fink describe svn-ssl-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/svn. These files are in the "svn-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
- %p/share/svn/tools and %p/share/svn/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 %p/bin/svnserve -d -r %p/var/svn' or you can
@@ -372,36 +370,39 @@
WARNING:
- Subversion (svn) 1.2 or later uses Berkeley DB 4.3 (db43).
+ Subversion (svn) 1.2.3 or later uses Berkeley DB 4.4 (db44).
If you are upgrading from an earlier version and you are using
BDB repositories please read
- http://subversion.tigris.org/faq.html#bdb43-upgrade
+ http://subversion.tigris.org/faq.html#bdb44-upgrade
To install an older svnadmin binary linked to db42 please install
- the fink package 'svn-1.1.4-11', e.g. by typing
+ the fink package 'svn-ssl-1.1.4-11', e.g. by typing
- fink install svn-1.1.4-11
+ fink install svn-ssl-1.1.4-11
<<
DescPackaging: <<
+ Although this package has a BSD license, it is marked Restrictive since
+ it depends on a Restrictive package (neon24-ssl).
+
To run the tests over ra_dav apache2 must be running with (an older)
- fink 'libapache2-mod-svn' already installed. You need to add the
- following to your '/sw/etc/apache2/httpd.conf' file:
+ fink 'libapache2-ssl-mod-svn' already installed. You need to add the
+ following to your '%p/etc/apache2/mods-available/dav_svn.conf' file:
<Location /repositories>
DAV svn
- SVNParentPath
/sw/src/svn-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
+ SVNParentPath
/sw/src/svn-ssl-%v-%r/subversion-%v/subversion/tests/clients/cmdline/repositories
</Location>
<Location /local_tmp/repos>
DAV svn
- SVNPath
/sw/src/svn-%v-%r/subversion-%v/subversion/tests/clients/cmdline/local_tmp/repos
+ SVNPath
/sw/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 /sw/sbin/apachectl graceful' to enable the mod_svn support.
+ 'sudo /sw/sbin/apache2ctl 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
+ 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
moved to the main package in 1.1.1-11.
<<
DescPort: <<
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
