7 files changed, 70 insertions, 62 deletions

diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 976e903599af..eed233e01ccd 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	cfengine
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,19 +18,17 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-CFLAGS+=	-pthread
-USE_AUTOCONF=yes
-USE_GMAKE=yes
-MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+USE_GMAKE=	yes
+USE_AUTOMAKE=	yes
 
 MAN8=		cfengine.8
 
+pre-configure:
+	@cd ${WRKSRC} && aclocal && autoheader
+
 post-install:
-.for binary in cfengine cfd cfrun cfkey
-	strip ${PREFIX}/sbin/${binary}
-.endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
 .for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html
 	${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME}
 .endfor
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index e8566ef68535..1766eadebc61 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -1 +1 @@
-MD5 (cfengine-1.6.1.tar.gz) = 89e2f94456666f6dbde5016d7b972263
+MD5 (cfengine-1.6.2.tar.gz) = f0fdd6ea146cfff405b35e20b79a8ae5
diff --git a/sysutils/cfengine/files/patch-aa b/sysutils/cfengine/files/patch-aa
deleted file mode 100644
index abcf4a95f6c5..000000000000
--- a/sysutils/cfengine/files/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Makefile.in.orig	Tue Dec 26 06:58:05 2000
-+++ src/Makefile.in	Mon Jan  8 20:33:09 2001
-@@ -80,19 +80,19 @@
- CFLAGS = @CFLAGS@ # -Wreturn-type -Wstrict-prototypes -Wmissing-prototypes # -Wuninitialized 
- YFLAGS = -d
- LEXLIB = @LEXLIB@
--LDADD = -L../pub -lpub
-+LDADD = -L../pub -lpub -ldes
- 
- sbin_PROGRAMS = cfengine cfd cfrun cfkey
- 
- cfengine_SOURCES =  	cfengine.c							        do.c                                                                    wrapper.c                                                               report.c                                                        	client.c								process.c								ifconf.c								image.c									item.c									item-ext.c								item-file.c								2Dlist.c								globals.c								classes.c								misc.c									parse.c									edittools.c								patches.c								install.c								link.c									tidy.c									filedir.c								eval.c									modes.c									chflags.c								locks.c									mount.c									macro.c									filenames.c								varstring.c								wildcard.c								cfparse.y								comparray.c								read.c									checksums.c								proto.c								        filters.c                                                       	copy.c									repository.c								rotate.c								errors.c								cflex.l									net.c									df.c									log.c									encrypt.c								popen.c									sensible.c								acl.c									dce_acl.c
- 
- 
--cfengine_LDADD = -L../pub -lpub $(LEXLIB)
-+cfengine_LDADD = -L../pub -lpub $(LEXLIB) -ldes
- 
- cfd_SOURCES =  	cfd.c									parse.c									install.c								cfparse.c								chflags.c								cflex.l									item.c									item-ext.c								varstring.c								popen.c									globals.c								filenames.c								macro.c									eval.c									read.c									classes.c								misc.c									2Dlist.c								modes.c									locks.c									wildcard.c								copy.c									rotate.c								net.c									acl.c									dce_acl.c								log.c									errors.c								encrypt.c							        filters.c                                                       	patches.c
- 
- 
--cfd_LDADD = -L../pub -lpub $(LEXLIB)
-+cfd_LDADD = -L../pub -lpub $(LEXLIB) -ldes
- 
- cfrun_SOURCES =  	cfrun.c									item.c									filenames.c								proto.c									popen.c									net.c									read.c									log.c									patches.c								globals.c
- 
diff --git a/sysutils/cfengine/files/patch-ac b/sysutils/cfengine/files/patch-ac
index d1e64063487e..402872a89106 100644
--- a/sysutils/cfengine/files/patch-ac
+++ b/sysutils/cfengine/files/patch-ac
@@ -1,32 +1,28 @@
---- configure.in.orig	Mon Dec 18 12:12:07 2000
-+++ configure.in	Mon Jan  8 20:52:29 2001
+--- configure.in.orig	Mon Jan 15 03:51:48 2001
++++ configure.in	Tue Jan 23 01:13:32 2001
 @@ -60,13 +60,13 @@
  AC_PROG_RANLIB
  AC_PROG_INSTALL
  
--AC_PATH_PROG(LATEX, latex, /bin/false, \
+-AC_PATH_PROG(LATEX, latex, false, \
 +AC_PATH_PROG(LATEX, latex, true, \
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
--AC_PATH_PROG(TEXI2DVI, texi2dvi, /bin/false, \
+-AC_PATH_PROG(TEXI2DVI, texi2dvi, false, \
 +AC_PATH_PROG(TEXI2DVI, texi2dvi, true, \
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
--AC_PATH_PROG(DVIPS, dvips, /bin/false, \
+-AC_PATH_PROG(DVIPS, dvips, false, \
 +AC_PATH_PROG(DVIPS, dvips, true, \
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
--AC_PATH_PROG(MAKEINFO, makeinfo, /bin/false, \
+-AC_PATH_PROG(MAKEINFO, makeinfo, false, \
 +AC_PATH_PROG(MAKEINFO, makeinfo, true, \
  		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
  
  
---- doc/Makefile.in.orig	Tue Dec 26 06:58:18 2000
-+++ doc/Makefile.in	Mon Jan  8 22:33:39 2001
-@@ -446,8 +446,7 @@
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-info-am install-man install-htmlDATA \
--		install-psDATA
-+install-data-am: install-info-am install-man
- install-data: install-data-am
- 
- install-am: all-am
+@@ -262,6 +262,7 @@
+    freebsd*)
+ 	AC_DEFINE(FREEBSD)
+          CFLAGS="$CFLAGS -pthread"
++         LIBS="$LIBS -ldes"
+         AC_CHECK_HEADERS(pthread.h)
+         ;;
+    netbsd*)
diff --git a/sysutils/cfengine/files/patch-ad b/sysutils/cfengine/files/patch-ad
new file mode 100644
index 000000000000..39fe0b6f9b16
--- /dev/null
+++ b/sysutils/cfengine/files/patch-ad
@@ -0,0 +1,34 @@
+--- doc/Makefile.am.orig	Fri Dec  1 19:24:39 2000
++++ doc/Makefile.am	Tue Jan 23 02:07:04 2001
+@@ -2,7 +2,7 @@
+ info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo
+ 
+ # Info used in building and installing HTML files
+-htmldir = $(pkgdatadir)/html
++htmldir = # $(pkgdatadir)/html
+ htmlfiles = cfengine-Reference.html cfengine-Tutorial.html 
+ html_DATA = $(htmlfiles) cf-security.html
+ 
+@@ -14,18 +14,19 @@
+ # then uncomment the reference to ps2
+ psfiles = $(ps1)	# $(ps2)
+ 
+-psdir = $(pkgdatadir)/doc
++psdir = # $(pkgdatadir)/doc
+ ps_DATA = $(psfiles)
+ 
+ # Make sure these get distributed with everything else.
+ EXTRA_DIST =								\
+ 	texinfo.tex							\
+-	cf-security.html						\
++	$(html_DATA)							\
++	$(ps_DATA)							\
+ 	locks.latex							\
+ 	paper1.latex							\
+ 	paper2.latex
+ 
+-SUFFIXES = html latex
++SUFFIXES = .html .latex
+ 
+ %.html : %.texinfo
+ 	${MAKEINFO} --html $<
diff --git a/sysutils/cfengine/pkg-descr b/sysutils/cfengine/pkg-descr
index a509bdf65dfa..8f08a393f837 100644
--- a/sysutils/cfengine/pkg-descr
+++ b/sysutils/cfengine/pkg-descr
@@ -1,2 +1,9 @@
-cfengine lets you manage your network (including editing files automatically),
-in an object-oriented manner.
+Cfengine, or the configuration engine is an agent/software robot and a
+very high level language for building expert systems to administrate
+and configure large computer networks. Cfengine uses the idea of
+classes and a primitive form of intelligence to define and automate
+the configuration and maintenance of system state, for small to huge
+configurations. Cfengine is designed to be a part of a computer immune
+system.
+
+WWW: http://www.iu.hioslo.no/cfengine/
diff --git a/sysutils/cfengine/pkg-plist b/sysutils/cfengine/pkg-plist
index 394e94e32bd0..1d72eeb52893 100644
--- a/sysutils/cfengine/pkg-plist
+++ b/sysutils/cfengine/pkg-plist
@@ -43,13 +43,11 @@ share/cfengine/cfd.conf.example
 share/cfengine/cfdaily
 share/cfengine/cfengine.conf.example
 share/cfengine/cfengine.el
-share/cfengine/cfmail
 share/cfengine/cfrc.example
 share/cfengine/cfrun.hosts.example
-share/cfengine/cfwrap
 share/cfengine/start-cfd
-share/doc/cfengine/cf-security.html
-share/doc/cfengine/cfengine-Reference.html
-share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%share/doc/cfengine/cf-security.html
+%%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
+%%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
+%%PORTDOCS%%@dirrm share/doc/cfengine
 @dirrm share/cfengine
-@dirrm share/doc/cfengine