Date: Wed, 18 Jul 2018 16:41:18 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474884 - in head/devel/cmake: . files Message-ID: <201807181641.w6IGfIV8085318@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Wed Jul 18 16:41:18 2018 New Revision: 474884 URL: https://svnweb.freebsd.org/changeset/ports/474884 Log: CMake: add TCL/Tk 8.7 as supported versions Since TCL/Tk 8.7 release hits the ports and allowed to be default versions, teach CMake modules to find its right way Submitted by: fluffy Reviewed by: tcberner Differential Revision: D16320 Added: head/devel/cmake/files/patch-Modules_FindTCL.cmake (contents, props changed) head/devel/cmake/files/patch-Modules_FindTclStub.cmake (contents, props changed) head/devel/cmake/files/patch-Modules_FindTclsh.cmake (contents, props changed) Modified: head/devel/cmake/Makefile Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Wed Jul 18 16:38:06 2018 (r474883) +++ head/devel/cmake/Makefile Wed Jul 18 16:41:18 2018 (r474884) @@ -4,7 +4,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.11.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ Added: head/devel/cmake/files/patch-Modules_FindTCL.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-Modules_FindTCL.cmake Wed Jul 18 16:41:18 2018 (r474884) @@ -0,0 +1,36 @@ +--- Modules/FindTCL.cmake.orig 2018-07-18 21:37:55.956332000 +0800 ++++ Modules/FindTCL.cmake 2018-07-18 21:45:48.214853000 +0800 +@@ -85,6 +85,8 @@ + ) + + set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES ++ lib/tcl/tcl8.7 ++ lib/tcl/tk8.7 + lib/tcl/tcl8.6 + lib/tcl/tk8.6 + lib/tcl/tcl8.5 +@@ -116,6 +118,7 @@ + NAMES + tcl + tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION} ++ tcl87 tcl8.7 tcl87t tcl8.7t + tcl86 tcl8.6 tcl86t tcl8.6t + tcl85 tcl8.5 + tcl84 tcl8.4 +@@ -130,6 +133,7 @@ + NAMES + tk + tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION} ++ tk87 tk8.7 tk87t tk8.7t + tk86 tk8.6 tk86t tk8.6t + tk85 tk8.5 + tk84 tk8.4 +@@ -176,6 +180,8 @@ + set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES + include/tcl${TK_LIBRARY_VERSION} + include/tcl${TCL_LIBRARY_VERSION} ++ include/tcl8.7 ++ include/tk8.7 + include/tcl8.6 + include/tk8.6 + include/tcl8.5 Added: head/devel/cmake/files/patch-Modules_FindTclStub.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-Modules_FindTclStub.cmake Wed Jul 18 16:41:18 2018 (r474884) @@ -0,0 +1,18 @@ +--- Modules/FindTclStub.cmake.orig 2018-07-18 21:37:55.827263000 +0800 ++++ Modules/FindTclStub.cmake 2018-07-18 21:46:40.911277000 +0800 +@@ -101,6 +101,7 @@ + NAMES + tclstub + tclstub${TK_LIBRARY_VERSION} tclstub${TCL_TCLSH_VERSION} tclstub${TK_WISH_VERSION} ++ tclstub87 tclstub8.7 + tclstub86 tclstub8.6 + tclstub85 tclstub8.5 + tclstub84 tclstub8.4 +@@ -114,6 +115,7 @@ + NAMES + tkstub + tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION} tkstub${TK_WISH_VERSION} ++ tkstub87 tkstub8.7 + tkstub86 tkstub8.6 + tkstub85 tkstub8.5 + tkstub84 tkstub8.4 Added: head/devel/cmake/files/patch-Modules_FindTclsh.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-Modules_FindTclsh.cmake Wed Jul 18 16:41:18 2018 (r474884) @@ -0,0 +1,10 @@ +--- Modules/FindTclsh.cmake.orig 2018-07-18 21:37:55.834809000 +0800 ++++ Modules/FindTclsh.cmake 2018-07-18 21:47:04.152861000 +0800 +@@ -68,6 +68,7 @@ + set(TCL_TCLSH_NAMES + tclsh + tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION} ++ tclsh87 tclsh8.7 + tclsh86 tclsh8.6 + tclsh85 tclsh8.5 + tclsh84 tclsh8.4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807181641.w6IGfIV8085318>