Update to 2.1.22:

2.1.22

	IMPORTANT: cfshow output formatting changes
	           database internal format changes

	Rewritten the checksum subsystem to allow for future development
	and improvements and tidied the fragile Berkeley DB code. Cfservd
	no longer caches checksums, as this causes update issues. This could
	lead to additional load.

	The checksum code has been rewritten with a new database model, so all
	old data will be rebuilt. The checksum database has been renamed.

	ChecksumDatabase variable is not longer used.

	Package manager debian patch added to iterate over packages
	under installation.

	Package manager for AIX code added, courtesy of Anthony Rassin

	Package manager for Gentoo added, courtesy of Eric Searcy

	ShowState(rootprocs), ShowState(otherprocs) added for
	better process reporting

	General code reorganization for better separation of concerns, looking
	towards cfengine 3.

	cfconvert removed. Change of future strategy for cfengine 3 migration.

	Rationalization of internal instrumentation and better integration
	with cfenvd.

	Bug fixes to miscmounts. Editing was broken with respect to editfilesize variable.
	Option processing for miscmounts was also broken.

	Support for old Berkeley DB APIs abandoned.

	Encryption level added for full encryption of opendir traffic.
	Must set FullEncryption = ( true ) in control for compatability

	server=none now signals noop in method execution and copy.

        Varstring expansion bug for nested variables.

2.1.21

	copy action now supports this $(this) variable which is made equal to the
	current server. This allows separating files from multiple hosts when downloading.

	cfenvd LDT fixes

	Bugs in PeerLeader/Group functions fixed.

	Some buffer limits too small and hardcoded in item.c - fix
	PH support removed from cfenvd during code rationalization - never used

	Cfenvd code rationalization and channge in database format.
	THe first time cfenvd runs, it will convert the database into the new format,
	be aware that this could take some time as it is disk intensive.

	Matt Shibla (ARM) ReturnsZeroShell function added.
	Cfrun ignored port number, fix


2.1.20
	ipv6 structure compilation error for Tru64

	Tested for compilation with latest Berkeley4.4-NC

	New option in cfservd.conf "LogEncryptedTransfers" (true/false).
	If true, any file that is granted access and is marked "encrypt=true"
	will be logged in syslog. i.e. one can keep a record of sensitive
	transfers.

	Linkcopy fix in 2.1.19 broke copying of links that point
	nowhere. Fixed.

	Copy was missing from the multi-pass detection. Fixed

	Patch to debian package management. (bastiaans@sara.nl) fixed -
	debian package always returned eq/true without cmp/version
	statement" (checking if a package is installed, regardless of
	version, now works

	However the "Comparison result" is always "eq" (equal) somehow for
	me... "

	If you are experiencing problems with 2.1.19 please get 2.1.19a.
	One of the changes in 2.1.19 has had bizarre side effects in links
	and disks.

2.1.19

	cfagent will now exit and cease processing if any class in the defined
	control list

	 AbortClasses = ( class_name_1 class_name_2 ... )

	The singlecopy feature has been rewritten after reports of it not
	working, besides, the code was bizarre and the documentation was
	even worse.

	The autodefine code also patched and tested. In both these cases,
	there are lists of *patterns* or wildcards. The code and docs now
	agree

	ExecResult now runs its command in -n mode

	Error parsing strings (esp shellcommands) that contain the $
	symbol due to a bug in 2D-lists.

	VMWare ESX recognition.

	Bug in cfservd stat-mode on symbolic links not correctly
	evaluated.  Bug in linktype=copy for copy fixed.

	Bug in array expansion fixed - would truncate string after expansion

	Constant-cosmetics and length alterations. CF_SMALLBUF introduced,
	and MAXHOSTNAMELEN used

	PID file added for each daemin in WORKDIR == /var/cfengine

	Patch for function argument parsing

	Typo in docs. SelectPartitionGroup -> SelectPartitionNeighbours

	Inform=true support for packages

	HostRange bug - recoding not implemented properly from
	2.1.16. Caused seg fault.

	Joe Buehler's harmless patch to cfexecd to flag daemon and batch mode.

	Serious bug in binserver handling fixed. (Rarely used feature)

	home tidying did not set the "done flag" for multiple pass avoidance.

	Patches to setting unqualified and qualified names

	SuSE 10 detection patch

	Minor error fixes discovered by Joe Buehler and his wonderful
	software.

        Files is the "suspicious" list were marked "not sensible" so that
	follow-up rules e.g. to delete them would not be triggered This is
	now considered a confusion of roles. Suspicious files are no
	longer skipped.

	More memory leaks in cfservd

	Compilation fix for non-IPv6 savvy machines

