From eda5ac7aed5e223ff04173be029b28bc119e2dd9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 18 May 2012 07:58:47 +0200
Subject: [PATCH] subversion: update to 1.7.5.

---
 srcpkgs/subversion/libsvn.rshlibs             | 15 ++++---
 srcpkgs/subversion/libsvn.template            |  1 -
 srcpkgs/subversion/subversion-apache.rshlibs  | 10 +++++
 srcpkgs/subversion/subversion-apache.template |  1 -
 .../subversion-gnome-keyring-auth.rshlibs     |  8 ++--
 .../subversion-gnome-keyring-auth.template    |  1 -
 srcpkgs/subversion/subversion-perl.rshlibs    | 11 ++---
 srcpkgs/subversion/subversion-perl.template   |  1 -
 srcpkgs/subversion/subversion-python.rshlibs  | 25 ++++++++---
 srcpkgs/subversion/subversion-python.template | 10 ++---
 srcpkgs/subversion/subversion-ruby.template   |  1 -
 srcpkgs/subversion/template                   | 42 +++++++++----------
 12 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/srcpkgs/subversion/libsvn.rshlibs b/srcpkgs/subversion/libsvn.rshlibs
index 9fab8fd1d39..52f23445b81 100644
--- a/srcpkgs/subversion/libsvn.rshlibs
+++ b/srcpkgs/subversion/libsvn.rshlibs
@@ -1,12 +1,7 @@
 libaprutil-1.so.0
-libldap-2.4.so.2
-liblber-2.4.so.2
 libdb-4.8.so
 libexpat.so.1
 libapr-1.so.0
-libuuid.so.1
-librt.so.1
-libcrypt.so.1
 libpthread.so.0
 libdl.so.2
 libz.so.1
@@ -14,4 +9,12 @@ libsqlite3.so.0
 libc.so.6
 libsasl2.so.2
 libneon.so.27
-libgdbm.so.4
+libmagic.so.1
+libssl.so.1
+libcrypto.so.1
+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 227f4744812..ba66629915d 100644
--- a/srcpkgs/subversion/libsvn.template
+++ b/srcpkgs/subversion/libsvn.template
@@ -1,6 +1,5 @@
 # Template file for 'libsvn'.
 #
-revision=2
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/subversion/subversion-apache.rshlibs b/srcpkgs/subversion/subversion-apache.rshlibs
index 96000301005..e6481a55d31 100644
--- a/srcpkgs/subversion/subversion-apache.rshlibs
+++ b/srcpkgs/subversion/subversion-apache.rshlibs
@@ -4,3 +4,13 @@ libsvn_delta-1.so.0
 libsvn_subr-1.so.0
 libpthread.so.0
 libc.so.6
+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
+libapr-1.so.0
+libexpat.so.1
+libz.so.1
+libsqlite3.so.0
+libmagic.so.1
diff --git a/srcpkgs/subversion/subversion-apache.template b/srcpkgs/subversion/subversion-apache.template
index 628a4237d72..6b121d6fb76 100644
--- a/srcpkgs/subversion/subversion-apache.template
+++ b/srcpkgs/subversion/subversion-apache.template
@@ -1,6 +1,5 @@
 # Template file for 'subversion-apache'.
 #
-revision=1
 short_desc="${short_desc} - apache httpd modules"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/subversion/subversion-gnome-keyring-auth.rshlibs b/srcpkgs/subversion/subversion-gnome-keyring-auth.rshlibs
index a2d6701c58b..139bbd37715 100644
--- a/srcpkgs/subversion/subversion-gnome-keyring-auth.rshlibs
+++ b/srcpkgs/subversion/subversion-gnome-keyring-auth.rshlibs
@@ -1,7 +1,4 @@
 libapr-1.so.0
-libuuid.so.1
-libcrypt.so.1
-libdl.so.2
 libdbus-1.so.3
 libpthread.so.0
 librt.so.1
@@ -9,3 +6,8 @@ libgnome-keyring.so.0
 libglib-2.0.so.0
 libsvn_subr-1.so.0
 libc.so.6
+libaprutil-1.so.0
+libexpat.so.1
+libz.so.1
+libsqlite3.so.0
+libmagic.so.1
diff --git a/srcpkgs/subversion/subversion-gnome-keyring-auth.template b/srcpkgs/subversion/subversion-gnome-keyring-auth.template
index 10b6db2a886..7f1a81cbdc8 100644
--- a/srcpkgs/subversion/subversion-gnome-keyring-auth.template
+++ b/srcpkgs/subversion/subversion-gnome-keyring-auth.template
@@ -1,6 +1,5 @@
 # Template file for 'subversion-gnome-keyring-auth'.
 #
-revision=1
 short_desc="subversion - gnome-keyring authentication support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/subversion/subversion-perl.rshlibs b/srcpkgs/subversion/subversion-perl.rshlibs
index a0e5ce57d05..60fc17c8b0b 100644
--- a/srcpkgs/subversion/subversion-perl.rshlibs
+++ b/srcpkgs/subversion/subversion-perl.rshlibs
@@ -1,16 +1,9 @@
 libsvn_delta-1.so.0
 libsvn_subr-1.so.0
 libaprutil-1.so.0
-libldap-2.4.so.2
-liblber-2.4.so.2
-libdb-4.8.so
 libexpat.so.1
 libapr-1.so.0
-libuuid.so.1
-librt.so.1
-libcrypt.so.1
 libpthread.so.0
-libdl.so.2
 libc.so.6
 libsvn_client-1.so.0
 libsvn_diff-1.so.0
@@ -18,4 +11,6 @@ libsvn_fs-1.so.0
 libsvn_ra-1.so.0
 libsvn_repos-1.so.0
 libsvn_wc-1.so.0
-libgdbm.so.4
+libz.so.1
+libsqlite3.so.0
+libmagic.so.1
diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template
index 04919a9043f..83df6435fb6 100644
--- a/srcpkgs/subversion/subversion-perl.template
+++ b/srcpkgs/subversion/subversion-perl.template
@@ -1,6 +1,5 @@
 # Template file for 'subversion-perl'.
 #
-revision=2
 short_desc="${short_desc} - perl bindings"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/subversion/subversion-python.rshlibs b/srcpkgs/subversion/subversion-python.rshlibs
index fb52496d9a7..3c8dde245b2 100644
--- a/srcpkgs/subversion/subversion-python.rshlibs
+++ b/srcpkgs/subversion/subversion-python.rshlibs
@@ -1,9 +1,6 @@
 libsvn_diff-1.so.0
 libsvn_subr-1.so.0
 libapr-1.so.0
-libuuid.so.1
-librt.so.1
-libcrypt.so.1
 libpthread.so.0
 libdl.so.2
 libc.so.6
@@ -14,8 +11,24 @@ libsvn_ra-1.so.0
 libsvn_repos-1.so.0
 libsvn_wc-1.so.0
 libaprutil-1.so.0
-libldap-2.4.so.2
-liblber-2.4.so.2
 libdb-4.8.so
 libexpat.so.1
-libgdbm.so.4
+libsvn_ra_local-1.so.0
+libsvn_fs_fs-1.so.0
+libsvn_fs_base-1.so.0
+libsvn_fs_util-1.so.0
+libsvn_ra_svn-1.so.0
+libsasl2.so.2
+libsvn_ra_neon-1.so.0
+libneon.so.27
+libssl.so.1
+libcrypto.so.1
+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
+libmagic.so.1
diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template
index f879497b710..6e552f8af76 100644
--- a/srcpkgs/subversion/subversion-python.template
+++ b/srcpkgs/subversion/subversion-python.template
@@ -1,6 +1,5 @@
 # Template file for 'subversion-python'.
 #
-revision=2
 short_desc="${short_desc} - python bindings"
 long_desc="${long_desc}
 
@@ -10,10 +9,7 @@ pycompile_module="libsvn svn"
 
 Add_dependency run python
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/python2.7
-	mv ${SRCPKGDESTDIR}/usr/lib/libsvn_swig_py-1.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/svn-python/ \
-		${DESTDIR}/usr/lib/python2.7/site-packages
+do_install() {
+	vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib
+	vmove "usr/lib/python*" usr/lib
 }
diff --git a/srcpkgs/subversion/subversion-ruby.template b/srcpkgs/subversion/subversion-ruby.template
index 87de8141532..d82a2b5f22c 100644
--- a/srcpkgs/subversion/subversion-ruby.template
+++ b/srcpkgs/subversion/subversion-ruby.template
@@ -1,6 +1,5 @@
 # Template file for 'subversion-ruby'.
 #
-revision=2
 short_desc="${short_desc} - ruby bindings"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index b9a2b7eb86e..1e2c62ee30f 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,14 +1,12 @@
 # Template file for 'subversion'
 pkgname=subversion
-version=1.6.17
+version=1.7.5
 homepage="http://subversion.apache.org/"
-#distfiles="$homepage/downloads/$pkgname-$version.tar.bz2"
-distfiles="http://${pkgname}.tigris.org/downloads/${pkgname}-${version}.tar.bz2"
-revision=1
+distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz2"
 short_desc="Enterprise-class centralized version control for the masses"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Apache-2.0, BSD"
-checksum=d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
+checksum=cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec
 long_desc="
  Apache Subversion is a full-featured version control system originally
  designed to be a better CVS. Subversion has since expanded beyond its
@@ -17,14 +15,13 @@ long_desc="
  feel very familiar to CVS users."
 
 # XXX enable kwallet when kdelibs is available.
-subpackages="$pkgname-python $pkgname-perl $pkgname-ruby"
+subpackages="$pkgname-python $pkgname-perl"
 subpackages="${subpackages} $pkgname-gnome-keyring-auth $pkgname-devel"
 subpackages="${subpackages} $pkgname-apache libsvn"
 
-
 Add_dependency build pkg-config
 Add_dependency build perl
-Add_dependency build ruby-devel
+#Add_dependency build ruby-devel
 Add_dependency build python-devel
 Add_dependency build swig
 Add_dependency build apr-util-devel
@@ -43,27 +40,28 @@ Add_dependency build glib-devel
 Add_dependency build neon-devel
 Add_dependency build apache-devel
 
-do_build()
-{
+do_configure() {
 	./configure --prefix=/usr --with-apxs --disable-javahl \
 		--without-kwallet --with-gnome-keyring --with-editor=vim \
 		--disable-mod-activation
-
-	(make ${makejobs} external-all && \
-		make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all)
 }
 
-do_install()
-{
+do_build() {
+	make ${makejobs} external-all
+	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
+	make ${makejobs} \
+		swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+		swig-py swig-pl
+}
+
+do_install() {
 	export LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
 
-	make DESTDIR=${DESTDIR} install
-	make DESTDIR=${DESTDIR} swig-py
-	make DESTDIR=${DESTDIR} install-swig-py
-	make DESTDIR=${DESTDIR} swig-pl
-	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor install-swig-pl
-	make DESTDIR=${DESTDIR} swig-rb
-	make DESTDIR=${DESTDIR} install-swig-rb
+	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor \
+		swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+		swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+		install install-swig-py install-swig-pl
 
 	rm -rf ${DESTDIR}/usr/lib/perl5/core_perl
 	install -d ${DESTDIR}/usr/share/subversion