From owner-svn-ports-all@FreeBSD.ORG Wed Dec 31 11:29:59 2014 Return-Path: Delivered-To: svn-ports-all@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 D3066DE5; Wed, 31 Dec 2014 11:29:59 +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 BEF4964BD9; Wed, 31 Dec 2014 11:29:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBVBTxwV087473; Wed, 31 Dec 2014 11:29:59 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBVBTxwP087471; Wed, 31 Dec 2014 11:29:59 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201412311129.sBVBTxwP087471@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 11:29:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375876 - head/net/freerdp/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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2014 11:29:59 -0000 Author: rakuco Date: Wed Dec 31 11:29:58 2014 New Revision: 375876 URL: https://svnweb.freebsd.org/changeset/ports/375876 QAT: https://qat.redports.org/buildarchive/r375876/ Log: Make the port build with CMake < 3.1.0 after r375840. Of course the part of the patch I wrote myself had to be wrong. Adjust the regexp to make it look like the others and work with all CMake versions. Modified: head/net/freerdp/files/patch-git_1b663cef Modified: head/net/freerdp/files/patch-git_1b663cef ============================================================================== --- head/net/freerdp/files/patch-git_1b663cef Wed Dec 31 10:00:44 2014 (r375875) +++ head/net/freerdp/files/patch-git_1b663cef Wed Dec 31 11:29:58 2014 (r375876) @@ -63,8 +63,8 @@ Tested with 3.1.0-rc3 foreach(FILEPATH ${FILEPATHS}) - if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") - string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH}) -+ if(${FILEPATH} MATCHES "^([^/]*)/${FILENAME}") -+ string(REGEX REPLACE "^([^/]*)/${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" ${MODULE_PREFIX}_SUBMODULE ${FILEPATH}) set(${MODULE_PREFIX}_SUBMODULES ${${MODULE_PREFIX}_SUBMODULES} ${${MODULE_PREFIX}_SUBMODULE}) endif() endforeach(FILEPATH)