6 files changed, 15 insertions, 18 deletions

diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 00f142e81fe1..eb635fe260a5 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	cfengine2
-PORTVERSION=	2.1.10
+PORTNAME=	cfengine
+PORTVERSION=	2.1.13
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	cfengine-${PORTVERSION}
 
 MAINTAINER=	paul@aps.org
 COMMENT=	A systems administration tool for networks
@@ -24,23 +23,20 @@ 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
+		cfrun.8 cfservd.8 cfshow.8
 
 WITH_BDB_VER?=	42
 
 .if ${WITH_BDB_VER} == 42
-BDBLIB=		db-4.2.2
-BDBVERSION=	db-4.2
+LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
+CPPFLAGS+=	-I${LOCALBASE}/include/db42
+LDFLAGS+=	-L${LOCALBASE}/lib/db42 -ldb-4.2
 .elif ${WITH_BDB_VER} == 41
-BDBLIB=		db41.1
-BDBVERSION=	db41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+CPPFLAGS+=	-I${LOCALBASE}/include/db41
+LDFLAGS+=	-L${LOCALBASE}/lib/db41 -ldb41
 .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 2bc6c4914c50..45f1e9642cb4 100644
--- a/sysutils/cfengine2/distinfo
+++ b/sysutils/cfengine2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cfengine-2.1.10.tar.gz) = 7a867c74ca3ad806a41b6f7339e67fa3
-SIZE (cfengine-2.1.10.tar.gz) = 3100323
+MD5 (cfengine-2.1.13.tar.gz) = 2c002fc37f2fc9f87248ad8b9e899091
+SIZE (cfengine-2.1.13.tar.gz) = 3153867
diff --git a/sysutils/cfengine2/files/patch-contrib_Makefile.in b/sysutils/cfengine2/files/patch-contrib_Makefile.in
index 6e66409ca8f7..10e3fe8f1f12 100644
--- a/sysutils/cfengine2/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine2/files/patch-contrib_Makefile.in
@@ -5,7 +5,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine2
++pkgdatadir = $(prefix)/share/examples/cfengine
  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 6a4227b84485..eb4514c12e8d 100644
--- a/sysutils/cfengine2/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine2/files/patch-doc_Makefile.in
@@ -14,7 +14,7 @@
  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
++docdir = $(prefix)/share/doc/cfengine
  doc_DATA = 
  
  # Info used in building and installing HTML files
diff --git a/sysutils/cfengine2/files/patch-inputs_Makefile.in b/sysutils/cfengine2/files/patch-inputs_Makefile.in
index eefc37d33277..39bd1e37b49e 100644
--- a/sysutils/cfengine2/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine2/files/patch-inputs_Makefile.in
@@ -5,7 +5,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(prefix)/share/examples/cfengine2
++pkgdatadir = $(prefix)/share/examples/cfengine
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
diff --git a/sysutils/cfengine2/pkg-plist b/sysutils/cfengine2/pkg-plist
index 4d97fe274c76..733e0b85b0f6 100644
--- a/sysutils/cfengine2/pkg-plist
+++ b/sysutils/cfengine2/pkg-plist
@@ -6,6 +6,7 @@ sbin/cfexecd
 sbin/cfkey
 sbin/cfrun
 sbin/cfservd
+sbin/cfshow
 sbin/vicf
 %%EXAMPLESDIR%%/cf.chflags.example
 %%EXAMPLESDIR%%/cf.freebsd.example