2.1.18


	Error in FileExists() left over from 2.1.16 changes. Fixed

	elsedefine was not defined if a copy was requested of a non-existent file. Fixed.

	HostnameKeys (dynamic keys for dhcp clients) fix for cfservd.

	Error in stat'ing links that point to non-existent files in
	cfservd. Missing "else" caused this to be reported as an error in
	remote file copy.

	5 second timeout reduced to 10 in cfservd file change check.

	Error message returned by cfservd is non-specific and previously
	said authentication denied, regardless of failure. The daemon now replies
	"Unspecified refusal". Users should use -v or -d2 on both sides of a connection
	to diagnose the true cause of failure,

	Segmentation fault when in verbose mode fixed - editfiles pointer.

	Error in parsing quotes and escaped quotes in functions.

	Bug in implementation of tidy scheduling during dependent classes fixed.

	BeginGroupIfLineMatch
	BeginGroupIfMatch
	BeginGroupIfLineContaining operations added

	Function ExecShellResult similar to ExecResult, but a shell is used,

	cfservd some additional memory reclamation during file updates, could cause memory leaks..

2.1.17

		This is a minor bugfix release


	WARNING	- the handling of function arguments has been changed. You are recommended to
	use normal C/Perl quoting of argument strings., e.g.

	  result = ( ExecResult("/bin/sh -c \"${pf_cc} -V | head -1 | cut -d\  -f3\"") )

	not

  	  result = ( ExecResult(/bin/sh -c "${pf_cc} -V | head -1 | cut -d\  -f3") )

	IsWildItemIn now has reflexive check - some confusion in the code about whether
	the needle or the haystack is the wildcard.

	Templating in editfiles. A new editfiles directive "ExpandVariables"
	adds an "m4" like function to cfengine -- allowing predefined variable strings
	to be expanded into text.

	Patch contributed to expansvariables: Davor Ocelic <docelic@mail.inet.hr>

	Alerts patch - some alerts not installed, if classes not defined.

	Patch for missing variable expansion after function
	parameter rewrite in 2.1.16. Some functions were not fully ported.

	vicf eliminated from distribution

	PrepModule environment fix

	Compilation error C++ mixed into cfetool fix

	Chdir to / when ascting as a daemon for cfservd, cfexecd etc

2.1.16
	Bugfix release

	Moved method parameter setting to fix a bug where parameters would
	be set too late to be used in the parser

	action=warn in copy required inform=true to work, fixed.

	Function arg expansion bug and improvement fix

	Include directive added to cfrun.hosts (Olivier Fauchon)

	MOUNT_RO name collision fix

	SEG fault fixed when signalling cfenvd

	SkipIdentify partial fix

	Alf Wachsmann and Elizabeth Cassel's cfetool added, based on cfenvd.

	"cfetool makes a standalone tool out of cfenvd that accepts arbitrary
	periodic data. In addition, it has support for yearly periodic data.
	It's function and the user interface is in many aspects like rrdtool's.
	cfetoolgraph was added to work with the new features of cfetool.
	It works basically like cfenvgraph."


	Bug fix for multipass evaluation when resolving dependencies.

	Cfservd reread patch. Timeout on polling for linux,

	Default route code now uses "route" command exclusively for portability.

	EmailFrom patch to cfexecd / redundant code was paste error

	Increase pass depth in evaluation of action sequence.

	Skipident patch

	Size increase for interface buffer list

	HPUX,AIX ifconfig location fix

	Methods documentation improved.

	New control function for testing tcp services
          var = ReadTCP(host,port,"send string",maxbytes)

2.1.15

	-f removal in cfservd patch

	Segmentation fault in cfservd with RSA key exchange fixed.

	Disk freespace alerting bug - did not agree with manual specification. Message
	appears only in verbose. Fixed.

	Autodefine install patch.

	Abspath in shellcommands was not parsed and acted on...

	Warnall action was not respected in copy. Permissions were altered on destination file anyway.

	cfcolon added to special symbols.

