- Update to 2.2.8

PR:		ports/126347
Submitted by:	Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Approved by:	jrhett@netconsonance.com (maintainer)

4 files changed, 59 insertions, 104 deletions

diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 01177f3cafcd..a17a4b731f77 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -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 @@ CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
 		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 --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index a0d20e9aca6e..57b2a510f3ce 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -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 --git a/sysutils/cfengine/files/patch-Makefile.in b/sysutils/cfengine/files/patch-Makefile.in
index dcb6c0b2a9d0..558288e16305 100644
--- a/sysutils/cfengine/files/patch-Makefile.in
+++ b/sysutils/cfengine/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2008-06-11 12:39:22.000000000 -0400
-+++ Makefile.in	2008-07-01 22:32:29.000000000 -0400
+--- Makefile.in.orig	Mon Aug  4 10:55:48 2008
++++ Makefile.in	Tue Aug 12 23:03:09 2008
 @@ -187,7 +187,7 @@
  builddir = @builddir@
  datadir = @datadir@
@@ -9,7 +9,7 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -225,7 +225,15 @@
+@@ -225,7 +225,11 @@
  @BUILD_DOC_TRUE@DOC_DIR = doc
  SUBDIRS = pub src contrib inputs $(DOC_DIR)
  EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
@@ -19,72 +19,18 @@
 +.else
 +doc_DATA = README ChangeLog INSTALL NEWS AUTHORS TODO
 +.endif
-+
-+# Info used in building the MAN files
-+man_MANS = doc/cfengine.8
-+man8dir = $(mandir)/man8
  
  #
  # Some basic clean ups
-@@ -298,8 +306,57 @@
- 
- distclean-libtool:
+@@ -300,6 +304,7 @@
  	-rm -f libtool
-+
-+install-man8: $(man8_MANS) $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
-+	  case "$$i" in \
-+	    *.8*) list="$$list $$i" ;; \
-+	  esac; \
-+	done; \
-+	for i in $$list; do \
-+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+	  else file=$$i; fi; \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
-+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	done
-+
-+uninstall-man8:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+	for i in $$l2; do \
-+	  case "$$i" in \
-+	    *.8*) list="$$list $$i" ;; \
-+	  esac; \
-+	done; \
-+	for i in $$list; do \
-+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+	  case "$$ext" in \
-+	    8*) ;; \
-+	    *) ext='8' ;; \
-+	  esac; \
-+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-+	done
-+
  install-docDATA: $(doc_DATA)
  	@$(NORMAL_INSTALL)
 +.if !defined(NOPORTDOCS)
  	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; \
-@@ -307,6 +364,7 @@
+@@ -307,6 +312,7 @@
  	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
  	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
@@ -92,38 +38,3 @@
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -645,7 +703,7 @@
- 
- info-am:
- 
--install-data-am: install-docDATA
-+install-data-am: install-docDATA install-man8
- 
- install-dvi: install-dvi-recursive
- 
-@@ -681,7 +739,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-docDATA
-+uninstall-am: uninstall-docDATA uninstall-man8
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- 	install-strip
-@@ -693,14 +751,14 @@
- 	distclean-generic distclean-libtool distclean-tags \
- 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-docDATA install-dvi install-dvi-am \
-+	install-data-am install-docDATA install-man8 install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man install-pdf \
- 	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs installdirs-am \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-docDATA
-+	tags tags-recursive uninstall uninstall-am uninstall-docDATA uninstall-man8
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/cfengine/files/patch-doc_Makefile.in b/sysutils/cfengine/files/patch-doc_Makefile.in
index f9c4ea0a680e..d5a6b15f2fbf 100644
--- a/sysutils/cfengine/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine/files/patch-doc_Makefile.in
@@ -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