From: Christian S. <ch...@us...> - 2004-03-15 23:46:49
|
Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/devel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5791/main/finkinfo/devel Added Files: svn.info svn.patch Log Message: Moved version 1.0.0-12 to stable based on user feedback. --- NEW FILE: svn.info --- Package: svn Version: 1.0.0 Revision: 12 Description: Compelling replacement for CVS - svnserve, tools License: BSD Maintainer: Christian Schaffner <ch...@us...> # Dependencies: Depends: %N-shlibs (= %v-%r) BuildDepends: apr (>= 0.9.5-12), db42, 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 (>= 0.24.4-11), swig (>= 1.3.20-2), texinfo (>= 4.2-22), libiconv-dev (>= 1.9.1-11), apache2-dev (>= 2.0.48-13), system-java14-dev, perl581-core Conflicts: svn-client-ssl, svn-client (<= 0.26.0-2), apache2 (<< 2.0.47-1) Replaces: svn-client-ssl, svn-client (<= 0.26.0-2) # Unpack Phase: Source: http://svn.collab.net/tarballs/subversion-%v.tar.gz Source-MD5: 32f2c6e8c7f97587f19275c4e3219363 # 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 --with-swig --with-python=%p/bin/python2.3 --with-perl=perl5.8.1 SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp GCC: 3.3 CompileScript: << ### Remove packages that are installed by fink rm -rf neon rm -rf apr rm -rf apr-util ### Configure shared perl -pi.bak -e "s/hardcode_direct=yes/hardcode_direct=no/" configure ./configure %c perl -pi -e 's/^fast_install=yes/fast_install=needless/g' libtool ### make everything shared make #make check ### Build swig python bindings make swig-py ### Build swig perl bindings make swig-pl-lib (cd subversion/bindings/swig/perl && APR_CONFIG=%p/bin/apr-config && export APR_CONFIG && APU_CONFIG=%p/bin/apu-config && export APU_CONFIG && perl5.8.1 Makefile.PL PERL=perl5.8.1 FULLPERL=perl5.8.1 INSTALLDIRS=vendor PREFIX=%p LIB=%p/lib/perl5/5.8.1 INSTALLBIN=%i/bin INSTALLSCRIPT=%i/bin INSTALLPRIVLIB=%p/lib/perl5/5.8.1 INSTALLARCHLIB=%p/lib/perl5/5.8.1/darwin-thread-multi-2level INSTALLSITELIB=%p/lib/perl5/5.8.1 INSTALLSITEARCH=%p/lib/perl5/5.8.1/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 all test) << # Install Phase: DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README InstallScript: << make install DESTDIR=%d ### Install docu /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 ### Configure and install examples, tools and notes sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/backup/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/client-side/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/dev/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/examples/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/hook-scripts/mailer/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/hook-scripts/mailer/tests/*.py sed -i -e 's;#!/usr/bin/env python2;#!/usr/bin/env %p/bin/python2.3;' tools/hook-scripts/*.py /usr/bin/install -d %i/share/%n cp -r tools/backup %i/share/%n/tools cp -r tools/client-side %i/share/%n/tools cp -r tools/dev %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 notes %i/share/%n cp -r contrib %i/share/%n ### Install binaries /usr/bin/install -d %i/bin /usr/bin/install -m 755 svn-config %i/bin /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-lib DESTDIR=%d (cd subversion/bindings/swig/perl && make install PERL=perl5.8.1 FULLPERL=5.8.1 DESTDIR=%d UNINST=0) ### Configure and install cvs2svn sed -i -e 's;#!/usr/bin/env python;#!/usr/bin/env %p/bin/python2.3;' tools/cvs2svn/cvs2svn.py /usr/bin/install -m 755 tools/cvs2svn/cvs2svn.py %i/bin/cvs2svn cp -r tools/cvs2svn/rcsparse %i/lib/python2.3/site-packages/rcsparse sed -i -e 's;cvs2svn.py;cvs2svn;' tools/cvs2svn/README cp tools/cvs2svn/README README.cvs2svn cp tools/cvs2svn/design-notes.txt design-notes-cvs2svn.txt << SplitOff: << Description: Compelling replacement for CVS - 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) Files: << bin/svn-config 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_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_swig_py-1.dylib lib/libsvn_wc-1.dylib << DocFiles: COPYING HACKING << SplitOff2: << Description: Compelling replacement for CVS - Shared libraries Package: %N-shlibs Conflicts: svn-client (<= 0.26.0-2) Replaces: svn-client (<= 0.26.0-2) Depends: apr-shlibs (>= 0.9.5-12), db42-shlibs, gdbm3-shlibs, expat-shlibs (>= 1.95.6-2), libxml2-shlibs (>= 2.5.10-12), neon24-shlibs (>= 0.24.4-11), system-java14 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_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_swig_py-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_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_swig_py-1.0.dylib 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_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_swig_py-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) << DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README << SplitOff3: << Description: Compelling replacement for CVS - Client Package: svn-client Depends: %N-shlibs (= %v-%r) Conflicts: svn-client (<= 0.26.0-2) Replaces: svn-client (<= 0.26.0-2) Files: << bin/svn bin/svnlook bin/svnversion share/man/man1/svn.1 share/man/man1/svnlook.1 << DocFiles: BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README DescUsage: << This installs the subversion client. Type 'svn help' for usage. WARNING: This client may be incompatible with ra_dav servers <= 0.35 << << SplitOff4: << Package: libapache2-mod-svn Depends: %N-shlibs (= %v-%r), apache2 (>= 2.0.48-13) Files: << lib/apache2 var/svn << DocFiles: COPYING HACKING INSTALL Description: Compelling replacement for CVS - mod_svn DescUsage: << This installs the subversion network server for apache2. Please read section III C in the file /sw/share/doc/libapache2-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 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' 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 echo "Restarting apache2..." %p/sbin/apachectl graceful << 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 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 "#####################################################################" << << SplitOff5: << Package: %N-swig-pm581 Depends: %N-shlibs (= %v-%r), perl581-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: Compelling replacement for CVS - Swig Perl bindings DescDetail: << Bindings to call svn functions from perl 5.8.1. << DescUsage: << Please read the files in '/sw/share/doc/svn-swig-pm581/'. << << 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) Files: << lib/python2.3 << 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: Compelling replacement for CVS - Swig Python bindings DescDetail: << Bindings to call svn functions from python 2.3. << DescUsage: << Please read the files in '/sw/share/doc/svn-swig-py23/'. << << SplitOff7: << Package: cvs2svn Depends: %N (= %v-%r), %N-swig-py23 (= %v-%r), python23-socket (>= 1:2.3.3-23) | python23-socket-nox (>= 1:2.3.3-23) Files: << bin/cvs2svn << DocFiles: COPYING design-notes-cvs2svn.txt README.cvs2svn Description: CVS to SVN (subversion) conversion tool DescDetail: << This is a script which converts a CVS repository to an SVN Repository. ****************************** Warning ****************************** * * * cvs2svn is not "1.0 quality" yet. While it has successfully * * converted many repositories (including their branches and tags), * * for others it has either failed to complete the conversion, or * * converted the data in an unexpected or subtly wrong way. * * * ********************************************************************* All that said, the script has been used on straightforward CVS repositories successfully. As an example, the whole first year of Subversion's own history was converted from CVS into a 3000+ revision svn repository. Your Mileage May Vary. << DescUsage: << Please read '/sw/share/doc/cvs2svn/README.cvs2svn' and the 'cvs2svn --help' for usage help. << << PostInstScript: << echo "" echo "PLEAE NOTE:" echo "As of release 0.35.0, Subversion once again does deltification" echo "automatically. This means that the deltification step most" echo "repositories introduced into their post-commit hooks as of" echo "release 0.33.0 should now be reverted. Look for a line with" echo "'svnadmin deltify' in hooks/post-commit, and remove it." echo "" echo "NOTICE:" echo "#####################################################################" echo "## WARNING: Incompatible change in database in 0.34 release ##" echo "#####################################################################" echo "## ##" echo "## The 0.34 release made an incompatible change to the Subversion ##" echo "## database. Repositories created with versions of Subversion ##" echo "## prior to 0.34 will not work with Subversion 0.34 and later. ##" echo "## To upgrade, first use 'svnadmin dump' with your existing ##" echo "## Subversion binaries. Then upgrade your binaries to 0.34, and ##" echo "## use 'svnadmin load' to create a new repository from your ##" echo "## dumpfile. ##" echo "## Don't forget to copy any custom configuration/hooks from the ##" echo "## old to the new repository. ##" echo "## ##" echo "#####################################################################" echo "" echo "Please see the notes/repository_upgrade_HOWTO document for" echo "documentation on how to update an old repos." echo "" echo "Also located here:" echo " <http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO>" << 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. Why should I switch to Subversion, after all CVS is the standard? Some advantages of Subversion include: - Commits are atomic - Moving and renaming are versioned. - Working with directories are easy. E.g. adding a directory adds all sub-files and folders to the repository. - It is fast: branching and tagging are cheap (constant time) operations, client/server protocol sends diffs in both directions, and in general time are proportional to change size, not project size. - Meta-data is versioned per file, e.g. store the `execute' permission flag on files in the repository. - Efficient handling of binary files - it uses a binary diffing algorithm to transmit and store successive revisions. Is Subversion stable enough for me to use for my own projects? The Developers think so! Read the full FAQ answer on the website: <http://subversion.tigris.org/project_faq.html#stable> Subversion is broken into these packages in fink: (The -ssl variants enable ssl encryption.) - The "svn-client" package installs a comman-line client program for using subversion. Type 'fink describe svn-client' to get usage help. - The "svn" package installs a stand-alone server 'svnserve'. Install this package if you want to maintain a stand-alone server. - The "libapache2-mod-svn" package contains an apache2 module to enable serving a repository via web-dav. Type 'fink describe libapache2-mod-svn' to get usage help. - The "svn-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. 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-swig-py23" package contains the swig python bindings to call svn from python. Type 'fink describe svn-swig-py23' to get usage help. - The "cvs2svn" package contains the tool to convert a cvs repository into a subversion repository. Type 'fink describe cvs2svn' to get usage help. For More Information, check the main Subversion website below and read the book at <http://svnbook.red-bean.com/>. Also look in /sw/share/svn/notes and /sw/share/svn/contrib << DescUsage: << Type 'svnserve --help', 'man svnserve', 'svnadmin help', or 'man svnadmin' for usage. Some tools (e.g. hook and back scripts) and examples are stored in /sw/share/svn/tools PLEAE NOTE: As of release 0.35.0, Subversion once again does deltification automatically. This means that the deltification step most repositories introduced into their post-commit hooks as of release 0.33.0 should now be reverted. Look for a line with "svnadmin deltify" in hooks/post-commit, and remove it. NOTICE: ##################################################################### ## WARNING: Incompatible change in database in 0.34 release ## ##################################################################### ## ## ## The 0.34 release made an incompatible change to the Subversion ## ## database. Repositories created with versions of Subversion ## ## prior to 0.34 will not work with Subversion 0.34 and later. ## ## To upgrade, first use 'svnadmin dump' with your existing ## ## Subversion binaries. Then upgrade your binaries to 0.34, and ## ## use 'svnadmin load' to create a new repository from your ## ## dumpfile. ## ## Don't forget to copy any custom configuration/hooks from the ## ## old to the new repository. ## ## ## ##################################################################### Please see the /sw/share/svn/notes/repos_upgrade_HOWTO document for documentation on how to update an old repos. Also located here: <http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO> << 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 ot libdb-4.1.la in there, so that libtool ignores these. Many thanks to Peter O'Gorman for the help with the libtool patch. Prebinding cannot be enabled at this time since apr is not built prebound. Once this is fixed, one could try to enable building two_level by doing: perl -pi -e 's,-flat_namespace -undefined suppress,,g' configure If that fails, maybe try to add '-lfoo' to Makefile.in Or, if that fails too, change '-undefined suppress -flat_namespace' to '-undefined dynamic_lookup' Many thanks to Ben Reser for fixing the perl bindings. The patch is alredy included in the upstream development tree. << Homepage: http://subversion.tigris.org/ --- NEW FILE: svn.patch --- diff -urN subversion-0.37.0.orig/ac-helpers/ltmain.sh subversion-0.37.0/ac-helpers/ltmain.sh --- subversion-0.37.0.orig/ac-helpers/ltmain.sh Sat Dec 20 12:02:12 2003 +++ subversion-0.37.0/ac-helpers/ltmain.sh Thu Dec 25 20:21:10 2003 @@ -1411,6 +1411,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 @@ -3681,7 +3683,7 @@ # if CDPATH is set. if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi -relink_command=\"$relink_command\" +relink_command="" # This environment variable determines our operation mode. if test \"\$libtool_install_magic\" = \"$magic\"; then @@ -4052,7 +4054,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 -urN subversion-0.37.0.orig/subversion/bindings/swig/perl/Makefile.PL subversion-0.37.0/subversion/bindings/swig/perl/Makefile.PL --- subversion-0.37.0.orig/subversion/bindings/swig/perl/Makefile.PL 2004-02-06 12:07:58.000000000 +0100 +++ subversion-0.37.0/subversion/bindings/swig/perl/Makefile.PL 2004-01-30 09:51:16.000000000 +0100 @@ -20,7 +20,10 @@ my @modules = qw/client delta fs ra repos wc/; my @ldpaths = ('../.libs', - map {"../../../libsvn_$_/.libs"} (@modules, qw/diff subr/)); + map {"../../../libsvn_$_/.libs"} (@modules, qw/diff subr + ra_local + ra_svn + ra_dav/)); my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/); my $apr_config = $ENV{APR_CONFIG} || '/usr/local/lib/apache2/apr-config'; @@ -31,7 +34,7 @@ my $apr_shlib_path_var = `$apr_config --shlib-path-var`; my $apr_cflags = `$apr_config --includes`; my $apu_cflags = `$apu_config --includes`; -my $apr_ldflags = `$apr_config --cflags --link-ld --libs` +my $apr_ldflags = `$apr_config --link-ld --libs` if $^O eq 'darwin'; chomp $apr_shlib_path_var; |