16 files changed, 788 insertions, 2 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6fc5c63a824a..a3d1faedc4ac 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -126,6 +126,7 @@
     SUBDIR += cfengine-masterfiles
     SUBDIR += cfengine-masterfiles36
     SUBDIR += cfengine-masterfiles37
+    SUBDIR += cfengine-masterfiles38
     SUBDIR += cfengine22
     SUBDIR += cfengine32
     SUBDIR += cfengine33
@@ -133,6 +134,7 @@
     SUBDIR += cfengine35
     SUBDIR += cfengine36
     SUBDIR += cfengine37
+    SUBDIR += cfengine38
     SUBDIR += chgrep
     SUBDIR += cinnamon-control-center
     SUBDIR += cinnamon-settings-daemon
diff --git a/sysutils/cfengine-masterfiles/Makefile b/sysutils/cfengine-masterfiles/Makefile
index f1e90986b66d..5171e2de3748 100644
--- a/sysutils/cfengine-masterfiles/Makefile
+++ b/sysutils/cfengine-masterfiles/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		36 37
+VERSIONS=		36 37 38
 CFENGINE_VERSION?=	37
 
 MASTERDIR=		${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION}
diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile
new file mode 100644
index 000000000000..003dff6c217a
--- /dev/null
+++ b/sysutils/cfengine-masterfiles38/Makefile
@@ -0,0 +1,34 @@
+# Created by: cy@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	cfengine-masterfiles
+PORTVERSION=	3.8.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	cfengine sample policies for installations and upgrades
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	38
+.endif
+
+RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX}
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+CONFLICTS=	cfengine-masterfiles[234]*
+
+MAKE_JOBS_UNSAFE=	yes
+USES=		cpe
+HAS_CONFIGURE=	yes
+EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles38/distinfo b/sysutils/cfengine-masterfiles38/distinfo
new file mode 100644
index 000000000000..5312083f10be
--- /dev/null
+++ b/sysutils/cfengine-masterfiles38/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cfengine-masterfiles-3.8.0.tar.gz) = 6956ba4a359e8fe03b627b3fb16b382fed6e33cdfc303db08fb9790895c2a98e
+SIZE (cfengine-masterfiles-3.8.0.tar.gz) = 403006
diff --git a/sysutils/cfengine-masterfiles38/pkg-descr b/sysutils/cfengine-masterfiles38/pkg-descr
new file mode 100644
index 000000000000..3b2329cbc24b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles38/pkg-descr
@@ -0,0 +1,10 @@
+CFEngine 3 is a popular open source configuration management system.
+Its primary function is to provide automated configuration and
+maintenance of large-scale computer systems.
+
+The repository is intended to provide a stable base policy for
+installations and upgrades, and is used by CFEngine 3.6 and newer.
+The port installs the repository as examples which should be copied by
+the user to the masterfiles directory (usually /var/cfengine/masterfiles).
+
+WWW: https://docs.cfengine.com/docs/master/guide-writing-and-serving-policy-policy-framework.html
diff --git a/sysutils/cfengine-masterfiles38/pkg-plist b/sysutils/cfengine-masterfiles38/pkg-plist
new file mode 100644
index 000000000000..31ac1992efe1
--- /dev/null
+++ b/sysutils/cfengine-masterfiles38/pkg-plist
@@ -0,0 +1,107 @@
+%%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
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
+%%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/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
+%%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
+%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
+%%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
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/promises.cf
+%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
+%%EXAMPLESDIR%%/masterfiles/services/main.cf
+%%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/update.cf
+%%EXAMPLESDIR%%/modules/packages/apt_get
+%%EXAMPLESDIR%%/modules/packages/yum
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index fca22b44207c..69b48a12e350 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		22 32 33 34 35 36 37
+VERSIONS=		22 32 33 34 35 36 37 38
 CFENGINE_VERSION?=	37
 
 MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
