Attachment #210339 for bug #242254

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.15.5	4	DISTVERSION= 3.16.2
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

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.15.5	4	DISTVERSION= 3.16.2
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

Lines 3-9 Link Here

(-)devel/cmake/Makefile (-1 / +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.15.5	6	DISTVERSION= 3.16.2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \	8	MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
9	https://www.cmake.org/files/v${PORTVERSION}/	9	https://www.cmake.org/files/v${PORTVERSION}/

Lines 1-3 Link Here

(-)devel/cmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1572548467	1	TIMESTAMP = 1577635740
2	SHA256 (cmake-3.15.5.tar.gz) = fbdd7cef15c0ced06bb13024bfda0ecc0dedbcaaaa6b8a5d368c75255243beb4	2	SHA256 (cmake-3.16.2.tar.gz) = 8c09786ec60ca2be354c29829072c38113de9184f29928eb9da8446a5f2ce6a9
3	SIZE (cmake-3.15.5.tar.gz) = 9271925	3	SIZE (cmake-3.16.2.tar.gz) = 9109837




--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig	2019-06-04 16:37:41 UTC
+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
@@ -331,6 +331,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()
 
   std::string broken_suffix = std::string("-") +
     var_lookup("CPACK_TOPLEVEL_TAG") + std::string(GetOutputExtension());
+  if (!pkg_initialized() && pkg_init(NULL, NULL) != EPKG_OK)
+  {
+    cmCPackLogger(cmCPackLog::LOG_ERROR, 
+                  "Can not initialize libpkg." << std::endl);
+    return 0;
+  }
+
   for (std::string& name : packageFileNames) {
     cmCPackLogger(cmCPackLog::LOG_DEBUG, "Packagefile " << name << std::endl);
     if (has_suffix(name, broken_suffix)) {

Lines 16-19 GH_ACCOUNT= Kurento Link Here

(-)devel/kms-cmake-utils/Makefile (+2 lines)
16		16
17	NO_ARCH= yes	17	NO_ARCH= yes
18		18
		19	PLIST_SUB= CMAKE_VERSION=3.16
		20
19	.include <bsd.port.mk>	21	.include <bsd.port.mk>

Lines 1-10 Link Here

(-)devel/kms-cmake-utils/pkg-plist (-10 / +10 lines)
1	share/cmake-3.15/Modules/CommonBuildFlags.cmake	1	share/cmake-%%CMAKE_VERSION%%/Modules/CommonBuildFlags.cmake
2	share/cmake-3.15/Modules/DpkgBuildFlags.cmake	2	share/cmake-%%CMAKE_VERSION%%/Modules/DpkgBuildFlags.cmake
3	share/cmake-3.15/Modules/FindGLIB-GENMARSHAL.cmake	3	share/cmake-%%CMAKE_VERSION%%/Modules/FindGLIB-GENMARSHAL.cmake
4	share/cmake-3.15/Modules/FindGLIB-MKENUMS.cmake	4	share/cmake-%%CMAKE_VERSION%%/Modules/FindGLIB-MKENUMS.cmake
5	share/cmake-3.15/Modules/FindKurentoHelpers.cmake	5	share/cmake-%%CMAKE_VERSION%%/Modules/FindKurentoHelpers.cmake
6	share/cmake-3.15/Modules/GLibHelpers.cmake	6	share/cmake-%%CMAKE_VERSION%%/Modules/GLibHelpers.cmake
7	share/cmake-3.15/Modules/GenericFind.cmake	7	share/cmake-%%CMAKE_VERSION%%/Modules/GenericFind.cmake
8	share/cmake-3.15/Modules/KurentoGitHelpers.cmake	8	share/cmake-%%CMAKE_VERSION%%/Modules/KurentoGitHelpers.cmake
9	share/cmake-3.15/Modules/TestHelpers.cmake	9	share/cmake-%%CMAKE_VERSION%%/Modules/TestHelpers.cmake
10	share/cmake-3.15/Modules/VersionHelpers.cmake	10	share/cmake-%%CMAKE_VERSION%%/Modules/VersionHelpers.cmake

Lines 19-24 CXXFLAGS+= -fPIC Link Here

(-)math/casadi/Makefile (+4 lines)
19		19
20	CMAKE_OFF= WITH_DEEPBIND WITH_BUILD_BLASFEO	20	CMAKE_OFF= WITH_DEEPBIND WITH_BUILD_BLASFEO
21		21
		22	# cmake-3.16: disable build of examples (they are not installed anyways),
		23	# and fail due to not setting up the linker environment properly:
		24	CMAKE_OFF+= WITH_EXAMPLES
		25
22	OPTIONS_DEFINE= BLASFEO BONMIN CLANG IPOPT LAPACK QPOASES	26	OPTIONS_DEFINE= BLASFEO BONMIN CLANG IPOPT LAPACK QPOASES
23	OPTIONS_DEFAULT= BLASFEO BONMIN IPOPT LAPACK QPOASES	27	OPTIONS_DEFAULT= BLASFEO BONMIN IPOPT LAPACK QPOASES
24	OPTIONS_SUB= yes	28	OPTIONS_SUB= yes

Lines 12-17 COMMENT= Generic data structure for manipulating polygonal meshes Link Here

(-)math/openmesh/Makefile (+2 lines)
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
		15	BROKEN= Fails to build with cmake-3.16.0
		16
15	USES= cmake compiler:c++11-lang dos2unix gl qt:5 xorg	17	USES= cmake compiler:c++11-lang dos2unix gl qt:5 xorg
16	DOS2UNIX_FILES= src/OpenMesh/Tools/CMakeLists.txt	18	DOS2UNIX_FILES= src/OpenMesh/Tools/CMakeLists.txt
17	USE_QT= core concurrent gui help network opengl printsupport script scripttools sql svg x11extras xml xmlpatterns webkit widgets \	19	USE_QT= core concurrent gui help network opengl printsupport script scripttools sql svg x11extras xml xmlpatterns webkit widgets \

Lines 13-18 COMMENT= FLAPW code for atomic computations in quantum chemistry and physics Link Here

(-)science/fleur/Makefile (+2 lines)
13	LICENSE= MIT	13	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
15		15
		16	BROKEN= Fails to build with cmake-3.16.0
		17
16	LIB_DEPENDS= libopenblas.so:math/openblas	18	LIB_DEPENDS= libopenblas.so:math/openblas
17		19
18	USES= cmake:noninja fortran gnome localbase:ldflags tar:tgz	20	USES= cmake:noninja fortran gnome localbase:ldflags tar:tgz

Return to bug 242254

Removed Link Here

(-)devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx (-16 lines)
1	--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig 2019-06-04 16:37:41 UTC
2	+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
3	@@ -331,6 +331,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()
4
5	std::string broken_suffix = std::string("-") +
6	var_lookup("CPACK_TOPLEVEL_TAG") + std::string(GetOutputExtension());
7	+ if (!pkg_initialized() && pkg_init(NULL, NULL) != EPKG_OK)
8	+ {
9	+ cmCPackLogger(cmCPackLog::LOG_ERROR,
10	+ "Can not initialize libpkg." << std::endl);
11	+ return 0;
12	+ }
13	+
14	for (std::string& name : packageFileNames) {
15	cmCPackLogger(cmCPackLog::LOG_DEBUG, "Packagefile " << name << std::endl);
16	if (has_suffix(name, broken_suffix)) {

Lines 1-4 Link Here

(-)devel/cmake-doc/pkg-plist (-3 / +179 lines)
1	%%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch	1	%%DOCSDIR%%/CMake.qch
2	%%DOCSDIR%%/html/_sources/command/add_compile_definitions.rst.txt	2	%%DOCSDIR%%/html/_sources/command/add_compile_definitions.rst.txt
3	%%DOCSDIR%%/html/_sources/command/add_compile_options.rst.txt	3	%%DOCSDIR%%/html/_sources/command/add_compile_options.rst.txt
4	%%DOCSDIR%%/html/_sources/command/add_custom_command.rst.txt	4	%%DOCSDIR%%/html/_sources/command/add_custom_command.rst.txt
Lines 111-116 Link Here
111	%%DOCSDIR%%/html/_sources/command/target_link_directories.rst.txt	111	%%DOCSDIR%%/html/_sources/command/target_link_directories.rst.txt
112	%%DOCSDIR%%/html/_sources/command/target_link_libraries.rst.txt	112	%%DOCSDIR%%/html/_sources/command/target_link_libraries.rst.txt
113	%%DOCSDIR%%/html/_sources/command/target_link_options.rst.txt	113	%%DOCSDIR%%/html/_sources/command/target_link_options.rst.txt
		114	%%DOCSDIR%%/html/_sources/command/target_precompile_headers.rst.txt
114	%%DOCSDIR%%/html/_sources/command/target_sources.rst.txt	115	%%DOCSDIR%%/html/_sources/command/target_sources.rst.txt
115	%%DOCSDIR%%/html/_sources/command/try_compile.rst.txt	116	%%DOCSDIR%%/html/_sources/command/try_compile.rst.txt
116	%%DOCSDIR%%/html/_sources/command/try_run.rst.txt	117	%%DOCSDIR%%/html/_sources/command/try_run.rst.txt
Lines 141-146 Link Here
141	%%DOCSDIR%%/html/_sources/envvar/CFLAGS.rst.txt	142	%%DOCSDIR%%/html/_sources/envvar/CFLAGS.rst.txt
142	%%DOCSDIR%%/html/_sources/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst.txt	143	%%DOCSDIR%%/html/_sources/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst.txt
143	%%DOCSDIR%%/html/_sources/envvar/CMAKE_CONFIG_TYPE.rst.txt	144	%%DOCSDIR%%/html/_sources/envvar/CMAKE_CONFIG_TYPE.rst.txt
		145	%%DOCSDIR%%/html/_sources/envvar/CMAKE_GENERATOR.rst.txt
		146	%%DOCSDIR%%/html/_sources/envvar/CMAKE_GENERATOR_INSTANCE.rst.txt
		147	%%DOCSDIR%%/html/_sources/envvar/CMAKE_GENERATOR_PLATFORM.rst.txt
		148	%%DOCSDIR%%/html/_sources/envvar/CMAKE_GENERATOR_TOOLSET.rst.txt
144	%%DOCSDIR%%/html/_sources/envvar/CMAKE_MSVCIDE_RUN_PATH.rst.txt	149	%%DOCSDIR%%/html/_sources/envvar/CMAKE_MSVCIDE_RUN_PATH.rst.txt
145	%%DOCSDIR%%/html/_sources/envvar/CMAKE_NO_VERBOSE.rst.txt	150	%%DOCSDIR%%/html/_sources/envvar/CMAKE_NO_VERBOSE.rst.txt
146	%%DOCSDIR%%/html/_sources/envvar/CMAKE_OSX_ARCHITECTURES.rst.txt	151	%%DOCSDIR%%/html/_sources/envvar/CMAKE_OSX_ARCHITECTURES.rst.txt
Lines 164-169 Link Here
164	%%DOCSDIR%%/html/_sources/envvar/PackageName_ROOT.rst.txt	169	%%DOCSDIR%%/html/_sources/envvar/PackageName_ROOT.rst.txt
165	%%DOCSDIR%%/html/_sources/envvar/RC.rst.txt	170	%%DOCSDIR%%/html/_sources/envvar/RC.rst.txt
166	%%DOCSDIR%%/html/_sources/envvar/RCFLAGS.rst.txt	171	%%DOCSDIR%%/html/_sources/envvar/RCFLAGS.rst.txt
		172	%%DOCSDIR%%/html/_sources/envvar/SWIFTC.rst.txt
167	%%DOCSDIR%%/html/_sources/envvar/VERBOSE.rst.txt	173	%%DOCSDIR%%/html/_sources/envvar/VERBOSE.rst.txt
168	%%DOCSDIR%%/html/_sources/generator/Borland Makefiles.rst.txt	174	%%DOCSDIR%%/html/_sources/generator/Borland Makefiles.rst.txt
169	%%DOCSDIR%%/html/_sources/generator/CodeBlocks.rst.txt	175	%%DOCSDIR%%/html/_sources/generator/CodeBlocks.rst.txt
Lines 191-196 Link Here
191	%%DOCSDIR%%/html/_sources/generator/Visual Studio 9 2008.rst.txt	197	%%DOCSDIR%%/html/_sources/generator/Visual Studio 9 2008.rst.txt
192	%%DOCSDIR%%/html/_sources/generator/Watcom WMake.rst.txt	198	%%DOCSDIR%%/html/_sources/generator/Watcom WMake.rst.txt
193	%%DOCSDIR%%/html/_sources/generator/Xcode.rst.txt	199	%%DOCSDIR%%/html/_sources/generator/Xcode.rst.txt
		200	%%DOCSDIR%%/html/_sources/guide/tutorial/index.rst.txt
194	%%DOCSDIR%%/html/_sources/index.rst.txt	201	%%DOCSDIR%%/html/_sources/index.rst.txt
195	%%DOCSDIR%%/html/_sources/manual/ccmake.1.rst.txt	202	%%DOCSDIR%%/html/_sources/manual/ccmake.1.rst.txt

Lines 142-147 share/aclocal/cmake.m4 Link Here

(-)devel/cmake/pkg-plist (-17 / +111 lines)
142	%%DATADIR%%/Help/command/target_link_directories.rst	142	%%DATADIR%%/Help/command/target_link_directories.rst
143	%%DATADIR%%/Help/command/target_link_libraries.rst	143	%%DATADIR%%/Help/command/target_link_libraries.rst
144	%%DATADIR%%/Help/command/target_link_options.rst	144	%%DATADIR%%/Help/command/target_link_options.rst
		145	%%DATADIR%%/Help/command/target_precompile_headers.rst
145	%%DATADIR%%/Help/command/target_sources.rst	146	%%DATADIR%%/Help/command/target_sources.rst
146	%%DATADIR%%/Help/command/try_compile.rst	147	%%DATADIR%%/Help/command/try_compile.rst
147	%%DATADIR%%/Help/command/try_run.rst	148	%%DATADIR%%/Help/command/try_run.rst
Lines 316-321 share/aclocal/cmake.m4 Link Here
316	%%DATADIR%%/Help/module/CheckIncludeFiles.rst	317	%%DATADIR%%/Help/module/CheckIncludeFiles.rst
317	%%DATADIR%%/Help/module/CheckLanguage.rst	318	%%DATADIR%%/Help/module/CheckLanguage.rst
318	%%DATADIR%%/Help/module/CheckLibraryExists.rst	319	%%DATADIR%%/Help/module/CheckLibraryExists.rst
		320	%%DATADIR%%/Help/module/CheckOBJCCompilerFlag.rst
		321	%%DATADIR%%/Help/module/CheckOBJCSourceCompiles.rst
		322	%%DATADIR%%/Help/module/CheckOBJCSourceRuns.rst
		323	%%DATADIR%%/Help/module/CheckOBJCXXCompilerFlag.rst
		324	%%DATADIR%%/Help/module/CheckOBJCXXSourceCompiles.rst
		325	%%DATADIR%%/Help/module/CheckOBJCXXSourceRuns.rst
319	%%DATADIR%%/Help/module/CheckPIESupported.rst	326	%%DATADIR%%/Help/module/CheckPIESupported.rst
320	%%DATADIR%%/Help/module/CheckPrototypeDefinition.rst	327	%%DATADIR%%/Help/module/CheckPrototypeDefinition.rst
321	%%DATADIR%%/Help/module/CheckStructHasMember.rst	328	%%DATADIR%%/Help/module/CheckStructHasMember.rst
Lines 609-614 share/aclocal/cmake.m4 Link Here
609	%%DATADIR%%/Help/policy/CMP0092.rst	616	%%DATADIR%%/Help/policy/CMP0092.rst
610	%%DATADIR%%/Help/policy/CMP0093.rst	617	%%DATADIR%%/Help/policy/CMP0093.rst
611	%%DATADIR%%/Help/policy/CMP0094.rst	618	%%DATADIR%%/Help/policy/CMP0094.rst
		619	%%DATADIR%%/Help/policy/CMP0095.rst
		620	%%DATADIR%%/Help/policy/CMP0096.rst
		621	%%DATADIR%%/Help/policy/CMP0097.rst
612	%%DATADIR%%/Help/policy/DEPRECATED.txt	622	%%DATADIR%%/Help/policy/DEPRECATED.txt
613	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt	623	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
614	%%DATADIR%%/Help/prop_cache/ADVANCED.rst	624	%%DATADIR%%/Help/prop_cache/ADVANCED.rst
Lines 718-723 share/aclocal/cmake.m4 Link Here
718	%%DATADIR%%/Help/prop_sf/SKIP_AUTOMOC.rst	728	%%DATADIR%%/Help/prop_sf/SKIP_AUTOMOC.rst
719	%%DATADIR%%/Help/prop_sf/SKIP_AUTORCC.rst	729	%%DATADIR%%/Help/prop_sf/SKIP_AUTORCC.rst
720	%%DATADIR%%/Help/prop_sf/SKIP_AUTOUIC.rst	730	%%DATADIR%%/Help/prop_sf/SKIP_AUTOUIC.rst
		731	%%DATADIR%%/Help/prop_sf/SKIP_PRECOMPILE_HEADERS.rst
		732	%%DATADIR%%/Help/prop_sf/SKIP_UNITY_BUILD_INCLUSION.rst
721	%%DATADIR%%/Help/prop_sf/SYMBOLIC.rst	733	%%DATADIR%%/Help/prop_sf/SYMBOLIC.rst
722	%%DATADIR%%/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst	734	%%DATADIR%%/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst