aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2013-03-06 09:24:25 +0800
committergjb <gjb@FreeBSD.org>2013-03-06 09:24:25 +0800
commitb03009a84cddec9393012ea87ce25d3a1be6dfb3 (patch)
tree8acc2ae897ab98e740b0566f342caf340ab58142 /sysutils
parentc2b93a90b3a3c3274486ba5239fc42fdb5b3b3ef (diff)
downloadfreebsd-ports-gnome-b03009a84cddec9393012ea87ce25d3a1be6dfb3.tar.gz
freebsd-ports-gnome-b03009a84cddec9393012ea87ce25d3a1be6dfb3.tar.zst
freebsd-ports-gnome-b03009a84cddec9393012ea87ce25d3a1be6dfb3.zip
Update to 3.4.3
Convert to new options framework Submitted by: skreuzer Approved by: cy (maintainer, implicit)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cfengine34/Makefile37
-rw-r--r--sysutils/cfengine34/distinfo4
2 files changed, 19 insertions, 22 deletions
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 4e7096913e1a..ce173a29b431 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cfengine
-PORTVERSION= 3.4.2
+PORTVERSION= 3.4.3
CATEGORIES= sysutils
MASTER_SITES= http://cfengine.com/source-code/download?file=
@@ -38,46 +38,43 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \
LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
-OPTIONS= TOKYOCABINET "Enable TokyoCabinet support" on \
- QDBM "Enable QDBM support" off \
- PGSQL "Enable PostgreSQL connector" off \
- MYSQL "Enable MySQL connector" off \
- LIBVIRT "Enable libvirt compatibility" off
+OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT
+OPTIONS_SINGLE= BACKEND
+OPTIONS_SINGLE_BACKEND= TOKYOCABINET QDBM
+OPTIONS_DEFAULT= TOKYOCABINET
-.include <bsd.port.pre.mk>
+TOKYOCABINET_DESC= Use TokyoCabinet as backend db
+QDBM_DESC= Use QDBM as backend db
+PGSQL_DESC= Enable PostgreSQL connector
+MYSQL_DESC= Enable MySQL connector
+LIBVIRT_DESC= Enable libvirt compatibility
-.if defined(WITH_TOKYOCABINET) && defined(WITH_QDBM)
-BROKEN= TOKYOCABINET and QDBM are mutuallly exclusive
-.endif
-
-.if !defined(WITH_TOKYOCABINET) && !defined(WITH_QDBM)
-BROKEN= TOKYOCABINET or QDBM must be defined
-.endif
+.include <bsd.port.options.mk>
-.if defined(WITH_TOKYOCABINET)
+.if ${PORT_OPTIONS:MTOKYOCABINET}
CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE}
LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
.endif
-.if defined(WITH_QDBM)
+.if ${PORT_OPTIONS:MQDBM}
CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE}
LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm
.endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}
LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
.endif
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
LDFLAGS+= -L${LOCALBASE}/lib/mysql
.endif
-.if defined(WITH_LIBVIRT)
+.if ${PORT_OPTIONS:MLIBVERT}
CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE}
LIB_DEPENDS+= virt.1000:${PORTSDIR}/devel/libvirt
.endif
@@ -90,4 +87,4 @@ post-patch:
@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
${WRKSRC}/docs/Makefile.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine34/distinfo b/sysutils/cfengine34/distinfo
index 54518ac6b292..51186e5ee023 100644
--- a/sysutils/cfengine34/distinfo
+++ b/sysutils/cfengine34/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.4.2.tar.gz) = 7548ecf3d95468705aed86ec237ebccb6618983386cee67ff47cab46ab1c2472
-SIZE (cfengine-3.4.2.tar.gz) = 4687590
+SHA256 (cfengine-3.4.3.tar.gz) = 50078f31a95714e4ccfa546c7a186b5aade63613dc1a94da0470bdd4f49f0c78
+SIZE (cfengine-3.4.3.tar.gz) = 4688415