svn commit: r416913 - in head/sysutils: . cfengine cfengine-masterfiles cfengine-masterfiles39 cfengine39 cfengine39/files
Cy Schubert
cy at FreeBSD.org
Wed Jun 15 02:20:49 UTC 2016
Author: cy
Date: Wed Jun 15 02:20:47 2016
New Revision: 416913
URL: https://svnweb.freebsd.org/changeset/ports/416913
Log:
Introduce new ports:
- cfengine39 (3.9.0), copied from cfengine38
- cfengine-masterfiles39 (3.9.0), copied from cfengine-masterfiles38
- add cfengine39 to cfengine metaport (non-default for now)
- add cfengine-masterfiles39 to cfengine-metafiles metaport (not default for now)
Sort documentation files in cfengine39.
Added:
head/sysutils/cfengine-masterfiles39/
- copied from r416620, head/sysutils/cfengine-masterfiles38/
head/sysutils/cfengine39/
- copied from r416620, head/sysutils/cfengine38/
head/sysutils/cfengine39/files/patch-configure.ac (contents, props changed)
Deleted:
head/sysutils/cfengine39/files/patch-cf-agent_verify__storage.c
Modified:
head/sysutils/Makefile
head/sysutils/cfengine-masterfiles/Makefile
head/sysutils/cfengine-masterfiles39/Makefile
head/sysutils/cfengine-masterfiles39/distinfo
head/sysutils/cfengine-masterfiles39/pkg-plist
head/sysutils/cfengine/Makefile
head/sysutils/cfengine39/Makefile
head/sysutils/cfengine39/distinfo
head/sysutils/cfengine39/pkg-plist
Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile Tue Jun 14 23:07:34 2016 (r416912)
+++ head/sysutils/Makefile Wed Jun 15 02:20:47 2016 (r416913)
@@ -129,6 +129,7 @@
SUBDIR += cfengine-masterfiles36
SUBDIR += cfengine-masterfiles37
SUBDIR += cfengine-masterfiles38
+ SUBDIR += cfengine-masterfiles39
SUBDIR += cfengine22
SUBDIR += cfengine32
SUBDIR += cfengine33
@@ -137,6 +138,7 @@
SUBDIR += cfengine36
SUBDIR += cfengine37
SUBDIR += cfengine38
+ SUBDIR += cfengine39
SUBDIR += chgrep
SUBDIR += cinnamon-control-center
SUBDIR += cinnamon-settings-daemon
Modified: head/sysutils/cfengine-masterfiles/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles/Makefile Tue Jun 14 23:07:34 2016 (r416912)
+++ head/sysutils/cfengine-masterfiles/Makefile Wed Jun 15 02:20:47 2016 (r416913)
@@ -1,6 +1,6 @@
# $FreeBSD$
-VERSIONS= 36 37 38
+VERSIONS= 36 37 38 39
CFENGINE_VERSION?= 38
MASTERDIR= ${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION}
Modified: head/sysutils/cfengine-masterfiles39/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles38/Makefile Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine-masterfiles39/Makefile Wed Jun 15 02:20:47 2016 (r416913)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cfengine-masterfiles
-PORTVERSION= 3.8.2
+PORTVERSION= 3.9.0
CATEGORIES= sysutils
MASTER_SITES= https://cfengine-package-repos.s3.amazonaws.com/tarballs/
@@ -16,7 +16,7 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
.if !defined(MASTERDIR)
-PKGNAMESUFFIX= 38
+PKGNAMESUFFIX= 39
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
Modified: head/sysutils/cfengine-masterfiles39/distinfo
==============================================================================
--- head/sysutils/cfengine-masterfiles38/distinfo Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine-masterfiles39/distinfo Wed Jun 15 02:20:47 2016 (r416913)
@@ -1,2 +1,3 @@
-SHA256 (cfengine-masterfiles-3.8.2.tar.gz) = dc9001eaf0c30958109290aa3c4267ef4caf2e038081586fe3907cc3e90bcdd1
-SIZE (cfengine-masterfiles-3.8.2.tar.gz) = 405280
+TIMESTAMP = 1465956498
+SHA256 (cfengine-masterfiles-3.9.0.tar.gz) = 63dec2f8649f5f2788cd463dccf47f8dbe941522acfcf3093517f983bbfa0606
+SIZE (cfengine-masterfiles-3.9.0.tar.gz) = 425356
Modified: head/sysutils/cfengine-masterfiles39/pkg-plist
==============================================================================
--- head/sysutils/cfengine-masterfiles38/pkg-plist Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine-masterfiles39/pkg-plist Wed Jun 15 02:20:47 2016 (r416913)
@@ -1,3 +1,4 @@
+
%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
@@ -12,6 +13,8 @@
%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_local_git_remote.cf
%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
@@ -91,6 +94,7 @@
%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
%%EXAMPLESDIR%%/masterfiles/lib/services.cf
%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
@@ -104,4 +108,6 @@
%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
%%EXAMPLESDIR%%/masterfiles/update.cf
%%EXAMPLESDIR%%/modules/packages/apt_get
+%%EXAMPLESDIR%%/modules/packages/freebsd_ports
+%%EXAMPLESDIR%%/modules/packages/pkgsrc
%%EXAMPLESDIR%%/modules/packages/yum
Modified: head/sysutils/cfengine/Makefile
==============================================================================
--- head/sysutils/cfengine/Makefile Tue Jun 14 23:07:34 2016 (r416912)
+++ head/sysutils/cfengine/Makefile Wed Jun 15 02:20:47 2016 (r416913)
@@ -1,6 +1,6 @@
# $FreeBSD$
-VERSIONS= 22 32 33 34 35 36 37 38
+VERSIONS= 22 32 33 34 35 36 37 38 39
CFENGINE_VERSION?= 38
MASTERDIR= ${.CURDIR}/../cfengine${CFENGINE_VERSION}
Modified: head/sysutils/cfengine39/Makefile
==============================================================================
--- head/sysutils/cfengine38/Makefile Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine39/Makefile Wed Jun 15 02:20:47 2016 (r416913)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= cfengine
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.9.0
+# XXX Remember to update files/patch-configure.am with any new version number.
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
@@ -17,7 +17,7 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
.if !defined(MASTERDIR)
-PKGNAMESUFFIX= 38
+PKGNAMESUFFIX= 39
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
@@ -30,7 +30,8 @@ MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USES= autoreconf cpe gmake libtool shebangfix
+USES= autoreconf:EXPLICIT_VERSION=${PORTVERSION} \
+ cpe gmake libtool shebangfix
SHEBANG_FILES= examples/remake_outputs.pl
CFLAGS+= -Wno-return-type
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/sysutils/cfengine39/distinfo
==============================================================================
--- head/sysutils/cfengine38/distinfo Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine39/distinfo Wed Jun 15 02:20:47 2016 (r416913)
@@ -1,2 +1,3 @@
-SHA256 (cfengine-3.8.2.tar.gz) = d5059a5c37784b3cd5f5217ee9aa9fde8c268f922c162247205a9f53271fac33
-SIZE (cfengine-3.8.2.tar.gz) = 2155283
+TIMESTAMP = 1465907136
+SHA256 (cfengine-3.9.0.tar.gz) = 32a38aedf1199c2361e1335e0d4a1d98f9efa7cd591bcb647f35c7395bb66f2d
+SIZE (cfengine-3.9.0.tar.gz) = 2275307
Added: head/sysutils/cfengine39/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/cfengine39/files/patch-configure.ac Wed Jun 15 02:20:47 2016 (r416913)
@@ -0,0 +1,32 @@
+--- configure.ac.orig 2016-06-06 03:01:06.000000000 -0700
++++ configure.ac 2016-06-14 18:39:28.962538000 -0700
+@@ -41,28 +41,10 @@
+ dnl
+ AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo)
+
+-m4_define([revision], m4_esyscmd_s([git rev-list -1 --abbrev-commit HEAD]))
+-
+-m4_define([cfversion_from_env], m4_esyscmd_s([echo $EXPLICIT_VERSION]))
+-m4_ifblank(cfversion_from_env, [
+- m4_define([cfversion_from_detect], m4_esyscmd_s([misc/determine-version.py]))
+- m4_if(m4_sysval, 0, [], [
+- m4_fatal([Could not determine CFEngine version. Please set EXPLICIT_VERSION in the environment or make sure all git tags are up to date.])
+- ])
+- m4_define([cfversion], cfversion_from_detect[]a1.revision)
+- m4_undefine([cfversion_from_detect])
+-], [
+- m4_define([cfversion], cfversion_from_env)
+-])
+-
+ _AM_SET_OPTION([tar-ustar])
+-AM_INIT_AUTOMAKE(cfengine, cfversion)
++AM_INIT_AUTOMAKE(cfengine, 3.9.0)
+ AM_MAINTAINER_MODE([enable])
+
+-m4_undefine([revision])
+-m4_undefine([cfversion])
+-m4_undefine([cfversion_from_env])
+-
+ AC_DEFINE(BUILD_YEAR, esyscmd([date +%Y | tr -d '\n']), "Software build year")
+
+ AC_DEFINE_UNQUOTED(ABS_TOP_SRCDIR,
Modified: head/sysutils/cfengine39/pkg-plist
==============================================================================
--- head/sysutils/cfengine38/pkg-plist Thu Jun 9 19:01:27 2016 (r416620)
+++ head/sysutils/cfengine39/pkg-plist Wed Jun 15 02:20:47 2016 (r416913)
@@ -27,6 +27,7 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/app_baseline.cf
%%DOCSDIR%%/examples/appgroups.cf
%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/augment.cf
%%DOCSDIR%%/examples/backreferences_files.cf
%%DOCSDIR%%/examples/badpromise.cf
%%DOCSDIR%%/examples/badtype.cf
@@ -60,7 +61,9 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/create_filedir.cf
%%DOCSDIR%%/examples/createdb.cf
%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_expand.cf
%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/data_regextract.cf
%%DOCSDIR%%/examples/datastate.cf
%%DOCSDIR%%/examples/defaults.cf
%%DOCSDIR%%/examples/defaults2.cf
@@ -69,8 +72,6 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/deletelines.cf
%%DOCSDIR%%/examples/depends_on.cf
%%DOCSDIR%%/examples/depends_on2.cf
-%%DOCSDIR%%/examples/data_expand.cf
-%%DOCSDIR%%/examples/data_regextract.cf
%%DOCSDIR%%/examples/difference.cf
%%DOCSDIR%%/examples/dirname.cf
%%DOCSDIR%%/examples/disable.cf
@@ -171,12 +172,19 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/length.cf
%%DOCSDIR%%/examples/linking.cf
%%DOCSDIR%%/examples/literal_server.cf
+%%DOCSDIR%%/examples/local_group_present.cf
+%%DOCSDIR%%/examples/local_user_password.cf
+%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
+%%DOCSDIR%%/examples/local_users_absent.cf
+%%DOCSDIR%%/examples/local_users_locked.cf
+%%DOCSDIR%%/examples/local_users_present.cf
%%DOCSDIR%%/examples/locate_files_and_compress.cf
%%DOCSDIR%%/examples/log_private.cf
%%DOCSDIR%%/examples/loops.cf
%%DOCSDIR%%/examples/lsdir.cf
%%DOCSDIR%%/examples/maparray.cf
%%DOCSDIR%%/examples/mapdata.cf
+%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
%%DOCSDIR%%/examples/maplist.cf
%%DOCSDIR%%/examples/max-min-mean-variance.cf
%%DOCSDIR%%/examples/measure_log.cf
@@ -192,9 +200,10 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/module_exec.cf
%%DOCSDIR%%/examples/module_exec_2.cf
%%DOCSDIR%%/examples/monitord.cf
-%%DOCSDIR%%/examples/motd.cf
%%DOCSDIR%%/examples/mount_fs.cf
%%DOCSDIR%%/examples/multipassvars.cf
+%%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_template_motd.cf
%%DOCSDIR%%/examples/namespace.cf
%%DOCSDIR%%/examples/namespace1.cf
%%DOCSDIR%%/examples/namespace2.cf
@@ -251,9 +260,9 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/product.cf
%%DOCSDIR%%/examples/promise_knowledge.cf
%%DOCSDIR%%/examples/promises.cf
+%%DOCSDIR%%/examples/randomint.cf
%%DOCSDIR%%/examples/readcsv.cf
%%DOCSDIR%%/examples/readdata.cf
-%%DOCSDIR%%/examples/randomint.cf
%%DOCSDIR%%/examples/readfile.cf
%%DOCSDIR%%/examples/readintrealstringlist.cf
%%DOCSDIR%%/examples/readlist.cf
@@ -261,6 +270,7 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/reg_multiline.cf
%%DOCSDIR%%/examples/regarray.cf
%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_replace.cf
%%DOCSDIR%%/examples/regex_win.cf
%%DOCSDIR%%/examples/regextract.cf
%%DOCSDIR%%/examples/registry.cf
@@ -279,6 +289,7 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/report_diffs.cf
%%DOCSDIR%%/examples/report_state.cf
%%DOCSDIR%%/examples/reporting.cf
+%%DOCSDIR%%/examples/reports.cf
%%DOCSDIR%%/examples/reporttofile.cf
%%DOCSDIR%%/examples/resolveconf.cf
%%DOCSDIR%%/examples/returnszero.cf
@@ -302,8 +313,8 @@ sbin/rpmvercmp
%%DOCSDIR%%/examples/services_win.cf
%%DOCSDIR%%/examples/setuidlog.cf
%%DOCSDIR%%/examples/setvar.cf
-%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
%%DOCSDIR%%/examples/software_dist.cf
%%DOCSDIR%%/examples/software_update_version_yum.cf
%%DOCSDIR%%/examples/some.cf
More information about the svn-ports-all
mailing list