ports/143175: [patch] port devel/subversion update to 1.6.9

Sun Jan 24 16:50:02 UTC 2010

>Number:         143175
>Category:       ports
>Synopsis:       [patch] port devel/subversion update to 1.6.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 24 16:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer <ohauer at gmx.de>
>Release:        
>Organization:
>Environment:


>Description:
Update subversion to 1.6.9

I added three patches which do the update but they let the user choose the neon version.
 - patch_subversion-1.6.9
    only a update to subversion-1.6.9
 - patch_subversion-1.6.9_neon28
    neon28 is the default for WITH_NEON=true, NEON29 is additional option
 - patch_subversion-1.6.9_neon29
    neon29 is the default for WITH_NEON=true, NEON28 is additional option

If choosing one of the patches with additional neon version please look at
PR 142185 which is an update to neon29.3

I have subversion running with neon29 since neon29.0 and it works fine for me.

Regards,
olli


>From subversion/CHANGES:
( http://svn.apache.org/viewvc/subversion/trunk/CHANGES?annotate=901365 )

Version 1.6.9
(25 Jan 2010, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.9

 User-visible changes:
  * allow multiple external updates over ra_svn (issue #3487)
  * fix a segmentation fault when using FSFS (r881905)
  * support Berkeley DB 4.8 (r879688)
  * various autoprop improvements (r880274, -5)
  * improve usage of svn+ssh:// on Windows (issue #2580)
  * teach 1.6.x to recognize 1.7 working copies (1.6.x-future-proof branch)
  * update help text for 'svn update' and 'svn switch' (r886164, -97)
  * make 'svnadmin load --parent-dir' create valid mergeinfo (r888979, -9081)
  * tolerate relative merge source paths in mergeinfo (r889840)
  * teach mod_dav_svn to support the Label header (issue #3519)
  * fixed: svnsync leaves stale sync-locks on mirrors (r884842)
  * fix applicability of 'svn resolve --accept=theirs-conflict' (r880525, -6)
  * fixed: segfault in 'svn resolve' (r896522, -47)
  * fix commit failure against an out-of-date mirror (r900797)

 Developer-visible changes:
  * update ruby bindings test expectation (r880162)
  * don't allow rangelist and mergeinfo API to modify input args (r879093)

Version 1.6.8
(Not released, see changes for 1.6.9.)

Version 1.6.7
(Not released, see changes for 1.6.9.)


>How-To-Repeat:
>Fix:
only update to subversion-1.6.9

--- patch_subversion-1.6.9.txt begins here ---
--- subversion/Makefile.common
+++ subversion/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.26 2009/11/04 19:47:35 lev Exp $
 
 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
--- subversion/distinfo
+++ 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
--- patch_subversion-1.6.9.txt ends here ---

update to subversion-1.6.9 default is neon28, neon29 is optional
--- patch_subversion-1.6.9_neon28.txt begins here ---
--- subversion/Makefile
+++ subversion/Makefile
@@ -20,7 +20,8 @@
 OPTIONS=	MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		APACHE2_APR	"Use APR from Apache 2.X" off \
 		MOD_DONTDOTHAT	"mod_dontdothat for Apache 2.X" off \
-		NEON		"WebDAV/Delta-V repo access module (neon)" on \
+		NEON		"WebDAV/Delta-V repo access module (neon28)" on \
+		NEON29		"WebDAV/Delta-V repo access module (neon29)" off \
 		SERF		"WebDAV/Delta-V repo access module (serf)" off \
 		SASL		"SASL2 authorization support" off \
 		BDB		"db4 repository backend" on \
@@ -74,7 +75,11 @@
 
 pre-everything::
 	@${ECHO_MSG} ""
-.if defined(WITH_NEON)
+.if defined(WITH_NEON) && defined(WITH_NEON29)
+	@${ECHO_CMD} "It doesn't make sense to depend on neon (neon28) and neon29 choose only one."
+	@${FALSE}
+.endif
+.if defined(WITH_NEON) || defined(WITH_NEON29)
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
 .else
 	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
--- subversion/Makefile.common
+++ subversion/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.26 2009/11/04 19:47:35 lev Exp $
 
 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
@@ -33,14 +33,18 @@
 LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
-# Default is "on"
-.if !defined(WITHOUT_NEON)
+# Default is "on" for neon28
+.if defined(WITHOUT_NEON) && defined(WITHOUTH_NEON29)
+CONFIGURE_ARGS+=	--without-neon
+PLIST_SUB+=		NEON="@comment "
+.else
+. if defined(WITH_NEON)
+LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+. else
 LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
+. endif
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		NEON=""
-.else
-CONFIGURE_ARGS+=	--without-neon
-PLIST_SUB+=		NEON="@comment "
 .endif
 
 .if defined(WITH_SASL)
--- subversion/distinfo
+++ 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
--- patch_subversion-1.6.9_neon28.txt ends here ---

update to subversion-1.6.9 default is neon29, neon28 is optional
--- patch_subversion-1.6.9_neon29.txt begins here ---
--- subversion/Makefile
+++ subversion/Makefile
@@ -20,7 +20,8 @@
 OPTIONS=	MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		APACHE2_APR	"Use APR from Apache 2.X" off \
 		MOD_DONTDOTHAT	"mod_dontdothat for Apache 2.X" off \
-		NEON		"WebDAV/Delta-V repo access module (neon)" on \
+		NEON		"WebDAV/Delta-V repo access module (neon29)" on \
+		NEON28		"WebDAV/Delta-V repo access module (neon28)" off \
 		SERF		"WebDAV/Delta-V repo access module (serf)" off \
 		SASL		"SASL2 authorization support" off \
 		BDB		"db4 repository backend" on \
@@ -74,7 +75,11 @@
 
 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."
--- subversion/Makefile.common
+++ subversion/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.26 2009/11/04 19:47:35 lev Exp $
 
 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
@@ -33,14 +33,18 @@
 LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
-# Default is "on"
-.if !defined(WITHOUT_NEON)
+# Default is "on" for neon29
+.if defined(WITHOUT_NEON) && defined(WITHOUTH_NEON28)
+CONFIGURE_ARGS+=	--without-neon
+PLIST_SUB+=		NEON="@comment "
+.else
+. if defined(WITH_NEON)
 LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
+. else
+LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+. endif
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		NEON=""
-.else
-CONFIGURE_ARGS+=	--without-neon
-PLIST_SUB+=		NEON="@comment "
 .endif
 
 .if defined(WITH_SASL)
--- subversion/distinfo
+++ 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
--- patch_subversion-1.6.9_neon29.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

