From owner-svn-ports-all@FreeBSD.ORG Thu Feb 28 00:22:51 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7B29A97C; Thu, 28 Feb 2013 00:22:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 55CCBCCF; Thu, 28 Feb 2013 00:22:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1S0Mpvp064665; Thu, 28 Feb 2013 00:22:51 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1S0MpWp064664; Thu, 28 Feb 2013 00:22:51 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201302280022.r1S0MpWp064664@svn.freebsd.org> From: Glen Barber Date: Thu, 28 Feb 2013 00:22:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313072 - head/sysutils/cfengine-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2013 00:22:51 -0000 Author: gjb Date: Thu Feb 28 00:22:50 2013 New Revision: 313072 URL: http://svnweb.freebsd.org/changeset/ports/313072 Log: Convert to new options framework Approved by: cy (maintainer, implicit) Modified: head/sysutils/cfengine-devel/Makefile Modified: head/sysutils/cfengine-devel/Makefile ============================================================================== --- head/sysutils/cfengine-devel/Makefile Thu Feb 28 00:15:17 2013 (r313071) +++ head/sysutils/cfengine-devel/Makefile Thu Feb 28 00:22:50 2013 (r313072) @@ -37,46 +37,42 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \ LIB_DEPENDS+= pcre.3:${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= DB +OPTIONS_SINGLE_DB= TOKYOCABINET QDBM +TOKYOCABINET_DESC= Enable TokyoCabinet database backend +QDBM_DESC= Enable QDBM database backend +PGSQL_DESC= Enable PostgreSQL integration +MYSQL_DESC= Enable MySQL integration +LIBVIRT_DESC= Enable libvirt integration +OPTIONS_DEFAULT=TOKYOCABINET .include -.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 - -.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:MLIBVIRT} CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= virt.1000:${PORTSDIR}/devel/libvirt .endif