From gordont@hobbes.melthusia.org  Mon Jan  8 23:37:39 2001
Return-Path: <gordont@hobbes.melthusia.org>
Received: from hobbes.melthusia.org (dt035n37.san.rr.com [24.30.140.55])
	by hub.freebsd.org (Postfix) with ESMTP
	id 638CD37B401; Mon,  8 Jan 2001 23:37:38 -0800 (PST)
Received: (from gordont@localhost)
	by hobbes.melthusia.org (8.11.1/8.11.1) id f097ba161807;
	Mon, 8 Jan 2001 23:37:37 -0800 (PST)
	(envelope-from gordont)
Message-Id: <200101090737.f097ba161807@hobbes.melthusia.org>
Date: Mon, 8 Jan 2001 23:37:37 -0800 (PST)
From: Gordon Tetlow <gordont@bluemtn.net>
To: FreeBSD-gnats-submit@freebsd.org, jseger@freebsd.org
Cc: Kris Kennaway <kris@freebsd.org>
Subject: update to cfengine port
X-Send-Pr-Version: 3.2

>Number:         24174
>Category:       ports
>Synopsis:       Update of cfengine port to 1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kris
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 08 23:40:03 PST 2001
>Closed-Date:    Fri May 25 17:30:20 PDT 2001
>Last-Modified:  Fri May 25 17:30:30 PDT 2001
>Originator:     Gordon Tetlow
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
Blue Mountain Arts
>Environment:

n/a

>Description:

update the cfengine port to use cfengine-1.6.1

>How-To-Repeat:

the current one doesn't build =)

>Fix:

Here's a unified diff of the changes I made to the port to make it compile.
I moved some of the documentation around and added the install-info --delete
to the pkg-plist so it uninstall more cleanly.

diff -uNr -x CVS ports/sysutils/cfengine/Makefile /usr/ports/sysutils/cfengine/Makefile
--- ports/sysutils/cfengine/Makefile	Tue Oct 10 23:49:39 2000
+++ /usr/ports/sysutils/cfengine/Makefile	Mon Jan  8 23:11:43 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hioslo.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
@@ -14,14 +14,26 @@
 
 MAINTAINER=	jseger@FreeBSD.org
 
-FORBIDDEN=	"Remote root vulnerability"
-
 .if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 CFLAGS+=	-pthread
 USE_AUTOCONF=yes
