Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Mar 2018 05:49:20 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r465148 - in head/sysutils: . cfengine-devel cfengine-masterfiles-devel
Message-ID:  <201803210549.w2L5nK6C020668@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Mar 21 05:49:20 2018
New Revision: 465148
URL: https://svnweb.freebsd.org/changeset/ports/465148

Log:
  Welcome the new cfengine-devel and cfengine-masterfiles-devel ports
  tracking the development branch of cfengine community edition on github.

Added:
  head/sysutils/cfengine-devel/
     - copied from r465144, head/sysutils/cfengine311/
  head/sysutils/cfengine-masterfiles-devel/
     - copied from r465144, head/sysutils/cfengine-masterfiles311/
Modified:
  head/sysutils/Makefile
  head/sysutils/cfengine-devel/Makefile
  head/sysutils/cfengine-devel/distinfo
  head/sysutils/cfengine-devel/pkg-plist
  head/sysutils/cfengine-masterfiles-devel/Makefile
  head/sysutils/cfengine-masterfiles-devel/distinfo
  head/sysutils/cfengine-masterfiles-devel/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Mar 21 05:37:37 2018	(r465147)
+++ head/sysutils/Makefile	Wed Mar 21 05:49:20 2018	(r465148)
@@ -147,6 +147,7 @@
     SUBDIR += cfengine-masterfiles37
     SUBDIR += cfengine-masterfiles38
     SUBDIR += cfengine-masterfiles39
+    SUBDIR += cfengine-masterfiles-devel
     SUBDIR += cfengine22
     SUBDIR += cfengine310
     SUBDIR += cfengine311
@@ -158,6 +159,7 @@
     SUBDIR += cfengine37
     SUBDIR += cfengine38
     SUBDIR += cfengine39
+    SUBDIR += cfengine-devel
     SUBDIR += chgrep
     SUBDIR += chyves
     SUBDIR += cinnamon-control-center

Modified: head/sysutils/cfengine-devel/Makefile
==============================================================================
--- head/sysutils/cfengine311/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-devel/Makefile	Wed Mar 21 05:49:20 2018	(r465148)
@@ -2,9 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.11.0
+PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+PKGNAMESUFFIX=	-devel
+HASH=		014512f
+CFENGINE_COMMIT_DATE=	2018.03.20
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
@@ -13,13 +16,12 @@ COMMENT=	Systems administration tool for networks
 
 LICENSE=	GPLv3
 
+USE_GITHUB=	yes
+GH_PROJECT=	core
+GH_TAGNAME=	${HASH}
 CPE_VENDOR=	gnu
 
-CONFLICTS=	cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	311
-CONFLICTS+=	cfengine-3.*
-.endif
+CONFLICTS=	cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-* cfengine-3.*
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
@@ -30,15 +32,17 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf \
+USES=		autoreconf:build \
 		cpe gmake localbase libtool shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
-MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
-CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
+EXPLICIT_VERSION=${PORTVERSION}-${HASH}
+CONFIGURE_SCRIPT=	./autogen.sh
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
 		--libexecdir=${PREFIX}/libexec \

Modified: head/sysutils/cfengine-devel/distinfo
==============================================================================
--- head/sysutils/cfengine311/distinfo	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-devel/distinfo	Wed Mar 21 05:49:20 2018	(r465148)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502457851
-SHA256 (cfengine-3.11.0.tar.gz) = 19524cf311c3cd7bf2d6c471c9b704c597671d2f89871d3d42302ba231de5865
-SIZE (cfengine-3.11.0.tar.gz) = 2396482
+TIMESTAMP = 1521598660
+SHA256 (cfengine-core-3.2018.03.20-014512f_GH0.tar.gz) = dbeef6ed44bafb17ef64b62789c73b75463a32424319fd69b1061ef960cb9ccf
+SIZE (cfengine-core-3.2018.03.20-014512f_GH0.tar.gz) = 2104178

Modified: head/sysutils/cfengine-devel/pkg-plist
==============================================================================
--- head/sysutils/cfengine311/pkg-plist	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-devel/pkg-plist	Wed Mar 21 05:49:20 2018	(r465148)
@@ -11,6 +11,7 @@ bin/rpmvercmp
 libexec/cfengine/libpromises.so
 libexec/cfengine/libpromises.so.3
 libexec/cfengine/libpromises.so.3.0.6
+
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/README.md
 %%DOCSDIR%%/examples/abort.cf
@@ -139,6 +140,7 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/groupexists.cf
 %%DOCSDIR%%/examples/guest_environment_kvm.cf
 %%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hash_to_int.cf
 %%DOCSDIR%%/examples/hashcomment.cf
 %%DOCSDIR%%/examples/hashmatch.cf
 %%DOCSDIR%%/examples/hashuncomment.cf
@@ -269,8 +271,11 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/readcsv.cf
 %%DOCSDIR%%/examples/readdata.cf
 %%DOCSDIR%%/examples/readfile.cf
+%%DOCSDIR%%/examples/readintarray.cf
 %%DOCSDIR%%/examples/readintrealstringlist.cf
 %%DOCSDIR%%/examples/readlist.cf
+%%DOCSDIR%%/examples/readrealarray.cf
+%%DOCSDIR%%/examples/readstringarray.cf
 %%DOCSDIR%%/examples/readtcp.cf
 %%DOCSDIR%%/examples/reg_multiline.cf
 %%DOCSDIR%%/examples/regarray.cf

Modified: head/sysutils/cfengine-masterfiles-devel/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles311/Makefile	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-masterfiles-devel/Makefile	Wed Mar 21 05:49:20 2018	(r465148)
@@ -2,9 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.11.0
+PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+PKGNAMESUFFIX=	-devel
+HASH=		7f96281
+CFENGINE_COMMIT_DATE=	2018.03.20
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
@@ -13,25 +16,28 @@ COMMENT=	cfengine sample policies for installations an
 
 LICENSE=	GPLv3
 
+USE_GITHUB=     yes
+GH_ACCOUNT=	cfengine
+GH_PROJECT=     masterfiles
+GH_TAGNAME=     ${HASH}
 CPE_VENDOR=	gnu
 
-CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	311
-CONFLICTS+=	cfengine-masterfiles-3.*
-.endif
+CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-* \
+		cfengine-masterfiles-3.*
 
-RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
+RUN_DEPENDS=	cf-agent:sysutils/cfengine3${PKGNAMESUFFIX}
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 CONFLICTS=	cfengine-masterfiles[6-9]*
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		cpe gmake python:build shebangfix
+USES=		autoreconf:build cpe gmake python:build shebangfix
 HAS_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
 
 .include <bsd.port.mk>

Modified: head/sysutils/cfengine-masterfiles-devel/distinfo
==============================================================================
--- head/sysutils/cfengine-masterfiles311/distinfo	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-masterfiles-devel/distinfo	Wed Mar 21 05:49:20 2018	(r465148)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502459345
-SHA256 (cfengine-masterfiles-3.11.0.tar.gz) = 052a25d8dc9f2480825a4c6097e9db74762d6726afc163fbc1fef010bb6adab8
-SIZE (cfengine-masterfiles-3.11.0.tar.gz) = 474803
+TIMESTAMP = 1521601047
+SHA256 (cfengine-masterfiles-3.2018.03.20-7f96281_GH0.tar.gz) = 4e1caedea7255017294408ee3c6b839638f2659f72b8846a87382ce1d5714a30
+SIZE (cfengine-masterfiles-3.2018.03.20-7f96281_GH0.tar.gz) = 372582

Modified: head/sysutils/cfengine-masterfiles-devel/pkg-plist
==============================================================================
--- head/sysutils/cfengine-masterfiles311/pkg-plist	Wed Mar 21 01:33:36 2018	(r465144)
+++ head/sysutils/cfengine-masterfiles-devel/pkg-plist	Wed Mar 21 05:49:20 2018	(r465148)
@@ -24,17 +24,6 @@
 %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
 %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
 %%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_agent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_execd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_hub.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_monitord.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_runagent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/cf_serverd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/def_inputs.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/reports.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/update_def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/3.6/update_def_inputs.cf
 %%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
 %%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
 %%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
@@ -58,28 +47,6 @@
 %%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
 %%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
 %%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/autorun.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/bundles.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfe_internal.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfe_internal_hub.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/cfengine_enterprise_hub_ha.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/commands.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/common.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/databases.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/edit_xml.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/examples.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/feature.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/files.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/guest_environments.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/monitor.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/packages.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/paths.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/processes.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/services.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/stdlib.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/storage.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/users.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.6/vcs.cf
 %%EXAMPLESDIR%%/masterfiles/lib/3.7/README.md
 %%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
 %%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
@@ -123,6 +90,8 @@
 %%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
 %%EXAMPLESDIR%%/masterfiles/update.cf
 %%EXAMPLESDIR%%/modules/packages/apt_get
 %%EXAMPLESDIR%%/modules/packages/freebsd_ports



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803210549.w2L5nK6C020668>