The attached diff updates cfengine2 to 2.0.8p1 which includes new features, performance enhancements for file copies and security patches.

PR:		56710
Submitted By:	Paul Dlug <paul@aps.org>

7 files changed, 10 insertions, 107 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 167c20b9ed8d..c2253c5e2593 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine2
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.8p1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 2712f823bb2f..10cd70ac1db2 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1 +1 @@
-MD5 (cfengine-2.0.3.tar.gz) = 55df32a5856e5d267f895ec1dc6b2511
+MD5 (cfengine-2.0.8p1.tar.gz) = 17f9647edcc955e5c07489a6ac6126b1
diff --git a/sysutils/cfengine2/files/patch-configure b/sysutils/cfengine2/files/patch-configure
deleted file mode 100644
index 9f5590039838..000000000000
--- a/sysutils/cfengine2/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
-Accept the -STABLE version of OpenSSL
-Use the correct #includes for sys/mount.h
-
---- configure.orig	Mon Jul 29 15:32:39 2002
-+++ configure	Mon Jul 29 15:35:41 2002
-@@ -3637,8 +3637,8 @@
- if test x"$OPENSSL_LIB_DIR" = xno ; then
-     echo "$as_me:3638: result: no" >&5
- echo "${ECHO_T}no" >&6
--    { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&5
--echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6b or later" >&2;}
-+    { { echo "$as_me:3640: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&5
-+echo "$as_me: error: This release of cfengine requires OpenSSL 0.9.6a or later" >&2;}
-    { (exit 1); exit 1; }; }
- else
-     if test x"$OPENSSL_LIB_DIR" = xyes ; then
-@@ -3700,7 +3700,7 @@
- #include <openssl/opensslv.h>
- int main(void)
- {
--    if (OPENSSL_VERSION_NUMBER < 0x0090602fL)
-+    if (OPENSSL_VERSION_NUMBER < 0x0090601fL)
-         exit(1);
-     exit(0);
- }
-@@ -3723,8 +3723,8 @@
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6b or later" >&5
--echo "$as_me: error: This release of cfengine requires openssl 0.9.6b or later" >&2;}
-+{ { echo "$as_me:3726: error: This release of cfengine requires openssl 0.9.6a or later" >&5
-+echo "$as_me: error: This release of cfengine requires openssl 0.9.6a or later" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
-@@ -4098,6 +4098,7 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line 4099 "configure"
- #include "confdefs.h"
-+#include <sys/param.h>
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:4103: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -8485,8 +8486,8 @@
- echo "$as_me: WARNING: This version requires Berkeley db version 3.2 or" >&2;}
- { echo "$as_me:8486: WARNING: later from www.sleepycat.com" >&5
- echo "$as_me: WARNING: later from www.sleepycat.com" >&2;}
--{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6b or later" >&5
--echo "$as_me: WARNING: This version requires OpenSSL 0.9.6b or later" >&2;}
-+{ echo "$as_me:8488: WARNING: This version requires OpenSSL 0.9.6a or later" >&5
-+echo "$as_me: WARNING: This version requires OpenSSL 0.9.6a or later" >&2;}
- { echo "$as_me:8490: WARNING: from www.openssl.org" >&5
- echo "$as_me: WARNING: from www.openssl.org" >&2;}
- { echo "$as_me:8492: WARNING: " >&5
diff --git a/sysutils/cfengine2/files/patch-contrib::Makefile.in b/sysutils/cfengine2/files/patch-contrib::Makefile.in
deleted file mode 100644
index e512b51ae22f..000000000000
--- a/sysutils/cfengine2/files/patch-contrib::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Mon Jul 29 17:24:20 2002
-+++ contrib/Makefile.in	Mon Jul 29 17:26:30 2002
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/emacs/site-lisp
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
diff --git a/sysutils/cfengine2/files/patch-doc::Makefile.in b/sysutils/cfengine2/files/patch-doc::Makefile.in
deleted file mode 100644
index b4aed68cfe50..000000000000
--- a/sysutils/cfengine2/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- doc/Makefile.in.orig	Sat Jun 22 08:36:43 2002
-+++ doc/Makefile.in	Mon Jul 29 17:19:22 2002
-@@ -88,10 +88,10 @@
- man_MANS = cfengine.8
- info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
- 
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+#docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
- doc_DATA = 
- # Info used in building and installing HTML files
--htmldir = $(pkgdatadir)/html
-+htmldir = $(datadir)/doc/@PACKAGE@
- htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
- html_DATA = $(htmlfiles)
- 
-@@ -103,7 +103,7 @@
- # then uncomment the reference to ps2
- psfiles = $(ps1)	# $(ps2)
- 
--psdir = $(pkgdatadir)/doc
-+#psdir = $(pkgdatadir)/doc
- ps_DATA = $(psfiles)
- 
- # Make sure these get distributed with everything else.
diff --git a/sysutils/cfengine2/files/patch-doc::cfengine-Anomalies.info b/sysutils/cfengine2/files/patch-doc::cfengine-Anomalies.info
deleted file mode 100644
index 1c6e5cd9ccd8..000000000000
--- a/sysutils/cfengine2/files/patch-doc::cfengine-Anomalies.info
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/cfengine-Anomalies.info.orig	Mon Jul 29 18:15:38 2002
-+++ doc/cfengine-Anomalies.info	Mon Jul 29 18:16:20 2002
-@@ -3,7 +3,7 @@
- 
- INFO-DIR-SECTION System Utilities
- START-INFO-DIR-ENTRY
--* cfengine Tutorial: (cfengine-Tutorial.info).
-+* cfengine Anomalies: (cfengine-Anomalies.info).
-                         Cfengine is a language based tool specifically
-                         designed for configuring and maintaining BSD
-                         and System-5-like operating systems attached
diff --git a/sysutils/cfengine2/pkg-plist b/sysutils/cfengine2/pkg-plist
index 5ecae01ae4eb..df182c43aaa1 100644
--- a/sysutils/cfengine2/pkg-plist
+++ b/sysutils/cfengine2/pkg-plist
@@ -30,7 +30,6 @@ sbin/cfkey
 sbin/cfrun
 sbin/cfservd
 sbin/vicf
-share/emacs/site-lisp/cfengine.el
 share/cfengine/cf.chflags.example
 share/cfengine/cf.freebsd.example
 share/cfengine/cf.ftp.example
@@ -46,11 +45,16 @@ share/cfengine/cf.sun4.example
 share/cfengine/cf.users.example
 share/cfengine/cfagent.conf-advanced.example
 share/cfengine/cfagent.conf.example
+share/cfengine/cfengine.el
 share/cfengine/cfrc.example
 share/cfengine/cfrun.hosts.example
 share/cfengine/cfservd.conf.example
+share/cfengine/html/cfengine-Reference.html
+share/cfengine/html/cfengine-Tutorial.html
 share/cfengine/update.conf.example
-share/doc/cfengine/cfengine-Reference.html
-share/doc/cfengine/cfengine-Tutorial.html
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@dirrm share/cfengine/html
+@dirrm share/cfengine/doc
 @dirrm share/cfengine
-@dirrm share/doc/cfengine
+@dirrm doc/cfengine-2.0.8p1
\ No newline at end of file