From owner-svn-ports-head@freebsd.org Mon May 16 19:29:00 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7AA0B3E049; Mon, 16 May 2016 19:29:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3F0613BD; Mon, 16 May 2016 19:29:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4GJSxi2006988; Mon, 16 May 2016 19:28:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4GJSx6n006985; Mon, 16 May 2016 19:28:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201605161928.u4GJSx6n006985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 16 May 2016 19:28:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415360 - in head/devel/cdash: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 19:29:01 -0000 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 - -.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