- Update to 2.1.15

- Resign maintainership

PR:		ports/83096
Submitted by:	Soren Klintrup <skl@telmore.dk>
Approved by:	Paul Dlug <paul@aps.org> (maintainer)

4 files changed, 29 insertions, 57 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index bad9c0f2275e..5e72c1062b40 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.1.13
+PORTVERSION=	2.1.15
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	paul@aps.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A systems administration tool for networks
 
 USE_OPENSSL=	yes
@@ -39,10 +39,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib/db41 -ldb41
 .error WITH_BDB_VER must be 41 or 42
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index 45f1e9642cb4..302e965098f9 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -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 --git a/sysutils/cfengine2/files/patch-doc_Makefile.in b/sysutils/cfengine2/files/patch-doc_Makefile.in
index eb4514c12e8d..13e4ad0aac7b 100644
--- a/sysutils/cfengine2/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine2/files/patch-doc_Makefile.in
@@ -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)
+
diff --git a/sysutils/cfengine2/pkg-plist b/sysutils/cfengine2/pkg-plist
index 733e0b85b0f6..049dac8c7f9c 100644
--- a/sysutils/cfengine2/pkg-plist
+++ b/sysutils/cfengine2/pkg-plist
@@ -31,5 +31,16 @@ sbin/vicf
 %%DOCSDIR%%/cfengine-Anomalies.html
 %%DOCSDIR%%/cfengine-Reference.html
 %%DOCSDIR%%/cfengine-Tutorial.html
+%%DOCSDIR%%/cfengine-Anomalies.pdf
+%%DOCSDIR%%/cfengine-Reference.pdf
+%%DOCSDIR%%/cfengine-Tutorial.pdf
+%%DOCSDIR%%/cfengine-Anomalies.ps
+%%DOCSDIR%%/cfengine-Reference.ps
+%%DOCSDIR%%/cfengine-Tutorial.ps
+%%DATADIR%%/README
+%%DATADIR%%/ChangeLog
+%%DATADIR%%/INSTALL
+%%DATADIR%%/NEWS
 @dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%