Update 3.4.1 --> 3.4.2

Suggested by:	Loic Pefferkorn <loic-freebsd@loicp.eu>
Closes PR:	175693 (PR patch was not used)

6 files changed, 11 insertions, 66 deletions

diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 9395ff4fc334..4e7096913e1a 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.4.1
+PORTVERSION=	3.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--with-pcre=${LOCALBASE} \
 		--enable-fhs
 
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 
 OPTIONS=	TOKYOCABINET	"Enable TokyoCabinet support"		on \
 		QDBM	"Enable QDBM support"				off \
diff --git a/sysutils/cfengine34/distinfo b/sysutils/cfengine34/distinfo
index e10f63b19d74..54518ac6b292 100644
--- a/sysutils/cfengine34/distinfo
+++ b/sysutils/cfengine34/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.4.1.tar.gz) = af57460dc1ac0a451447fb5e98c8c070e20d3e4a9f07c71ad9bf5f7eeec31108
-SIZE (cfengine-3.4.1.tar.gz) = 4697144
+SHA256 (cfengine-3.4.2.tar.gz) = 7548ecf3d95468705aed86ec237ebccb6618983386cee67ff47cab46ab1c2472
+SIZE (cfengine-3.4.2.tar.gz) = 4687590
diff --git a/sysutils/cfengine34/files/patch-ext-Makefile.am b/sysutils/cfengine34/files/patch-ext-Makefile.am
index 14cfa104c90c..ddedeedb19a5 100644
--- a/sysutils/cfengine34/files/patch-ext-Makefile.am
+++ b/sysutils/cfengine34/files/patch-ext-Makefile.am
@@ -1,8 +1,7 @@
---- 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 @@
+--- ext/Makefile.am.orig	2013-01-11 04:54:39.000000000 -0800
++++ ext/Makefile.am	2013-01-30 10:55:15.874733217 -0800
+@@ -1,4 +1,3 @@
 -sbin_PROGRAMS = rpmvercmp
-+sbin_PROGRAMS = 
  
  rpmvercmp_LDADD = ../pub/libcfpub.la
  
diff --git a/sysutils/cfengine34/files/patch-ext-Makefile.in b/sysutils/cfengine34/files/patch-ext-Makefile.in
index 067e874aa61b..7c7ec8a24efa 100644
--- a/sysutils/cfengine34/files/patch-ext-Makefile.in
+++ b/sysutils/cfengine34/files/patch-ext-Makefile.in
@@ -1,52 +1,10 @@
---- 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 @@
+--- ext/Makefile.in.orig	2013-01-11 04:54:49.000000000 -0800
++++ ext/Makefile.in	2013-01-30 10:54:51.204746233 -0800
+@@ -35,7 +35,6 @@
  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
diff --git a/sysutils/cfengine34/files/patch-src-files_select.c b/sysutils/cfengine34/files/patch-src-files_select.c
deleted file mode 100644
index 756a9a6973b7..000000000000
--- a/sysutils/cfengine34/files/patch-src-files_select.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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,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);
- static int SelectOwnerMatch(char *path, struct stat *lstatptr, Rlist *crit);
diff --git a/sysutils/cfengine34/pkg-plist b/sysutils/cfengine34/pkg-plist
index 63f721ec682c..5d4dd5982ec6 100644
--- a/sysutils/cfengine34/pkg-plist
+++ b/sysutils/cfengine34/pkg-plist
@@ -19,9 +19,9 @@ share/cfengine/CoreBase/controls/cf_agent.cf
 share/cfengine/CoreBase/controls/cf_runagent.cf
 share/cfengine/CoreBase/controls/cf_monitord.cf
 share/cfengine/CoreBase/controls/cf_serverd.cf
-share/cfengine/CoreBase/failsafe/failsafe.cf
 share/cfengine/CoreBase/libraries/cfengine_stdlib.cf
 share/cfengine/CoreBase/services/init_msg.cf
+share/cfengine/CoreBase/update.cf
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/README
 %%DOCSDIR%%/examples/active_directory.cf
@@ -292,7 +292,6 @@ share/cfengine/CoreBase/services/init_msg.cf
 @dirrm %%DOCSDIR%%/examples
 @dirrm %%DOCSDIR%%
 @dirrm share/cfengine/CoreBase/controls
-@dirrm share/cfengine/CoreBase/failsafe
 @dirrm share/cfengine/CoreBase/libraries
 @dirrm share/cfengine/CoreBase/services
 @dirrm share/cfengine/CoreBase