2.1.14

	Alerts processed now in update context.

	More locking canonification fixes

	Exception for ReplaceALL convergence warning. Warning is not fatal
	if the operation is inside an editgroup.

	md5/sha1 message incorrect on new file found.

       Fixup Makefile.am and doc/Makefile.am.  Docs are now installed
       in the CFEngine "share" directory where they belong.

	Directory iteration fixed. New: owner=LastNode sets the owner of
	the directory to the name of the last node in the dir name. This allows
	the creation of homedirs.

	CentOS support added.

	Extra encryption stage added in C5 protocol. NOTE: This makes 2.1.14
	cfagent clients unable to talk to older servers. (Upgrade servers
	first, or at the same time.)

	Class "no_default_route" is now defined if a default route is not previously
	set, and a default route is defined for the current host.

	Added class functions IsGreaterThan, IsLessThan for numerical or string comparisons

	control:

  	 actionsequence = ( files )

	 a = ( 2.12 )
 	 b = ( 2.11 )

	classes:

	lt = ( LessThan(${a},${b}) )
   	gt = ( GreaterThan(${a},${b}) )

	alerts:

	  lt:: "$(a) LESS THAN $(b)"
	  gt:: "$(a) GREATER THAN $(b)"


	Bugfix for cfshow -c options (Nathan Hruby)

2.1.13
	Mistake in placement of update.conf runs fixed.

	Alteration to lock hashing to avoid conflicts

	Mandrake version type patch/repatched

	Error message in disable now
	underlines move to respository where defined.

	Locking patch to tidy. Did not release lock when tidying
	recursively with subdirectory deletions. (Eric Sorensen).

	Host range patched (again) (Bas VdV)

2.1.12
	cf.preconf can now cause an abort if the script prints out a string
	containing the substring "cfengine-preconf-abort".
	An exit code of 2 signals this failure

	Cfrun bug in placement of workdir initialization. Would try to open
	/inputs/cfrun.hosts instead of /var/cfengine/inputs/cfrun.hosts

	Moved mutex locks in address purging, to see if it prevents some
	segmentation faults.

	In image.c:
	/*      if (TRAVLINKS || ip->linktype == 'n') */
	Took out linktype reference. This appears to be erroneous.

	Patch to tidy: "Guolin Cheng" <guolin@alexa.com>

	Patch to -Q to prevent update.conf from being executed.

	Patch to rationalize choice of port number for new getaddrinfo
	interfaces. (ip.c)

	small patch to allow the use of PCRE if it is compiled with
	--with-pcre.  This is using the POSIX compatible API that PCRE provides,
	so the change necessary is to use pcreposix.h instead of regex.h and to
	link in pcreposix.so. cindy.marasco@pnl.gov)

2.1.11

	SUPPORT FOR POSIX ACLS IN LINUX IS NOT AS STRAIGHTFORWARD AS
	ORIGINALLY THOUGHT.  THE API DOES NOT MATCH EXISTING
	IMPLEMENTATIONS AND SEEMS SIGNIFICANTLY MORE COMPLEX. IN THE
	INTERESTS OF STABILITY THIS WILL HAVE TO BE DEFERRED TO A LATER
	RELEASE.

	Comma in function argument bug in FileExists etc, fixed

	Option -z (--schedule) now prints only the run schedule.  Option
	-Q (--query) added to print values of variables defined in
	configuration

	  cfagent -Q sysadm,domain,site,ipaddress

	in format  varname=value

	New variables can be used in cfagent.conf for cfexecd control:

	  EmailFrom = ( )
	  EmailTo   = ( )  - overrides sysadm if set


	White Box linux class recognition added


	When setting classes or variables by function call, the function
	evaluation is no longer performed if it is not in an active class.

	Cfexecd now calls cfagent with -D from_cfexecd to define the class
	"from_cfexecd::" when run from the executor

	WarnIfFileMissing added to editfiles and default is not to warn
	of non-existent files, except in inform/verbose modes.

	Check added for DefineInGroup, signals error if not in group
	Added copy type "any" for any matching criteria, date/sum etc.

	Respository variable was not expanded like a normal variable

	cfshow tool added for consulting the databases

	Better autodetection of Berkeley DB in some distros of Linux (SuSE) - has anyone heard of "standards"?
	Date format changed in cfexecd output files
	Errors if remote copy is not encrypted when server demands encryption. (patch)

	Renaming of directories is now allowed if dest= is set specifically.

	Check added for variables defined in terms of undefined variables.

	Patch for solaris package manager added (Louis Erickson - wwonko@rdwarf.com)

	file added as synonym til reg in filter

	Patch to HostRange (item.c) (rader@ginseng.hep.wisc.edu)
	Internal variable determining WORKDIR for non-privileged users.

	Various minor changes and cosmetics.

	Lock string must include server name in copy - added
	Method reply bundles fixed to work correctly with ipv6 addresses

	SIGPIPE and SIGCHLD added to signal handler (SIGCHILD ignored against posix, but
	how the hell do you sort this out?)
	srand -> srand48 typo in cfenvd

	Multiple method reply variables were incorrectly separated.
	Added options to disable LastSeen data recording feature.

	fclose used instead of pclose when calling ifconfig - resulted in zombies

