Update to 1.6.9

Changes:	http://svn.apache.org/repos/asf/subversion/tags/1.6.9/CHANGES
PR:		ports/143175
Submitted by:	olli hauer <ohauer xx gmx.de>
Approved by:	maintainer timeout (lev; >1.5 month)

6 files changed, 34 insertions, 18 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index d027a996c339..c013340188ca 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -74,7 +74,11 @@ SCRIPTS_DATA=
 
 pre-everything::
 	@${ECHO_MSG} ""
-.if defined(WITH_NEON)
+.if defined(WITH_NEON) && defined(WITH_NEON28)
+	@${ECHO_CMD} "It doesn't make sense to depend on neon (neon29) and neon28 choose only one."
+	@${FALSE}
+.endif
+.if defined(WITH_NEON) || defined(WITH_NEON28)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 8fee8a454ca1..d25c6d66331b 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.6
-PORTREVISION?=	1
+PORTVERSION=	1.6.9
+#PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -35,9 +35,13 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
-PLIST_SUB+=		NEON=""
+.if exists(${LOCALBASE}/bin/neon-config)
+NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
+		${SED} -n -E  's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
+.else
+NEON_VER=      29
+.endif
+LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		NEON="@comment "
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index f018d6cad106..974b51179535 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.6.tar.bz2) = e5109da756d74c7d98f683f004a539af
-SHA256 (subversion/subversion-1.6.6.tar.bz2) = fe23c1a247dea631048bd62fd1cd6111924be2896ef2d166245ac9a1284c3c92
-SIZE (subversion/subversion-1.6.6.tar.bz2) = 5513036
+MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53
+SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
+SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index d027a996c339..c013340188ca 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -74,7 +74,11 @@ SCRIPTS_DATA=
 
 pre-everything::
 	@${ECHO_MSG} ""
-.if defined(WITH_NEON)
+.if defined(WITH_NEON) && defined(WITH_NEON28)
+	@${ECHO_CMD} "It doesn't make sense to depend on neon (neon29) and neon28 choose only one."
+	@${FALSE}
+.endif
+.if defined(WITH_NEON) || defined(WITH_NEON28)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 8fee8a454ca1..d25c6d66331b 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.6
-PORTREVISION?=	1
+PORTVERSION=	1.6.9
+#PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -35,9 +35,13 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
-PLIST_SUB+=		NEON=""
+.if exists(${LOCALBASE}/bin/neon-config)
+NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
+		${SED} -n -E  's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
+.else
+NEON_VER=      29
+.endif
+LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
 .else
 CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		NEON="@comment "
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index f018d6cad106..974b51179535 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.6.tar.bz2) = e5109da756d74c7d98f683f004a539af
-SHA256 (subversion/subversion-1.6.6.tar.bz2) = fe23c1a247dea631048bd62fd1cd6111924be2896ef2d166245ac9a1284c3c92
-SIZE (subversion/subversion-1.6.6.tar.bz2) = 5513036
+MD5 (subversion/subversion-1.6.9.tar.bz2) = 9c30a47b1d48664e7afef68bb4834c53
+SHA256 (subversion/subversion-1.6.9.tar.bz2) = 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
+SIZE (subversion/subversion-1.6.9.tar.bz2) = 5478554
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484