- Update to 2.1.3

PR:		ports/63447
Submitted by:	Paul Dlug <paul@aps.org> (maintainer)

5 files changed, 40 insertions, 24 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index b5a79c9a632f..7f8baab1b967 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine2
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
@@ -16,7 +16,7 @@ DISTNAME=	cfengine-${PORTVERSION}
 MAINTAINER=	paul@aps.org
 COMMENT=	A systems administration tool for networks
 
-LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
+LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index b568cfc6b3f0..a93bc1f3976a 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1 +1 @@
-MD5 (cfengine-2.1.1.tar.gz) = 71a91ec5283b45313b78fe00f8d1e042 
+MD5 (cfengine-2.1.3.tar.gz) = 54cc5ac220c16ad636fb94a950d8e83a
diff --git a/sysutils/cfengine2/files/patch-doc_Makefile.in b/sysutils/cfengine2/files/patch-doc_Makefile.in
index 711a202abf28..fe26cc7ac0bd 100644
--- a/sysutils/cfengine2/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine2/files/patch-doc_Makefile.in
@@ -1,9 +1,18 @@
---- doc/Makefile.in.orig	Sun Jan 11 17:16:59 2004
-+++ doc/Makefile.in	Tue Jan 27 01:31:55 2004
-@@ -146,10 +146,10 @@
- 
+--- doc/Makefile.in.orig	Mon Feb  9 16:17:57 2004
++++ doc/Makefile.in	Thu Feb 26 17:46:02 2004
+@@ -70,7 +70,7 @@
+ docDATA_INSTALL = $(INSTALL_DATA)
+ htmlDATA_INSTALL = $(INSTALL_DATA)
+ psDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(doc_DATA) $(html_DATA) $(ps_DATA)
++DATA = $(doc_DATA) $(html_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -182,10 +182,10 @@
+ target_vendor = @target_vendor@
+ man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  cfrun.8  cfservd.8
  info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo
- 
 -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(prefix)/share/doc/cfengine2
  doc_DATA = 
@@ -13,12 +22,30 @@
  htmlfiles = cfengine-Reference.html cfengine-Tutorial.html cfengine-Anomalies.html
  html_DATA = $(htmlfiles)
  
-@@ -161,7 +161,7 @@
+@@ -196,7 +196,7 @@
+ # When the Texi2DVI problem with cfengine-Reference is corrected, 
  # then uncomment the reference to ps2
- psfiles = $(ps1)	# $(ps2)
- 
+ psfiles = $(ps2)
 -psdir = $(pkgdatadir)/doc
 +psdir = $(docdir)
  ps_DATA = $(psfiles)
+ MAKEINFOHTML = $(MAKEINFO) --html --no-split
+ 
+@@ -708,7 +708,7 @@
+ info-am: $(INFO_DEPS)
+ 
+ install-data-am: install-docDATA install-htmlDATA install-info-am \
+-	install-man install-psDATA
++	install-man 
+ 
+ install-exec-am:
+ 
+@@ -768,7 +768,7 @@
+ ps-am: $(PSS)
+ 
+ uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \
+-	uninstall-man uninstall-psDATA
++	uninstall-man
+ 
+ uninstall-man: uninstall-man8
  
- # Make sure these get distributed with everything else.
diff --git a/sysutils/cfengine2/files/patch-filedir b/sysutils/cfengine2/files/patch-filedir
deleted file mode 100644
index 40e6d82a4a5d..000000000000
--- a/sysutils/cfengine2/files/patch-filedir
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/filedir.c.orig	Mon Jan 19 19:22:26 2004
-+++ src/filedir.c	Mon Jan 19 19:22:39 2004
-@@ -554,7 +554,7 @@
-    return;
-    }
- #else
--if (((newperm & 07777) == (dstat->st_mode & 07777) && (action != touch))    /* file okay */
-+if (((newperm & 07777) == (dstat->st_mode & 07777) && (action != touch)))    /* file okay */
-    {
-    Debug("File okay, newperm = %o, stat = %o\n",(newperm & 07777),(dstat->st_mode & 07777));
-    fixmode = false;
diff --git a/sysutils/cfengine2/files/patch-inputs_Makefile.in b/sysutils/cfengine2/files/patch-inputs_Makefile.in
index 01d3cc242c43..62d3088778a0 100644
--- a/sysutils/cfengine2/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine2/files/patch-inputs_Makefile.in
@@ -1,6 +1,6 @@
 --- inputs/Makefile.in.orig	Tue Jan 27 01:33:35 2004
 +++ inputs/Makefile.in	Tue Jan 27 01:34:11 2004
-@@ -17,7 +17,7 @@
+@@ -20,7 +20,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@