ports/126347: Update sysutils/cfengine to 2.2.8

[Eygene Ryabinkin]

>Number:         126347
>Category:       ports
>Synopsis:       Update sysutils/cfengine to 2.2.8
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 07 19:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Eygene Ryabinkin
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
Code Labs
>Environment:

System: FreeBSD XXX 7.0-STABLE FreeBSD 7.0-STABLE #17: Thu Jul 3 16:37:17 MSD 2008 root at XXX:/usr/obj/usr/src/sys/XXX i386

>Description:

CFEngine 2.2.8 is out and it fixed important threading error, judging
by the ChangeLog.

>How-To-Repeat:

Look at
  http://cfengine.org/
  http://svn.iu.hio.no/viewvc/trunk/ChangeLog?view=markup&revision=593&root=Cfengine-2

>Fix:

The following patch will update the port to 2.2.8 and add info(1)
files with tutorial and reference manual to the port contents.

--- 2.2.7-to-2.2.8.patch begins here ---
diff -urN ./Makefile ../cfengine/Makefile
--- ./Makefile	2008-08-06 17:09:33.000000000 +0400
+++ ../cfengine/Makefile	2008-08-08 02:40:46.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/downloads/
 
@@ -27,6 +27,9 @@
 		BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
 		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
 		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
+.if !defined(NOPORTDOCS)
+INFO=		cfengine-Tutorial cfengine-Reference
+.endif
 
 MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
 		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
diff -urN ./distinfo ../cfengine/distinfo
--- ./distinfo	2008-08-06 17:09:33.000000000 +0400
+++ ../cfengine/distinfo	2008-08-06 17:11:09.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (cfengine-2.2.7.tar.gz) = 8ee6d6d58ba6eca649c199c6c7074a67
-SHA256 (cfengine-2.2.7.tar.gz) = 36f672957bbfd639a591cf77549865130c19b691deeb29fbcca207ee145016bd
-SIZE (cfengine-2.2.7.tar.gz) = 1077903
+MD5 (cfengine-2.2.8.tar.gz) = 8881c3c350f36b35845cdb1e6e53b8a1
+SHA256 (cfengine-2.2.8.tar.gz) = 6423ad330057b28524bf4a91b064d459af2be01d5cddb5064c15d8cb1130e7b8
+SIZE (cfengine-2.2.8.tar.gz) = 2715678
diff -urN ./files/patch-doc_Makefile.in ../cfengine/files/patch-doc_Makefile.in
--- ./files/patch-doc_Makefile.in	2008-08-06 17:09:33.000000000 +0400
+++ ../cfengine/files/patch-doc_Makefile.in	2008-08-08 02:54:16.000000000 +0400
@@ -1,6 +1,31 @@
---- doc/Makefile.in.orig	2008-07-01 21:38:18.000000000 -0400
-+++ doc/Makefile.in	2008-07-01 21:39:06.000000000 -0400
-@@ -331,6 +331,7 @@
+--- doc/Makefile.in.orig	2008-08-04 21:55:47.000000000 +0400
++++ doc/Makefile.in	2008-08-08 02:18:39.000000000 +0400
+@@ -214,7 +214,7 @@
+ man_MANS = cfengine.8 cfagent.8  cfenvd.8  cfenvgraph.8  cfexecd.8  cfkey.8  cfrun.8  cfservd.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 
+ 
+ # Info used in building the Info files
+-info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo # cfengine-Anomalies.texinfo
++info_TEXINFOS =
+ infofiles = $(info_TEXINFOS:.texinfo=.info)
+ MAKEINFOHTML = $(MAKEINFO) --html --css-include=cfcomdoc.css --no-split
+ 
+@@ -476,6 +476,7 @@
+ 	done
+ 
+ dist-info: $(INFO_DEPS)
++.if !defined(NOPORTDOCS)
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(INFO_DEPS)'; \
+ 	for base in $$list; do \
+@@ -492,6 +493,7 @@
+ 	    else :; fi; \
+ 	  done; \
+ 	done
++.endif
+ 
+ mostlyclean-aminfo:
+ 	-rm -rf cfengine-Reference.aux cfengine-Reference.cp cfengine-Reference.cps \
+@@ -570,6 +572,7 @@
  	done
  install-docDATA: $(doc_DATA)
  	@$(NORMAL_INSTALL)
@@ -8,7 +33,7 @@
  	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -338,6 +339,7 @@
+@@ -577,6 +580,7 @@
  	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
  	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
@@ -16,7 +41,7 @@
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -348,6 +350,7 @@
+@@ -587,6 +591,7 @@
  	done
  install-htmlDATA: $(html_DATA)
  	@$(NORMAL_INSTALL)
@@ -24,7 +49,7 @@
  	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
  	@list='$(html_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -355,6 +358,7 @@
+@@ -594,6 +599,7 @@
  	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
  	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
  	done
@@ -32,3 +57,19 @@
  
  uninstall-htmlDATA:
  	@$(NORMAL_UNINSTALL)
+@@ -730,6 +736,7 @@
+ install-info: install-info-am
+ 
+ install-info-am: $(INFO_DEPS)
++.if !defined(NOPORTDOCS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -759,6 +766,7 @@
+ 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+ 	  done; \
+ 	else : ; fi
++.endif
+ install-man: install-man8
+ 
+ install-pdf: install-pdf-am
--- 2.2.7-to-2.2.8.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: