- 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
This commit is contained in:
Olli Hauer 2013-01-13 23:25:34 +00:00
parent 93e97ef93a
commit 73d6257398
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=310350
2 changed files with 4 additions and 9 deletions

View File

@ -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:

View File

@ -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