From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 13 23:25:35 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 79E453EC;
 Sun, 13 Jan 2013 23:25:35 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 60F12670;
 Sun, 13 Jan 2013 23:25:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0DNPZNv035430;
 Sun, 13 Jan 2013 23:25:35 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0DNPZPt035428;
 Sun, 13 Jan 2013 23:25:35 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201301132325.r0DNPZPt035428@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Sun, 13 Jan 2013 23:25:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310350 - head/devel/subversion
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Jan 2013 23:25:35 -0000

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