Update to 2.2.7

Properly respect NOPORTDOCS and NOPORTEXAMPLES

PR:		ports/124993, ports/122057
Submitted by:	Jo Rhett <jrhett@netconsonance.com>
Approved by:	sergei (maintainer timeout)

24 files changed, 600 insertions, 576 deletions

diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index f74f6c356043..83608b7bfe80 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ftp.osuosl.org/pub/cfengine/ \
-		ftp://ftp.iu.hio.no/pub/cfengine/
+MASTER_SITES=	http://www.cfengine.org/downloads/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	A systems administration tool for networks
@@ -23,16 +21,13 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-docs \
-		--docdir=${DOCSDIR}
+		--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html
 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-Anomalies cfengine-Reference cfengine-Tutorial
-.endif
-
 MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
 		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
 		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
@@ -43,5 +38,14 @@ post-patch:
 				  -e s,-lpthread,${PTHREAD_LIBS},g \
 				  -e s,lpthread,${PTHREAD_LIBS},g \
 				  ${WRKSRC}/configure
+		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
+				  ${WRKSRC}/inputs/Makefile.in \
+				  ${WRKSRC}/contrib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index 3c29e929abce..a0d20e9aca6e 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfengine-2.2.3.tar.gz) = 903298e54e80fe0c617f1c51102caef1
-SHA256 (cfengine-2.2.3.tar.gz) = 2f0f62f4ba28a0532f589092af76a3693c50c6f42236662e2d97a8fda8b8fc06
-SIZE (cfengine-2.2.3.tar.gz) = 3932061
+MD5 (cfengine-2.2.7.tar.gz) = 8ee6d6d58ba6eca649c199c6c7074a67
+SHA256 (cfengine-2.2.7.tar.gz) = 36f672957bbfd639a591cf77549865130c19b691deeb29fbcca207ee145016bd
+SIZE (cfengine-2.2.7.tar.gz) = 1077903
diff --git a/sysutils/cfengine/files/patch-Makefile.in b/sysutils/cfengine/files/patch-Makefile.in
index 15fda846d1ee..dcb6c0b2a9d0 100644
--- a/sysutils/cfengine/files/patch-Makefile.in
+++ b/sysutils/cfengine/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in_orig	Wed May 30 10:44:56 2007
-+++ Makefile.in	Wed May 30 10:48:32 2007
-@@ -174,7 +174,7 @@
- build_vendor = @build_vendor@
+--- Makefile.in.orig	2008-06-11 12:39:22.000000000 -0400
++++ Makefile.in	2008-07-01 22:32:29.000000000 -0400
+@@ -187,7 +187,7 @@
+ builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
 -docdir = $(pkgdatadir)
@@ -9,16 +9,121 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -209,7 +209,11 @@
+@@ -225,7 +225,15 @@
  @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
+ EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
 -doc_DATA = README ChangeLog INSTALL NEWS
 +.if defined(NOPORTDOCS)
 +doc_DATA = 
 +.else
-+doc_DATA = AUTHORS ChangeLog README TODO
++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:
+ 	-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 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++.endif
+ 
+ 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-configure b/sysutils/cfengine/files/patch-configure
deleted file mode 100644
index 131b28611ce4..000000000000
--- a/sysutils/cfengine/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2007-12-01 04:42:22.000000000 -0800
-+++ configure	2007-12-11 14:36:12.215074399 -0800
-@@ -33621,7 +33621,7 @@
- 
- 
- 
--LIBS="-L../pub -lpub $LIBS"
-+LIBS="../pub/libpub.a $LIBS"
- 
- 
- { echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5
diff --git a/sysutils/cfengine/files/patch-contrib_Makefile.in b/sysutils/cfengine/files/patch-contrib_Makefile.in
index 10e3fe8f1f12..5dac09930b39 100644
--- a/sysutils/cfengine/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine/files/patch-contrib_Makefile.in
@@ -1,12 +1,18 @@
---- contrib/Makefile.in.orig    Mon Sep 13 19:21:57 2004
-+++ contrib/Makefile.in Mon Sep 13 19:22:23 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- contrib/Makefile.in.orig	2008-07-01 22:50:46.000000000 -0400
++++ contrib/Makefile.in	2008-07-01 22:51:08.000000000 -0400
+@@ -251,6 +251,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -260,6 +261,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine/files/patch-doc_Makefile.in b/sysutils/cfengine/files/patch-doc_Makefile.in
index deb651f388b5..f9c4ea0a680e 100644
--- a/sysutils/cfengine/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine/files/patch-doc_Makefile.in
@@ -1,94 +1,14 @@
---- doc/Makefile.in.orig	Tue May 29 11:07:06 2007
-+++ doc/Makefile.in	Wed May 30 10:58:27 2007
-@@ -52,8 +52,12 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
-+.if defined(NOPORTDOCS)
-+INFO_DEPS =
-+.else
- INFO_DEPS = cfengine-Reference.info cfengine-Tutorial.info \
- 	cfengine-Anomalies.info
-+.endif
- am__TEXINFO_TEX_DIR = $(srcdir)
- DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \
- 	cfengine-Anomalies.dvi
-@@ -171,7 +175,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(pkgdatadir)/doc
-+docdir = $(prefix)/share/doc/cfengine
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -179,7 +183,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--htmldir = $(pkgdatadir)/html
-+htmldir = $(docdir)
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-@@ -213,13 +217,21 @@
- 
- # Info used in building and installing HTML files
- htmlfiles = $(info_TEXINFOS:.texinfo=.html)
-+.if defined(NOPORTDOCS)
-+html_DATA = 
-+.else
- html_DATA = $(htmlfiles)
-+.endif
- 
- # Info used in building and installing Postscript files
- psfiles = $(info_TEXINFOS:.texinfo=.ps)
- pdffiles = $(info_TEXINFOS:.texinfo=.pdf)
- dvifiles = $(info_TEXINFOS:.texinfo=.dvi)
-+.if defined(NOPORTDOCS)
-+doc_DATA = 
-+.else
- doc_DATA = $(psfiles) $(pdffiles)
-+.endif
- 
- # Make sure these get distributed with everything else.
- EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles)  $(psfiles) $(dvifiles) $(pdffiles)
-@@ -324,7 +336,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version1.texi:  $(srcdir)/stamp-vti
--$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
- 	@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -385,7 +397,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version2.texi:  $(srcdir)/stamp-1
--$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
- 	@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -446,7 +458,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version3.texi:  $(srcdir)/stamp-2
--$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
- 	@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -592,6 +604,7 @@
- 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+--- 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 @@
  	done
  install-docDATA: $(doc_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -600,6 +613,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -338,6 +339,7 @@
  	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
  	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
@@ -96,15 +16,15 @@
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -609,6 +623,7 @@
- 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+@@ -348,6 +350,7 @@
  	done
  install-htmlDATA: $(html_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
  	@list='$(html_DATA)'; for p in $$list; do \
-@@ -617,6 +632,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -355,6 +358,7 @@
  	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
  	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
  	done
@@ -112,19 +32,3 @@
  
  uninstall-htmlDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -725,6 +741,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'`; \
-@@ -754,6 +771,7 @@
- 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
- 	  done; \
- 	else : ; fi
-+.endif
- install-man: install-man8
- 
- installcheck-am:
diff --git a/sysutils/cfengine/files/patch-inputs_Makefile.in b/sysutils/cfengine/files/patch-inputs_Makefile.in
index 39bd1e37b49e..bac3996a6dc6 100644
--- a/sysutils/cfengine/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine/files/patch-inputs_Makefile.in
@@ -1,12 +1,18 @@
---- inputs/Makefile.in.orig     Mon Sep 13 19:25:42 2004
-+++ inputs/Makefile.in  Mon Sep 13 19:25:57 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- inputs/Makefile.in.orig	2008-07-01 22:51:16.000000000 -0400
++++ inputs/Makefile.in	2008-07-01 22:51:37.000000000 -0400
+@@ -267,6 +267,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -276,6 +277,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine/pkg-plist b/sysutils/cfengine/pkg-plist
index 5a7fa60b4fbe..59ee35803ad5 100644
--- a/sysutils/cfengine/pkg-plist
+++ b/sysutils/cfengine/pkg-plist
@@ -12,38 +12,32 @@ sbin/cfkey
 sbin/cfrun
 sbin/cfservd
 sbin/cfshow
-%%EXAMPLESDIR%%/cf.chflags.example
-%%EXAMPLESDIR%%/cf.freebsd.example
-%%EXAMPLESDIR%%/cf.ftp.example
-%%EXAMPLESDIR%%/cf.groups.example
-%%EXAMPLESDIR%%/cf.linux.example
-%%EXAMPLESDIR%%/cf.main.example
-%%EXAMPLESDIR%%/cf.motd.example
-%%EXAMPLESDIR%%/cf.preconf.example
-%%EXAMPLESDIR%%/cf.services.example
-%%EXAMPLESDIR%%/cf.site.example
-%%EXAMPLESDIR%%/cf.solaris.example
-%%EXAMPLESDIR%%/cf.sun4.example
-%%EXAMPLESDIR%%/cf.users.example
-%%EXAMPLESDIR%%/cfagent.conf-advanced.example
-%%EXAMPLESDIR%%/cfagent.conf.example
-%%EXAMPLESDIR%%/cfengine.el
-%%EXAMPLESDIR%%/cfrc.example
-%%EXAMPLESDIR%%/cfrun.hosts.example
-%%EXAMPLESDIR%%/cfservd.conf.example
-%%EXAMPLESDIR%%/update.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.chflags.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.freebsd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.ftp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.groups.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.linux.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.main.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.motd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.preconf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.services.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.site.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.solaris.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.sun4.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.users.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf-advanced.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfengine.el
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrc.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrun.hosts.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfservd.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.conf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.ps
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index f74f6c356043..83608b7bfe80 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ftp.osuosl.org/pub/cfengine/ \
-		ftp://ftp.iu.hio.no/pub/cfengine/
+MASTER_SITES=	http://www.cfengine.org/downloads/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	A systems administration tool for networks
@@ -23,16 +21,13 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-docs \
-		--docdir=${DOCSDIR}
+		--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html
 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-Anomalies cfengine-Reference cfengine-Tutorial
-.endif
-
 MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
 		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
 		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
@@ -43,5 +38,14 @@ post-patch:
 				  -e s,-lpthread,${PTHREAD_LIBS},g \
 				  -e s,lpthread,${PTHREAD_LIBS},g \
 				  ${WRKSRC}/configure
+		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
+				  ${WRKSRC}/inputs/Makefile.in \
+				  ${WRKSRC}/contrib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine3-legacy/distinfo b/sysutils/cfengine3-legacy/distinfo
index 3c29e929abce..a0d20e9aca6e 100644
--- a/sysutils/cfengine3-legacy/distinfo
+++ b/sysutils/cfengine3-legacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfengine-2.2.3.tar.gz) = 903298e54e80fe0c617f1c51102caef1
-SHA256 (cfengine-2.2.3.tar.gz) = 2f0f62f4ba28a0532f589092af76a3693c50c6f42236662e2d97a8fda8b8fc06
-SIZE (cfengine-2.2.3.tar.gz) = 3932061
+MD5 (cfengine-2.2.7.tar.gz) = 8ee6d6d58ba6eca649c199c6c7074a67
+SHA256 (cfengine-2.2.7.tar.gz) = 36f672957bbfd639a591cf77549865130c19b691deeb29fbcca207ee145016bd
+SIZE (cfengine-2.2.7.tar.gz) = 1077903
diff --git a/sysutils/cfengine3-legacy/files/patch-Makefile.in b/sysutils/cfengine3-legacy/files/patch-Makefile.in
index 15fda846d1ee..dcb6c0b2a9d0 100644
--- a/sysutils/cfengine3-legacy/files/patch-Makefile.in
+++ b/sysutils/cfengine3-legacy/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in_orig	Wed May 30 10:44:56 2007
-+++ Makefile.in	Wed May 30 10:48:32 2007
-@@ -174,7 +174,7 @@
- build_vendor = @build_vendor@
+--- Makefile.in.orig	2008-06-11 12:39:22.000000000 -0400
++++ Makefile.in	2008-07-01 22:32:29.000000000 -0400
+@@ -187,7 +187,7 @@
+ builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
 -docdir = $(pkgdatadir)
@@ -9,16 +9,121 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -209,7 +209,11 @@
+@@ -225,7 +225,15 @@
  @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
+ EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
 -doc_DATA = README ChangeLog INSTALL NEWS
 +.if defined(NOPORTDOCS)
 +doc_DATA = 
 +.else
-+doc_DATA = AUTHORS ChangeLog README TODO
++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:
+ 	-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 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++.endif
+ 
+ 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/cfengine3-legacy/files/patch-configure b/sysutils/cfengine3-legacy/files/patch-configure
deleted file mode 100644
index 131b28611ce4..000000000000
--- a/sysutils/cfengine3-legacy/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2007-12-01 04:42:22.000000000 -0800
-+++ configure	2007-12-11 14:36:12.215074399 -0800
-@@ -33621,7 +33621,7 @@
- 
- 
- 
--LIBS="-L../pub -lpub $LIBS"
-+LIBS="../pub/libpub.a $LIBS"
- 
- 
- { echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5
diff --git a/sysutils/cfengine3-legacy/files/patch-contrib_Makefile.in b/sysutils/cfengine3-legacy/files/patch-contrib_Makefile.in
index 10e3fe8f1f12..5dac09930b39 100644
--- a/sysutils/cfengine3-legacy/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine3-legacy/files/patch-contrib_Makefile.in
@@ -1,12 +1,18 @@
---- contrib/Makefile.in.orig    Mon Sep 13 19:21:57 2004
-+++ contrib/Makefile.in Mon Sep 13 19:22:23 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- contrib/Makefile.in.orig	2008-07-01 22:50:46.000000000 -0400
++++ contrib/Makefile.in	2008-07-01 22:51:08.000000000 -0400
+@@ -251,6 +251,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -260,6 +261,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine3-legacy/files/patch-doc_Makefile.in b/sysutils/cfengine3-legacy/files/patch-doc_Makefile.in
index deb651f388b5..f9c4ea0a680e 100644
--- a/sysutils/cfengine3-legacy/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine3-legacy/files/patch-doc_Makefile.in
@@ -1,94 +1,14 @@
---- doc/Makefile.in.orig	Tue May 29 11:07:06 2007
-+++ doc/Makefile.in	Wed May 30 10:58:27 2007
-@@ -52,8 +52,12 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
-+.if defined(NOPORTDOCS)
-+INFO_DEPS =
-+.else
- INFO_DEPS = cfengine-Reference.info cfengine-Tutorial.info \
- 	cfengine-Anomalies.info
-+.endif
- am__TEXINFO_TEX_DIR = $(srcdir)
- DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \
- 	cfengine-Anomalies.dvi
-@@ -171,7 +175,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(pkgdatadir)/doc
-+docdir = $(prefix)/share/doc/cfengine
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -179,7 +183,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--htmldir = $(pkgdatadir)/html
-+htmldir = $(docdir)
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-@@ -213,13 +217,21 @@
- 
- # Info used in building and installing HTML files
- htmlfiles = $(info_TEXINFOS:.texinfo=.html)
-+.if defined(NOPORTDOCS)
-+html_DATA = 
-+.else
- html_DATA = $(htmlfiles)
-+.endif
- 
- # Info used in building and installing Postscript files
- psfiles = $(info_TEXINFOS:.texinfo=.ps)
- pdffiles = $(info_TEXINFOS:.texinfo=.pdf)
- dvifiles = $(info_TEXINFOS:.texinfo=.dvi)
-+.if defined(NOPORTDOCS)
-+doc_DATA = 
-+.else
- doc_DATA = $(psfiles) $(pdffiles)
-+.endif
- 
- # Make sure these get distributed with everything else.
- EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles)  $(psfiles) $(dvifiles) $(pdffiles)
-@@ -324,7 +336,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version1.texi:  $(srcdir)/stamp-vti
--$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
- 	@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -385,7 +397,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version2.texi:  $(srcdir)/stamp-1
--$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
- 	@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -446,7 +458,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version3.texi:  $(srcdir)/stamp-2
--$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
- 	@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -592,6 +604,7 @@
- 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+--- 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 @@
  	done
  install-docDATA: $(doc_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -600,6 +613,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -338,6 +339,7 @@
  	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
  	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
@@ -96,15 +16,15 @@
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -609,6 +623,7 @@
- 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+@@ -348,6 +350,7 @@
  	done
  install-htmlDATA: $(html_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
  	@list='$(html_DATA)'; for p in $$list; do \
-@@ -617,6 +632,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -355,6 +358,7 @@
  	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
  	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
  	done
@@ -112,19 +32,3 @@
  
  uninstall-htmlDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -725,6 +741,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'`; \
-@@ -754,6 +771,7 @@
- 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
- 	  done; \
- 	else : ; fi
-+.endif
- install-man: install-man8
- 
- installcheck-am:
diff --git a/sysutils/cfengine3-legacy/files/patch-inputs_Makefile.in b/sysutils/cfengine3-legacy/files/patch-inputs_Makefile.in
index 39bd1e37b49e..bac3996a6dc6 100644
--- a/sysutils/cfengine3-legacy/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine3-legacy/files/patch-inputs_Makefile.in
@@ -1,12 +1,18 @@
---- inputs/Makefile.in.orig     Mon Sep 13 19:25:42 2004
-+++ inputs/Makefile.in  Mon Sep 13 19:25:57 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- inputs/Makefile.in.orig	2008-07-01 22:51:16.000000000 -0400
++++ inputs/Makefile.in	2008-07-01 22:51:37.000000000 -0400
+@@ -267,6 +267,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -276,6 +277,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index 5a7fa60b4fbe..59ee35803ad5 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -12,38 +12,32 @@ sbin/cfkey
 sbin/cfrun
 sbin/cfservd
 sbin/cfshow
-%%EXAMPLESDIR%%/cf.chflags.example
-%%EXAMPLESDIR%%/cf.freebsd.example
-%%EXAMPLESDIR%%/cf.ftp.example
-%%EXAMPLESDIR%%/cf.groups.example
-%%EXAMPLESDIR%%/cf.linux.example
-%%EXAMPLESDIR%%/cf.main.example
-%%EXAMPLESDIR%%/cf.motd.example
-%%EXAMPLESDIR%%/cf.preconf.example
-%%EXAMPLESDIR%%/cf.services.example
-%%EXAMPLESDIR%%/cf.site.example
-%%EXAMPLESDIR%%/cf.solaris.example
-%%EXAMPLESDIR%%/cf.sun4.example
-%%EXAMPLESDIR%%/cf.users.example
-%%EXAMPLESDIR%%/cfagent.conf-advanced.example
-%%EXAMPLESDIR%%/cfagent.conf.example
-%%EXAMPLESDIR%%/cfengine.el
-%%EXAMPLESDIR%%/cfrc.example
-%%EXAMPLESDIR%%/cfrun.hosts.example
-%%EXAMPLESDIR%%/cfservd.conf.example
-%%EXAMPLESDIR%%/update.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.chflags.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.freebsd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.ftp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.groups.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.linux.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.main.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.motd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.preconf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.services.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.site.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.solaris.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.sun4.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.users.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf-advanced.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfengine.el
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrc.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrun.hosts.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfservd.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.conf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.ps
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index f74f6c356043..83608b7bfe80 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.2.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ftp.osuosl.org/pub/cfengine/ \
-		ftp://ftp.iu.hio.no/pub/cfengine/
+MASTER_SITES=	http://www.cfengine.org/downloads/
 
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	A systems administration tool for networks
@@ -23,16 +21,13 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-docs \
-		--docdir=${DOCSDIR}
+		--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html
 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-Anomalies cfengine-Reference cfengine-Tutorial
-.endif
-
 MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfenvgraph.8 cfetoolcheck.8 \
 		cfetoolcreate.8 cfetooldump.8 cfetoolgraph.8 cfetoolimport.8 \
 		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
@@ -43,5 +38,14 @@ post-patch:
 				  -e s,-lpthread,${PTHREAD_LIBS},g \
 				  -e s,lpthread,${PTHREAD_LIBS},g \
 				  ${WRKSRC}/configure
+		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
+				  ${WRKSRC}/doc/Makefile.in \
+				  ${WRKSRC}/Makefile.in
+		@${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
+				  ${WRKSRC}/inputs/Makefile.in \
+				  ${WRKSRC}/contrib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index 3c29e929abce..a0d20e9aca6e 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfengine-2.2.3.tar.gz) = 903298e54e80fe0c617f1c51102caef1
-SHA256 (cfengine-2.2.3.tar.gz) = 2f0f62f4ba28a0532f589092af76a3693c50c6f42236662e2d97a8fda8b8fc06
-SIZE (cfengine-2.2.3.tar.gz) = 3932061
+MD5 (cfengine-2.2.7.tar.gz) = 8ee6d6d58ba6eca649c199c6c7074a67
+SHA256 (cfengine-2.2.7.tar.gz) = 36f672957bbfd639a591cf77549865130c19b691deeb29fbcca207ee145016bd
+SIZE (cfengine-2.2.7.tar.gz) = 1077903
diff --git a/sysutils/cfengine3/files/patch-Makefile.in b/sysutils/cfengine3/files/patch-Makefile.in
index 15fda846d1ee..dcb6c0b2a9d0 100644
--- a/sysutils/cfengine3/files/patch-Makefile.in
+++ b/sysutils/cfengine3/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in_orig	Wed May 30 10:44:56 2007
-+++ Makefile.in	Wed May 30 10:48:32 2007
-@@ -174,7 +174,7 @@
- build_vendor = @build_vendor@
+--- Makefile.in.orig	2008-06-11 12:39:22.000000000 -0400
++++ Makefile.in	2008-07-01 22:32:29.000000000 -0400
+@@ -187,7 +187,7 @@
+ builddir = @builddir@
  datadir = @datadir@
  datarootdir = @datarootdir@
 -docdir = $(pkgdatadir)
@@ -9,16 +9,121 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -209,7 +209,11 @@
+@@ -225,7 +225,15 @@
  @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
+ EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
 -doc_DATA = README ChangeLog INSTALL NEWS
 +.if defined(NOPORTDOCS)
 +doc_DATA = 
 +.else
-+doc_DATA = AUTHORS ChangeLog README TODO
++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:
+ 	-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 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++.endif
+ 
+ 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/cfengine3/files/patch-configure b/sysutils/cfengine3/files/patch-configure
deleted file mode 100644
index 131b28611ce4..000000000000
--- a/sysutils/cfengine3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2007-12-01 04:42:22.000000000 -0800
-+++ configure	2007-12-11 14:36:12.215074399 -0800
-@@ -33621,7 +33621,7 @@
- 
- 
- 
--LIBS="-L../pub -lpub $LIBS"
-+LIBS="../pub/libpub.a $LIBS"
- 
- 
- { echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5
diff --git a/sysutils/cfengine3/files/patch-contrib_Makefile.in b/sysutils/cfengine3/files/patch-contrib_Makefile.in
index 10e3fe8f1f12..5dac09930b39 100644
--- a/sysutils/cfengine3/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine3/files/patch-contrib_Makefile.in
@@ -1,12 +1,18 @@
---- contrib/Makefile.in.orig    Mon Sep 13 19:21:57 2004
-+++ contrib/Makefile.in Mon Sep 13 19:22:23 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- contrib/Makefile.in.orig	2008-07-01 22:50:46.000000000 -0400
++++ contrib/Makefile.in	2008-07-01 22:51:08.000000000 -0400
+@@ -251,6 +251,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -260,6 +261,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine3/files/patch-doc_Makefile.in b/sysutils/cfengine3/files/patch-doc_Makefile.in
index deb651f388b5..f9c4ea0a680e 100644
--- a/sysutils/cfengine3/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine3/files/patch-doc_Makefile.in
@@ -1,94 +1,14 @@
---- doc/Makefile.in.orig	Tue May 29 11:07:06 2007
-+++ doc/Makefile.in	Wed May 30 10:58:27 2007
-@@ -52,8 +52,12 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
-+.if defined(NOPORTDOCS)
-+INFO_DEPS =
-+.else
- INFO_DEPS = cfengine-Reference.info cfengine-Tutorial.info \
- 	cfengine-Anomalies.info
-+.endif
- am__TEXINFO_TEX_DIR = $(srcdir)
- DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \
- 	cfengine-Anomalies.dvi
-@@ -171,7 +175,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(pkgdatadir)/doc
-+docdir = $(prefix)/share/doc/cfengine
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -179,7 +183,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
--htmldir = $(pkgdatadir)/html
-+htmldir = $(docdir)
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-@@ -213,13 +217,21 @@
- 
- # Info used in building and installing HTML files
- htmlfiles = $(info_TEXINFOS:.texinfo=.html)
-+.if defined(NOPORTDOCS)
-+html_DATA = 
-+.else
- html_DATA = $(htmlfiles)
-+.endif
- 
- # Info used in building and installing Postscript files
- psfiles = $(info_TEXINFOS:.texinfo=.ps)
- pdffiles = $(info_TEXINFOS:.texinfo=.pdf)
- dvifiles = $(info_TEXINFOS:.texinfo=.dvi)
-+.if defined(NOPORTDOCS)
-+doc_DATA = 
-+.else
- doc_DATA = $(psfiles) $(pdffiles)
-+.endif
- 
- # Make sure these get distributed with everything else.
- EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 cfetoolcheck.8   cfetooldump.8   cfetoolimport.8  cfetoolupdate.8 cfetoolcreate.8  cfetoolgraph.8  cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles)  $(psfiles) $(dvifiles) $(pdffiles)
-@@ -324,7 +336,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version1.texi:  $(srcdir)/stamp-vti
--$(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-vti: cfengine-Reference.texinfo
- 	@(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -385,7 +397,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version2.texi:  $(srcdir)/stamp-1
--$(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-1: cfengine-Tutorial.texinfo
- 	@(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -446,7 +458,7 @@
- 	  exit 1; \
- 	fi
- $(srcdir)/version3.texi:  $(srcdir)/stamp-2
--$(srcdir)/stamp-2: cfengine-Anomalies.texinfo $(top_srcdir)/configure
-+$(srcdir)/stamp-2: cfengine-Anomalies.texinfo
- 	@(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \
- 	set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -592,6 +604,7 @@
- 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+--- 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 @@
  	done
  install-docDATA: $(doc_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -600,6 +613,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -338,6 +339,7 @@
  	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
  	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
@@ -96,15 +16,15 @@
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -609,6 +623,7 @@
- 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+@@ -348,6 +350,7 @@
  	done
  install-htmlDATA: $(html_DATA)
-+.if !defined(NOPORTDOCS)
  	@$(NORMAL_INSTALL)
- 	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
++.if !defined(NOPORTDOCS)
+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
  	@list='$(html_DATA)'; for p in $$list; do \
-@@ -617,6 +632,7 @@
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -355,6 +358,7 @@
  	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
  	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
  	done
@@ -112,19 +32,3 @@
  
  uninstall-htmlDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -725,6 +741,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'`; \
-@@ -754,6 +771,7 @@
- 	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
- 	  done; \
- 	else : ; fi
-+.endif
- install-man: install-man8
- 
- installcheck-am:
diff --git a/sysutils/cfengine3/files/patch-inputs_Makefile.in b/sysutils/cfengine3/files/patch-inputs_Makefile.in
index 39bd1e37b49e..bac3996a6dc6 100644
--- a/sysutils/cfengine3/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine3/files/patch-inputs_Makefile.in
@@ -1,12 +1,18 @@
---- inputs/Makefile.in.orig     Mon Sep 13 19:25:42 2004
-+++ inputs/Makefile.in  Mon Sep 13 19:25:57 2004
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-
+--- inputs/Makefile.in.orig	2008-07-01 22:51:16.000000000 -0400
++++ inputs/Makefile.in	2008-07-01 22:51:37.000000000 -0400
+@@ -267,6 +267,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
++.if !defined(NOPORTEXAMPLES)
+ 	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ 	@list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@@ -276,6 +277,7 @@
+ 	    $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ 	  else :; fi; \
+ 	done
++.endif
+ 
+ uninstall-pkgdataSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index 5a7fa60b4fbe..59ee35803ad5 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -12,38 +12,32 @@ sbin/cfkey
 sbin/cfrun
 sbin/cfservd
 sbin/cfshow
-%%EXAMPLESDIR%%/cf.chflags.example
-%%EXAMPLESDIR%%/cf.freebsd.example
-%%EXAMPLESDIR%%/cf.ftp.example
-%%EXAMPLESDIR%%/cf.groups.example
-%%EXAMPLESDIR%%/cf.linux.example
-%%EXAMPLESDIR%%/cf.main.example
-%%EXAMPLESDIR%%/cf.motd.example
-%%EXAMPLESDIR%%/cf.preconf.example
-%%EXAMPLESDIR%%/cf.services.example
-%%EXAMPLESDIR%%/cf.site.example
-%%EXAMPLESDIR%%/cf.solaris.example
-%%EXAMPLESDIR%%/cf.sun4.example
-%%EXAMPLESDIR%%/cf.users.example
-%%EXAMPLESDIR%%/cfagent.conf-advanced.example
-%%EXAMPLESDIR%%/cfagent.conf.example
-%%EXAMPLESDIR%%/cfengine.el
-%%EXAMPLESDIR%%/cfrc.example
-%%EXAMPLESDIR%%/cfrun.hosts.example
-%%EXAMPLESDIR%%/cfservd.conf.example
-%%EXAMPLESDIR%%/update.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.chflags.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.freebsd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.ftp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.groups.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.linux.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.main.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.motd.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.preconf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.services.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.site.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.solaris.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.sun4.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cf.users.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf-advanced.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfagent.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfengine.el
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrc.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfrun.hosts.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cfservd.conf.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.conf.example
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Anomalies.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Reference.ps
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.pdf
-%%PORTDOCS%%%%DOCSDIR%%/cfengine-Tutorial.ps
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%