From ohauer@FreeBSD.org  Fri Nov  2 05:23:24 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 505E8977;
	Fri,  2 Nov 2012 05:23:24 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id 35F238FC12;
	Fri,  2 Nov 2012 05:23:24 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA25NO6l069339;
	Fri, 2 Nov 2012 05:23:24 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA25NOjC069338;
	Fri, 2 Nov 2012 05:23:24 GMT
	(envelope-from ohauer)
Message-Id: <201211020523.qA25NOjC069338@freefall.freebsd.org>
Date: Fri, 2 Nov 2012 05:23:24 GMT
From: Olli Hauer <ohauer@freebsd.org>
Reply-To: Olli Hauer <ohauer@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: <lev@freebsd.org>
Subject: [patch] update devel/subversion to 1.7.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         173283
>Category:       ports
>Synopsis:       [patch] update devel/subversion to 1.7.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 02 05:30:00 UTC 2012
>Closed-Date:    Sun Jan 13 23:26:57 UTC 2013
>Last-Modified:  Sun Jan 13 23:30:00 UTC 2013
>Originator:     ohauer
>Release:        
>Organization:
>Environment:

>Description:
- update subversion to 1.7.7


Changelog:
http://svn.apache.org/repos/asf/subversion/tags/1.7.7/CHANGES

