Date: Wed, 30 May 2007 18:11:26 GMT From: Jo Rhett<jrhett@svcolo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/113167: patch to update cfengine port to 2.2.1 Message-ID: <200705301811.l4UIBQsN020224@www.freebsd.org> Resent-Message-ID: <200705301820.l4UIK2c3012572@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113167 >Category: ports >Synopsis: patch to update cfengine port to 2.2.1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed May 30 18:20:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Jo Rhett >Release: 6.0 >Organization: Silicon Valley Colocation >Environment: FreeBSD arran 6.0-RELEASE FreeBSD 6.0-RELEASE #4: Fri Nov 11 13:29:33 PST 2005 root@barrel.svcolo.com:/usr/obj/usr/src/sys/MEERMINIMAL i386 >Description: cfengine is up to version 2.2.1. In particular, this version includes support for FreeBSD package management. >How-To-Repeat: >Fix: Attached patch will update the port. Patch attached with submission follows: --- Makefile.orig Mon May 21 18:11:42 2007 +++ Makefile Wed May 30 11:07:49 2007 @@ -6,7 +6,7 @@ # PORTNAME= cfengine -PORTVERSION= 2.1.22 +PORTVERSION= 2.2.1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} @@ -15,7 +15,6 @@ MAINTAINER= sergei@FreeBSD.org COMMENT= A systems administration tool for networks -USE_BDB= 44 USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -24,6 +23,10 @@ BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \ BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \ BERKELEY_DB_LIB=-l${BDB_LIB_NAME} + +.if !defined(USE_BDB) +USE_BDB= 44 +.endif .if !defined(NOPORTDOCS) INFO= cfengine-Anomalies cfengine-Reference cfengine-Tutorial --- files/orig/patch-Makefile.in Wed May 30 10:43:06 2007 +++ files/patch-Makefile.in Wed May 30 10:49:20 2007 @@ -1,12 +1,19 @@ ---- Makefile.in.orig Sat Oct 1 16:32:09 2005 -+++ Makefile.in Fri Oct 7 10:36:51 2005 -@@ -201,8 +201,12 @@ +--- Makefile.in_orig Wed May 30 10:44:56 2007 ++++ Makefile.in Wed May 30 10:48:32 2007 +@@ -174,7 +174,7 @@ + build_vendor = @build_vendor@ + datadir = @datadir@ + datarootdir = @datarootdir@ +-docdir = $(pkgdatadir) ++docdir = $(prefix)/share/doc/cfengine + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ +@@ -209,7 +209,11 @@ @BUILD_DOC_TRUE@DOC_DIR = doc SUBDIRS = pub src contrib inputs $(DOC_DIR) EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README --docdir = $(pkgdatadir) -doc_DATA = README ChangeLog INSTALL NEWS -+docdir = $(prefix)/share/doc/cfengine +.if defined(NOPORTDOCS) +doc_DATA = +.else --- files/orig/patch-doc_Makefile.in Wed May 30 10:43:06 2007 +++ files/patch-doc_Makefile.in Wed May 30 11:04:56 2007 @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig Wed Sep 20 10:27:06 2006 -+++ doc/Makefile.in Fri Dec 15 12:24:05 2006 +--- doc/Makefile.in.orig Tue May 29 11:07:06 2007 ++++ doc/Makefile.in Wed May 30 10:58:27 2007 @@ -52,8 +52,12 @@ CONFIG_CLEAN_FILES = SOURCES = @@ -13,12 +13,28 @@ am__TEXINFO_TEX_DIR = $(srcdir) DVIS = cfengine-Reference.dvi cfengine-Tutorial.dvi \ cfengine-Anomalies.dvi -@@ -205,15 +209,23 @@ +@@ -171,7 +175,7 @@ + build_vendor = @build_vendor@ + datadir = @datadir@ + datarootdir = @datarootdir@ +-docdir = $(pkgdatadir)/doc ++docdir = $(prefix)/share/doc/cfengine + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ +@@ -179,7 +183,7 @@ + host_cpu = @host_cpu@ + host_os = @host_os@ + host_vendor = @host_vendor@ +-htmldir = $(pkgdatadir)/html ++htmldir = $(docdir) + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ +@@ -213,13 +217,21 @@ # Info used in building and installing HTML files htmlfiles = $(info_TEXINFOS:.texinfo=.html) --htmldir = $(pkgdatadir)/html -+htmldir = $(docdir) +.if defined(NOPORTDOCS) +html_DATA = +.else @@ -29,9 +45,7 @@ psfiles = $(info_TEXINFOS:.texinfo=.ps) pdffiles = $(info_TEXINFOS:.texinfo=.pdf) dvifiles = $(info_TEXINFOS:.texinfo=.dvi) --docdir = $(pkgdatadir)/doc -+docdir = $(prefix)/share/doc/cfengine -+.if defined(NOPORTDOCS) ++if defined(NOPORTDOCS) +doc_DATA = +.else doc_DATA = $(psfiles) $(pdffiles) @@ -39,7 +53,7 @@ # Make sure these get distributed with everything else. EXTRA_DIST = cfagent.8 cfenvd.8 cfenvgraph.8 cfexecd.8 cfkey.8 cfrun.8 cfservd.8 cfengine.8 cfshow.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 cfetoolcheck.8 cfetooldump.8 cfetoolimport.8 cfetoolupdate.8 cfetoolcreate.8 cfetoolgraph.8 cfetoolinfo.8 texinfo.tex $(htmlfiles) $(infofiles) $(psfiles) $(dvifiles) $(pdffiles) -@@ -316,7 +328,7 @@ +@@ -324,7 +336,7 @@ exit 1; \ fi $(srcdir)/version1.texi: $(srcdir)/stamp-vti @@ -48,7 +62,7 @@ @(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \ set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \ echo "@set UPDATED $$1 $$2 $$3"; \ -@@ -375,7 +387,7 @@ +@@ -385,7 +397,7 @@ exit 1; \ fi $(srcdir)/version2.texi: $(srcdir)/stamp-1 @@ -57,7 +71,7 @@ @(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \ set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \ echo "@set UPDATED $$1 $$2 $$3"; \ -@@ -434,7 +446,7 @@ +@@ -446,7 +458,7 @@ exit 1; \ fi $(srcdir)/version3.texi: $(srcdir)/stamp-2 @@ -66,7 +80,7 @@ @(dir=.; test -f ./cfengine-Anomalies.texinfo || dir=$(srcdir); \ set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Anomalies.texinfo`; \ echo "@set UPDATED $$1 $$2 $$3"; \ -@@ -579,6 +591,7 @@ +@@ -592,6 +604,7 @@ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ done install-docDATA: $(doc_DATA) @@ -74,7 +88,7 @@ @$(NORMAL_INSTALL) test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; for p in $$list; do \ -@@ -587,6 +600,7 @@ +@@ -600,6 +613,7 @@ echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ done @@ -82,7 +96,7 @@ uninstall-docDATA: @$(NORMAL_UNINSTALL) -@@ -596,6 +610,7 @@ +@@ -609,6 +623,7 @@ rm -f "$(DESTDIR)$(docdir)/$$f"; \ done install-htmlDATA: $(html_DATA) @@ -90,7 +104,7 @@ @$(NORMAL_INSTALL) test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)" @list='$(html_DATA)'; for p in $$list; do \ -@@ -604,6 +619,7 @@ +@@ -617,6 +632,7 @@ echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ done @@ -98,7 +112,7 @@ uninstall-htmlDATA: @$(NORMAL_UNINSTALL) -@@ -712,6 +728,7 @@ +@@ -725,6 +741,7 @@ install-info: install-info-am install-info-am: $(INFO_DEPS) @@ -106,7 +120,7 @@ @$(NORMAL_INSTALL) test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)" @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -@@ -741,6 +758,7 @@ +@@ -754,6 +771,7 @@ install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ done; \ else : ; fi --- files/orig/patch-configure Wed May 30 10:43:06 2007 +++ files/patch-configure Wed May 30 10:52:51 2007 @@ -1,6 +1,6 @@ ---- configure.orig Wed Sep 20 10:27:07 2006 -+++ configure Thu Dec 14 18:00:21 2006 -@@ -8539,7 +8539,7 @@ +--- configure.orig Tue May 29 11:07:07 2007 ++++ configure Wed May 30 10:52:14 2007 +@@ -9745,7 +9745,7 @@ done BERKELEY_DB_LIB="-ldb" @@ -9,7 +9,7 @@ if test -f "$BERKELEY_DB_DIR/lib/lib$v.so"; then BERKELEY_DB_LIB="-l$v" break -@@ -15998,7 +15998,7 @@ +@@ -17933,7 +17933,7 @@ @@ -17,4 +17,4 @@ +LIBS="../pub/libpub.a $LIBS" - echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5 + { echo "$as_me:$LINENO: checking Checking for GCC Specific compile flags" >&5 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705301811.l4UIBQsN020224>