Date: Wed, 28 Mar 2001 17:27:58 -0800 (PST) From: gordont@bluemtn.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26189: Update cfengine port Message-ID: <200103290127.f2T1RwB82313@fountainhead.sd.bluemt.net>
next in thread | raw e-mail | index | archive | help
>Number: 26189
>Category: ports
>Synopsis: Update cfengine to use db3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 28 17:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Gordon Tetlow
>Release: FreeBSD 4.3-RC i386
>Organization:
Blue Mountain
>Environment:
System: FreeBSD fountainhead.sd.bluemt.net 4.3-RC FreeBSD 4.3-RC #0: Mon Mar 26 19:20:47 PST 2001 root@fountainhead.sd.bluemt.net:/local/usr.obj/usr/src/sys/FOUNTAINHEAD i386
>Description:
Per the instructions of the software, cfengine is now dependent on BerkleyDB 3.
In fact, the only thing (that I can tell anyway) that uses the DB functions is
cfd. I'm guessing most people don't use it, especially since I haven't heard
any complaints about it.
Also, it was putting some of the docs in / (for some really strange reason).
That should be fixed too. They are now put in {PREFIX}/share/doc/cfengine,
depending on NOPORTSDOC (somewhat reverse logic than normal, but it made the
amount of changes less).
Finally, strip the binaries.
>How-To-Repeat:
N/A
>Fix:
diff -uNr -x CVS cfengine.old/Makefile cfengine/Makefile
--- cfengine.old/Makefile Sat Feb 24 22:17:55 2001
+++ cfengine/Makefile Wed Mar 28 17:15:31 2001
@@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \
${MASTER_SITE_GNU}
@@ -14,8 +15,9 @@
MAINTAINER= gordont@bluemtn.net
+LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
-LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
+LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
@@ -27,11 +29,11 @@
@cd ${WRKSRC} && aclocal && autoheader
post-install:
-.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
+.if defined(NOPORTDOCS)
+ @${RM} -rf ${PREFIX}/share/doc/${PORTNAME}
.endif
+.for binary in cfd cfengine cfrun cfkey
+ @strip ${PREFIX}/sbin/${binary}
+.endfor
.include <bsd.port.mk>
diff -uNr -x CVS cfengine.old/files/patch-ad cfengine/files/patch-ad
--- cfengine.old/files/patch-ad Tue Jan 23 00:58:29 2001
+++ cfengine/files/patch-ad Wed Mar 28 16:28:40 2001
@@ -1,3 +1,6 @@
+This moves the documentation out of /usr/local/share/cfengine/{doc,html} into
+/usr/local/shared/doc/cfengine to keep it inline with the rest of the ports.
+
--- 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 @@
@@ -5,7 +8,7 @@
# Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
-+htmldir = # $(pkgdatadir)/html
++htmldir = $(datadir)/doc/cfengine
htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
html_DATA = $(htmlfiles) cf-security.html
@@ -14,7 +17,7 @@
psfiles = $(ps1) # $(ps2)
-psdir = $(pkgdatadir)/doc
-+psdir = # $(pkgdatadir)/doc
++psdir = $(datadir)/doc/cfengine
ps_DATA = $(psfiles)
# Make sure these get distributed with everything else.
diff -uNr -x CVS cfengine.old/files/patch-ae cfengine/files/patch-ae
--- cfengine.old/files/patch-ae Wed Dec 31 16:00:00 1969
+++ cfengine/files/patch-ae Wed Mar 28 12:52:29 2001
@@ -0,0 +1,15 @@
+This patch only makes sense if you subscribe to the FreeBSD port model.
+Basically this only works if you have installed BerkleyDB from the ports
+collection.
+
+--- src/misc.c.orig Wed Jan 24 07:28:01 2001
++++ src/misc.c Wed Mar 28 12:41:06 2001
+@@ -39,7 +39,7 @@
+
+
+ #ifdef HAVE_DB_H
+-# include <db.h>
++#include <db3/db.h>
+ #endif
+
+ /*******************************************************************/
diff -uNr -x CVS cfengine.old/pkg-plist cfengine/pkg-plist
--- cfengine.old/pkg-plist Tue Jan 23 00:58:27 2001
+++ cfengine/pkg-plist Wed Mar 28 17:23:36 2001
@@ -46,8 +46,8 @@
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/start-cfd
+@dirrm share/cfengine
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103290127.f2T1RwB82313>