Version 1.7.7
(09 Oct 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.7
 User-visible changes
  - Client- and server-side bugfixes:
    * fix memory read bug (r137614)
    * update Chinese translation

  - Client-side bugfixes:
    * fix issues with applying Git patch files (r1374800, et al)
    * fix status does not descend into dir externals after upgrade (issue #4016)
    * fix file externals don't update with old mod_dav_svn (issue #4224)
    * fix external diff tool duplicates Index: lines with 'svn diff' (r1380697)
    * fix GNOME keyring library fails with very old glib (r1378847)
    * fix unknown password stores in config file cause error (r1375052)
    * fix assertions in ra_serf running against server root (r1365519, et al)
    * fix ra_serf checkout/export aborts early on Windows (issue #4174)
 
  - Server-side bugfixes:
    * fix an assert with SVNAutoVersioning in mod_dav_svn (issue #4231)
    * fix unbounded memory use with SVNPathAuthz short_circuit (r1387943)
    * fix svndumpfilter exclude --targets requires leading slash (issue #4234)
    * fix connection ttl for memcache should be 50 seconds (r1391641)
    * stabilize order of paths in dumpfiles with APR 1.4.6 (r1344864, et al)

 Developer-visible changes:
  - General:
    * print "All tests successful" at the end of 'make check' (r1375089)
    * fix sandbox violation in a test (r1371282)
    * fix tests fail when running within a format 30 WC (r1391188, et al)
    * fix return value of svn_client_update4() incorrect (r1380295)
    * fix make check summary missing test failures (r1390965)
    * fix build does not fail when apache httpd is not available (r1374198)

  - Bindings:
    * fix swig-pl build fails with swig 2.0.7 and newer. (r1389658)
    * fix swig-py runtime problems with swig 2.0.5 and newer (r1351117)

>How-To-Repeat:

>Fix:
- removed files: file/patch-build-outputs.mk


--- subversion.diff begins here ---
Index: subversion/Makefile
===================================================================
--- subversion/Makefile	(revision 306834)
+++ subversion/Makefile	(working copy)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	subversion
-# Date created:				10 September 2001
-# Whom:					rooneg@electricjellyfish.net
-#
+# Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 MAINTAINER=	lev@FreeBSD.org
@@ -253,7 +250,7 @@
 # takes a long time, and will fail but gives maintainer a good oversight
 .if ${PORT_OPTIONS:MTEST}
 test:
-	make check -C ${WRKSRC}
+	-@make check -C ${WRKSRC}
 .endif
 
 pre-install:
Index: subversion/Makefile.common
===================================================================
--- subversion/Makefile.common	(revision 306834)
+++ subversion/Makefile.common	(working copy)
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	subversion
-# Date created:				10 September 2001
-# Whom:					rooneg@electricjellyfish.net
-#
+# Created by: rooneg@electricjellyfish.net
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.7.6
+PORTVERSION=	1.7.7
 #PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:main/} \
@@ -123,6 +120,7 @@
 CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
 PLIST_SUB+=	SERF=""
 .else
+CONFIGURE_ARGS+=--without-serf
 PLIST_SUB+=	SERF="@comment "
 .endif
 
Index: subversion/files/patch-build-outputs.mk
===================================================================
--- subversion/files/patch-build-outputs.mk	(revision 306834)
+++ subversion/files/patch-build-outputs.mk	(working copy)
@@ -1,48 +0,0 @@
---- build-outputs.mk.orig	2012-08-08 18:21:32.000000000 +0400
-+++ build-outputs.mk	2012-09-14 15:47:59.000000000 +0400
-@@ -825,7 +825,7 @@
- # Section 6: Install-Group build targets
- ########################################
- 
--apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 
- bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
- 
-@@ -877,16 +877,17 @@
- 
- test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EX
 EEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversio
 n/tests/libsvn_wc/wc-incomplete-tester$(EXEE!
 XT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
- 
--tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
-+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 
- 
- ########################################
- # Section 7: Install-Group install targets
- ########################################
- 
--install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
-+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
- 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
-+	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la 
- 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
-@@ -1036,7 +1037,7 @@
- 	$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
- 	cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
- 
--install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)  tools/server-side/mod_dontdothat/mod_dontdothat.la
-+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) 
- 	$(MKDIR) $(DESTDIR)$(toolsdir)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
-@@ -1046,7 +1047,6 @@
- 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
- 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
- 	cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
--	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- 
- ########################################
--- subversion.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Nov 2 05:30:09 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173283 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Sun Jan 13 23:25:56 UTC 2013 
State-Changed-Why:  



Responsible-Changed-From-To: lev->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Sun Jan 13 23:25:56 UTC 2013 
Responsible-Changed-Why:  
commit missing parts from PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173283 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173283: commit references a PR
Date: Sun, 13 Jan 2013 23:25:42 +0000 (UTC)

 Author: ohauer
 Date: Sun Jan 13 23:25:34 2013
 New Revision: 310350
 URL: http://svnweb.freebsd.org/changeset/ports/310350
 
 Log:
   - disable build against installed serf if not explicit selected via OPTION
   - make test fail non fatal
   
    patch was part of PR 173283
   
    while I'm here adopt new Makefile header
   
   PR:		173283
   Submitted by:	ohauer
   Approved by:	maintainer timeout
 
 Modified:
   head/devel/subversion/Makefile
   head/devel/subversion/Makefile.common
 
 Modified: head/devel/subversion/Makefile
 ==============================================================================
 --- head/devel/subversion/Makefile	Sun Jan 13 22:48:52 2013	(r310349)
 +++ head/devel/subversion/Makefile	Sun Jan 13 23:25:34 2013	(r310350)
 @@ -1,7 +1,4 @@
 -# New ports collection makefile for:	subversion
 -# Date created:				10 September 2001
 -# Whom:					rooneg@electricjellyfish.net
 -#
 +# Created by: rooneg@electricjellyfish.net
  # $FreeBSD$
  
  MAINTAINER=	lev@FreeBSD.org
 @@ -253,7 +250,7 @@ pre-configure:
  # takes a long time, and will fail but gives maintainer a good oversight
  .if ${PORT_OPTIONS:MTEST}
  test:
 -	make check -C ${WRKSRC}
 +	-@make check -C ${WRKSRC}
  .endif
  
  pre-install:
 
 Modified: head/devel/subversion/Makefile.common
 ==============================================================================
 --- head/devel/subversion/Makefile.common	Sun Jan 13 22:48:52 2013	(r310349)
 +++ head/devel/subversion/Makefile.common	Sun Jan 13 23:25:34 2013	(r310350)
 @@ -1,7 +1,4 @@
 -# New ports collection makefile for:	subversion
 -# Date created:				10 September 2001
 -# Whom:					rooneg@electricjellyfish.net
 -#
 +# Created by: rooneg@electricjellyfish.net
  # $FreeBSD$
  
  PORTNAME=	subversion
 @@ -123,6 +120,7 @@ LIB_DEPENDS+=	serf-1:${PORTSDIR}/www/ser
  CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
  PLIST_SUB+=	SERF=""
  .else
 +CONFIGURE_ARGS+=--without-serf
  PLIST_SUB+=	SERF="@comment "
  .endif
  
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
