From 73d6257398d8fa48778be472122b7d275f186dcb Mon Sep 17 00:00:00 2001 From: Olli Hauer Date: Sun, 13 Jan 2013 23:25:34 +0000 Subject: [PATCH] - 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 --- devel/subversion/Makefile | 7 ++----- devel/subversion/Makefile.common | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index ba65d387e149..b3cf72caa6cc 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -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: diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 511165937ed8..244ce05c0e1a 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -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/serf CONFIGURE_ARGS+=--with-serf=${LOCALBASE} PLIST_SUB+= SERF="" .else +CONFIGURE_ARGS+=--without-serf PLIST_SUB+= SERF="@comment " .endif