svn commit: r375876 - head/net/freerdp/files

Raphael Kubo da Costa rakuco at FreeBSD.org
Wed Dec 31 11:29:59 UTC 2014


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)


More information about the svn-ports-head mailing list