ports/165859: [patch] sysutils/cfengine3: libpcre is no longer optional

[Glen Barber]

>Number:         165859
>Category:       ports
>Synopsis:       [patch] sysutils/cfengine3: libpcre is no longer optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 08 20:30:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Glen Barber
>Release:        10-CURRENT r232116M
>Organization:
>Environment:
FreeBSD nucleus 10.0-CURRENT FreeBSD 10.0-CURRENT #7 r232116M: Sun Feb 26 14:12:14 EST 2012     root at nucleus:/usr/obj/usr/src/sys/NUCLEUS  amd64
>Description:
sysutils/cfengine3 fails to build without devel/pcre.  Output from the
configure script indicates libpcre is not optional anymore.

>How-To-Repeat:
# make -C /usr/ports/sysutils/cfengine3 WITHOUT_PCRE=yes > /dev/null
configure: error: Cannot find PCRE
# cd /usr/ports/sysutils/cfengine3/work/cfengine-3.2.3/
# ./configure --without-pcre > /dev/null
configure: error: PCRE is required

>Fix:
Patch is attached.  (Also makes portlint a bit happier.)

Tinderbox logs can be found here:
 
 http://builder.glenbarber.us/tb/logs/10-64-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/9-64-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/8-64-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/7-64-FreeBSD/cfengine-3.2.3_1.log

 http://builder.glenbarber.us/tb/logs/10-32-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/9-32-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/8-32-FreeBSD/cfengine-3.2.3_1.log
 http://builder.glenbarber.us/tb/logs/7-32-FreeBSD/cfengine-3.2.3_1.log


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/cfengine3/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile	14 Feb 2012 12:45:30 -0000	1.61
+++ Makefile	8 Mar 2012 20:18:46 -0000
@@ -13,6 +13,7 @@
 
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	A systems administration tool for networks
+
 LATEST_LINK=	cfengine3
 FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
 
@@ -26,24 +27,19 @@
 DOCSDIR=	${PREFIX}/share/doc/cfengine3
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
-		--with-berkeleydb=${LOCALBASE}
+		--with-berkeleydb=${LOCALBASE} \
+		--with-pcre=${LOCALBASE}
+LIB_DEPENDS+=   pcre.1:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ENV+=	BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
 		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
 		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
 
-OPTIONS=	PCRE	"Enable Perl-compatible regular expressions"		on
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PCRE)
-LIB_DEPENDS+=   pcre.1:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
-.endif
-
 MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
 	cf-report.8	cf-serverd.8	cf-execd.8	\
 	cf-know.8	cf-promises.8	cf-runagent.8
-	
 
 post-patch:
 		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\


>Release-Note:
>Audit-Trail:
>Unformatted: