Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24403/stable/main/finkinfo/devel
Modified Files:
libapache2-mod-svn.info svn-javahl.info svn-swig-pm.info
Log Message:
versioned dependencies on svn
Index: svn-swig-pm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-swig-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svn-swig-pm.info 25 Jan 2006 04:21:39 -0000 1.2
+++ svn-swig-pm.info 1 Feb 2006 19:52:41 -0000 1.3
@@ -1,22 +1,19 @@
Info2: <<
Package: svn-swig-pm%type_pkg[perl]
-Version: 1.1.4
-Revision: 1011
-Architecture: powerpc
+Version: 1.2.3
+Revision: 12
Description: Subversion - Swig Perl bindings
-Type: perl (5.8.1 5.8.6)
+Type: perl (5.8.1 5.8.4 5.8.6)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
-Depends: perl%type_pkg[perl]-core, svn-shlibs (>= %v-11), swig-shlibs (>=
1.3.20-2)
-BuildDepends: fink (>= 0.21.1-1), svn-dev (>= %v-11), apr (>= 0.9.5-15),
apr-common (>= 0.9.5-15), db42 (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2),
libxml2 (>= 2.5.10-12), neon24 (>= 0.24.7-11), swig (>= 1.3.20-2), 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: %{Ni}581, %{Ni}584, %{Ni}586
-Replaces: %{Ni}581, %{Ni}584, %{Ni}586
+Depends: perl%type_pkg[perl]-core, svn-shlibs (>= 1.2.3-1012), swig-shlibs (>=
1.3.20-1012)
+BuildDepends: fink (>= 0.21.1-1), svn-dev (>= 1.2.3-1012), 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), neon24 (>= 0.24.7-11), swig (>=
1.3.20-1012), libiconv-dev (>= 1.9.1-11), gettext-bin, gettext-tools,
gettext-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
+Source-MD5: a14bc6590241b6e5c2ff2b354cc184a1
# Patch Phase:
Patch: svn.patch
@@ -24,8 +21,9 @@
# Compile Phase:
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
GCC: 3.3
+NoPerlTests: true
CompileScript: <<
-#! /bin/sh -e
+#! /bin/sh -ev
### Remove packages that are installed by fink
rm -rf neon
rm -rf apr
@@ -34,17 +32,17 @@
# 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_ra,libsvn_repos,libsvn_subr,libsvn_wc
+ ./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=perl --with-swig=%p --without-python
--with-perl=perl%type_raw[perl]
-
+ 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=perl --with-swig=%p --without-python
--with-perl=perl%type_raw[perl] --without-ruby
+
### force SWIG to use gcc 3.3 too
- perl -pi.bak -e 's|(SWIG.*)gcc|${1}gcc-3.3|g' Makefile
+# perl -pi.bak -e 's|(SWIG.*)gcc|${1}gcc-3.3|g' Makefile
### Build swig perl bindings
- make CC=gcc-3.3 CXX=g++-3.3 swig-pl-lib
+ make swig-pl-lib
- # make swig-pl
+ #make swig-pl
(cd subversion/bindings/swig/perl/native && %{default_script})
<<
@@ -60,9 +58,28 @@
### Remove unneeded archives
rm %i/lib/*.a
rm %i/lib/*.la
+
+ ### Move man files to perl versioned directory
+ /usr/bin/install -d %i/lib
+ /usr/bin/install -d %i/lib/perl5
+ /usr/bin/install -d %i/lib/perl5/%type_raw[perl]
+ mv %i/share/man %i/lib/perl5/%type_raw[perl]
<<
-Shlibs: <<
- %p/lib/libsvn_swig_perl-1.0.dylib 1.0.0 %n (>= 0.37.0-11)
+SplitOff: <<
+ Description: Subversion - Swig Perl Shared libraries
+ Package: %N-shlibs
+ Depends: svn-shlibs (>= 1.2.3-1012), swig-shlibs (>= 1.3.20-1012)
+ Replaces: %{Ni}581-shlibs, %{Ni}584-shlibs, %{Ni}586-shlibs
+ Provides: %{Ni}-shlibs
+ Files: <<
+ 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 (>= 1.2.1-11)
+ <<
+ DocFiles: COPYING HACKING INSTALL.swig NOTES.swig
<<
# Additional Info
@@ -81,6 +98,11 @@
Added 'export F77=no;' to configure in order not to fail if the
fort77 package is installed.
+
+ ConfigureParams can't be used since they would be added to default_script
+ otherwise.
+
+ Tests disabled since one test fails if run with --build-as-nobody.
<<
Homepage: http://subversion.tigris.org/
<<
Index: svn-javahl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/svn-javahl.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svn-javahl.info 25 Jan 2006 04:21:39 -0000 1.2
+++ svn-javahl.info 1 Feb 2006 19:52:41 -0000 1.3
@@ -1,53 +1,48 @@
Info2: <<
Package: svn-javahl
-Version: 1.1.4
-Revision: 1011
-Architecture: powerpc
+Version: 1.2.3
+Revision: 1012
Description: Subversion - Java bindings
Type: java(1.4)
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
-Depends: system-java%type_pkg[java], svn-shlibs (>= %v-11)
-BuildDepends: fink (>= 0.22.2-1), svn-dev (>= %v-11), apr (>= 0.9.5-15),
apr-common (>= 0.9.5-15), db42 (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2),
libxml2 (>= 2.5.10-12), neon24 (>= 0.24.7-11), libiconv-dev (>= 1.9.1-11),
system-java%type_pkg[java]-dev, gettext-bin, gettext-tools, gettext-dev,
io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9, junit, gcc3.3
+Depends: system-java%type_pkg[java], svn-shlibs (>= 1.2.3-1012)
+BuildDepends: fink (>= 0.22.2-1), svn-dev (>= 1.2.3-1012), 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), neon24 (>= 0.24.7-11), libiconv-dev (>=
1.9.1-11), system-java%type_pkg[java]-dev, gettext-bin, gettext-tools,
gettext-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9
# Only needs to be enabled for 'make check-javahl':
#, junit
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
+Source-MD5: a14bc6590241b6e5c2ff2b354cc184a1
# Patch Phase:
Patch: svn.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 --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
+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
+# Only needs to be enabled for 'make check-javahl':
+# --with-junit=%p/share/java/junit/junit.jar
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
-GCC: 3.3
+GCC: 4.0
CompileScript: <<
-#! /bin/sh -e
+#! /bin/sh -ev
### Remove packages that are installed by fink
rm -rf neon
rm -rf apr
rm -rf apr-util
- # recreate configure with libtool 1.5.
+ # 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_ra,libsvn_repos,libsvn_subr,libsvn_wc
+ ./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
+ export F77=no; ./configure %c
### 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 CC=gcc-3.3 CXX=g++-3.3 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 javahl
+ # There is one test failing because of permissions while running as root
# make check-javahl
<<
@@ -75,11 +70,6 @@
rm -rf %i/include
rm %i/lib/*.a
rm %i/lib/*.la
-
- ### 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-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-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-mod-svn.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/libapache2-mod-svn.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libapache2-mod-svn.info 25 Jan 2006 04:21:39 -0000 1.2
+++ libapache2-mod-svn.info 1 Feb 2006 19:52:41 -0000 1.3
@@ -1,43 +1,42 @@
Package: libapache2-mod-svn
-Version: 1.1.4
-Revision: 1011
-Architecture: powerpc
+Version: 1.2.3
+Revision: 1012
Description: Subversion - mod_svn
License: BSD
Maintainer: Christian Schaffner <[EMAIL PROTECTED]>
# Dependencies:
-Depends: apache2 (>= 2.0.50-10), apr-common, svn-shlibs (>= %v-11)
-BuildDepends: fink (>= 0.21.1-1), svn-dev (>= %v-11), apr (>= 0.9.5-15),
apr-common (>= 0.9.5-15), db42 (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2),
libxml2 (>= 2.5.10-12), neon24 (>= 0.24.7-11), libiconv-dev (>= 1.9.1-11),
apache2-dev (>= 2.0.50-10), gettext-bin, gettext-tools, gettext-dev,
io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9, gcc3.3
+Depends: apache2 (>= 2.0.55-1010), apr-common (>= 0.9.7-1011), svn-shlibs (>=
1.2.3-1012)
+BuildDepends: fink (>= 0.21.1-1), svn-dev (>= 1.2.3-1012), 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), neon24 (>= 0.24.7-11), libiconv-dev (>=
1.9.1-11), apache2-dev (>= 2.0.55-1010), gettext-bin, gettext-tools,
gettext-dev, io-string-pm, libtool14 (>= 1.5.10-1), autoconf2.5, automake1.9
Conflicts: svn-client (<= 0.26.0-2), apache2 (<< 2.0.47-1)
# Unpack Phase:
Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2
-Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23
+Source-MD5: a14bc6590241b6e5c2ff2b354cc184a1
# Patch Phase:
Patch: svn.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 --without-jdk --disable-javahl
--with-jikes=no --disable-swig-bindings --without-swig --without-python
--without-perl
+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
SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp
-GCC: 3.3
+GCC: 4.0
CompileScript: <<
-#! /bin/sh -e
+#! /bin/sh -ev
### Remove packages that are installed by fink
rm -rf neon
rm -rf apr
rm -rf apr-util
- # recreate configure with libtool 1.5.
+ # 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
+ export F77=no; ./configure %c
### make mod_svn shared
- make CC=gcc-3.3 CXX=g++-3.3 apache-mod
+ make apache-mod
<<
# Install Phase:
@@ -50,9 +49,37 @@
# 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
+<<
+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 "To install an older svnadmin binary linked to db43 please install"
+ echo "the fink package 'svn-1.1.4-11', e.g. by typing"
+ echo ""
+ echo " fink install svn-1.1.4-11"
+ 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`
@@ -138,6 +165,19 @@
If you need the examples or the tools (e.g. svnadmin) install the
'svn' 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
+
+ To install an older svnadmin binary linked to db42 please install
+ the fink package 'svn-1.1.4-11', e.g. by typing
+
+ fink install svn-1.1.4-11
<<
DescPort: <<
Patches applied to be able to not rebuild already installed libraries
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
