11 files changed, 17 insertions, 47 deletions

diff --git a/sysutils/cfengine-masterfiles/Makefile b/sysutils/cfengine-masterfiles/Makefile
index 31bb0829e603..13e3eddfae76 100644
--- a/sysutils/cfengine-masterfiles/Makefile
+++ b/sysutils/cfengine-masterfiles/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 VERSIONS=		36 37 38 39
-CFENGINE_VERSION?=	38
+CFENGINE_VERSION?=	39
 
 MASTERDIR=		${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION}
 
diff --git a/sysutils/cfengine-masterfiles39/Makefile b/sysutils/cfengine-masterfiles39/Makefile
index 3b26777926e2..1f580b785f82 100644
--- a/sysutils/cfengine-masterfiles39/Makefile
+++ b/sysutils/cfengine-masterfiles39/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.9.0
+PORTVERSION=	3.9.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
 
diff --git a/sysutils/cfengine-masterfiles39/distinfo b/sysutils/cfengine-masterfiles39/distinfo
index 1330b9434b73..f39fad84f7e0 100644
--- a/sysutils/cfengine-masterfiles39/distinfo
+++ b/sysutils/cfengine-masterfiles39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465956498
-SHA256 (cfengine-masterfiles-3.9.0.tar.gz) = 63dec2f8649f5f2788cd463dccf47f8dbe941522acfcf3093517f983bbfa0606
-SIZE (cfengine-masterfiles-3.9.0.tar.gz) = 425356
+TIMESTAMP = 1470432585
+SHA256 (cfengine-masterfiles-3.9.1.tar.gz) = 99d59ea4229253ef2e35fc30c33d5e2605fab1144af7b16562affcceabddb03a
+SIZE (cfengine-masterfiles-3.9.1.tar.gz) = 426996
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 9e643d31e2eb..3eee3baae48e 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 VERSIONS=		22 32 33 34 35 36 37 38 39
-CFENGINE_VERSION?=	38
+CFENGINE_VERSION?=	39
 
 MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}
 
diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile
index d07b90a607aa..f88a52aceb86 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 4263a05ac88a..9d6977af1610 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index 79db3109dc7f..795757620d56 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
diff --git a/sysutils/cfengine39/Makefile b/sysutils/cfengine39/Makefile
index 6d0235f3d11f..22d843a3757f 100644
--- a/sysutils/cfengine39/Makefile
+++ b/sysutils/cfengine39/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.9.0
+PORTVERSION=	3.9.1
 # 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/
@@ -30,7 +30,7 @@ MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf:EXPLICIT_VERSION=${PORTVERSION} \
+USES=		autoreconf:build \
 		cpe gmake libtool shebangfix
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type
@@ -38,6 +38,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
 		--libexecdir=${PREFIX}/libexec \
diff --git a/sysutils/cfengine39/distinfo b/sysutils/cfengine39/distinfo
index 738265419379..68b7c90c6810 100644
--- a/sysutils/cfengine39/distinfo
+++ b/sysutils/cfengine39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465907136
-SHA256 (cfengine-3.9.0.tar.gz) = 32a38aedf1199c2361e1335e0d4a1d98f9efa7cd591bcb647f35c7395bb66f2d
-SIZE (cfengine-3.9.0.tar.gz) = 2275307
+TIMESTAMP = 1470238660
+SHA256 (cfengine-3.9.1.tar.gz) = 19bf900741efe3da4266591985dc1103243cb751888047694fce6f407ef2d225
+SIZE (cfengine-3.9.1.tar.gz) = 2278474
diff --git a/sysutils/cfengine39/files/patch-configure.ac b/sysutils/cfengine39/files/patch-configure.ac
deleted file mode 100644
index 7f0403109783..000000000000
--- a/sysutils/cfengine39/files/patch-configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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,
diff --git a/sysutils/cfengine39/pkg-plist b/sysutils/cfengine39/pkg-plist
index d38adf63f44d..68d9e8b5cf3d 100644
--- a/sysutils/cfengine39/pkg-plist
+++ b/sysutils/cfengine39/pkg-plist
@@ -1,5 +1,4 @@
 libexec/cfengine/libpromises.so
-libexec/cfengine/libpromises.so.3
 libexec/cfengine/libpromises.so.3.0.6
 sbin/cf-agent
 sbin/cf-execd
@@ -309,6 +308,7 @@ sbin/rpmvercmp
 %%DOCSDIR%%/examples/service_catalogue_separate.cf
 %%DOCSDIR%%/examples/service_disable.cf
 %%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services.cf
 %%DOCSDIR%%/examples/services_concept.cf
 %%DOCSDIR%%/examples/services_win.cf
 %%DOCSDIR%%/examples/setuidlog.cf