Date: Mon, 1 Oct 2012 13:09:31 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305115 - head/devel/cdash Message-ID: <201210011309.q91D9Vun051358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Oct 1 13:09:31 2012 New Revision: 305115 URL: http://svn.freebsd.org/changeset/ports/305115 Log: - Convert to OptionsNG [1] - Re-activate dependencies - Bump PORTREVISION Notified by: http://wiki.freebsd.org/Ports/Options/ConvertingToOptionsNG [1] Modified: head/devel/cdash/Makefile (contents, props changed) Modified: head/devel/cdash/Makefile ============================================================================== --- head/devel/cdash/Makefile Mon Oct 1 12:36:51 2012 (r305114) +++ head/devel/cdash/Makefile Mon Oct 1 13:09:31 2012 (r305115) @@ -7,6 +7,7 @@ PORTNAME= cdash PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cdash.org/download/ DISTNAME= CDash-${PORTVERSION} @@ -16,8 +17,8 @@ COMMENT= A web-based software testing se LICENSE= BSD -OPTIONS= MYSQL "Use MySQL" on \ - PGSQL "Use PostgreSQL" off +OPTIONS_MULTI= DB +OPTIONS_MULTI_DB= MYSQL PGSQL USE_ZIP= yes USE_CMAKE= yes @@ -25,7 +26,7 @@ CMAKE_OUTSOURCE=yes CMAKE_ARGS+= -DCDASH_DB_NAME:STRING=cdash \ -DCDASH_DB_LOGIN:STRING=cdash \ -DCDASH_DB_TYPE:STRING=${DB_TYPE} -#USE_PHP= curl gd xsl +USE_PHP= curl gd xsl WRKSRC= ${WRKDIR}/${DISTNAME:S/./-/g} SUB_FILES= pkg-message @@ -33,19 +34,15 @@ SUB_LIST+= DB_TYPE=${DB_TYPE} .include <bsd.port.options.mk> -.if (!defined(WITH_MYSQL) && !defined(WITH_PGSQL)) || (defined(WITH_MYSQL) && defined(WITH_PGSQL)) -IGNORE= please run 'make config' and select either MYSQL or PGSQL, but not both -.endif - -.if defined(WITH_MYSQL) -#USE_MYSQL= yes -#USE_PHP+= mysql +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= yes +USE_PHP+= mysql DB_TYPE= mysql .endif -.if defined(WITH_PGSQL) -#USE_PGSQL= yes -#USE_PHP+= pgsql +.if ${PORT_OPTIONS:MPGSQL} +USE_PGSQL= yes +USE_PHP+= pgsql DB_TYPE= pgsql .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210011309.q91D9Vun051358>