aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils/cfengine
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-03-20 11:34:48 +0800
committerdelphij <delphij@FreeBSD.org>2007-03-20 11:34:48 +0800
commit045902ec65995271eb4fb0a984bc4732797c2471 (patch)
treeaa04a2d3e9ba52f2d09ee71dda01a23b0689db4a /sysutils/cfengine
parent09ca16309f9c01af72284aa9b1a084cf53fed267 (diff)
downloadfreebsd-ports-gnome-045902ec65995271eb4fb0a984bc4732797c2471.tar.gz
freebsd-ports-gnome-045902ec65995271eb4fb0a984bc4732797c2471.tar.zst
freebsd-ports-gnome-045902ec65995271eb4fb0a984bc4732797c2471.zip
- Update to 2.1.22
- Respect users' PTHREEAD related settings - Correct usage of BerkeleyDB - Use Berkeley DB 4.4 per original authors PR: ports/109707 Approved by: maintainer timeout (19 days)
Diffstat (limited to 'sysutils/cfengine')
-rw-r--r--sysutils/cfengine/Makefile19
-rw-r--r--sysutils/cfengine/distinfo6
-rw-r--r--sysutils/cfengine/pkg-plist1
3 files changed, 16 insertions, 10 deletions
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index d90211c22c88..dd19f98e9100 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -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@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 cfenvgraph.8 cfetoolcheck.8 \
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>
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
index db436c1bb03b..ec42d8a87ff6 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine/distinfo
@@ -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
diff --git a/sysutils/cfengine/pkg-plist b/sysutils/cfengine/pkg-plist
index ad973e818f39..426a9cff6e15 100644
--- a/sysutils/cfengine/pkg-plist
+++ b/sysutils/cfengine/pkg-plist
@@ -1,6 +1,5 @@
@comment $FreeBSD$
sbin/cfagent
-sbin/cfconvert
sbin/cfdoc
sbin/cfenvd
sbin/cfenvgraph