Update to 1.7.2

  Fix building with apr 0.9.20.

Feature safe: yes

5 files changed, 31 insertions, 38 deletions

diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 37a323befd0e..6f0ca2db4c9f 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.7.1
-PORTREVISION?=	1
+PORTVERSION=	1.7.2
+PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}:main \
 		http://svnbook.red-bean.com/en/1.6/:book
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 916d14515dc7..6fc390962825 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-SHA256 (subversion17/subversion-1.7.1.tar.bz2) = d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608
-SIZE (subversion17/subversion-1.7.1.tar.bz2) = 5973480
-SHA256 (subversion17/svn-book-html.tar.bz2) = 10527f73c45625a42922734b382e3f2ae73ec74cc16c60ac7ac62bc3e28e36b2
-SIZE (subversion17/svn-book-html.tar.bz2) = 442342
-SHA256 (subversion17/svn-book.pdf) = 8693c97b72660e70b7b7f43cab4607be19a3d76e027ea2905d7ddb9248c8e0f3
-SIZE (subversion17/svn-book.pdf) = 1718315
+SHA256 (subversion17/subversion-1.7.2.tar.bz2) = 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517
+SIZE (subversion17/subversion-1.7.2.tar.bz2) = 5944987
+SHA256 (subversion17/svn-book-html.tar.bz2) = 2a6b58ac4951c719a5a52dfb6f16c8478a0cca117469910cf0e2fc336a492484
+SIZE (subversion17/svn-book-html.tar.bz2) = 443043
+SHA256 (subversion17/svn-book.pdf) = 90f503f6a4c4138c27abb88d457322cfb5e6599eb0b7e5c462b683384ad46d74
+SIZE (subversion17/svn-book.pdf) = 1722286
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
index 756e75a4956f..78b85dafcece 100644
--- a/devel/subversion/files/patch-configure
+++ b/devel/subversion/files/patch-configure
@@ -1,5 +1,14 @@
---- configure.orig	2011-08-26 19:03:02.000000000 +0400
-+++ configure	2011-09-07 21:22:39.000000000 +0400
+--- configure.orig	2011-11-29 20:16:31.000000000 +0400
++++ configure	2011-12-05 23:43:08.000000000 +0400
+@@ -4326,7 +4326,7 @@
+ # ==== Libraries, for which we may have source to build ======================
+ 
+ 
+-APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."
++APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
+ 
+ 
+   do_subdir_config="yes"
 @@ -19106,11 +19106,11 @@
                    SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
                    qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
@@ -23,7 +32,7 @@
                    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -20714,6 +20714,9 @@
+@@ -20762,6 +20762,9 @@
  
  fi
  if test "$RUBY" != "none"; then
diff --git a/devel/subversion/files/patch-configure.ac b/devel/subversion/files/patch-configure.ac
new file mode 100644
index 000000000000..d92a7a9c8940
--- /dev/null
+++ b/devel/subversion/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2011-08-17 17:01:30.000000000 +0400
++++ configure.ac	2011-12-05 23:43:19.000000000 +0400
+@@ -92,7 +92,7 @@
+ dnl   them.  Only .7 and later can guarantee repository
+ dnl   integrity with FSFS.
+ 
+-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
++APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
+ 
+ SVN_LIB_APR($APR_VER_REGEXES)
+ 
diff --git a/devel/subversion/files/patch-r1187695-subversion--mod_dav_svn--mod_dav_svn.c b/devel/subversion/files/patch-r1187695-subversion--mod_dav_svn--mod_dav_svn.c
deleted file mode 100644
index 2fade5cd5fd8..000000000000
--- a/devel/subversion/files/patch-r1187695-subversion--mod_dav_svn--mod_dav_svn.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- subversion/mod_dav_svn/mod_dav_svn.c	2011/08/19 17:13:38	1159686
-+++ subversion/mod_dav_svn/mod_dav_svn.c	2011/10/22 11:32:38	1187695
-@@ -902,13 +902,17 @@
- /* Response handler for POST requests (protocol-v2 commits).  */
- static int dav_svn__handler(request_rec *r)
- {
--  /* HTTP-defined Methods we handle */
--  r->allowed = 0
--    | (AP_METHOD_BIT << M_POST);
--
--  if (r->method_number == M_POST) {
--    return dav_svn__method_post(r);
--  }
-+  dir_conf_t *conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
-+
-+  if (conf->fs_path || conf->fs_parent_path)
-+    {
-+      /* HTTP-defined Methods we handle */
-+      r->allowed = 0
-+        | (AP_METHOD_BIT << M_POST);
-+
-+      if (r->method_number == M_POST)
-+        return dav_svn__method_post(r);
-+    }
- 
-   return DECLINED;
- }