From owner-svn-ports-all@FreeBSD.ORG Wed Nov 28 00:24:10 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 D35A68D4; Wed, 28 Nov 2012 00:24:10 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B00848FC15; Wed, 28 Nov 2012 00:24:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAS0OAAq092574; Wed, 28 Nov 2012 00:24:10 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAS0OAPx092567; Wed, 28 Nov 2012 00:24:10 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201211280024.qAS0OAPx092567@svn.freebsd.org> From: Cy Schubert Date: Wed, 28 Nov 2012 00:24:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307867 - in head/sysutils: . cfengine34 cfengine34/files 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: Wed, 28 Nov 2012 00:24:10 -0000 Author: cy Date: Wed Nov 28 00:24:10 2012 New Revision: 307867 URL: http://svnweb.freebsd.org/changeset/ports/307867 Log: Introducing the new sysutils/cfengine34 port which will track the 3.4.X branch. Feature safe: yes Added: head/sysutils/cfengine34/ - copied from r307858, head/sysutils/cfengine-devel/ head/sysutils/cfengine34/files/patch-ext-Makefile.am (contents, props changed) head/sysutils/cfengine34/files/patch-ext-Makefile.in (contents, props changed) Modified: head/sysutils/Makefile head/sysutils/cfengine34/Makefile head/sysutils/cfengine34/distinfo head/sysutils/cfengine34/files/patch-src-files_select.c head/sysutils/cfengine34/pkg-plist Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Tue Nov 27 23:11:32 2012 (r307866) +++ head/sysutils/Makefile Wed Nov 28 00:24:10 2012 (r307867) @@ -108,6 +108,7 @@ SUBDIR += cfengine22 SUBDIR += cfengine32 SUBDIR += cfengine33 + SUBDIR += cfengine34 SUBDIR += chgrep SUBDIR += ciso SUBDIR += ck4up Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine-devel/Makefile Tue Nov 27 18:18:38 2012 (r307858) +++ head/sysutils/cfengine34/Makefile Wed Nov 28 00:24:10 2012 (r307867) @@ -6,20 +6,18 @@ # PORTNAME= cfengine -PORTVERSION= 3.4.0b2 -PORTEPOCH= 1 +PORTVERSION= 3.4.0 CATEGORIES= sysutils -PKGNAMESUFFIX= -devel MASTER_SITES= http://cfengine.com/source-code/download?file= MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= A systems administration tool for networks -LATEST_LINK= cfengine-devel +LATEST_LINK= cfengine34 FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-[23]* +CONFLICTS= cfengine-2* cfengine-3.[23]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd Modified: head/sysutils/cfengine34/distinfo ============================================================================== --- head/sysutils/cfengine-devel/distinfo Tue Nov 27 18:18:38 2012 (r307858) +++ head/sysutils/cfengine34/distinfo Wed Nov 28 00:24:10 2012 (r307867) @@ -1,2 +1,2 @@ -SHA256 (cfengine-3.4.0b2.tar.gz) = 5150125b56f1235e90b29fbe351a0d09b2148cdcf9ad2c78840d2ce08ff20999 -SIZE (cfengine-3.4.0b2.tar.gz) = 4671105 +SHA256 (cfengine-3.4.0.tar.gz) = 5f1a3ce9cc15068291becac4d5956b18e8c7968c934977e52cd8b6b70f3a0a6b +SIZE (cfengine-3.4.0.tar.gz) = 4691849 Added: head/sysutils/cfengine34/files/patch-ext-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cfengine34/files/patch-ext-Makefile.am Wed Nov 28 00:24:10 2012 (r307867) @@ -0,0 +1,8 @@ +--- ext/Makefile.am.orig 2012-11-26 03:13:20.000000000 -0800 ++++ ext/Makefile.am 2012-11-27 15:39:01.000000000 -0800 +@@ -1,4 +1,4 @@ +-sbin_PROGRAMS = rpmvercmp ++sbin_PROGRAMS = + + rpmvercmp_LDADD = ../pub/libcfpub.la + Added: head/sysutils/cfengine34/files/patch-ext-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/cfengine34/files/patch-ext-Makefile.in Wed Nov 28 00:24:10 2012 (r307867) @@ -0,0 +1,52 @@ +--- ext/Makefile.in.orig 2012-11-26 03:13:28.000000000 -0800 ++++ ext/Makefile.in 2012-11-27 15:46:24.000000000 -0800 +@@ -52,7 +52,7 @@ + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-sbin_PROGRAMS = rpmvercmp$(EXEEXT) ++sbin_PROGRAMS = + subdir = ext + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -72,8 +72,8 @@ + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(sbindir)" + PROGRAMS = $(sbin_PROGRAMS) +-rpmvercmp_SOURCES = rpmvercmp.c +-rpmvercmp_OBJECTS = rpmvercmp.$(OBJEXT) ++rpmvercmp_SOURCES = ++rpmvercmp_OBJECTS = + rpmvercmp_DEPENDENCIES = ../pub/libcfpub.la + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +@@ -104,8 +104,8 @@ + AM_V_GEN = $(am__v_GEN_@AM_V@) + am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) + am__v_GEN_0 = @echo " GEN " $@; +-SOURCES = rpmvercmp.c +-DIST_SOURCES = rpmvercmp.c ++SOURCES = ++DIST_SOURCES = + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -382,9 +382,6 @@ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +-rpmvercmp$(EXEEXT): $(rpmvercmp_OBJECTS) $(rpmvercmp_DEPENDENCIES) $(EXTRA_rpmvercmp_DEPENDENCIES) +- @rm -f rpmvercmp$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(rpmvercmp_OBJECTS) $(rpmvercmp_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -392,8 +389,6 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmvercmp.Po@am__quote@ +- + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po Modified: head/sysutils/cfengine34/files/patch-src-files_select.c ============================================================================== --- head/sysutils/cfengine-devel/files/patch-src-files_select.c Tue Nov 27 18:18:38 2012 (r307858) +++ head/sysutils/cfengine34/files/patch-src-files_select.c Wed Nov 28 00:24:10 2012 (r307867) @@ -1,9 +1,10 @@ --- src/files_select.c.orig 2012-10-03 17:59:39.000000000 +0000 +++ src/files_select.c 2012-10-03 18:00:44.000000000 +0000 -@@ -27,6 +27,7 @@ +@@ -27,7 +27,8 @@ #include "env_context.h" #include "files_names.h" + #include "files_interfaces.h" +#include "promises.h" static int SelectTypeMatch(struct stat *lstatptr, Rlist *crit); Modified: head/sysutils/cfengine34/pkg-plist ============================================================================== --- head/sysutils/cfengine-devel/pkg-plist Tue Nov 27 18:18:38 2012 (r307858) +++ head/sysutils/cfengine34/pkg-plist Wed Nov 28 00:24:10 2012 (r307867) @@ -10,6 +10,7 @@ sbin/cf-promises sbin/cf-report sbin/cf-runagent sbin/cf-serverd +share/cfengine/CoreBase/cf-sketch-runfile.cf share/cfengine/CoreBase/def.cf share/cfengine/CoreBase/promises.cf share/cfengine/CoreBase/controls/cf_execd.cf