Date: Thu, 7 Jul 2005 16:45:23 +0200 (CEST) From: Soren Klintrup <skl@telmore.dk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: paul@aps.org Subject: ports/83096: [PATCH] Update sysutils/cfengine2 to 2.1.15 Message-ID: <200507071445.j67EjNr0054483@telmore.dk> Resent-Message-ID: <200507071450.j67EoFGC092672@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83096 >Category: ports >Synopsis: [PATCH] Update sysutils/cfengine2 to 2.1.15 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jul 07 14:50:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Soren Klintrup <skl@telmore.dk> >Release: FreeBSD 4.11-RELEASE-p3 i386 >Organization: TELMORE A/S >Environment: System: FreeBSD build01.telmore.dk 4.11-RELEASE-p3 FreeBSD 4.11-RELEASE-p3 #7: Tue Apr 19 09:54:48 CEST 2005 root@build01.telmore.dk:/usr/obj/usr/src/sys/TelmoreSMP i386 >Description: - Update to 2.1.15 - Minor tweaks to doc/Makefile.in patch, most of the old patches has been implemented in cfengine codebase - Compiles on FreeBSD 4.x again >How-To-Repeat: >Fix: --- cfengine-2.1.15.patch begins here --- diff -ruN cfengine2/Makefile /mnt/home/skl/cfengine2/Makefile --- cfengine2/Makefile Thu Jul 7 16:23:26 2005 +++ /mnt/home/skl/cfengine2/Makefile Thu Jul 7 16:15:06 2005 @@ -6,7 +6,7 @@ # PORTNAME= cfengine -PORTVERSION= 2.1.13 +PORTVERSION= 2.1.15 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \ ${MASTER_SITE_GNU} @@ -40,9 +40,5 @@ .endif .include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on FreeBSD 4.x" -.endif .include <bsd.port.post.mk> diff -ruN cfengine2/distinfo /mnt/home/skl/cfengine2/distinfo --- cfengine2/distinfo Thu Jul 7 16:23:26 2005 +++ /mnt/home/skl/cfengine2/distinfo Thu Jul 7 13:28:41 2005 @@ -1,2 +1,2 @@ -MD5 (cfengine-2.1.13.tar.gz) = 2c002fc37f2fc9f87248ad8b9e899091 -SIZE (cfengine-2.1.13.tar.gz) = 3153867 +MD5 (cfengine-2.1.15.tar.gz) = f03de82709f84c3d6d916b6e557321f9 +SIZE (cfengine-2.1.15.tar.gz) = 3555495 diff -ruN cfengine2/files/patch-doc_Makefile.in /mnt/home/skl/cfengine2/files/patch-doc_Makefile.in --- cfengine2/files/patch-doc_Makefile.in Thu Jul 7 16:23:26 2005 +++ /mnt/home/skl/cfengine2/files/patch-doc_Makefile.in Thu Jul 7 13:50:49 2005 @@ -1,51 +1,18 @@ ---- doc/Makefile.in.orig Mon Sep 13 19:37:05 2004 -+++ doc/Makefile.in Mon Sep 13 19:39:34 2004 -@@ -70,7 +70,7 @@ - docDATA_INSTALL = $(INSTALL_DATA) - htmlDATA_INSTALL = $(INSTALL_DATA) - psDATA_INSTALL = $(INSTALL_DATA) --DATA = $(doc_DATA) $(html_DATA) $(ps_DATA) -+DATA = $(doc_DATA) $(html_DATA) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ -@@ -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/cfengine - doc_DATA = - +--- doc/Makefile.in.orig Thu Jul 7 13:32:07 2005 ++++ doc/Makefile.in Thu Jul 7 13:37:09 2005 +@@ -205,14 +205,14 @@ + # Info used in building and installing HTML files + htmlfiles = $(info_TEXINFOS:.texinfo=.html) -htmldir = $(pkgdatadir)/html +htmldir = $(docdir) - htmlfiles = cfengine-Reference.html cfengine-Tutorial.html cfengine-Anomalies.html html_DATA = $(htmlfiles) - + # 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) $(pdffiles) - MAKEINFOHTML = $(MAKEINFO) --html --no-split - -@@ -709,7 +709,7 @@ - info-am: $(INFO_DEPS) - - install-data-am: install-docDATA install-htmlDATA install-info-am \ -- install-man install-psDATA -+ install-man - - install-exec-am: - -@@ -769,7 +769,7 @@ - ps-am: $(PSS) - - uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \ -- uninstall-man uninstall-psDATA -+ uninstall-man - - uninstall-man: uninstall-man8 - + psfiles = $(info_TEXINFOS:.texinfo=.ps) + pdffiles = $(info_TEXINFOS:.texinfo=.pdf) + dvifiles = $(info_TEXINFOS:.texinfo=.dvi) +-docdir = $(pkgdatadir)/doc ++docdir = $(prefix)/share/doc/cfengine + doc_DATA = $(psfiles) $(pdffiles) + --- cfengine-2.1.15.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507071445.j67EjNr0054483>