+USE_GMAKE=yes
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+
+MAN8=		cfengine.8
+
+post-install:
+.for binary in cfengine cfd cfrun cfkey
+	strip ${PREFIX}/sbin/${binary}
+.endfor
+.if !defined(NOPORTDOCS)
+	${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
+.endif
 
 .include <bsd.port.mk>
diff -uNr -x CVS ports/sysutils/cfengine/distinfo /usr/ports/sysutils/cfengine/distinfo
--- ports/sysutils/cfengine/distinfo	Tue Apr 25 13:57:37 2000
+++ /usr/ports/sysutils/cfengine/distinfo	Mon Jan  8 23:13:11 2001
@@ -1 +1 @@
-MD5 (cfengine-1.5.4.tar.gz) = adb7f15c42842adb74436a17df38693e
+MD5 (cfengine-1.6.1.tar.gz) = 89e2f94456666f6dbde5016d7b972263
diff -uNr -x CVS ports/sysutils/cfengine/files/patch-aa /usr/ports/sysutils/cfengine/files/patch-aa
--- ports/sysutils/cfengine/files/patch-aa	Thu Oct 28 21:02:03 1999
+++ /usr/ports/sysutils/cfengine/files/patch-aa	Mon Jan  8 20:40:53 2001
@@ -1,11 +1,25 @@
---- src/Makefile.in.orig	Thu Oct 28 16:50:34 1999
-+++ src/Makefile.in	Thu Oct 28 16:50:37 1999
-@@ -130,7 +130,7 @@
- LEX= @LEX@
+--- 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
  
--LDFLAGS= @LDFLAGS@
-+LDFLAGS= @LDFLAGS@ -pthread
- LIBS= @LIBS@
+ 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
  
- DEFS= @DEFS@
diff -uNr -x CVS ports/sysutils/cfengine/files/patch-ac /usr/ports/sysutils/cfengine/files/patch-ac
--- ports/sysutils/cfengine/files/patch-ac	Wed Aug 19 04:28:24 1998
+++ /usr/ports/sysutils/cfengine/files/patch-ac	Mon Jan  8 22:34:33 2001
@@ -1,11 +1,32 @@
---- contrib/Makefile.in.orig	Wed Aug 19 07:15:49 1998
-+++ contrib/Makefile.in	Wed Aug 19 07:16:06 1998
-@@ -28,7 +28,7 @@
- 	${MKINSTALLDIR} ${sbindir}
- 	for x in $?; \
- 	do \
--	${INSTALL_PROGRAM} $$x ${sbindir}; \
-+	${INSTALL_SCRIPT} $$x ${sbindir}; \
- 	done
+--- configure.in.orig	Mon Dec 18 12:12:07 2000
++++ configure.in	Mon Jan  8 20:52:29 2001
+@@ -60,13 +60,13 @@
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
  
- clean:
+-AC_PATH_PROG(LATEX, latex, /bin/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, true, \
+ 		$PATH:$prefix/bin:/usr/bin:/usr/local/bin)
+-AC_PATH_PROG(DVIPS, dvips, /bin/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, 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
diff -uNr -x CVS ports/sysutils/cfengine/pkg-plist /usr/ports/sysutils/cfengine/pkg-plist
--- ports/sysutils/cfengine/pkg-plist	Thu Oct 28 21:02:04 1999
+++ /usr/ports/sysutils/cfengine/pkg-plist	Mon Jan  8 22:58:15 2001
@@ -1,8 +1,36 @@
-sbin/cfd
-sbin/cfdoc
+@unexec install-info --delete %D/info/cfengine-Reference.info %D/info/dir
+@unexec install-info --delete %D/info/cfengine-Tutorial.info %D/info/dir
+info/cfengine-Reference.info
+info/cfengine-Reference.info-1
+info/cfengine-Reference.info-2
+info/cfengine-Reference.info-3
+info/cfengine-Reference.info-4
+info/cfengine-Reference.info-5
+info/cfengine-Reference.info-6
+info/cfengine-Reference.info-7
+info/cfengine-Tutorial.info
+info/cfengine-Tutorial.info-1
+info/cfengine-Tutorial.info-2
+info/cfengine-Tutorial.info-3
+info/cfengine-Tutorial.info-4
+info/cfengine-Tutorial.info-5
+@exec install-info %D/info/cfengine-Reference.info %D/info/dir
+@exec install-info %D/info/cfengine-Tutorial.info %D/info/dir
 sbin/cfengine
-sbin/cfkey
+sbin/cfd
 sbin/cfrun
+sbin/cfkey
+sbin/cfwrap
+sbin/cfmail
+sbin/cfmailfilter
+sbin/cfcron
+sbin/vicf
+sbin/cfdoc
+share/cfengine/cfdaily
+share/cfengine/start-cfd
+share/cfengine/cfengine.el
+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
@@ -15,9 +43,11 @@
 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/cfmail
 share/cfengine/cfrc.example
-share/cfengine/cfwrap
+share/cfengine/cfrun.hosts.example
+share/doc/cfengine/cf-security.html
+share/doc/cfengine/cfengine-Reference.html
+share/doc/cfengine/cfengine-Tutorial.html
 @dirrm share/cfengine
+@dirrm share/doc/cfengine

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->kris 
Responsible-Changed-By: kris 
Responsible-Changed-When: Thu Jan 18 01:09:02 PST 2001 
Responsible-Changed-Why:  
I'll take this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=24174 
State-Changed-From-To: open->closed 
State-Changed-By: kris 
State-Changed-When: Fri May 25 17:30:20 PDT 2001 
State-Changed-Why:  
The port was updated some time ago, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=24174 
>Unformatted:
