main/subversion: upgrade to 1.7.0

3 files changed, 22 insertions, 36 deletions

diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 1581aa764a..aa9f361339 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
-pkgver=1.6.17
-pkgrel=4
+pkgver=1.7.0
+pkgrel=0
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="http://subversion.tigris.org/"
 arch="all"
@@ -13,8 +13,8 @@ makedepends="apr-dev apr-util-dev expat-dev neon-dev openssl-dev zlib-dev
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs mod_dav_svn
 	perl-$pkgname:pl"
-source="http://subversion.tigris.org/downloads/subversion-$pkgver.tar.bz2
-	subversion-1.6.0-deplibs.patch
+source="http://apache.uib.no/subversion/subversion-$pkgver.tar.bz2
+	subversion-1.7.0-deplibs.patch
 	svnserve.confd
 	svnserve.initd
 	"
@@ -76,7 +76,7 @@ pl() {
 	mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/
 }
 
-md5sums="81e5dc5beee4b3fc025ac70c0b6caa14  subversion-1.6.17.tar.bz2
-f1ebbdcd51671f5394dca0e8489d088c  subversion-1.6.0-deplibs.patch
+md5sums="930e6644a1b6094efd268fde6a318f04  subversion-1.7.0.tar.bz2
+e1127cb722daecb3c89adbaf9eed7adf  subversion-1.7.0-deplibs.patch
 d084a7558053784886bc858b94fa9186  svnserve.confd
 22c274fafb4817e31126f60f9d84039f  svnserve.initd"
diff --git a/main/subversion/subversion-1.6.0-deplibs.patch b/main/subversion/subversion-1.6.0-deplibs.patch
deleted file mode 100644
index d892a7b24f..0000000000
--- a/main/subversion/subversion-1.6.0-deplibs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- subversion-1.6.0/build/ac-macros/apr.m4.deplibs
-+++ subversion-1.6.0/build/ac-macros/apr.m4
-@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR,
- 
-   dnl When APR stores the dependent libs in the .la file, we don't need 
-   dnl --libs.
--  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
-+  SVN_APR_LIBS="`$apr_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apr-config --link-libtool failed])
-   fi
- 
-   SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
---- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs
-+++ subversion-1.6.0/build/ac-macros/aprutil.m4
-@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL,
-     AC_MSG_ERROR([apu-config --prefix failed])
-   fi
- 
--  dnl When APR stores the dependent libs in the .la file, we don't need
--  dnl --libs.
--  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
-+  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
-   if test $? -ne 0; then
--    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
-+    AC_MSG_ERROR([apu-config --link-libtool failed])
-   fi
- 
-   SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
diff --git a/main/subversion/subversion-1.7.0-deplibs.patch b/main/subversion/subversion-1.7.0-deplibs.patch
new file mode 100644
index 0000000000..a8df17326e
--- /dev/null
+++ b/main/subversion/subversion-1.7.0-deplibs.patch
@@ -0,0 +1,16 @@
+diff --git a/build/ac-macros/aprutil.m4 b/build/ac-macros/aprutil.m4
+index 54f5e32..40c2ed3 100644
+--- a/build/ac-macros/aprutil.m4
++++ b/build/ac-macros/aprutil.m4
+@@ -103,9 +103,9 @@ AC_DEFUN(SVN_LIB_APRUTIL,
+       AC_MSG_ERROR([apu-config --link-ld --libs failed])
+     fi
+   else
+-    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
++    SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
+     if test $? -ne 0; then
+-      AC_MSG_ERROR([apu-config --link-ld failed])
++      AC_MSG_ERROR([apu-config --link-ld --libs failed])
+     fi
+   fi
+   SVN_APRUTIL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APRUTIL_LIBS)`"