Update of /cvsroot/fink/dists/10.4/stable/crypto/finkinfo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24403/stable/crypto/finkinfo
Modified Files: svn-ssl-javahl.info svn-ssl-swig-pm.info svn-ssl-swig-py.info Log Message: versioned dependencies on svn Index: svn-ssl-swig-py.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/crypto/finkinfo/svn-ssl-swig-py.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- svn-ssl-swig-py.info 25 Jan 2006 04:21:37 -0000 1.2 +++ svn-ssl-swig-py.info 1 Feb 2006 19:52:41 -0000 1.3 @@ -1,22 +1,21 @@ Info2: << Package: svn-ssl-swig-py%type_pkg[python] -Version: 1.1.4 -Revision: 1011 -Architecture: powerpc +Version: 1.2.3 +Revision: 1012 Description: Subversion - Swig Python bindings (with SSL) -Type: python (2.3) +Type: python (2.3 2.4) License: Restrictive Maintainer: Christian Schaffner <[EMAIL PROTECTED]> # Dependencies: -Depends: python%type_pkg[python] | python%type_pkg[python]-nox, svn-ssl-shlibs (>= %v-11), swig-shlibs (>= 1.3.20-2) -BuildDepends: fink (>= 0.21.1-1), svn-ssl-dev (>= %v-11), apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), 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), 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 +Depends: python%type_pkg[python] | python%type_pkg[python]-nox, svn-ssl-shlibs (>= 1.2.3-1012), swig-shlibs (>= 1.3.20-1012) +BuildDepends: fink (>= 0.21.1-1), svn-ssl-dev (>= 1.2.3-1012), apr-ssl (>= 0.9.7-1011), apr-ssl-common (>= 0.9.7-1011), db43-ssl (>= 4.3.29-1001), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), neon24-ssl (>= 0.24.7-11), openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, 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 Conflicts: %{Ni}23, %{Ni}24 Replaces: %{Ni}23, %{Ni}24, svn-ssl-shlibs (<< 1.0.4-11) # Unpack Phase: Source: http://subversion.tigris.org/tarballs/subversion-%v.tar.bz2 -Source-MD5: 6e557ae65b6b8d7577cc7704ede85a23 +Source-MD5: a14bc6590241b6e5c2ff2b354cc184a1 # Patch Phase: Patch: svn-ssl.patch @@ -25,24 +24,24 @@ SetCPPFLAGS: -I%p/include/db4 -no-cpp-precomp GCC: 3.3 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 --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-swig=%p --with-python=%p/bin/python%type_raw[python] --without-perl PYTHON2=%p/bin/python%type_raw[python] + 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-swig=%p --with-python=%p/bin/python%type_raw[python] --without-perl PYTHON2=%p/bin/python%type_raw[python] --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 python bindings - make CC=gcc-3.3 CXX=g++-3.3 swig-py + make swig-py << # Install Phase: Index: svn-ssl-javahl.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/crypto/finkinfo/svn-ssl-javahl.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- svn-ssl-javahl.info 25 Jan 2006 04:21:37 -0000 1.2 +++ svn-ssl-javahl.info 1 Feb 2006 19:52:41 -0000 1.3 @@ -1,8 +1,7 @@ Info2: << Package: svn-ssl-javahl -Version: 1.1.4 -Revision: 1011 -Architecture: powerpc +Version: 1.2.3 +Revision: 1012 Description: Subversion - Java bindings (with SSL) Type: java(1.4) DescPackaging: << @@ -13,45 +12,41 @@ Maintainer: Christian Schaffner <[EMAIL PROTECTED]> # Dependencies: -Depends: system-java%type_pkg[java], svn-ssl-shlibs (>= %v-11) -BuildDepends: fink (>= 0.22.2-1), svn-ssl-dev (>= %v-11), apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), neon24-ssl (>= 0.24.7-11), openldap-ssl-dev (>= 2.1.22-24), cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, 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-ssl-shlibs (>= 1.2.3-1012) +BuildDepends: fink (>= 0.22.2-1), svn-ssl-dev (>= 1.2.3-1012), apr-ssl (>= 0.9.7-1011), apr-ssl-common (>= 0.9.7-1011), db43-ssl (>= 4.3.29-1001), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), neon24-ssl (>= 0.24.7-11), openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, 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-ssl.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 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 << @@ -79,11 +74,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-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: svn-ssl-swig-pm.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/crypto/finkinfo/svn-ssl-swig-pm.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- svn-ssl-swig-pm.info 25 Jan 2006 04:21:37 -0000 1.2 +++ svn-ssl-swig-pm.info 1 Feb 2006 19:52:41 -0000 1.3 @@ -1,8 +1,7 @@ Info2: << Package: svn-ssl-swig-pm%type_pkg[perl] -Version: 1.1.4 -Revision: 1011 -Architecture: powerpc +Version: 1.2.3 +Revision: 1012 Description: Subversion - Swig Perl bindings (with SSL) Type: perl (5.8.1 5.8.6) DescPackaging: << @@ -13,14 +12,12 @@ Maintainer: Christian Schaffner <[EMAIL PROTECTED]> # Dependencies: -Depends: perl%type_pkg[perl]-core, svn-ssl-shlibs (>= %v-11), swig-shlibs (>= 1.3.20-2) -BuildDepends: fink (>= 0.21.1-1), svn-ssl-dev (>= %v-11), apr-ssl (>= 0.9.5-15), apr-ssl-common (>= 0.9.5-15), db42-ssl (>= 4.2.52-1017), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), 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), 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, %{Ni}-shlibs +BuildDepends: fink (>= 0.21.1-1), svn-ssl-dev (>= 1.2.3-1012), apr-ssl (>= 0.9.7-1011), apr-ssl-common (>= 0.9.7-1011), db43-ssl (>= 4.3.29-1001), gdbm3, expat (>= 1.95.6-2), libxml2 (>= 2.5.10-12), neon24-ssl (>= 0.24.7-11), openldap23-dev, cyrus-sasl2-dev (>= 2.1.15-23), openssl097-dev, 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-ssl.patch @@ -28,8 +25,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 @@ -38,17 +36,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}) << @@ -64,9 +62,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 (with SSL) + Package: %N-shlibs + Depends: svn-ssl-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 @@ -85,6 +102,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/ << ------------------------------------------------------- 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