svn commit: r310350 - head/devel/subversion

[Olli Hauer]

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 at electricjellyfish.net
-#
+# Created by: rooneg at electricjellyfish.net
 # $FreeBSD$
 
 MAINTAINER=	lev at 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}
+	- at 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 at electricjellyfish.net
-#
+# Created by: rooneg at 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