From owner-svn-ports-all@FreeBSD.ORG Fri Aug 31 16:26:07 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7D30106564A; Fri, 31 Aug 2012 16:26:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 894588FC15; Fri, 31 Aug 2012 16:26:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VGQ7iV060917; Fri, 31 Aug 2012 16:26:07 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7VGQ72w060915; Fri, 31 Aug 2012 16:26:07 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201208311626.q7VGQ72w060915@svn.freebsd.org> From: Glen Barber Date: Fri, 31 Aug 2012 16:26:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303434 - head/sysutils/cfengine32 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2012 16:26:07 -0000 Author: gjb Date: Fri Aug 31 16:26:07 2012 New Revision: 303434 URL: http://svn.freebsd.org/changeset/ports/303434 Log: - 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) Modified: head/sysutils/cfengine32/Makefile Modified: head/sysutils/cfengine32/Makefile ============================================================================== --- head/sysutils/cfengine32/Makefile Fri Aug 31 16:17:19 2012 (r303433) +++ head/sysutils/cfengine32/Makefile Fri Aug 31 16:26:07 2012 (r303434) @@ -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