From 3a2e5bf97170ca643ef7ab5dd0951718f360393b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 May 2012 12:28:21 +0200 Subject: [PATCH] subversion: rebuild against perl-5.16; fix version in libsvn shlibs. --- common/shlibs | 34 +++++++++---------- srcpkgs/subversion/libsvn.rshlibs | 2 -- srcpkgs/subversion/libsvn.template | 7 ++-- srcpkgs/subversion/subversion-apache.template | 7 ++-- srcpkgs/subversion/subversion-devel.template | 11 +++--- .../subversion-gnome-keyring-auth.template | 8 ++--- srcpkgs/subversion/subversion-perl.template | 13 +++---- srcpkgs/subversion/subversion-python.rshlibs | 2 -- srcpkgs/subversion/subversion-python.template | 4 +-- srcpkgs/subversion/subversion.rshlibs | 9 +++++ srcpkgs/subversion/template | 12 +++---- 11 files changed, 47 insertions(+), 62 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3478d824895..b2fe7e4463b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -663,23 +663,23 @@ libSDL_net-1.2.so.0 SDL_net-1.2.7 libmodplug.so.1 libmodplug-0.8.8 libfetch.so libfetch-2.33 libneon.so.27 neon-0.29.5 -libsvn_subr-1.so.0 libsvn-0.29.5 -libsvn_diff-1.so.0 libsvn-0.29.5 -libsvn_client-1.so.0 libsvn-0.29.5 -libsvn_delta-1.so.0 libsvn-0.29.5 -libsvn_fs-1.so.0 libsvn-0.29.5 -libsvn_ra-1.so.0 libsvn-0.29.5 -libsvn_repos-1.so.0 libsvn-0.29.5 -libsvn_wc-1.so.0 libsvn-0.29.5 -libsvn_fs_util-1.so.0 libsvn-0.29.5 -libsvn_ra_svn-1.so.0 libsvn-0.29.5 -libsvn_fs_fs-1.so.0 libsvn-0.29.5 -libsvn_fs_base-1.so.0 libsvn-0.29.5 -libsvn_ra_local-1.so.0 libsvn-0.29.5 -libsvn_ra_neon-1.so.0 libsvn-0.29.5 -libsvn_swig_py-1.so.0 subversion-python-0.29.5 -libsvn_swig_perl-1.so.0 subversion-perl-0.29.5 -libsvn_swig_ruby-1.so.0 subversion-ruby-0.29.5 +libsvn_subr-1.so.0 libsvn-1.7.5 +libsvn_diff-1.so.0 libsvn-1.7.5 +libsvn_client-1.so.0 libsvn-1.7.5 +libsvn_delta-1.so.0 libsvn-1.7.5 +libsvn_fs-1.so.0 libsvn-1.7.5 +libsvn_ra-1.so.0 libsvn-1.7.5 +libsvn_repos-1.so.0 libsvn-1.7.5 +libsvn_wc-1.so.0 libsvn-1.7.5 +libsvn_fs_util-1.so.0 libsvn-1.7.5 +libsvn_ra_svn-1.so.0 libsvn-1.7.5 +libsvn_fs_fs-1.so.0 libsvn-1.7.5 +libsvn_fs_base-1.so.0 libsvn-1.7.5 +libsvn_ra_local-1.so.0 libsvn-1.7.5 +libsvn_ra_neon-1.so.0 libsvn-1.7.5 +libsvn_swig_py-1.so.0 subversion-python-1.7.5 +libsvn_swig_perl-1.so.0 subversion-perl-1.7.5 +libsvn_swig_ruby-1.so.0 subversion-ruby-1.7.5 libjson-glib-1.0.so.0 json-glib-0.12.2 liblxc.so.0 liblxc-0.7.3 libvirt.so.0 libvirt-0.8.7 diff --git a/srcpkgs/subversion/libsvn.rshlibs b/srcpkgs/subversion/libsvn.rshlibs index 52f23445b81..438efd92789 100644 --- a/srcpkgs/subversion/libsvn.rshlibs +++ b/srcpkgs/subversion/libsvn.rshlibs @@ -3,7 +3,6 @@ libdb-4.8.so libexpat.so.1 libapr-1.so.0 libpthread.so.0 -libdl.so.2 libz.so.1 libsqlite3.so.0 libc.so.6 @@ -16,5 +15,4 @@ libgssapi_krb5.so.2 libkrb5.so.3 libk5crypto.so.3 libcom_err.so.2 -libresolv.so.2 libproxy.so.1 diff --git a/srcpkgs/subversion/libsvn.template b/srcpkgs/subversion/libsvn.template index ba66629915d..fae267a7c54 100644 --- a/srcpkgs/subversion/libsvn.template +++ b/srcpkgs/subversion/libsvn.template @@ -5,9 +5,6 @@ long_desc="${long_desc} This package contains the shared libraries used by subversion." - -do_install() -{ - mkdir -p ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib ${DESTDIR}/usr +do_install() { + vmove usr/lib usr } diff --git a/srcpkgs/subversion/subversion-apache.template b/srcpkgs/subversion/subversion-apache.template index 6b121d6fb76..6751d2597dd 100644 --- a/srcpkgs/subversion/subversion-apache.template +++ b/srcpkgs/subversion/subversion-apache.template @@ -6,9 +6,6 @@ long_desc="${long_desc} This package contains two modules for the HTTP apache daemon for use with subversion." - -do_install() -{ - mkdir -p ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/libexec ${DESTDIR}/usr +do_install() { + vmove usr/libexec usr } diff --git a/srcpkgs/subversion/subversion-devel.template b/srcpkgs/subversion/subversion-devel.template index 706547745ac..2a74983feb8 100644 --- a/srcpkgs/subversion/subversion-devel.template +++ b/srcpkgs/subversion/subversion-devel.template @@ -1,15 +1,12 @@ # Template file for 'subversion-devel'. # -depends="pkg-config perl ruby-devel python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel libsvn" +depends="libsvn>=$version" short_desc="${short_desc} - development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/subversion/subversion-gnome-keyring-auth.template b/srcpkgs/subversion/subversion-gnome-keyring-auth.template index 7f1a81cbdc8..79b6e89259c 100644 --- a/srcpkgs/subversion/subversion-gnome-keyring-auth.template +++ b/srcpkgs/subversion/subversion-gnome-keyring-auth.template @@ -6,10 +6,6 @@ long_desc="${long_desc} This package contains files for subversion to authenticate with the libgnome-keyring package." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*gnome_keyring*.so* \ - ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/lib*gnome_keyring*.so*" usr/lib } diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template index ce6d787f4f3..411ae1120c9 100644 --- a/srcpkgs/subversion/subversion-perl.template +++ b/srcpkgs/subversion/subversion-perl.template @@ -1,16 +1,13 @@ # Template file for 'subversion-perl'. # -depends="perl" +depends="perl>=5.16" short_desc="${short_desc} - perl bindings" long_desc="${long_desc} This package contains the perl language bindings for subversion." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man - mv ${SRCPKGDESTDIR}/usr/lib/libsvn_swig_perl-1.so* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +do_install() { + vmove "usr/lib/libsvn_swig_perl-1.so*" usr/lib + vmove usr/lib/perl5 usr/lib + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/subversion/subversion-python.rshlibs b/srcpkgs/subversion/subversion-python.rshlibs index 3c8dde245b2..f9fe3fc6567 100644 --- a/srcpkgs/subversion/subversion-python.rshlibs +++ b/srcpkgs/subversion/subversion-python.rshlibs @@ -2,7 +2,6 @@ libsvn_diff-1.so.0 libsvn_subr-1.so.0 libapr-1.so.0 libpthread.so.0 -libdl.so.2 libc.so.6 libsvn_client-1.so.0 libsvn_delta-1.so.0 @@ -27,7 +26,6 @@ libgssapi_krb5.so.2 libkrb5.so.3 libk5crypto.so.3 libcom_err.so.2 -libresolv.so.2 libproxy.so.1 libz.so.1 libsqlite3.so.0 diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template index 66d44c4bd5e..0daa5b52876 100644 --- a/srcpkgs/subversion/subversion-python.template +++ b/srcpkgs/subversion/subversion-python.template @@ -1,14 +1,12 @@ # Template file for 'subversion-python'. # depends="python" +pycompile_module="libsvn svn" short_desc="${short_desc} - python bindings" long_desc="${long_desc} This package contains the Python language bindings for subversion." -pycompile_module="libsvn svn" - - do_install() { vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib vmove "usr/lib/python*" usr/lib diff --git a/srcpkgs/subversion/subversion.rshlibs b/srcpkgs/subversion/subversion.rshlibs index b09465afeec..b1eaeb87aa9 100644 --- a/srcpkgs/subversion/subversion.rshlibs +++ b/srcpkgs/subversion/subversion.rshlibs @@ -11,3 +11,12 @@ libsvn_repos-1.so.0 libsvn_fs-1.so.0 libsvn_ra_svn-1.so.0 libsasl2.so.2 +libsvn_fs_fs-1.so.0 +libsvn_fs_base-1.so.0 +libdb-4.8.so +libsvn_fs_util-1.so.0 +libaprutil-1.so.0 +libexpat.so.1 +libz.so.1 +libsqlite3.so.0 +libmagic.so.1 diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index fa5594a73f9..052447a1688 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,12 +1,15 @@ # Template file for 'subversion' pkgname=subversion version=1.7.5 +revision=1 homepage="http://subversion.apache.org/" -distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2" -makedepends="pkg-config perl python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel zlib-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel" +subpackages="$pkgname-python $pkgname-perl $pkgname-gnome-keyring-auth $pkgname-devel libsvn" +# XXX enable kwallet when kdelibs is available. +makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel neon-devel apache-devel" short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " license="Apache-2.0, BSD" +distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2" checksum=cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec long_desc=" Apache Subversion is a full-featured version control system originally @@ -15,11 +18,6 @@ long_desc=" remain heavily influenced by that goal. Even today, Subversion should still feel very familiar to CVS users." -# XXX enable kwallet when kdelibs is available. -subpackages="$pkgname-python $pkgname-perl" -subpackages="${subpackages} $pkgname-gnome-keyring-auth $pkgname-devel" -subpackages="${subpackages} $pkgname-apache libsvn" - do_configure() { ./configure --prefix=/usr --with-apxs --disable-javahl \ --without-kwallet --with-gnome-keyring --with-editor=vim \