From owner-svn-ports-head@FreeBSD.ORG Wed Dec 31 17:41:05 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AF334FB; Wed, 31 Dec 2014 17:41:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F140B2443; Wed, 31 Dec 2014 17:41:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBVHf4Jm067439; Wed, 31 Dec 2014 17:41:04 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBVHf4pp067438; Wed, 31 Dec 2014 17:41:04 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201412311741.sBVHf4pp067438@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 31 Dec 2014 17:41:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375906 - head/www/hiawatha/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.18-1 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: Wed, 31 Dec 2014 17:41:05 -0000 Author: rakuco Date: Wed Dec 31 17:41:04 2014 New Revision: 375906 URL: https://svnweb.freebsd.org/changeset/ports/375906 QAT: https://qat.redports.org/buildarchive/r375906/ Log: Add a patch (sent upstream) to fix the creation of empty directories with CMake 3.1.0. No PORTREVISION bump, as there should not be any functional changes. Tested with CMake 3.0.2. Added: head/www/hiawatha/files/patch-CMakeLists.txt (contents, props changed) Added: head/www/hiawatha/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/hiawatha/files/patch-CMakeLists.txt Wed Dec 31 17:41:04 2014 (r375906) @@ -0,0 +1,28 @@ +Submitted upstream: https://github.com/hsleisink/hiawatha/pull/20 + +commit 4f61342f9f6ff46fbb8b4dc5646c9f0b15809bef +Author: Raphael Kubo da Costa +Date: Wed Dec 31 19:31:22 2014 +0200 + + Make the INSTALL(DIRECTORY empty) calls work with CMake >= 3.1.0. + + Since CMake 3.1.0, ${LOG_DIR}, ${PID_DIR} and ${WORK_DIR} were no longer + being created because the regular expression does not match anything and + CMake's behavior changed in a way that those directories would not be + created before filtering the match list anymore. + + Instead, just call INSTALL(DIRECTORY) with an empty source, which works + with all CMake versions currently supported. + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -172,6 +172,6 @@ endforeach() + install(FILES extra/index.html DESTINATION ${WEBROOT_DIR}) + + # Create directories +-install(DIRECTORY empty DESTINATION ${LOG_DIR} PATTERN "empty" EXCLUDE) +-install(DIRECTORY empty DESTINATION ${PID_DIR} PATTERN "empty" EXCLUDE) +-install(DIRECTORY empty DESTINATION ${WORK_DIR} PATTERN "empty" EXCLUDE) ++install(DIRECTORY DESTINATION ${LOG_DIR}) ++install(DIRECTORY DESTINATION ${PID_DIR}) ++install(DIRECTORY DESTINATION ${WORK_DIR})