ports/109707: [PATCH] Update sysutils/cfengine to 2.1.22

[Xin LI]

>Number:         109707
>Category:       ports
>Synopsis:       [PATCH] Update sysutils/cfengine to 2.1.22
>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 Mar 01 04:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
SINA Corporation
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


>Description:
	Updates cfengine to 2.1.22.
	Respect users' PTHREEAD related settings.
	Correct usage of BerkeleyDB.  Use 4.4 per original authors.
>How-To-Repeat:
>Fix:


--- patch-cfengine-update begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/cfengine/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- Makefile	24 Jan 2007 22:47:36 -0000	1.36
+++ Makefile	27 Feb 2007 18:49:41 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	2.1.21
-PORTREVISION=	1
+PORTVERSION=	2.1.22
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.iu.hio.no/pub/cfengine/ \
 		${MASTER_SITE_GNU}
@@ -16,13 +15,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sergei at FreeBSD.org
 COMMENT=	A systems administration tool for networks
 
-USE_BDB=	yes
+USE_BDB=	44
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-berkeleydb=${LOCALBASE} --with-docs
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-LDFLAGS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
+CONFIGURE_ARGS=	--with-docs
+CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \
+		BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
+		BERKELEY_DB_LDFLAGS=-L${BDB_LIB_DIR} \
+		BERKELEY_DB_LIB=-l${BDB_LIB_NAME}
 
 .if !defined(NOPORTDOCS)
 INFO=		cfengine-Anomalies cfengine-Reference cfengine-Tutorial
@@ -33,4 +34,10 @@ MAN8=		cfagent.8 cfengine.8 cfenvd.8 cfe
 		cfetoolinfo.8 cfetoolupdate.8 cfexecd.8 cfkey.8 \
 		cfrun.8 cfservd.8 cfshow.8
 
+post-patch:
+		@${REINPLACE_CMD} -e s,-pthread,${PTHREAD_CFLAGS},g \
+				  -e s,-lpthread,${PTHREAD_LIBS},g \
+				  -e s,lpthread,${PTHREAD_LIBS},g \
+				  ${WRKSRC}/configure
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/cfengine/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo	9 Oct 2006 15:36:58 -0000	1.11
+++ distinfo	27 Feb 2007 17:47:16 -0000
@@ -1,3 +1,3 @@
-MD5 (cfengine-2.1.21.tar.gz) = 5dc382283789cba1b38b474bfb63e289
-SHA256 (cfengine-2.1.21.tar.gz) = 3d670fdcc8dc669d3cdad9c3e951dfdb84c21415fee19202c90039aac204a8be
-SIZE (cfengine-2.1.21.tar.gz) = 3688993
+MD5 (cfengine-2.1.22.tar.gz) = 5452c988225751da9ed2f1edf3426866
+SHA256 (cfengine-2.1.22.tar.gz) = fa30e5b29517370e5cea8d9935999e437709e574d103eb317eeed007c975d451
+SIZE (cfengine-2.1.22.tar.gz) = 3673965
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/cfengine/pkg-plist,v
retrieving revision 1.8
diff -u -p -u -r1.8 pkg-plist
--- pkg-plist	9 Oct 2006 13:19:33 -0000	1.8
+++ pkg-plist	27 Feb 2007 18:25:10 -0000
@@ -1,6 +1,5 @@
 @comment $FreeBSD: ports/sysutils/cfengine/pkg-plist,v 1.8 2006/10/09 13:19:33 sergei Exp $
 sbin/cfagent
-sbin/cfconvert
 sbin/cfdoc
 sbin/cfenvd
 sbin/cfenvgraph
--- patch-cfengine-update ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: