3 files changed, 27 insertions, 26 deletions
diff --git a/packages/subversion/files/apr-regex.patch b/packages/subversion/files/apr-regex.patch
new file mode 100644
index 0000000000..4f1f50a7d5
--- /dev/null
+++ b/packages/subversion/files/apr-regex.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- subversion-1.3.1/configure~apr-regex
++++ subversion-1.3.1/configure
+@@ -2933,9 +2933,9 @@
+ 
+ 
+ 
+-APR_VER_REGEX="0\.9\.[5-9]"
++APR_VER_REGEX="0\.9\.12"
+ APR_VER_REGEX_TOO="1\."
+-APU_VER_REGEX="0\.9\.[5-9]"
++APU_VER_REGEX="0\.9\.12"
+ APU_VER_REGEX_TOO="1\."
+ 
+ 
diff --git a/packages/subversion/subversion_1.3.0.bb b/packages/subversion/subversion_1.3.0.bb
deleted file mode 100644
index 1211bea2fc..0000000000
--- a/packages/subversion/subversion_1.3.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "The Subversion (svn) client"
-SECTION = "console/network"
-DEPENDS = "apr-util-0.9.7 neon-0.25.5"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
-LICENSE = "Apache/BSD"
-HOMEPAGE = "http://subversion.tigris.org"
-
-PR = "r0"
-
-SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-           file://disable-revision-install.patch;patch=1"
-
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
-                --without-berkeley-db --without-apxs --without-apache \ 
-                --without-swig --with-apr=${STAGING_BINDIR} \
-                --with-apr-util=${STAGING_BINDIR}"
-
-inherit autotools
-
-do_configure() {
-  oe_runconf
-}
diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.3.1.bb
index e50833b536..ac537cf310 100644
--- a/packages/subversion/subversion_1.2.0.bb
+++ b/packages/subversion/subversion_1.3.1.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
-DEPENDS = "apr-util-0.9.7 neon-0.24.7"
+DEPENDS = "apr-util-0.9.12 neon"
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
-
 PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-	   file://disable-revision-install.patch;patch=1"
+           file://disable-revision-install.patch;patch=1 \
+           file://apr-regex.patch;patch=1"
 
 EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \ 
@@ -18,5 +18,9 @@ EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
 inherit autotools
 
 do_configure() {
-  oe_runconf
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
 }