diff options
| -rw-r--r-- | devel/cmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindTCL.cmake | 36 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindTclStub.cmake | 18 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindTclsh.cmake | 10 |
4 files changed, 65 insertions, 1 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 33a3d15a2de8..f5108b351948 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -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}/ diff --git a/devel/cmake/files/patch-Modules_FindTCL.cmake b/devel/cmake/files/patch-Modules_FindTCL.cmake new file mode 100644 index 000000000000..f893679c2a81 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindTCL.cmake @@ -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 diff --git a/devel/cmake/files/patch-Modules_FindTclStub.cmake b/devel/cmake/files/patch-Modules_FindTclStub.cmake new file mode 100644 index 000000000000..f6df0d7cc0ca --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindTclStub.cmake @@ -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 diff --git a/devel/cmake/files/patch-Modules_FindTclsh.cmake b/devel/cmake/files/patch-Modules_FindTclsh.cmake new file mode 100644 index 000000000000..e029bfd549d9 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindTclsh.cmake @@ -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 |