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

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 65cdb67..6104853 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -23038,6 +23038,10 @@ sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 md5=6f3701a0f2acf3fe53093491ba3d77ee
 sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 
+[http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2]
+md5=1a53a0e72bee0bf814f4da83a9b6a636
+sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
+
 [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz]
 md5=b29893c06192df6230dd5f340f3badf5
 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a

diff --git a/recipes/subversion/files/apr-regex.patch b/recipes/subversion/files/apr-regex.patch
deleted file mode 100644 (file)
index 4f1f50a..0000000
--- 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 (file)
index d296806..0000000
--- 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 (file)
index 305b13c..0000000
--- 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 (file)
index 1029e70..0000000
--- 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
similarity index 50%
rename from recipes/subversion/subversion_1.3.1.bb
rename to recipes/subversion/subversion_1.6.5.bb
index 79e5e67..50f5e6e 100644 (file)
--- 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() {