- Update to 2.1.10

- Allow various version of BDB

PR:		ports/72066
Submitted by:	Kevin Way <kevin@insidesystems.net>
Based on work by: maintainer

5 files changed, 40 insertions, 22 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index fbdf0f582e5..00f142e81fe 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine2
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.10
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
@@ -16,15 +16,31 @@ DISTNAME=	cfengine-${PORTVERSION}
 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
+USE_REINPLACE=	yes
 
 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
+BDBVERSION=	db-4.2
+.elif ${WITH_BDB_VER} == 41
+BDBLIB=		db41.1
+BDBVERSION=	db41
+.else
+.error WITH_BDB_VER must be 41 or 42
+.endif
+
+LIB_DEPENDS+=	${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER}
+
+post-patch:
+	@${REINPLACE_CMD} 's|-ldb|-l${BDBVERSION}|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
index efab2bc869f..2bc6c4914c5 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cfengine-2.1.5.tar.gz) = 0c7c15d646defe23123708ee836b4040
-SIZE (cfengine-2.1.5.tar.gz) = 1852357
+MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3
+SIZE (cfengine-2.1.10.tar.gz) = 3100323
diff --git a/sysutils/cfengine2/files/patch-contrib_Makefile.in b/sysutils/cfengine2/files/patch-contrib_Makefile.in
index 92294ca6806..6e66409ca8f 100644
--- a/sysutils/cfengine2/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine2/files/patch-contrib_Makefile.in
@@ -1,5 +1,5 @@
---- contrib/Makefile.in.orig	Tue Jan 27 01:34:49 2004
-+++ contrib/Makefile.in	Tue Jan 27 01:35:03 2004
+--- contrib/Makefile.in.orig    Mon Sep 13 19:21:57 2004
++++ contrib/Makefile.in Mon Sep 13 19:22:23 2004
 @@ -17,7 +17,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
@@ -9,3 +9,4 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
+
diff --git a/sysutils/cfengine2/files/patch-doc_Makefile.in b/sysutils/cfengine2/files/patch-doc_Makefile.in
index fe26cc7ac0b..6a4227b8448 100644
--- a/sysutils/cfengine2/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine2/files/patch-doc_Makefile.in
@@ -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 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)
@@ -9,38 +9,38 @@
  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 \
 -	install-man install-psDATA
-+	install-man 
++	install-man
  
  install-exec-am:
  
-@@ -768,7 +768,7 @@
+@@ -769,7 +769,7 @@
  ps-am: $(PSS)
  
  uninstall-am: uninstall-docDATA uninstall-htmlDATA uninstall-info-am \
diff --git a/sysutils/cfengine2/files/patch-inputs_Makefile.in b/sysutils/cfengine2/files/patch-inputs_Makefile.in
index 62d3088778a..eefc37d3327 100644
--- a/sysutils/cfengine2/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine2/files/patch-inputs_Makefile.in
@@ -1,6 +1,6 @@
---- inputs/Makefile.in.orig	Tue Jan 27 01:33:35 2004
-+++ inputs/Makefile.in	Tue Jan 27 01:34:11 2004
-@@ -20,7 +20,7 @@
+--- inputs/Makefile.in.orig     Mon Sep 13 19:25:42 2004
++++ inputs/Makefile.in  Mon Sep 13 19:25:57 2004
+@@ -17,7 +17,7 @@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -9,3 +9,4 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
+