new file mode 100644
index 000000000000..7eb18807f5f2
--- /dev/null
+++ b/sysutils/cfengine38/Makefile
@@ -0,0 +1,66 @@
+# Created by: jrhett@netconsonance.com
+# $FreeBSD$
+
+PORTNAME=	cfengine
+PORTVERSION=	3.8.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	Systems administration tool for networks
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	38
+.endif
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+CONFLICTS=	cfengine-[234]*
+
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
+
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf cpe gmake libtool shebangfix
+SHEBANG_FILES=	examples/remake_outputs.pl
+CFLAGS+=	-Wno-return-type
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
+		--mandir=${PREFIX}/man \
+		--with-workdir=/var/cfengine \
+		--with-pcre=${LOCALBASE} \
+		--with-lmdb=${LOCALBASE} \
+		--enable-fhs
+INSTALL_TARGET=	install-strip
+
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
+		liblmdb.so:${PORTSDIR}/databases/lmdb
+
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}
+
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
+MYSQL_LIB_DEPENDS=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+
+LIBVIRT_CONFIGURE_ON=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine38/distinfo b/sysutils/cfengine38/distinfo
new file mode 100644
index 000000000000..e2bd81a67fec
--- /dev/null
+++ b/sysutils/cfengine38/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cfengine-3.8.0.tar.gz) = 21743034e3e3e0bea1faba956462079260e8486423eaa955e5f0e58d1ddf5088
+SIZE (cfengine-3.8.0.tar.gz) = 2142690
diff --git a/sysutils/cfengine38/files/cf-execd.in b/sysutils/cfengine38/files/cf-execd.in
new file mode 100644
index 000000000000..1ee33104e76e
--- /dev/null
+++ b/sysutils/cfengine38/files/cf-execd.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/sbin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine38/files/cf-monitord.in b/sysutils/cfengine38/files/cf-monitord.in
new file mode 100644
index 000000000000..471ee108622a
--- /dev/null
+++ b/sysutils/cfengine38/files/cf-monitord.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+command="%%PREFIX%%/sbin/cf-monitord"
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine38/files/cf-serverd.in b/sysutils/cfengine38/files/cf-serverd.in
new file mode 100644
index 000000000000..9fbd07cc148a
--- /dev/null
+++ b/sysutils/cfengine38/files/cf-serverd.in
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/sbin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine38/files/patch-m4-strndup.m4 b/sysutils/cfengine38/files/patch-m4-strndup.m4
new file mode 100644
index 000000000000..31e4b7e264de
--- /dev/null
+++ b/sysutils/cfengine38/files/patch-m4-strndup.m4
@@ -0,0 +1,54 @@
+--- /dev/null	2014-07-29 08:00:54.000000000 -0700
++++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
+@@ -0,0 +1,51 @@
++# strndup.m4 serial 21
++dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([cf3_FUNC_STRNDUP],
++[
++  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
++  AC_CHECK_DECLS([strndup])
++  AC_REPLACE_FUNCS([strndup])
++  if test $ac_cv_have_decl_strndup = no; then
++    HAVE_DECL_STRNDUP=0
++  fi
++
++  if test $ac_cv_func_strndup = yes; then
++    HAVE_STRNDUP=1
++    # AIX 5.3 has a function that tries to copy the entire range specified
++    # by n, instead of just the length of src.
++    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
++      [AC_RUN_IFELSE([
++         AC_LANG_PROGRAM([[#include <string.h>
++                           #include <stdlib.h>]], [[
++#if !HAVE_DECL_STRNDUP
++  extern
++  #ifdef __cplusplus
++  "C"
++  #endif
++  char *strndup (const char *, size_t);
++#endif
++  char *s;
++  // Will crash if strndup tries to traverse all 2GB.
++  s = strndup ("string", 2000000000);
++  return 0;]])],
++         [cf3_cv_func_strndup_works=yes],
++         [cf3_cv_func_strndup_works=no],
++         [
++changequote(,)dnl
++          case $host_os in
++            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
++            *)               cf3_cv_func_strndup_works="guessing yes";;
++          esac
++changequote([,])dnl
++         ])])
++    case $cf3_cv_func_strndup_works in
++      *no) AC_LIBOBJ([strndup]) ;;
++    esac
++  else
++    HAVE_STRNDUP=0
++  fi
++])
diff --git a/sysutils/cfengine38/files/patch-m4__strndup.m4 b/sysutils/cfengine38/files/patch-m4__strndup.m4
new file mode 100644
index 000000000000..cb6d41d2e7cf
--- /dev/null
+++ b/sysutils/cfengine38/files/patch-m4__strndup.m4
@@ -0,0 +1,56 @@
+Index: m4/strndup.m4
+===================================================================
+--- /dev/null	2014-07-29 08:00:54.000000000 -0700
++++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
+@@ -0,0 +1,51 @@
++# strndup.m4 serial 21
++dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([cf3_FUNC_STRNDUP],
++[
++  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
++  AC_CHECK_DECLS([strndup])
++  AC_REPLACE_FUNCS([strndup])
++  if test $ac_cv_have_decl_strndup = no; then
++    HAVE_DECL_STRNDUP=0
++  fi
++
++  if test $ac_cv_func_strndup = yes; then
++    HAVE_STRNDUP=1
++    # AIX 5.3 has a function that tries to copy the entire range specified
++    # by n, instead of just the length of src.
++    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
++      [AC_RUN_IFELSE([
++         AC_LANG_PROGRAM([[#include <string.h>
++                           #include <stdlib.h>]], [[
++#if !HAVE_DECL_STRNDUP
++  extern
++  #ifdef __cplusplus
++  "C"
++  #endif
++  char *strndup (const char *, size_t);
++#endif
++  char *s;
++  // Will crash if strndup tries to traverse all 2GB.
++  s = strndup ("string", 2000000000);
++  return 0;]])],
++         [cf3_cv_func_strndup_works=yes],
++         [cf3_cv_func_strndup_works=no],
++         [
++changequote(,)dnl
++          case $host_os in
++            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
++            *)               cf3_cv_func_strndup_works="guessing yes";;
++          esac
++changequote([,])dnl
++         ])])
++    case $cf3_cv_func_strndup_works in
++      *no) AC_LIBOBJ([strndup]) ;;
++    esac
++  else
++    HAVE_STRNDUP=0
++  fi
++])
diff --git a/sysutils/cfengine38/pkg-descr b/sysutils/cfengine38/pkg-descr
new file mode 100644
index 000000000000..7c0c7eb39135
--- /dev/null
+++ b/sysutils/cfengine38/pkg-descr
@@ -0,0 +1,10 @@
+Cfengine is an automated suite of programs for configuring and 
+maintaining Unix-like computers. It has been used on computing arrays 
+of between 1 and 20,000 computers since 1993 by a wide range of 
+organizations. Cfengine is supported by active research and was the 
+first autonomic, hands-free management system for Unix-like operating
+systems. Cfengine is an autonomic maintenance system not merely a
+change management roll-out tool. Cfengine has a history of security
+and adaptability. 
+
+WWW: http://www.cfengine.org/
diff --git a/sysutils/cfengine38/pkg-plist b/sysutils/cfengine38/pkg-plist
new file mode 100644
index 000000000000..89a92ede8984
--- /dev/null
+++ b/sysutils/cfengine38/pkg-plist
@@ -0,0 +1,359 @@
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
+libexec/cfengine/libpromises.so.3.0.6
+sbin/cf-agent
+sbin/cf-execd
+sbin/cf-key
+sbin/cf-monitord
+sbin/cf-promises
+sbin/cf-runagent
+sbin/cf-serverd
+sbin/cf-upgrade
+sbin/rpmvercmp
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/examples/abort.cf
+%%DOCSDIR%%/examples/accessed_before.cf
+%%DOCSDIR%%/examples/accessedbefore.cf
+%%DOCSDIR%%/examples/accumulated_time.cf
+%%DOCSDIR%%/examples/acl.cf
+%%DOCSDIR%%/examples/acl_generic.cf
+%%DOCSDIR%%/examples/acl_ntfs.cf
+%%DOCSDIR%%/examples/acl_secret.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/activedirectory_listusers.cf
+%%DOCSDIR%%/examples/activedirectory_showuser.cf
+%%DOCSDIR%%/examples/ago.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/appgroups.cf
+%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/backreferences_files.cf
+%%DOCSDIR%%/examples/badpromise.cf
+%%DOCSDIR%%/examples/badtype.cf
+%%DOCSDIR%%/examples/bsdflags.cf
+%%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesmatching.cf
+%%DOCSDIR%%/examples/bundlestate.cf
+%%DOCSDIR%%/examples/canonify.cf
+%%DOCSDIR%%/examples/cf2_integration.cf
+%%DOCSDIR%%/examples/change_detect.cf
+%%DOCSDIR%%/examples/changedbefore.cf
+%%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/classes_global.cf
+%%DOCSDIR%%/examples/classesmatching.cf
+%%DOCSDIR%%/examples/classmatch.cf
+%%DOCSDIR%%/examples/classvar_convergence.cf
+%%DOCSDIR%%/examples/commands.cf
+%%DOCSDIR%%/examples/compare.cf
+%%DOCSDIR%%/examples/container_iteration.cf
+%%DOCSDIR%%/examples/container_key_iteration.cf
+%%DOCSDIR%%/examples/control_expand.cf
+%%DOCSDIR%%/examples/controlclasses.cf
+%%DOCSDIR%%/examples/copy.cf
+%%DOCSDIR%%/examples/copy_classes.cf
+%%DOCSDIR%%/examples/copy_copbl.cf
+%%DOCSDIR%%/examples/copy_edit.cf
+%%DOCSDIR%%/examples/copydir_copbl.cf
+%%DOCSDIR%%/examples/copylinks.cf
+%%DOCSDIR%%/examples/countclassesmatching.cf
+%%DOCSDIR%%/examples/countlinesmatching.cf
+%%DOCSDIR%%/examples/create_filedir.cf
+%%DOCSDIR%%/examples/createdb.cf
+%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/datastate.cf
+%%DOCSDIR%%/examples/defaults.cf
+%%DOCSDIR%%/examples/defaults2.cf
+%%DOCSDIR%%/examples/defaults3.cf
+%%DOCSDIR%%/examples/definitions.cf
+%%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
+%%DOCSDIR%%/examples/disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/diskfree.cf
+%%DOCSDIR%%/examples/dollar.cf
+%%DOCSDIR%%/examples/edit_column_files.cf
+%%DOCSDIR%%/examples/edit_comment_lines.cf
+%%DOCSDIR%%/examples/edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/edit_insert_lines.cf
+%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/edit_passwd_file.cf
+%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
+%%DOCSDIR%%/examples/edit_replace_string.cf
+%%DOCSDIR%%/examples/edit_sectioned_file.cf
+%%DOCSDIR%%/examples/edit_setvar.cf
+%%DOCSDIR%%/examples/edit_template.cf
+%%DOCSDIR%%/examples/edit_triggerclass.cf
+%%DOCSDIR%%/examples/edit_xml.cf
+%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
+%%DOCSDIR%%/examples/env.cf
+%%DOCSDIR%%/examples/epimenides.cf
+%%DOCSDIR%%/examples/escape.cf
+%%DOCSDIR%%/examples/eval.cf
+%%DOCSDIR%%/examples/every.cf
+%%DOCSDIR%%/examples/exec_args.cf
+%%DOCSDIR%%/examples/exec_in_sequence.cf
+%%DOCSDIR%%/examples/execd.cf
+%%DOCSDIR%%/examples/execresult.cf
+%%DOCSDIR%%/examples/expand.cf
+%%DOCSDIR%%/examples/failedcommand.cf
+%%DOCSDIR%%/examples/failsafe.cf
+%%DOCSDIR%%/examples/file_change_detection.cf
+%%DOCSDIR%%/examples/file_hash.cf
+%%DOCSDIR%%/examples/file_owner_list_template.cf
+%%DOCSDIR%%/examples/fileexists.cf
+%%DOCSDIR%%/examples/filenames.cf
+%%DOCSDIR%%/examples/fileperms.cf
+%%DOCSDIR%%/examples/filesexist.cf
+%%DOCSDIR%%/examples/filesexist2.cf
+%%DOCSDIR%%/examples/filesize.cf
+%%DOCSDIR%%/examples/filestat.cf
+%%DOCSDIR%%/examples/filter.cf
+%%DOCSDIR%%/examples/findfiles.cf
+%%DOCSDIR%%/examples/fix_names.cf
+%%DOCSDIR%%/examples/format.cf
+%%DOCSDIR%%/examples/getclassmetatags.cf
+%%DOCSDIR%%/examples/getenv.cf
+%%DOCSDIR%%/examples/getfields.cf
+%%DOCSDIR%%/examples/getgid.cf
+%%DOCSDIR%%/examples/getindices.cf
+%%DOCSDIR%%/examples/getindices_and_values.cf
+%%DOCSDIR%%/examples/getmacaddress.cf
+%%DOCSDIR%%/examples/getregistry.cf
+%%DOCSDIR%%/examples/getuid.cf
+%%DOCSDIR%%/examples/getusers.cf
+%%DOCSDIR%%/examples/getvalues.cf
+%%DOCSDIR%%/examples/getvariablemetatags.cf
+%%DOCSDIR%%/examples/global_list_expansion.cf
+%%DOCSDIR%%/examples/global_list_expansion_2.cf
+%%DOCSDIR%%/examples/grep.cf
+%%DOCSDIR%%/examples/groupexists.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hashcomment.cf
+%%DOCSDIR%%/examples/hashmatch.cf
+%%DOCSDIR%%/examples/hashuncomment.cf
+%%DOCSDIR%%/examples/helloworld.cf
+%%DOCSDIR%%/examples/host2ip.cf
+%%DOCSDIR%%/examples/hostrange.cf
+%%DOCSDIR%%/examples/hostsseen.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/hub.cf
+%%DOCSDIR%%/examples/id.cf
+%%DOCSDIR%%/examples/inherit.cf
+%%DOCSDIR%%/examples/insert_users.cf
+%%DOCSDIR%%/examples/intarray.cf
+%%DOCSDIR%%/examples/intersection.cf
+%%DOCSDIR%%/examples/inventory_cpu.cf
+%%DOCSDIR%%/examples/ip2host.cf
+%%DOCSDIR%%/examples/iprange.cf
+%%DOCSDIR%%/examples/irange.cf
+%%DOCSDIR%%/examples/isdir.cf
+%%DOCSDIR%%/examples/isexecutable.cf
+%%DOCSDIR%%/examples/isgreaterthan.cf
+%%DOCSDIR%%/examples/islessthan.cf
+%%DOCSDIR%%/examples/islink.cf
+%%DOCSDIR%%/examples/isnewerthan.cf
+%%DOCSDIR%%/examples/isplain.cf
+%%DOCSDIR%%/examples/isvariable.cf
+%%DOCSDIR%%/examples/iteration.cf
+%%DOCSDIR%%/examples/join.cf
+%%DOCSDIR%%/examples/knowledge_driver.cf
+%%DOCSDIR%%/examples/knowledge_txt.cf
+%%DOCSDIR%%/examples/lastnode.cf
+%%DOCSDIR%%/examples/ldap.cf
+%%DOCSDIR%%/examples/length.cf
+%%DOCSDIR%%/examples/linking.cf
+%%DOCSDIR%%/examples/literal_server.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/maplist.cf
+%%DOCSDIR%%/examples/max-min-mean-variance.cf
+%%DOCSDIR%%/examples/measure_log.cf
+%%DOCSDIR%%/examples/measurements.cf
+%%DOCSDIR%%/examples/menu.cf
+%%DOCSDIR%%/examples/mergedata.cf
+%%DOCSDIR%%/examples/meta.cf
+%%DOCSDIR%%/examples/method.cf
+%%DOCSDIR%%/examples/method_polymorph.cf
+%%DOCSDIR%%/examples/method_validate.cf
+%%DOCSDIR%%/examples/method_var.cf
+%%DOCSDIR%%/examples/method_var2.cf
+%%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/namespace.cf
+%%DOCSDIR%%/examples/namespace1.cf
+%%DOCSDIR%%/examples/namespace2.cf
+%%DOCSDIR%%/examples/namespace3.cf
+%%DOCSDIR%%/examples/namespace_class1.cf
+%%DOCSDIR%%/examples/namespace_classes.cf
+%%DOCSDIR%%/examples/namespace_var_meta.cf
+%%DOCSDIR%%/examples/namespace_var_meta2.cf
+%%DOCSDIR%%/examples/neighbourhood_watch.cf
+%%DOCSDIR%%/examples/none.cf
+%%DOCSDIR%%/examples/nth.cf
+%%DOCSDIR%%/examples/null_config.cf
+%%DOCSDIR%%/examples/occurrences.cf
+%%DOCSDIR%%/examples/orchestrate_chain1.cf
+%%DOCSDIR%%/examples/orchestrate_chain2.cf
+%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/orchestrate_dragon.cf
+%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/orchestration_hostlist.cf
+%%DOCSDIR%%/examples/ordering.cf
+%%DOCSDIR%%/examples/package_apt.cf
+%%DOCSDIR%%/examples/package_bundles.cf
+%%DOCSDIR%%/examples/package_freebsd.cf
+%%DOCSDIR%%/examples/package_latest.cf
+%%DOCSDIR%%/examples/package_msi_file.cf
+%%DOCSDIR%%/examples/package_msi_version.cf
+%%DOCSDIR%%/examples/package_rpm.cf
+%%DOCSDIR%%/examples/package_solaris.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/package_yum.cf
+%%DOCSDIR%%/examples/package_zypper.cf
+%%DOCSDIR%%/examples/packagesmatching.cf
+%%DOCSDIR%%/examples/parallel_exec.cf
+%%DOCSDIR%%/examples/parseintrealstringarray.cf
+%%DOCSDIR%%/examples/parsestringarray.cf
+%%DOCSDIR%%/examples/parsestringarrayidx.cf
+%%DOCSDIR%%/examples/pathtype.cf
+%%DOCSDIR%%/examples/pattern_and_edit.cf
+%%DOCSDIR%%/examples/peerleader.cf
+%%DOCSDIR%%/examples/peerleaders.cf
+%%DOCSDIR%%/examples/peers.cf
+%%DOCSDIR%%/examples/postfix.cf
+%%DOCSDIR%%/examples/process_kill.cf
+%%DOCSDIR%%/examples/process_matching.cf
+%%DOCSDIR%%/examples/process_matching2.cf
+%%DOCSDIR%%/examples/process_matching3.cf
+%%DOCSDIR%%/examples/process_restart.cf
+%%DOCSDIR%%/examples/process_restart_basic.cf
+%%DOCSDIR%%/examples/process_signalling.cf
+%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
+%%DOCSDIR%%/examples/product.cf
+%%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/promises.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
+%%DOCSDIR%%/examples/readtcp.cf
+%%DOCSDIR%%/examples/reg_multiline.cf
+%%DOCSDIR%%/examples/regarray.cf
+%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_win.cf
+%%DOCSDIR%%/examples/regextract.cf
+%%DOCSDIR%%/examples/registry.cf
+%%DOCSDIR%%/examples/registry_cache.cf
+%%DOCSDIR%%/examples/registryvalue.cf
+%%DOCSDIR%%/examples/regline.cf
+%%DOCSDIR%%/examples/reglist.cf
+%%DOCSDIR%%/examples/remake_outputs.pl
+%%DOCSDIR%%/examples/remoteclasses.cf
+%%DOCSDIR%%/examples/remoteclasses2.cf
+%%DOCSDIR%%/examples/remotescalar.cf
+%%DOCSDIR%%/examples/remove_deadlinks.cf
+%%DOCSDIR%%/examples/rename.cf
+%%DOCSDIR%%/examples/repairedcommand.cf
+%%DOCSDIR%%/examples/report_custom.cf
+%%DOCSDIR%%/examples/report_diffs.cf
+%%DOCSDIR%%/examples/report_state.cf
+%%DOCSDIR%%/examples/reporting.cf
+%%DOCSDIR%%/examples/reporttofile.cf
+%%DOCSDIR%%/examples/resolveconf.cf
+%%DOCSDIR%%/examples/returnszero.cf
+%%DOCSDIR%%/examples/reverse.cf
+%%DOCSDIR%%/examples/root_passwd.cf
+%%DOCSDIR%%/examples/select_class.cf
+%%DOCSDIR%%/examples/select_mode.cf
+%%DOCSDIR%%/examples/select_region.cf
+%%DOCSDIR%%/examples/select_size.cf
+%%DOCSDIR%%/examples/selectservers.cf
+%%DOCSDIR%%/examples/server_callback.cf
+%%DOCSDIR%%/examples/server_copy_localhost.cf
+%%DOCSDIR%%/examples/server_copy_purge.cf
+%%DOCSDIR%%/examples/server_copy_remote.cf
+%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/service_disable.cf
+%%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services_concept.cf
+%%DOCSDIR%%/examples/services_win.cf
+%%DOCSDIR%%/examples/setuidlog.cf
+%%DOCSDIR%%/examples/setvar.cf
+%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/software_dist.cf
+%%DOCSDIR%%/examples/software_update_version_yum.cf
+%%DOCSDIR%%/examples/some.cf
+%%DOCSDIR%%/examples/sort.cf
+%%DOCSDIR%%/examples/splitstring.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
+%%DOCSDIR%%/examples/storage.cf
+%%DOCSDIR%%/examples/strcmp.cf
+%%DOCSDIR%%/examples/strftime.cf
+%%DOCSDIR%%/examples/string_downcase.cf
+%%DOCSDIR%%/examples/string_head.cf
+%%DOCSDIR%%/examples/string_length.cf
+%%DOCSDIR%%/examples/string_mustache.cf
+%%DOCSDIR%%/examples/string_reverse.cf
+%%DOCSDIR%%/examples/string_split.cf
+%%DOCSDIR%%/examples/string_tail.cf
+%%DOCSDIR%%/examples/string_upcase.cf
+%%DOCSDIR%%/examples/stringarray.cf
+%%DOCSDIR%%/examples/sublist.cf
+%%DOCSDIR%%/examples/sum.cf
+%%DOCSDIR%%/examples/switchcase.cf
+%%DOCSDIR%%/examples/symlink.cf
+%%DOCSDIR%%/examples/symlink_children.cf
+%%DOCSDIR%%/examples/syslog.cf
+%%DOCSDIR%%/examples/syslog2.cf
+%%DOCSDIR%%/examples/template.cf
+%%DOCSDIR%%/examples/template2.cf
+%%DOCSDIR%%/examples/test_environment.cf
+%%DOCSDIR%%/examples/tidy_all_files.cf
+%%DOCSDIR%%/examples/translatepath.cf
+%%DOCSDIR%%/examples/unique.cf
+%%DOCSDIR%%/examples/unpack_method_calls.cf
+%%DOCSDIR%%/examples/update.cf
+%%DOCSDIR%%/examples/user_edit.cf
+%%DOCSDIR%%/examples/user_edit_method.cf
+%%DOCSDIR%%/examples/userexists.cf
+%%DOCSDIR%%/examples/users_type.cf
+%%DOCSDIR%%/examples/varclass.cf
+%%DOCSDIR%%/examples/varexpansion.cf
+%%DOCSDIR%%/examples/variablesmatching.cf
+%%DOCSDIR%%/examples/varnet.cf
+%%DOCSDIR%%/examples/vars.cf
+%%DOCSDIR%%/examples/warnifline.cf
+%%DOCSDIR%%/examples/webserver.cf
+%%DOCSDIR%%/examples/win_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/zenoss.cf
+@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 || :