From owner-svn-ports-all@FreeBSD.ORG Tue Dec 30 18:26:52 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 52E406ED; Tue, 30 Dec 2014 18:26:52 +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 3E4F02B7F; Tue, 30 Dec 2014 18:26:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBUIQqWC077097; Tue, 30 Dec 2014 18:26:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBUIQp9n077094; Tue, 30 Dec 2014 18:26:51 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201412301826.sBUIQp9n077094@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 30 Dec 2014 18:26:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375840 - in 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: Tue, 30 Dec 2014 18:26:52 -0000 Author: rakuco Date: Tue Dec 30 18:26:50 2014 New Revision: 375840 URL: https://svnweb.freebsd.org/changeset/ports/375840 QAT: https://qat.redports.org/buildarchive/r375840/ Log: - Add upstream patch (slightly adjusted to this version) to make the port build with the upcoming CMake 3.1.0. - Add missing dependency on libXi, and set PORTREVISION only once while here. Approved by: fluffy (maintainer, implicit) Added: head/net/freerdp/files/patch-git_1b663cef (contents, props changed) Modified: head/net/freerdp/Makefile Modified: head/net/freerdp/Makefile ============================================================================== --- head/net/freerdp/Makefile Tue Dec 30 18:00:07 2014 (r375839) +++ head/net/freerdp/Makefile Tue Dec 30 18:26:50 2014 (r375840) @@ -3,9 +3,8 @@ PORTNAME= freerdp PORTVERSION= 1.1.0 -PORTREVISION= 1 DISTVERSIONSUFFIX= -beta+2013071101 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net comms ipv6 MAINTAINER= fluffy@FreeBSD.org @@ -66,7 +65,7 @@ X11_DESC= Build FreeRDP X11 client X11_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto X11_CMAKE_ON= -DWITH_X11=ON X11_CMAKE_OFF= -DWITH_X11=OFF -DWITH_XKBFILE=OFF -X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr +X11_USE= xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xcursor,xrandr,xi .include Added: head/net/freerdp/files/patch-git_1b663cef ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freerdp/files/patch-git_1b663cef Tue Dec 30 18:26:50 2014 (r375840) @@ -0,0 +1,70 @@ +The patch below comes from upstream and has been slightly adjusted to apply +on the tarball we build. + +From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 +From: Bernhard Miklautz +Date: Fri, 12 Dec 2014 18:26:45 +0100 +Subject: [PATCH] build: cmake 3.1 compatibility + +* fix problem with REMOVE_DUPLICATES on undefined lists +* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as + previously - necessary adoptions for regex and matches done. Should + work with all cmake versions. + +Tested with 3.1.0-rc3 +--- channels/CMakeLists.txt ++++ channels/CMakeLists.txt +@@ -202,8 +202,8 @@ set(FILENAME "ChannelOptions.cmake") + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + foreach(FILEPATH ${FILEPATHS}) +- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") +- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) + set(CHANNEL_OPTION) + include(${FILEPATH}) + if(${CHANNEL_OPTION}) +--- channels/client/CMakeLists.txt ++++ channels/client/CMakeLists.txt +@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/addin.c + ${CMAKE_CURRENT_SOURCE_DIR}/addin.h) + ++if(CHANNEL_STATIC_CLIENT_ENTRIES) + list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) ++endif() + + foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) + foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) +--- third-party/CMakeLists.txt ++++ third-party/CMakeLists.txt +@@ -22,11 +22,11 @@ + file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") + + foreach(dir ${all_valid_subdirs}) +- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") +- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) ++ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") ++ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) + message(STATUS "Adding third-party component ${dir_trimmed}") + add_subdirectory(${dir_trimmed}) + endif() + endforeach(dir) + +-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) +\ No newline at end of file ++set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) +--- winpr/libwinpr/CMakeLists.txt ++++ winpr/libwinpr/CMakeLists.txt +@@ -32,8 +32,8 @@ + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + 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}) + set(${MODULE_PREFIX}_SUBMODULES ${${MODULE_PREFIX}_SUBMODULES} ${${MODULE_PREFIX}_SUBMODULE}) + endif() + endforeach(FILEPATH)