subversion: Updated to version 1.6.5. Deleted old unused versions.

5 files changed, 13 insertions, 105 deletions

diff --git a/recipes/subversion/files/apr-regex.patch b/recipes/subversion/files/apr-regex.patch
deleted file mode 100644
index 4f1f50a7d5..0000000000
--- a/recipes/subversion/files/apr-regex.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#
-# 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/recipes/subversion/files/libtool.patch b/recipes/subversion/files/libtool.patch
deleted file mode 100644
index d296806b12..0000000000
--- a/recipes/subversion/files/libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: subversion-1.4.5/configure.in
-===================================================================
---- subversion-1.4.5.orig/configure.in	2007-01-01 14:41:51.000000000 +0000
-+++ subversion-1.4.5/configure.in	2009-04-30 21:19:12.000000000 +0000
-@@ -11,6 +11,7 @@
- 
- AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
- AC_CONFIG_AUX_DIR([build])
-+AC_CONFIG_MACRO_DIR([build/ac-macros])
- 
- AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION)
- 
diff --git a/recipes/subversion/subversion_1.4.0.bb b/recipes/subversion/subversion_1.4.0.bb
deleted file mode 100644
index 305b13c6a4..0000000000
--- a/recipes/subversion/subversion_1.4.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "The Subversion (svn) client"
-SECTION = "console/network"
-DEPENDS = "apr-util neon"
-RDEPENDS = "neon"
-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://neon-detection.patch;patch=1"
-
-EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
-                --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
-                --with-apr-util=${STAGING_BINDIR_CROSS}"
-
-
-inherit autotools
-
-export LDFLAGS += " -L${STAGING_LIBDIR} "
-
-do_configure() {
-	gnu-configize
-	libtoolize --force
-	aclocal -I build/ -I build/ac-macros/ && autoconf
-	oe_runconf
-}
diff --git a/recipes/subversion/subversion_1.4.5.bb b/recipes/subversion/subversion_1.4.5.bb
deleted file mode 100644
index 1029e70c5c..0000000000
--- a/recipes/subversion/subversion_1.4.5.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "The Subversion (svn) client"
-SECTION = "console/network"
-DEPENDS = "apr-util neon"
-RDEPENDS = "neon"
-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 \
-	   file://neon-detection.patch;patch=1 \
-	   file://libtool.patch;patch=1"
-
-EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
-                --without-berkeley-db --without-apxs --without-apache \
-                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
-                --with-apr-util=${STAGING_BINDIR_CROSS}"
-
-
-inherit autotools
-
-export LDFLAGS += " -L${STAGING_LIBDIR} "
-
-acpaths = "-I build/ -I build/ac-macros/"
-
-# FIXME: Ugly hack! Instead of fully porting to the new libtool, apply libtool.patch and do the rest here.
-do_configure_prepend() {
-	rm -f build/libtool.m4
-}
-do_configure_append() {
-	if ! test -f libtool ; then cp -a *-libtool libtool ; fi
-}
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/recipes/subversion/subversion_1.3.1.bb b/recipes/subversion/subversion_1.6.5.bb
index 79e5e67d7b..50f5e6e5d6 100644
--- a/recipes/subversion/subversion_1.3.1.bb
+++ b/recipes/subversion/subversion_1.6.5.bb
@@ -1,23 +1,27 @@
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
-DEPENDS = "apr-util-0.9.12 neon"
+DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
 LICENSE = "Apache BSD"
-HOMEPAGE = "http://subversion.tigris.org"
-PR = "r1"
+HOMEPAGE = "http://subversion.tigris.org/"
+
+PR = "r0"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-           file://disable-revision-install.patch;patch=1 \
-           file://apr-regex.patch;patch=1"
+	   file://disable-revision-install.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
-                --without-berkeley-db --without-apxs --without-apache \
+EXTRA_OECONF = "--without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
 
+
 inherit autotools
 
-do_configure() {
-	oe_runconf
+acpaths = "-I build/ac-macros"
+
+# FIXME: Ugly hack!
+do_configure_append() {
+	if ! test -f libtool ; then cp -a *-libtool libtool ; fi
 }
 
 do_stage() {