Index: head/devel/cdash/Makefile
===================================================================
--- head/devel/cdash/Makefile	(revision 393805)
+++ head/devel/cdash/Makefile	(revision 393806)
@@ -1,52 +1,54 @@
 # Created by: gahr
 # $FreeBSD$
 
 PORTNAME=	cdash
 PORTVERSION=	2.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cdash.org/wp-content/uploads/2014/11/
 DISTNAME=	CDash-2-2-3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-based software testing server
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=MYSQL
 
-USES=		cmake:outsource zip
+USES=		dos2unix cmake:outsource zip
+DOS2UNIX_GLOB=	*.php *.xml *.xsl *.txt
+
 CMAKE_ARGS+=	-DCDASH_DB_NAME:STRING=cdash \
    		-DCDASH_DB_LOGIN:STRING=cdash \
    		-DCDASH_DB_TYPE:STRING=${DB_TYPE}
 USE_PHP=	curl gd pdo session xsl zlib
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/./-/g}
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST+=	DB_TYPE=${DB_TYPE}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 USE_PHP+=	mysql pdo_mysql
 DB_TYPE=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 USE_PHP+=	pgsql pdo_pgsql
 DB_TYPE=	pgsql
 .endif
 
 do-install:
 	${MKDIR} ${WRKSRC}/rss
 	${CP} ${WRKSRC}/backup/.htaccess ${WRKSRC}/rss/.htaccess
 	${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
 
 .include <bsd.port.mk>
Index: head/devel/cdash/files/patch-CMakeLists.txt
===================================================================
--- head/devel/cdash/files/patch-CMakeLists.txt	(revision 393805)
+++ head/devel/cdash/files/patch-CMakeLists.txt	(revision 393806)
@@ -1,19 +1,19 @@
 --- 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 @@
- 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")
-+set(CDASH_DB_NAME "cdash4simpletest" CACHE STRING "Database name")
- 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")
+ 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")
++set(CDASH_DB_NAME "cdash4simpletest" CACHE STRING "Database name")
+ 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 @@
- //
- // Some of the CDash tests also inject config settings below as tests run...
- //
--$CDASH_DB_NAME = 'cdash4simpletest';
-+$CDASH_DB_NAME = '${CDASH_DB_NAME}';
- $CDASH_TESTING_MODE = true;
- $CDASH_REGISTRATION_EMAIL_VERIFY = false;
- $CDASH_TESTING_RENAME_LOGS = ${rename_logs};
+ //
+ // Some of the CDash tests also inject config settings below as tests run...
+ //
+-$CDASH_DB_NAME = 'cdash4simpletest';
++$CDASH_DB_NAME = '${CDASH_DB_NAME}';
+ $CDASH_TESTING_MODE = true;
+ $CDASH_REGISTRATION_EMAIL_VERIFY = false;
+ $CDASH_TESTING_RENAME_LOGS = ${rename_logs};