Remove cfengine -- obsoleted by cfengine2.

11 files changed, 1 insertions, 258 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 01f516b9876..9e2e7326491 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.292 2005/03/29 20:53:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.293 2005/04/22 19:03:04 wiz Exp $
 
 COMMENT=	System utilities
 
@@ -27,7 +27,6 @@ SUBDIR+=	cdrdao
 SUBDIR+=	cdrecord
 SUBDIR+=	cdrecord-xcdroast
 SUBDIR+=	cdrtools-ossdvd
-SUBDIR+=	cfengine
 SUBDIR+=	cfengine2
 SUBDIR+=	cfengine2-doc
 SUBDIR+=	checkpassword
diff --git a/sysutils/cfengine/DESCR b/sysutils/cfengine/DESCR
deleted file mode 100644
index 81eca51babf..00000000000
--- a/sysutils/cfengine/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Cfengine, or the "configuration engine" is a very high level language
-for building expert systems which administrate and configure large
-computer networks. Cfengine uses the idea of classes and a primitive
-form of intelligence to define and automate the configuration of
-large systems in the most economical way possible. Cfengine is
-designed to be a part of computer immune system
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
deleted file mode 100644
index a78a94f1c1a..00000000000
--- a/sysutils/cfengine/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:22 tv Exp $
-#
-
-DISTNAME=	cfengine-1.6.5
-PKGREVISION=	1
-CATEGORIES=	sysutils net
-MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
-		http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.cfengine.org/
-COMMENT=	Automate configuration and administration of large systems
-
-USE_OLD_DES_API=	YES
-USE_GNU_TOOLS+=		lex
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS=		--without-pthreads
-
-.include "../../security/openssl/buildlink3.mk"
-
-pre-configure:
-	cd ${WRKSRC};					\
-	${ACLOCAL};					\
-	${AUTOHEADER};					\
-	${AUTOMAKE} -a --foreign -i;			\
-	${AUTOCONF}
-
-.include "../../mk/automake.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine/PLIST b/sysutils/cfengine/PLIST
deleted file mode 100644
index 88f11338e2d..00000000000
--- a/sysutils/cfengine/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/19 11:45:02 seb Exp $
-sbin/cfcron
-sbin/cfd
-sbin/cfdoc
-sbin/cfengine
-sbin/cfkey
-sbin/cfmail
-sbin/cfmailfilter
-sbin/cfrun
-sbin/cfwrap
-share/cfengine/cf.chflags.example
-share/cfengine/cf.freebsd.example
-share/cfengine/cf.ftp.example
-share/cfengine/cf.groups.example
-share/cfengine/cf.linux.example
-share/cfengine/cf.main.example
-share/cfengine/cf.motd.example
-share/cfengine/cf.preconf.example
-share/cfengine/cf.services.example
-share/cfengine/cf.site.example
-share/cfengine/cf.solaris.example
-share/cfengine/cf.sun4.example
-share/cfengine/cf.users.example
-share/cfengine/cfd.conf.example
-share/cfengine/cfdaily
-share/cfengine/cfengine.conf.example
-share/cfengine/cfengine.el
-share/cfengine/cfrc.example
-share/cfengine/cfrun.hosts.example
-share/cfengine/start-cfd
-share/examples/cfengine/vicf
-@dirrm share/examples/cfengine
-@dirrm share/cfengine
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
deleted file mode 100644
index 21c33eda130..00000000000
--- a/sysutils/cfengine/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 13:40:51 agc Exp $
-
-SHA1 (cfengine-1.6.5.tar.gz) = 0e40c6094cb4fa12b34920d30e789719e04df511
-RMD160 (cfengine-1.6.5.tar.gz) = 43fe836eec4786e8d9d61cef528005aff9207aea
-Size (cfengine-1.6.5.tar.gz) = 879792 bytes
-SHA1 (patch-aa) = dd6adaef964ad78f2b12d8714099c111f5152b2e
-SHA1 (patch-ab) = dc6a9d7381778b5f3c2fdb16e65204d5c3faac0d
-SHA1 (patch-ac) = 417ca3785c7d7d668a08d4aad298a8d2ec4a6571
-SHA1 (patch-ad) = 047e02555d541c22f07cb3e3a102beb0be32df6d
-SHA1 (patch-ae) = 283e129a515b664f651fd2272e3f9f8d7f99b60f
-SHA1 (patch-ag) = 228f0934e2e9409615b868a8c9a0a5829e4f9196
diff --git a/sysutils/cfengine/patches/patch-aa b/sysutils/cfengine/patches/patch-aa
deleted file mode 100644
index c477d711c2f..00000000000
--- a/sysutils/cfengine/patches/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/09/10 21:12:21 wiz Exp $
-
---- configure.in.orig	2002-08-15 07:59:16.000000000 +0200
-+++ configure.in
-@@ -86,6 +86,7 @@ AC_CHECK_LIB(wrap, main)   dnl TCP wrapp
- AC_CHECK_LIB(nsl, main)    dnl Debian -lwrap needs nsl
- AC_CHECK_LIB(rx, main)     dnl GNU regex lib if you have regcomp in libc you shouldn't have this
- AC_CHECK_LIB(crypto,main)
-+AC_CHECK_LIB(des,main)
- 
- 
- dnl ######################################################################
-@@ -159,17 +160,17 @@ dnl ####################################
- dnl Handle DCE + threading stuff
- dnl #######################################################################
- 
--AC_CHECK_LIB(pthread,main)         dnl POSIX threads
-+dnl AC_CHECK_LIB(pthread,main)         dnl POSIX threads
- 
--if test "$ac_cv_lib_pthread_main" = "yes"; then
--	AC_CHECK_HEADERS(pthread.h)
--	AC_CHECK_HEADERS(sched.h)
--fi
-+dnl if test "$ac_cv_lib_pthread_main" = "yes"; then
-+dnl 	AC_CHECK_HEADERS(pthread.h)
-+dnl 	AC_CHECK_HEADERS(sched.h)
-+dnl fi
- 
- AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
- 
--AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
--AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
-+dnl AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
-+dnl AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
- 
- AC_ARG_ENABLE(DCE,[  --enable-DCE            support for DCE and ACLs],[
-   case "$enableval" in
-@@ -235,8 +236,8 @@ case "$target_os" in
-    aix*)
- 	AC_DEFINE(AIX)
-         CPPFLAGS="$CPPFLAGS -w"
--	AC_CHECK_LIB(pthreads, main)
--        AC_CHECK_HEADER(pthreads.h)
-+dnl 	AC_CHECK_LIB(pthreads, main)
-+dnl     AC_CHECK_HEADER(pthreads.h)
-         ;;
-    osf*)
- 	AC_DEFINE(OSF)
-@@ -261,8 +262,8 @@ case "$target_os" in
-         ;;
-    freebsd*)
- 	AC_DEFINE(FREEBSD)
--         CFLAGS="$CFLAGS -pthread"
--        AC_CHECK_HEADERS(pthread.h)
-+dnl     CFLAGS="$CFLAGS -pthread"
-+dnl     AC_CHECK_HEADERS(pthread.h)
-         ;;
-    netbsd*)
- 	AC_DEFINE(NETBSD)
-@@ -301,10 +302,10 @@ case "$target_os" in
- 
-    sysv4.2MP|unix_sv*)
- 	AC_DEFINE(UNIXWARE)
--        AC_CHECK_LIB(thread,main)         dnl POSIX threads, weird setup
--        if test "$ac_cv_lib_thread_main" = "yes"; then
--	   AC_CHECK_HEADERS(thread.h)
--        fi
-+dnl     AC_CHECK_LIB(thread,main)         dnl POSIX threads, weird setup
-+dnl     if test "$ac_cv_lib_thread_main" = "yes"; then
-+dnl	   AC_CHECK_HEADERS(thread.h)
-+dnl     fi
-         ;;
- 
-    cygwin*)
diff --git a/sysutils/cfengine/patches/patch-ab b/sysutils/cfengine/patches/patch-ab
deleted file mode 100644
index ec1e08fffa4..00000000000
--- a/sysutils/cfengine/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/06/19 11:45:02 seb Exp $
-
---- contrib/Makefile.am.orig	2002-06-20 13:38:34.000000000 +0000
-+++ contrib/Makefile.am
-@@ -1,10 +1,12 @@
- s1 = cfdoc
- s2 = cfengine.el
- 
--sbin_SCRIPTS = cfcron
--bin_SCRIPTS = cfdoc vicf
-+sbin_SCRIPTS = cfcron cfdoc
- pkgdata_SCRIPTS = $(s2)
- 
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
-+
- EXTRA_DIST = README README.cfcron README.vicf $(s1) $(s2)
- 
- #
diff --git a/sysutils/cfengine/patches/patch-ac b/sysutils/cfengine/patches/patch-ac
deleted file mode 100644
index 25775b9ddbe..00000000000
--- a/sysutils/cfengine/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/06/19 11:45:02 seb Exp $
-
---- contrib/vicf.in.orig	2002-06-20 13:38:34.000000000 +0000
-+++ contrib/vicf.in
-@@ -8,9 +8,9 @@ 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
- 
-@@ -39,7 +39,8 @@ EdFile () {
- 		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
diff --git a/sysutils/cfengine/patches/patch-ad b/sysutils/cfengine/patches/patch-ad
deleted file mode 100644
index 56a49487f96..00000000000
--- a/sysutils/cfengine/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2003/06/19 11:45:02 seb Exp $
-
---- src/Makefile.am.orig	2002-06-20 13:38:34.000000000 +0000
-+++ src/Makefile.am
-@@ -5,8 +5,7 @@ LEXLIB = @LEXLIB@
- LDADD = -L../pub -lpub
- 
- 
--sbin_PROGRAMS = cfd cfrun cfkey
--bin_PROGRAMS = cfengine
-+sbin_PROGRAMS = cfd cfrun cfkey cfengine
- 
- cfengine_SOURCES =							\
- 	cfengine.c							\
diff --git a/sysutils/cfengine/patches/patch-ae b/sysutils/cfengine/patches/patch-ae
deleted file mode 100644
index 268e6630a61..00000000000
--- a/sysutils/cfengine/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/06/19 11:45:02 seb Exp $
-
---- src/image.c.orig	2002-06-20 17:53:53.000000000 +0000
-+++ src/image.c
-@@ -206,9 +206,12 @@ if (ip->purge == 'y')
-    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/cfengine/patches/patch-ag b/sysutils/cfengine/patches/patch-ag
deleted file mode 100644
index 063e4274978..00000000000
--- a/sysutils/cfengine/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/09/16 18:08:36 minskim Exp $
-
---- src/df.c.orig	2000-09-10 12:16:00.000000000 -0500
-+++ src/df.c
-@@ -51,7 +51,8 @@ char *file;
- enum cfsizes type;
- 
- {
--#if defined SOLARIS || defined OSF || defined UNIXWARE 
-+#if defined SOLARIS || defined OSF || defined UNIXWARE || \
-+  (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
-     struct statvfs buf;
- #elif defined ULTRIX
-     struct fs_data buf;
-@@ -73,7 +74,8 @@ enum cfsizes type;
-        CfLog(cferror,OUTPUT,"");
-        return cfinfinity;
-        }
--#elif defined SOLARIS || defined OSF || defined UNIXWARE 
-+#elif defined SOLARIS || defined OSF || defined UNIXWARE || \
-+  (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000)
-     if (statvfs (file, &buf) != 0)
-        {
-        sprintf(OUTPUT,"Couldn't get filesystem info for %s\n",file);