From 21332ab6976f0fcda9ec329ffb6bbfe5477849cc Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 31 Aug 2012 16:26:07 +0000 Subject: - devel/pcre is no longer optional in sysutils/cfengine32. - Remove -legacy PKGNAMESUFFIX - Bump PORTREVISION - Use [tab] in CONFLICTS line (portlint) Approved by: cy (maintainer) Approved by: crees (mentor, implicit) --- sysutils/cfengine32/Makefile | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'sysutils') diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index 43148bae4087..17075b90cf93 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -7,22 +7,24 @@ PORTNAME= cfengine PORTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= http://cfengine.com/source-code/download?file= -PKGNAMESUFFIX= -legacy MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is an alternate committer for this port COMMENT= A systems administration tool for networks + LATEST_LINK= cfengine32 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[2]* cfengine-3.[34]* cfengine-devel-* +CONFLICTS= cfengine-[2]* cfengine-3.[34]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd +LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre + WITH_BDB_VER?= 47 USE_BDB= yes USE_OPENSSL= yes @@ -31,20 +33,13 @@ GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/cfengine3 CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ - --with-berkeleydb=${LOCALBASE} + --with-berkeleydb=${LOCALBASE} \ + --with-pcre=${LOCALBASE} 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 - -.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 @@ -54,4 +49,4 @@ post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ ${WRKSRC}/docs/Makefile.in -.include +.include -- cgit