From owner-svn-ports-all@FreeBSD.ORG Sat Oct 19 12:28:03 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 661DA478; Sat, 19 Oct 2013 12:28:03 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 528D02801; Sat, 19 Oct 2013 12:28:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JCS3u1017173; Sat, 19 Oct 2013 12:28:03 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JCS3dl017172; Sat, 19 Oct 2013 12:28:03 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310191228.r9JCS3dl017172@svn.freebsd.org> From: Tijl Coosemans Date: Sat, 19 Oct 2013 12:28:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330863 - head/sysutils/cfengine33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sat, 19 Oct 2013 12:28:03 -0000 Author: tijl Date: Sat Oct 19 12:28:02 2013 New Revision: 330863 URL: http://svnweb.freebsd.org/changeset/ports/330863 Log: - Fix build with clang (CFLAGS+=-Wno-error=implicit-function-declaration) - USE_GMAKE=yes -> USES=gmake - Remove the indefinite article from COMMENT - Remove --mandir from CONFIGURE_ARGS (already set in bsd.port.mk) - Use new syntax at LIB_DEPENDS - Include instead of - Place unconditionned statements before those conditions - Remove LATEST_LINK. PKGNAMESUFFIX is already set. PR: ports/181618 Submitted by: bsam Approved by: maintainer timeout (7 weeks) Modified: head/sysutils/cfengine33/Makefile Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Sat Oct 19 11:42:56 2013 (r330862) +++ head/sysutils/cfengine33/Makefile Sat Oct 19 12:28:02 2013 (r330863) @@ -3,34 +3,34 @@ PORTNAME= cfengine PORTVERSION= 3.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://cfengine.com/source-code/download?file= PKGNAMESUFFIX= 33 MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port -COMMENT= A systems administration tool for networks -LATEST_LINK= cfengine33 +COMMENT= Systems administration tool for networks + FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-2* cfengine-3.[245]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd +USES= gmake USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes -USE_GMAKE= yes # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ - --mandir=${PREFIX}/man \ --with-pcre=${LOCALBASE} \ --enable-fhs +CFLAGS+= -Wno-error=implicit-function-declaration -LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT OPTIONS_SINGLE= DB @@ -42,43 +42,43 @@ MYSQL_DESC= Enable MySQL integration LIBVIRT_DESC= Enable libvirt integration OPTIONS_DEFAULT=TOKYOCABINET +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@!' \ + ${WRKSRC}/docs/Makefile.in + NO_STAGE= yes -.include +.include .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE} -LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet +LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet .endif .if ${PORT_OPTIONS:MQDBM} CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE} -LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm +LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} -LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client +LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT} +LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif .if ${PORT_OPTIONS:MLIBVIRT} CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} -LIB_DEPENDS+= virt.1001:${PORTSDIR}/devel/libvirt +LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt .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@!'\ - ${WRKSRC}/docs/Makefile.in - -.include +.include