From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 15 15:50:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 204B916A4DB for ; Sun, 15 Aug 2004 15:50:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F35BA43D31 for ; Sun, 15 Aug 2004 15:50:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7FFoOQ0095538 for ; Sun, 15 Aug 2004 15:50:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7FFoOw0095537; Sun, 15 Aug 2004 15:50:24 GMT (envelope-from gnats) Date: Sun, 15 Aug 2004 15:50:24 GMT Message-Id: <200408151550.i7FFoOw0095537@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Paul Dlug Subject: Re: ports/70301: Update sysutils/cfengine2 to 2.1.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Paul Dlug List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2004 15:50:25 -0000 The following reply was made to PR ports/70301; it has been noted by GNATS. From: Paul Dlug To: Michael Ranner Cc: acidos@bandwidth-junkies.net, sem@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org Subject: Re: ports/70301: Update sysutils/cfengine2 to 2.1.9 Date: Sun, 15 Aug 2004 11:40:54 -0400 The patch looks great, thanks. I modified it to use db42 by default or optionally db41. Original patch plus this addition is below. I think it's ready to be committed. I tested under 5.2.1 and 4.9 diff -urN cfengine2/Makefile cfengine2.update/Makefile --- cfengine2/Makefile Sun Aug 15 11:29:02 2004 +++ cfengine2.update/Makefile Sun Aug 15 11:35:41 2004 @@ -6,7 +6,7 @@ # PORTNAME= cfengine2 -PORTVERSION= 2.1.5 +PORTVERSION= 2.1.9 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} @@ -16,15 +16,26 @@ MAINTAINER= paul@aps.org COMMENT= A systems administration tool for networks -LIB_DEPENDS= db41:${PORTSDIR}/databases/db41 - USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-berkeleydb=${LOCALBASE} +CONFIGURE_ARGS= --with-berkeleydb=${LOCALBASE} --with-docs INFO= cfengine-Anomalies cfengine-Reference cfengine-Tutorial MAN8= cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 \ cfrun.8 cfservd.8 + +WITH_BDB_VER?= 42 + +.if ${WITH_BDB_VER} == 42 +BDBLIB= db-4.2.2 +.elif ${WITH_BDB_VER} == 41 +BDBLIB= db41.1 +.else +.error WITH_BDB_VER must be 41 or 42 +.endif + +LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER} + .include diff -urN cfengine2/distinfo cfengine2.update/distinfo --- cfengine2/distinfo Sun Aug 15 11:29:02 2004 +++ cfengine2.update/distinfo Sun Aug 15 11:21:24 2004 @@ -1,2 +1,2 @@ -MD5 (cfengine-2.1.5.tar.gz) = 0c7c15d646defe23123708ee836b4040 -SIZE (cfengine-2.1.5.tar.gz) = 1852357 +MD5 (cfengine-2.1.9.tar.gz) = 421ac1ba0fd9cbe0384f1b0eded1afd8 +SIZE (cfengine-2.1.9.tar.gz) = 3099090 diff -urN cfengine2/files/patch-doc_Makefile.in cfengine2.update/files/patch-doc_Makefile.in --- cfengine2/files/patch-doc_Makefile.in Sun Aug 15 11:29:02 2004 +++ cfengine2.update/files/patch-doc_Makefile.in Sun Aug 15 11:21:24 2004 @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Mon Feb 9 16:17:57 2004 -+++ doc/Makefile.in Thu Feb 26 17:46:02 2004 +--- doc/Makefile.in.orig Mon Aug 9 19:27:42 2004 ++++ doc/Makefile.in Sun Aug 15 16:30:38 2004 @@ -70,7 +70,7 @@ docDATA_INSTALL = $(INSTALL_DATA) htmlDATA_INSTALL = $(INSTALL_DATA) @@ -9,29 +9,29 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ -@@ -182,10 +182,10 @@ +@@ -184,18 +184,18 @@ target_vendor = @target_vendor@ man_MANS = cfengine.8 cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 info_TEXINFOS = cfengine-Reference.texinfo cfengine-Tutorial.texinfo cfengine-Anomalies.texinfo -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION) +docdir = $(prefix)/share/doc/cfengine2 doc_DATA = + # Info used in building and installing HTML files -htmldir = $(pkgdatadir)/html +htmldir = $(docdir) htmlfiles = cfengine-Reference.html cfengine-Tutorial.html cfengine-Anomalies.html html_DATA = $(htmlfiles) -@@ -196,7 +196,7 @@ - # When the Texi2DVI problem with cfengine-Reference is corrected, - # then uncomment the reference to ps2 - psfiles = $(ps2) + # Info used in building and installing Postscript files + psfiles = cfengine-Tutorial.ps cfengine-Reference.ps cfengine-Anomalies.ps + pdffiles = cfengine-Tutorial.pdf cfengine-Reference.pdf cfengine-Anomalies.pdf -psdir = $(pkgdatadir)/doc +psdir = $(docdir) - ps_DATA = $(psfiles) + ps_DATA = $(psfiles) $(pdffiles) MAKEINFOHTML = $(MAKEINFO) --html --no-split -@@ -708,7 +708,7 @@ +@@ -709,7 +709,7 @@ info-am: $(INFO_DEPS) install-data-am: install-docDATA install-htmlDATA install-info-am \ @@ -40,7 +40,7 @@ install-exec-am: -@@ -768,7 +768,7 @@ +@@ -769,7 +769,7 @@ ps-am: $(PSS) uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \