From owner-svn-ports-all@FreeBSD.ORG Thu May 29 05:20:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3EDCEFE; Thu, 29 May 2014 05:20:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D632F2CC8; Thu, 29 May 2014 05:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4T5KRJ8086084; Thu, 29 May 2014 05:20:27 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4T5KPTJ086067; Thu, 29 May 2014 05:20:25 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201405290520.s4T5KPTJ086067@svn.freebsd.org> From: Cy Schubert Date: Thu, 29 May 2014 05:20:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355665 - in head/sysutils: cfengine22 cfengine32 cfengine33 cfengine34 cfengine35 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.18 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: Thu, 29 May 2014 05:20:28 -0000 Author: cy Date: Thu May 29 05:20:25 2014 New Revision: 355665 URL: http://svnweb.freebsd.org/changeset/ports/355665 QAT: https://qat.redports.org/buildarchive/r355665/ Log: Update MASTER_SITES. Fix other issues including USES shebangfix and libtool. Stage remaining cfengine ports. PR: 190135 and 190329 Modified: head/sysutils/cfengine22/Makefile head/sysutils/cfengine22/pkg-plist head/sysutils/cfengine32/Makefile head/sysutils/cfengine32/pkg-plist head/sysutils/cfengine33/Makefile head/sysutils/cfengine33/pkg-plist head/sysutils/cfengine34/Makefile head/sysutils/cfengine34/pkg-plist head/sysutils/cfengine35/Makefile head/sysutils/cfengine35/pkg-plist Modified: head/sysutils/cfengine22/Makefile ============================================================================== --- head/sysutils/cfengine22/Makefile Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine22/Makefile Thu May 29 05:20:25 2014 (r355665) @@ -5,7 +5,8 @@ PORTNAME= cfengine PORTVERSION= 2.2.10 PORTREVISION= 1 CATEGORIES= sysutils -MASTER_SITES= http://cfengine.com/source-code/download?file= +MASTER_SITES= http://cfengine.com/source-code/download?file= \ + https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 22 MAINTAINER= cy@FreeBSD.org @@ -18,6 +19,9 @@ CONFLICTS= cfengine-3* cfengine-devel-* USE_RC_SUBR= cfexecd cfservd +USES= libtool shebangfix +SHEBANG_FILES= contrib/cfdoc + WITH_BDB_VER?= 46 USE_BDB= yes USE_OPENSSL= yes Modified: head/sysutils/cfengine22/pkg-plist ============================================================================== --- head/sysutils/cfengine22/pkg-plist Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine22/pkg-plist Thu May 29 05:20:25 2014 (r355665) @@ -1,4 +1,3 @@ -lib/libcfengine.la lib/libcfengine.a sbin/cfagent sbin/cfdoc @@ -56,8 +55,3 @@ man/man8/cfshow.8.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir "/var/cfengine/inputs" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/modules" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/outputs" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/ppkeys" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine" >/dev/null 2>&1 || : Modified: head/sysutils/cfengine32/Makefile ============================================================================== --- head/sysutils/cfengine32/Makefile Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine32/Makefile Thu May 29 05:20:25 2014 (r355665) @@ -6,7 +6,8 @@ PORTVERSION= 3.2.3 PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= sysutils -MASTER_SITES= http://cfengine.com/source-code/download?file= +MASTER_SITES= http://cfengine.com/source-code/download?file= \ + https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 32 MAINTAINER= cy@FreeBSD.org @@ -22,6 +23,7 @@ USE_RC_SUBR= cf-execd cf-serverd LIB_DEPENDS= pcre.3:${PORTSDIR}/devel/pcre +USES= libtool WITH_BDB_VER?= 47 USE_BDB= yes USE_OPENSSL= yes Modified: head/sysutils/cfengine32/pkg-plist ============================================================================== --- head/sysutils/cfengine32/pkg-plist Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine32/pkg-plist Thu May 29 05:20:25 2014 (r355665) @@ -1,6 +1,6 @@ -lib/libpromises.la lib/libpromises.so lib/libpromises.so.1 +lib/libpromises.so.1.0.0 man/man8/cf-agent.8.gz man/man8/cf-execd.8.gz man/man8/cf-key.8.gz @@ -263,8 +263,3 @@ share/cfengine/masterfiles/promises.cf @dirrm %%DOCSDIR%% @dirrm share/cfengine/masterfiles @dirrm share/cfengine -@unexec rmdir "/var/cfengine/inputs" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/modules" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/outputs" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine/ppkeys" >/dev/null 2>&1 || : -@unexec rmdir "/var/cfengine" >/dev/null 2>&1 || : Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine33/Makefile Thu May 29 05:20:25 2014 (r355665) @@ -5,7 +5,8 @@ PORTNAME= cfengine PORTVERSION= 3.3.8 PORTREVISION= 5 CATEGORIES= sysutils -MASTER_SITES= http://cfengine.com/source-code/download?file= +MASTER_SITES= http://cfengine.com/source-code/download?file= \ + https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 33 MAINTAINER= cy@FreeBSD.org @@ -18,7 +19,7 @@ CONFLICTS= cfengine-2* cfengine-3.[245]* USE_RC_SUBR= cf-execd cf-serverd -USES= gmake +USES= gmake libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes @@ -42,15 +43,10 @@ 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 .if ${PORT_OPTIONS:MTOKYOCABINET} Modified: head/sysutils/cfengine33/pkg-plist ============================================================================== --- head/sysutils/cfengine33/pkg-plist Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine33/pkg-plist Thu May 29 05:20:25 2014 (r355665) @@ -1,6 +1,15 @@ -libexec/cfengine/libpromises.la libexec/cfengine/libpromises.so libexec/cfengine/libpromises.so.1 +libexec/cfengine/libpromises.so.1.0.0 +man/man8/cf-agent.8.gz +man/man8/cf-execd.8.gz +man/man8/cf-key.8.gz +man/man8/cf-know.8.gz +man/man8/cf-monitord.8.gz +man/man8/cf-promises.8.gz +man/man8/cf-report.8.gz +man/man8/cf-runagent.8.gz +man/man8/cf-serverd.8.gz sbin/cf-agent sbin/cf-execd sbin/cf-key @@ -261,3 +270,10 @@ share/cfengine/CoreBase/promises.cf @dirrm share/cfengine/CoreBase @dirrm share/cfengine @dirrm libexec/cfengine +@unexec rmdir "/var/cfengine/inputs" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/masterfiles" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/modules" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/outputs" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/ppkeys" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine" >/dev/null 2>&1 || : + Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine34/Makefile Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine34/Makefile Thu May 29 05:20:25 2014 (r355665) @@ -5,7 +5,8 @@ PORTNAME= cfengine PORTVERSION= 3.4.5 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= http://cfengine.com/source-code/download?file= +MASTER_SITES= http://cfengine.com/source-code/download?file= \ + https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port @@ -22,6 +23,7 @@ CONFLICTS= cfengine-2* cfengine-3.[235]* USE_RC_SUBR= cf-execd cf-serverd +USES= libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes @@ -50,7 +52,6 @@ PGSQL_DESC= Enable PostgreSQL connector MYSQL_DESC= Enable MySQL connector LIBVIRT_DESC= Enable libvirt compatibility -NO_STAGE= yes .include .if ${PORT_OPTIONS:MTOKYOCABINET} @@ -81,10 +82,6 @@ CONFIGURE_ARGS+= --with-libvirt=${LOCALB 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-promises.8 cf-runagent.8 - post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ ${WRKSRC}/docs/Makefile.in Modified: head/sysutils/cfengine34/pkg-plist ============================================================================== --- head/sysutils/cfengine34/pkg-plist Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine34/pkg-plist Thu May 29 05:20:25 2014 (r355665) @@ -1,6 +1,14 @@ -libexec/cfengine/libpromises.la libexec/cfengine/libpromises.so libexec/cfengine/libpromises.so.1 +libexec/cfengine/libpromises.so.1.0.0 +man/man8/cf-agent.8.gz +man/man8/cf-execd.8.gz +man/man8/cf-key.8.gz +man/man8/cf-monitord.8.gz +man/man8/cf-promises.8.gz +man/man8/cf-report.8.gz +man/man8/cf-runagent.8.gz +man/man8/cf-serverd.8.gz sbin/cf-agent sbin/cf-execd sbin/cf-key @@ -296,3 +304,10 @@ share/cfengine/CoreBase/update.cf @dirrm share/cfengine/CoreBase @dirrm share/cfengine @dirrm libexec/cfengine +@unexec rmdir "/var/cfengine/inputs" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/masterfiles" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/modules" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/outputs" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine/ppkeys" >/dev/null 2>&1 || : +@unexec rmdir "/var/cfengine" >/dev/null 2>&1 || : + Modified: head/sysutils/cfengine35/Makefile ============================================================================== --- head/sysutils/cfengine35/Makefile Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine35/Makefile Thu May 29 05:20:25 2014 (r355665) @@ -5,7 +5,8 @@ PORTNAME= cfengine PORTVERSION= 3.5.3 PORTREVISION= 4 CATEGORIES= sysutils -MASTER_SITES= http://cfengine.com/source-code/download?file= +MASTER_SITES= http://cfengine.com/source-code/download?file= \ + https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port @@ -24,6 +25,7 @@ CONFLICTS= cfengine-[234]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord +USES= libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes Modified: head/sysutils/cfengine35/pkg-plist ============================================================================== --- head/sysutils/cfengine35/pkg-plist Thu May 29 05:11:17 2014 (r355664) +++ head/sysutils/cfengine35/pkg-plist Thu May 29 05:20:25 2014 (r355665) @@ -324,6 +324,7 @@ share/cfengine/CoreBase/update.cf @dirrm share/cfengine/CoreBase @dirrm share/cfengine @dirrm libexec/cfengine +@unexec rmdir "/var/cfengine/masterfiles" >/dev/null 2>&1 || : @unexec rmdir "/var/cfengine/inputs" >/dev/null 2>&1 || : @unexec rmdir "/var/cfengine/modules" >/dev/null 2>&1 || : @unexec rmdir "/var/cfengine/outputs" >/dev/null 2>&1 || :