Attachment #196036 for bug #230488

View | Details | Raw Unified | Return to bug 230488
Collapse All | Expand All

Lines 3-10 Link Here

(-)devel/cmake/Makefile (-2 / +1 lines)
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.	5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.
6	DISTVERSION= 3.12.0	6	DISTVERSION= 3.12.1
7	PORTREVISION= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	8	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
10		9

Lines 1-3 Link Here

(-)devel/cmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1531849848	1	TIMESTAMP = 1533828712
2	SHA256 (cmake-3.12.0.tar.gz) = d0781a90f6cdb9049d104ac16a150f9350b693498b9dea8a0331e799db6b9d69	2	SHA256 (cmake-3.12.1.tar.gz) = c53d5c2ce81d7a957ee83e3e635c8cda5dfe20c9d501a4828ee28e1615e57ab2
3	SIZE (cmake-3.12.0.tar.gz) = 8089372	3	SIZE (cmake-3.12.1.tar.gz) = 8090272




--- 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




--- 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

Lines 1-10 Link Here

(-)devel/cmake/files/patch-Modules_FindTclsh.cmake (-10 lines)
1	--- Modules/FindTclsh.cmake.orig 2018-07-18 21:37:55.834809000 +0800
2	+++ Modules/FindTclsh.cmake 2018-07-18 21:47:04.152861000 +0800
3	@@ -68,6 +68,7 @@
4	set(TCL_TCLSH_NAMES
5	tclsh
6	tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
7	+ tclsh87 tclsh8.7
8	tclsh86 tclsh8.6
9	tclsh85 tclsh8.5
10	tclsh84 tclsh8.4

Lines 1-7 Link Here

(-)devel/cmake-doc/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.12.0	4	DISTVERSION= 3.12.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -doc	7	PKGNAMESUFFIX= -doc




%%DOCSDIR%%/html/_sources/envvar/FFLAGS.rst.txt
%%DOCSDIR%%/html/_sources/envvar/LDFLAGS.rst.txt
%%DOCSDIR%%/html/_sources/envvar/MACOSX_DEPLOYMENT_TARGET.rst.txt
%%DOCSDIR%%/html/_sources/envvar/PackageName_ROOT.rst.txt
%%DOCSDIR%%/html/_sources/envvar/RC.rst.txt
%%DOCSDIR%%/html/_sources/envvar/RCFLAGS.rst.txt
%%DOCSDIR%%/html/_sources/generator/Borland Makefiles.rst.txt

%%DOCSDIR%%/html/_sources/variable/MSVC_IDE.rst.txt
%%DOCSDIR%%/html/_sources/variable/MSVC_TOOLSET_VERSION.rst.txt
%%DOCSDIR%%/html/_sources/variable/MSVC_VERSION.rst.txt
%%DOCSDIR%%/html/_sources/variable/PackageName_ROOT.rst.txt
%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_BINARY_DIR.rst.txt
%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_DESCRIPTION.rst.txt
%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_HOMEPAGE_URL.rst.txt

%%DOCSDIR%%/html/envvar/FFLAGS.html
%%DOCSDIR%%/html/envvar/LDFLAGS.html
%%DOCSDIR%%/html/envvar/MACOSX_DEPLOYMENT_TARGET.html
%%DOCSDIR%%/html/envvar/PackageName_ROOT.html
%%DOCSDIR%%/html/envvar/RC.html
%%DOCSDIR%%/html/envvar/RCFLAGS.html
%%DOCSDIR%%/html/generator/Borland Makefiles.html

%%DOCSDIR%%/html/variable/MSVC_IDE.html
%%DOCSDIR%%/html/variable/MSVC_TOOLSET_VERSION.html
%%DOCSDIR%%/html/variable/MSVC_VERSION.html
%%DOCSDIR%%/html/variable/PackageName_ROOT.html
%%DOCSDIR%%/html/variable/PROJECT-NAME_BINARY_DIR.html
%%DOCSDIR%%/html/variable/PROJECT-NAME_DESCRIPTION.html
%%DOCSDIR%%/html/variable/PROJECT-NAME_HOMEPAGE_URL.html

Lines 1-7 Link Here

(-)devel/cmake-gui/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.12.0	4	DISTVERSION= 3.12.1
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -gui	7	PKGNAMESUFFIX= -gui

Return to bug 230488

Lines 1-36 Link Here

(-)devel/cmake/files/patch-Modules_FindTCL.cmake (-36 lines)
1	--- Modules/FindTCL.cmake.orig 2018-07-18 21:37:55.956332000 +0800
2	+++ Modules/FindTCL.cmake 2018-07-18 21:45:48.214853000 +0800
3	@@ -85,6 +85,8 @@
4	)
5
6	set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
7	+ lib/tcl/tcl8.7
8	+ lib/tcl/tk8.7
9	lib/tcl/tcl8.6
10	lib/tcl/tk8.6
11	lib/tcl/tcl8.5
12	@@ -116,6 +118,7 @@
13	NAMES
14	tcl
15	tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
16	+ tcl87 tcl8.7 tcl87t tcl8.7t
17	tcl86 tcl8.6 tcl86t tcl8.6t
18	tcl85 tcl8.5
19	tcl84 tcl8.4
20	@@ -130,6 +133,7 @@
21	NAMES
22	tk
23	tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
24	+ tk87 tk8.7 tk87t tk8.7t
25	tk86 tk8.6 tk86t tk8.6t
26	tk85 tk8.5
27	tk84 tk8.4
28	@@ -176,6 +180,8 @@
29	set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
30	include/tcl${TK_LIBRARY_VERSION}
31	include/tcl${TCL_LIBRARY_VERSION}
32	+ include/tcl8.7
33	+ include/tk8.7
34	include/tcl8.6
35	include/tk8.6
36	include/tcl8.5

Lines 1-18 Link Here

(-)devel/cmake/files/patch-Modules_FindTclStub.cmake (-18 lines)
1	--- Modules/FindTclStub.cmake.orig 2018-07-18 21:37:55.827263000 +0800
2	+++ Modules/FindTclStub.cmake 2018-07-18 21:46:40.911277000 +0800
3	@@ -101,6 +101,7 @@
4	NAMES
5	tclstub
6	tclstub${TK_LIBRARY_VERSION} tclstub${TCL_TCLSH_VERSION} tclstub${TK_WISH_VERSION}
7	+ tclstub87 tclstub8.7
8	tclstub86 tclstub8.6
9	tclstub85 tclstub8.5
10	tclstub84 tclstub8.4
11	@@ -114,6 +115,7 @@
12	NAMES
13	tkstub
14	tkstub${TCL_LIBRARY_VERSION} tkstub${TCL_TCLSH_VERSION} tkstub${TK_WISH_VERSION}
15	+ tkstub87 tkstub8.7
16	tkstub86 tkstub8.6
17	tkstub85 tkstub8.5
18	tkstub84 tkstub8.4

Lines 170-175 Link Here

(-)devel/cmake/pkg-plist (+2 lines)
170	%%DATADIR%%/Help/envvar/FFLAGS.rst	170	%%DATADIR%%/Help/envvar/FFLAGS.rst
171	%%DATADIR%%/Help/envvar/LDFLAGS.rst	171	%%DATADIR%%/Help/envvar/LDFLAGS.rst
172	%%DATADIR%%/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst	172	%%DATADIR%%/Help/envvar/MACOSX_DEPLOYMENT_TARGET.rst
		173	%%DATADIR%%/Help/envvar/PackageName_ROOT.rst
173	%%DATADIR%%/Help/envvar/RC.rst	174	%%DATADIR%%/Help/envvar/RC.rst
174	%%DATADIR%%/Help/envvar/RCFLAGS.rst	175	%%DATADIR%%/Help/envvar/RCFLAGS.rst
175	%%DATADIR%%/Help/generator/Borland Makefiles.rst	176	%%DATADIR%%/Help/generator/Borland Makefiles.rst
Lines 1443-1448 Link Here
1443	%%DATADIR%%/Help/variable/MSVC_IDE.rst	1444	%%DATADIR%%/Help/variable/MSVC_IDE.rst
1444	%%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst	1445	%%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst
1445	%%DATADIR%%/Help/variable/MSVC_VERSION.rst	1446	%%DATADIR%%/Help/variable/MSVC_VERSION.rst
		1447	%%DATADIR%%/Help/variable/PackageName_ROOT.rst
1446	%%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst	1448	%%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst
1447	%%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst	1449	%%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst
1448	%%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst	1450	%%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst

Lines 142-147 Link Here

(-)devel/cmake-doc/pkg-plist (+4 lines)
142	%%DOCSDIR%%/html/_sources/envvar/FFLAGS.rst.txt	142	%%DOCSDIR%%/html/_sources/envvar/FFLAGS.rst.txt
143	%%DOCSDIR%%/html/_sources/envvar/LDFLAGS.rst.txt	143	%%DOCSDIR%%/html/_sources/envvar/LDFLAGS.rst.txt
144	%%DOCSDIR%%/html/_sources/envvar/MACOSX_DEPLOYMENT_TARGET.rst.txt	144	%%DOCSDIR%%/html/_sources/envvar/MACOSX_DEPLOYMENT_TARGET.rst.txt
		145	%%DOCSDIR%%/html/_sources/envvar/PackageName_ROOT.rst.txt
145	%%DOCSDIR%%/html/_sources/envvar/RC.rst.txt	146	%%DOCSDIR%%/html/_sources/envvar/RC.rst.txt
146	%%DOCSDIR%%/html/_sources/envvar/RCFLAGS.rst.txt	147	%%DOCSDIR%%/html/_sources/envvar/RCFLAGS.rst.txt
147	%%DOCSDIR%%/html/_sources/generator/Borland Makefiles.rst.txt	148	%%DOCSDIR%%/html/_sources/generator/Borland Makefiles.rst.txt
Lines 1398-1403 Link Here
1398	%%DOCSDIR%%/html/_sources/variable/MSVC_IDE.rst.txt	1399	%%DOCSDIR%%/html/_sources/variable/MSVC_IDE.rst.txt
1399	%%DOCSDIR%%/html/_sources/variable/MSVC_TOOLSET_VERSION.rst.txt	1400	%%DOCSDIR%%/html/_sources/variable/MSVC_TOOLSET_VERSION.rst.txt
1400	%%DOCSDIR%%/html/_sources/variable/MSVC_VERSION.rst.txt	1401	%%DOCSDIR%%/html/_sources/variable/MSVC_VERSION.rst.txt
		1402	%%DOCSDIR%%/html/_sources/variable/PackageName_ROOT.rst.txt
1401	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_BINARY_DIR.rst.txt	1403	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_BINARY_DIR.rst.txt
1402	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_DESCRIPTION.rst.txt	1404	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_DESCRIPTION.rst.txt
1403	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_HOMEPAGE_URL.rst.txt	1405	%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_HOMEPAGE_URL.rst.txt
Lines 1593-1598 Link Here
1593	%%DOCSDIR%%/html/envvar/FFLAGS.html	1595	%%DOCSDIR%%/html/envvar/FFLAGS.html
1594	%%DOCSDIR%%/html/envvar/LDFLAGS.html	1596	%%DOCSDIR%%/html/envvar/LDFLAGS.html
1595	%%DOCSDIR%%/html/envvar/MACOSX_DEPLOYMENT_TARGET.html	1597	%%DOCSDIR%%/html/envvar/MACOSX_DEPLOYMENT_TARGET.html
		1598	%%DOCSDIR%%/html/envvar/PackageName_ROOT.html
1596	%%DOCSDIR%%/html/envvar/RC.html	1599	%%DOCSDIR%%/html/envvar/RC.html
1597	%%DOCSDIR%%/html/envvar/RCFLAGS.html	1600	%%DOCSDIR%%/html/envvar/RCFLAGS.html
1598	%%DOCSDIR%%/html/generator/Borland Makefiles.html	1601	%%DOCSDIR%%/html/generator/Borland Makefiles.html
Lines 2853-2858 Link Here
2853	%%DOCSDIR%%/html/variable/MSVC_IDE.html	2856	%%DOCSDIR%%/html/variable/MSVC_IDE.html
2854	%%DOCSDIR%%/html/variable/MSVC_TOOLSET_VERSION.html	2857	%%DOCSDIR%%/html/variable/MSVC_TOOLSET_VERSION.html
2855	%%DOCSDIR%%/html/variable/MSVC_VERSION.html	2858	%%DOCSDIR%%/html/variable/MSVC_VERSION.html
		2859	%%DOCSDIR%%/html/variable/PackageName_ROOT.html
2856	%%DOCSDIR%%/html/variable/PROJECT-NAME_BINARY_DIR.html	2860	%%DOCSDIR%%/html/variable/PROJECT-NAME_BINARY_DIR.html
2857	%%DOCSDIR%%/html/variable/PROJECT-NAME_DESCRIPTION.html	2861	%%DOCSDIR%%/html/variable/PROJECT-NAME_DESCRIPTION.html
2858	%%DOCSDIR%%/html/variable/PROJECT-NAME_HOMEPAGE_URL.html	2862	%%DOCSDIR%%/html/variable/PROJECT-NAME_HOMEPAGE_URL.html