9 files changed, 24 insertions, 229 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 0d95de558c9..5c783ee961e 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/07 00:03:28 wiz Exp $
 #
 
-PKGREVISION=	4
-
 .include "../../sysutils/cfengine2/Makefile.common"
 
 COMMENT=	Automate configuration and administration of large systems
@@ -17,16 +15,9 @@ CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
 RCD_SCRIPTS=		cfexecd cfservd cfenvd
 
-pre-configure:
-	${MV} -f ${WRKSRC}/contrib/vicf.in ${WRKSRC}/contrib/vicf.in.orig
-	${SED} -e "s|@ECHO@|${ECHO}|" \
-		${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in
-
 post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/inputs/*.example \
-		${PREFIX}/share/examples/cfengine
 	${INSTALL_DATA_DIR} /var/cfengine/inputs
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
index 56a359a381e..d6b6bea0b3f 100644
--- a/sysutils/cfengine2/Makefile.common
+++ b/sysutils/cfengine2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2006/11/24 23:04:15 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/02/07 00:03:28 wiz Exp $
 #
 
-CFENGINE_VERSION= 2.1.10
+CFENGINE_VERSION= 2.1.22
 DISTNAME=	cfengine-${CFENGINE_VERSION}
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
index a6ecd7786a8..d5aae1ec331 100644
--- a/sysutils/cfengine2/PLIST
+++ b/sysutils/cfengine2/PLIST
@@ -1,21 +1,35 @@
-@comment $NetBSD: PLIST,v 1.9 2005/09/22 02:08:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/02/07 00:03:28 wiz Exp $
 man/man8/cfagent.8
 man/man8/cfengine.8
 man/man8/cfenvd.8
 man/man8/cfenvgraph.8
+man/man8/cfetoolcheck.8
+man/man8/cfetoolcreate.8
+man/man8/cfetooldump.8
+man/man8/cfetoolgraph.8
+man/man8/cfetoolimport.8
+man/man8/cfetoolinfo.8
+man/man8/cfetoolupdate.8
 man/man8/cfexecd.8
 man/man8/cfkey.8
 man/man8/cfrun.8
 man/man8/cfservd.8
+man/man8/cfshow.8
 sbin/cfagent
 sbin/cfdoc
 sbin/cfenvd
 sbin/cfenvgraph
+sbin/cfetool
+sbin/cfetoolgraph
 sbin/cfexecd
 sbin/cfkey
 sbin/cfrun
 sbin/cfservd
-sbin/vicf
+sbin/cfshow
+share/cfengine/ChangeLog
+share/cfengine/INSTALL
+share/cfengine/NEWS
+share/cfengine/README
 share/cfengine/cfengine.el
 share/examples/cfengine/cf.chflags.example
 share/examples/cfengine/cf.freebsd.example
@@ -36,7 +50,6 @@ share/examples/cfengine/cfrc.example
 share/examples/cfengine/cfrun.hosts.example
 share/examples/cfengine/cfservd.conf.example
 share/examples/cfengine/update.conf.example
-share/examples/cfengine/vicf
 share/examples/rc.d/cfenvd
 share/examples/rc.d/cfexecd
 share/examples/rc.d/cfservd
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 72e2d796852..6af65562577 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/02/07 00:03:28 wiz Exp $
 
-SHA1 (cfengine-2.1.10.tar.gz) = 01e80f12881b35704896757d338548dddc44883c
-RMD160 (cfengine-2.1.10.tar.gz) = 0b9f8f805f0ff8abed2468249b86399228d10291
-Size (cfengine-2.1.10.tar.gz) = 3100323 bytes
-SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
-SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
-SHA1 (patch-aj) = 8bf0d1e3af5b4fac229eb7eb62459e9c6afe4ead
-SHA1 (patch-al) = 8837267fe8ffa1f003b4dd48a8fe397ab9b0a3d9
+SHA1 (cfengine-2.1.22.tar.gz) = 79501a4d430bc5a955b56519e0d00f62d8353229
+RMD160 (cfengine-2.1.22.tar.gz) = 9109a5156aa24e29137ff51ad1b5a0050b62eb2f
+Size (cfengine-2.1.22.tar.gz) = 3673965 bytes
+SHA1 (patch-aa) = 97cb8cf6cdf200dcc7d6dab8010e7b0db5374f37
diff --git a/sysutils/cfengine2/patches/patch-ad b/sysutils/cfengine2/patches/patch-ad
deleted file mode 100644
index d4768bafe1b..00000000000
--- a/sysutils/cfengine2/patches/patch-ad
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/04/26 08:33:01 seb Exp $
-
---- contrib/vicf.in.orig	2003-02-09 11:33:04.000000000 +0000
-+++ contrib/vicf.in
-@@ -3,14 +3,15 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- sbindir=@sbindir@
-+ECHO=@ECHO@
- EDITOR="${EDITOR-vi}"
- CFINPUTS="${CFINPUTS-"@pkgdata@"}"
- export EDITOR CFINPUTS
- NOPARSE="cf.preconf|cfd.conf"
- 
--if [ "`hostname`" != "sentral" ]
-+if [ "`hostname`" != "CHANGEME" ]
- then
--	echo $0 can only be run on host sentral.
-+	echo $0 can only be run on host CHANGEME.
- 	exit 1
- fi
- 
-@@ -20,7 +21,7 @@ EdFile () {
- 	echo "File not found: ${file}"
- 	echo "Only these files are eligible for editing:"
- 	\ls $CFINPUTS
--	/usr/ucb/echo -n "Create new file? (Y/n) "
-+	${ECHO} -n "Create new file? (Y/n) "
- 	read answer
- 	if [ "$answer" = "n" ]
- 	then
-@@ -32,14 +33,15 @@ EdFile () {
-     if [ -f ${CFINPUTS}/.${file}.lock -a "$force" = "n" ]
-     then
- 	i=30
--	/usr/ucb/echo -n "File ${file} is busy -- waiting up to $i seconds..."
-+	${ECHO} -n "File ${file} is busy -- waiting up to $i seconds..."
- 	while [ -f ${CFINPUTS}/.${file}.lock ]
- 	do
--		/usr/ucb/echo -n .
-+		${ECHO} -n .
- 		i=`expr $i - 1`
- 		if [ $i = 0 ]
- 		then
--			echo "\nSorry, file is busy -- try again later."
-+			${ECHO} ""
-+			${ECHO} "Sorry, file is busy -- try again later."
- 			exit 0
- 		fi
- 		sleep 1
-@@ -62,7 +64,7 @@ EdFile () {
- 	then
- 		echo PARSE ERROR IN NEW INPUT-FILE:
- 		cat /tmp/cfparse.$$
--		/usr/ucb/echo -n "Re-edit file? (Y/n) "
-+		${ECHO} -n "Re-edit file? (Y/n) "
- 		read answer
- 		if [ "$answer" = "n" ]
- 		then
diff --git a/sysutils/cfengine2/patches/patch-ae b/sysutils/cfengine2/patches/patch-ae
deleted file mode 100644
index 1879a33d6c3..00000000000
--- a/sysutils/cfengine2/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
-
---- src/image.c.orig	Thu Feb 15 07:23:22 2001
-+++ src/image.c
-@@ -206,9 +206,12 @@
-    DeleteItemList(namecache);
-    }
-  
--DeleteCompressedArray(ip->inode_cache);
--
--ip->inode_cache = NULL;
-+	/* Only flush when exiting initial call to RecursiveImage() */
-+if (strcmp(from,ip->path) == 0)
-+   {
-+   DeleteCompressedArray(ip->inode_cache);
-+   ip->inode_cache = NULL;
-+   }
- 
- cfclosedir(dirh);
- }
diff --git a/sysutils/cfengine2/patches/patch-ah b/sysutils/cfengine2/patches/patch-ah
deleted file mode 100644
index a8a83c62af6..00000000000
--- a/sysutils/cfengine2/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/04/26 08:33:01 seb Exp $
-
---- contrib/Makefile.am.orig	2001-11-21 18:59:51.000000000 +0000
-+++ contrib/Makefile.am
-@@ -1,9 +1,12 @@
- s1 = cfdoc
- s2 = cfengine.el
- 
--sbin_SCRIPTS = vicf $(s1)
-+sbin_SCRIPTS = $(s1)
- pkgdata_SCRIPTS = $(s2)
- 
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
-+
- EXTRA_DIST = README README.vicf $(s1) $(s2)
- 
- #
diff --git a/sysutils/cfengine2/patches/patch-aj b/sysutils/cfengine2/patches/patch-aj
deleted file mode 100644
index 1742802d0be..00000000000
--- a/sysutils/cfengine2/patches/patch-aj
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/08/10 14:18:44 ben Exp $
-
---- contrib/Makefile.in.orig	2004-08-09 13:27:41.000000000 -0400
-+++ contrib/Makefile.in	2004-08-09 20:44:12.000000000 -0400
-@@ -50,5 +50,7 @@
- pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
--SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
-+SCRIPTS = $(example_SCRIPTS) $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
-+depcomp =
-+am__depfiles_maybe =
- SOURCES =
- DIST_SOURCES =
-@@ -168,4 +170,6 @@
- sbin_SCRIPTS = vicf $(s1)
- pkgdata_SCRIPTS = $(s2)
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
- EXTRA_DIST = README README.vicf $(s1) $(s2)
- 
-@@ -205,5 +209,5 @@
- 	  esac; \
- 	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  contrib/Makefile'; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  contrib/Makefile'; \
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  contrib/Makefile
-@@ -218,4 +222,26 @@
- 	esac;
- 
-+exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+install-exampleSCRIPTS: $(example_SCRIPTS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(exampledir)
-+	@list='$(example_SCRIPTS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  if test -f $$d$$p; then \
-+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	    echo " $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f"; \
-+	    $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-exampleSCRIPTS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(example_SCRIPTS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	  echo " rm -f $(DESTDIR)$(exampledir)/$$f"; \
-+	  rm -f $(DESTDIR)$(exampledir)/$$f; \
-+	done
-+
-+
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-@@ -353,5 +379,5 @@
- info-am:
- 
--install-data-am: install-pkgdataSCRIPTS
-+install-data-am: install-exampleSCRIPTS install-pkgdataSCRIPTS
- 
- install-exec-am: install-sbinSCRIPTS
-@@ -379,15 +405,16 @@
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \
--	uninstall-sbinSCRIPTS
-+uninstall-am: uninstall-exampleSCRIPTS uninstall-info-am \
-+	uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
- 	distclean-generic distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-pkgdataSCRIPTS install-sbinSCRIPTS install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
--	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-+	install install-am install-data install-data-am install-exampleSCRIPTS \
-+       	install-exec install-exec-am install-info install-info-am \
-+       	install-man install-pkgdataSCRIPTS install-sbinSCRIPTS \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-exampleSCRIPTS uninstall-info-am \
- 	uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
- 
diff --git a/sysutils/cfengine2/patches/patch-al b/sysutils/cfengine2/patches/patch-al
deleted file mode 100644
index 3ae1adce8b7..00000000000
--- a/sysutils/cfengine2/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/08/18 23:03:44 ben Exp $
-
---- Makefile.in.orig	Mon Aug  9 10:27:40 2004
-+++ Makefile.in
-@@ -60,7 +60,7 @@ RECURSIVE_TARGETS = all-recursive check-
- 	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = pub src contrib inputs doc
-+DIST_SUBDIRS = pub src contrib doc
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -184,7 +184,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- @BUILD_DOC_FALSE@DOC_DIR = 
- @BUILD_DOC_TRUE@DOC_DIR = doc
--SUBDIRS = pub src contrib inputs $(DOC_DIR)
-+SUBDIRS = pub src contrib $(DOC_DIR)
- EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
- 
- #