svn commit: r415360 - in head/devel/cdash: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Mon May 16 19:28:59 2016
New Revision: 415360
URL: https://svnweb.freebsd.org/changeset/ports/415360

Log:
  - Fix options (MULTI->SINGLE), only single DB type is allowed
  - Convert to USES=mysql
  - Switch to options helpers
  - Silence mkdirs
  - Regenerate patches with `make makepatch`

Modified:
  head/devel/cdash/Makefile
  head/devel/cdash/files/patch-CMakeLists.txt
  head/devel/cdash/files/patch-cdash-common.php

Modified: head/devel/cdash/Makefile
==============================================================================
--- head/devel/cdash/Makefile	Mon May 16 19:22:51 2016	(r415359)
+++ head/devel/cdash/Makefile	Mon May 16 19:28:59 2016	(r415360)
@@ -27,28 +27,22 @@ PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${
 SUB_FILES=	pkg-message
 SUB_LIST=	DB_TYPE=${DB_TYPE}
 
-OPTIONS_MULTI=	DB
-OPTIONS_MULTI_DB=	MYSQL PGSQL
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=MYSQL
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-USE_PHP+=	pdo_mysql
-DB_TYPE=	mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-USE_PHP+=	pgsql pdo_pgsql
-DB_TYPE=	pgsql
-.endif
+MYSQL_USES=	mysql
+MYSQL_USE=	PHP=pdo_mysql
+MYSQL_VARS=	DB_TYPE=mysql
+
+PGSQL_USES=	pgsql
+PGSQL_USE=	PHP=pgsql,pdo_pgsql
+PGSQL_VARS=	DB_TYPE=pgsql
 
 do-install:
-	${MKDIR} ${WRKSRC}/rss
+	@${MKDIR} ${WRKSRC}/rss
 	${CP} ${WRKSRC}/backup/.htaccess ${WRKSRC}/rss/.htaccess
-	${MKDIR} ${STAGEDIR}${PREFIX}/www/CDash
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/CDash
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 	${MV} ${WRKSRC}/cdash/config.local.php ${WRKSRC}/cdash/config.local.sample.php
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/www/CDash

Modified: head/devel/cdash/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/cdash/files/patch-CMakeLists.txt	Mon May 16 19:22:51 2016	(r415359)
+++ head/devel/cdash/files/patch-CMakeLists.txt	Mon May 16 19:28:59 2016	(r415360)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2012-03-02 11:38:07.000000000 +0100
-+++ CMakeLists.txt	2012-03-02 11:38:47.000000000 +0100
-@@ -11,6 +11,7 @@
+--- CMakeLists.txt.orig	2016-05-16 19:20:14 UTC
++++ CMakeLists.txt
+@@ -11,6 +11,7 @@ set(CDASH_DB_PASS "" CACHE STRING "Passw
  set(CDASH_DB_PORT "" CACHE STRING "Port to connect to the database")
  set(CDASH_DB_HOST "localhost" CACHE STRING "Hostname of the database server")
  set(CDASH_DB_TYPE "mysql" CACHE STRING "Database type")
@@ -8,7 +8,7 @@
  option(CDASH_USE_SELENIUM "Should CDash use Selenium to test ajax functionality?" OFF)
  option(CDASH_PRO "Are we testing CDashPro?" OFF)
  set(CMake_SOURCE_DIR CACHE FILEPATH "Path to CMake source dir.  Set this to import tests from CMake")
-@@ -87,7 +88,7 @@
+@@ -97,7 +98,7 @@ file(WRITE "${CDash_SOURCE_DIR}/cdash/co
  //
  // Some of the CDash tests also inject config settings below as tests run...
  //

Modified: head/devel/cdash/files/patch-cdash-common.php
==============================================================================
--- head/devel/cdash/files/patch-cdash-common.php	Mon May 16 19:22:51 2016	(r415359)
+++ head/devel/cdash/files/patch-cdash-common.php	Mon May 16 19:28:59 2016	(r415360)
@@ -1,6 +1,6 @@
---- cdash/common.php.orig	2015-08-05 14:20:51.000000000 +0000
-+++ cdash/common.php	2015-08-05 14:21:39.038187339 +0000
-@@ -20,6 +20,7 @@
+--- cdash/common.php.orig	2016-05-16 19:20:14 UTC
++++ cdash/common.php
+@@ -20,6 +20,7 @@ require_once("cdash/log.php");
  
  if (PHP_VERSION >= 5) {
      // Emulate the old xslt library functions