Attachment #206445 for bug #239273

Lines 25-28 OPTIONS_DEFAULT= PGSQL Link Here

(-)b/databases/opendbviewer/Makefile (+2 lines)
25	PGSQL_USE= QT=sql-pgsql	25	PGSQL_USE= QT=sql-pgsql
26	MYSQL_USE= QT=sql-mysql	26	MYSQL_USE= QT=sql-mysql
27		27
		28	CMAKE_ARGS+= -DCMAKE_CXX_STANDARD=11
		29
28	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/devel/cmake-doc/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.14.5	4	DISTVERSION= 3.15.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-8 Link Here

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

Lines 3-12 Link Here

(-)b/devel/cmake/Makefile (-3 / +3 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.14.5	6	DISTVERSION= 3.15.2
7	PORTREVISION= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	8	MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
		9	https://www.cmake.org/files/v${PORTVERSION}/
10		10
11	MAINTAINER= kde@FreeBSD.org	11	MAINTAINER= kde@FreeBSD.org
12	COMMENT= Cross-platform Makefile generator	12	COMMENT= Cross-platform Makefile generator

Lines 1-3 Link Here

(-)b/devel/cmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1559327154	1	TIMESTAMP = 1565240207
2	SHA256 (cmake-3.14.5.tar.gz) = 505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06	2	SHA256 (cmake-3.15.2.tar.gz) = 539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768
3	SIZE (cmake-3.14.5.tar.gz) = 8854929	3	SIZE (cmake-3.15.2.tar.gz) = 9269449




--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig	2019-06-04 16:37:41 UTC
index 91ae1a23f..a676302e7 100644
--- Source/CPack/cmCPackFreeBSDGenerator.cxx
+++ 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, 

+    return 0;
+  }
+
   for (std::string& name : packageFileNames) {
     cmCPackLogger(cmCPackLog::LOG_DEBUG, "Packagefile " << name << std::endl);
     if (has_suffix(name, broken_suffix)) {

Lines 1-10 Link Here

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




commit bea1c027ed5c863ae21df895d62d7a519bc24eaf
Author: Adriaan de Groot <groot@kde.org>
Date:   Sat Aug 10 21:54:33 2019 +0200

    Fix build with CMake 3.15
    
    Summary:
     - The build flags for the C part of the library overwrite the
       compile flags for C++, in particular, they add -std=c99
       to the C++ compilation.
     - The C parts get auto-mocced (!) which generates a C++
       file (although it's empty), which then gets compiled with
       the C flags (and weird -std= setting).
     - For clang, that leads to a build failure.
    
    So switch out some things:
    
     - Build the C parts as an OBJECT library,
     - Don't apply the C flags to anything but that OBJECT library,
     - and don't automoc C code.
    
    Test Plan: It now builds when CMake 3.15.2 is used.
    
    Reviewers: leinir
    
    Differential Revision: https://phabricator.kde.org/D23076
diff --git src/qtquick/karchive-rar/CMakeLists.txt src/qtquick/karchive-rar/CMakeLists.txt
index 3928dfd..022ecd1 100644
--- src/qtquick/karchive-rar/CMakeLists.txt
+++ src/qtquick/karchive-rar/CMakeLists.txt
@@ -2,10 +2,6 @@ project(karchive-rar)
 
 find_package(ZLIB)
 
-if (UNIX OR MINGW)
-    add_compile_options(-std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
-endif (UNIX OR MINGW)
-
 set(unarr_SRCS
     unarr/rar/uncompress-rar.c
     unarr/rar/huffman-rar.c
@@ -31,7 +27,14 @@ set(karchive_rar_SRCS
     KRarFileEntry.cpp
 )
 
-add_library(karchive-rar STATIC ${karchive_rar_SRCS} ${unarr_SRCS})
+add_library(karchive-c-unarr OBJECT ${unarr_SRCS})
+if (UNIX OR MINGW)
+    target_compile_options(karchive-c-unarr PRIVATE -std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
+    set_property(TARGET karchive-c-unarr PROPERTY AUTOMOC OFF)
+endif (UNIX OR MINGW)
+
+
+add_library(karchive-rar STATIC ${karchive_rar_SRCS} $<TARGET_OBJECTS:karchive-c-unarr>)
 target_link_libraries(karchive-rar
     PUBLIC KF5::Archive
 )

Added Link Here

(-)b/misc/libemos/files/patch-libemos-dp_CMakeLists.txt (+10 lines)
1	--- libemos-dp/CMakeLists.txt.orig 2019-08-10 23:48:55 UTC
2	+++ libemos-dp/CMakeLists.txt
3	@@ -42,6 +42,6 @@ ecbuild_add_library(
4	# libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
5	#else()
6	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
7	- libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
8	+ libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
9	#endif()
10

Added Link Here

(-)b/misc/libemos/files/patch-libemos-sp_CMakeLists.txt (+10 lines)
1	--- libemos-sp/CMakeLists.txt.orig 2019-08-10 23:49:07 UTC
2	+++ libemos-sp/CMakeLists.txt
3	@@ -45,6 +45,6 @@ ecbuild_add_library(
4	# libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
5	#else()
6	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
7	- libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
8	+ libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
9	#endif()
10

Lines 31-36 include/libemos/libemos_config.h Link Here

(-)b/misc/libemos/pkg-plist (+2 lines)
31	include/libemos/libemos_ecbuild_config.h	31	include/libemos/libemos_ecbuild_config.h
32	include/libemos/libemos_version.h	32	include/libemos/libemos_version.h
33	lib/libemos.a	33	lib/libemos.a
		34	lib/libemos.R32.D64.I32.a
		35	lib/libemos.R64.D64.I32.a
34	lib/libemosR64.a	36	lib/libemosR64.a
35	libdata/pkgconfig/libemos.pc	37	libdata/pkgconfig/libemos.pc
36	libdata/pkgconfig/libemosR64.pc	38	libdata/pkgconfig/libemosR64.pc

Return to bug 239273

Lines 1-11 Link Here

(-)b/devel/cmake/files/patch-Source_CPack_cmCPackFreeBSDGenerator.cxx (-9 / +7 lines)
1	diff --git Source/CPack/cmCPackFreeBSDGenerator.cxx Source/CPack/cmCPackFreeBSDGenerator.cxx	1	--- Source/CPack/cmCPackFreeBSDGenerator.cxx.orig 2019-06-04 16:37:41 UTC
2	index 91ae1a23f..a676302e7 100644
3	--- Source/CPack/cmCPackFreeBSDGenerator.cxx
4	+++ Source/CPack/cmCPackFreeBSDGenerator.cxx	2	+++ Source/CPack/cmCPackFreeBSDGenerator.cxx
5	@@ -339,6 +339,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()	3	@@ -331,6 +331,13 @@ int cmCPackFreeBSDGenerator::PackageFiles()
6		4
7	std::string output_dir =	5	std::string broken_suffix = std::string("-") +
8	cmSystemTools::CollapseCombinedPath(toplevel, "../");	6	var_lookup("CPACK_TOPLEVEL_TAG") + std::string(GetOutputExtension());
9	+ if (!pkg_initialized() && pkg_init(NULL, NULL) != EPKG_OK)	7	+ if (!pkg_initialized() && pkg_init(NULL, NULL) != EPKG_OK)
10	+ {	8	+ {
11	+ cmCPackLogger(cmCPackLog::LOG_ERROR,	9	+ cmCPackLogger(cmCPackLog::LOG_ERROR,
Lines 13-18 index 91ae1a23f..a676302e7 100644 Link Here
13	+ return 0;	11	+ return 0;
14	+ }	12	+ }
15	+	13	+
16	pkg_create_from_manifest(output_dir.c_str(), ::TXZ, toplevel.c_str(),	14	for (std::string& name : packageFileNames) {
17	manifestname.c_str(), NULL);	15	cmCPackLogger(cmCPackLog::LOG_DEBUG, "Packagefile " << name << std::endl);
18		16	if (has_suffix(name, broken_suffix)) {

Added Link Here

(-)b/graphics/peruse/files/patch-src_qtquick_karchive_rar_CMakeLists.txt (+57 lines)
1	commit bea1c027ed5c863ae21df895d62d7a519bc24eaf
2	Author: Adriaan de Groot <groot@kde.org>
3	Date: Sat Aug 10 21:54:33 2019 +0200
4
5	Fix build with CMake 3.15
6
7	Summary:
8	- The build flags for the C part of the library overwrite the
9	compile flags for C++, in particular, they add -std=c99
10	to the C++ compilation.
11	- The C parts get auto-mocced (!) which generates a C++
12	file (although it's empty), which then gets compiled with
13	the C flags (and weird -std= setting).
14	- For clang, that leads to a build failure.
15
16	So switch out some things:
17
18	- Build the C parts as an OBJECT library,
19	- Don't apply the C flags to anything but that OBJECT library,
20	- and don't automoc C code.
21
22	Test Plan: It now builds when CMake 3.15.2 is used.
23
24	Reviewers: leinir
25
26	Differential Revision: https://phabricator.kde.org/D23076
27	diff --git src/qtquick/karchive-rar/CMakeLists.txt src/qtquick/karchive-rar/CMakeLists.txt
28	index 3928dfd..022ecd1 100644
29	--- src/qtquick/karchive-rar/CMakeLists.txt
30	+++ src/qtquick/karchive-rar/CMakeLists.txt
31	@@ -2,10 +2,6 @@ project(karchive-rar)
32
33	find_package(ZLIB)
34
35	-if (UNIX OR MINGW)
36	- add_compile_options(-std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
37	-endif (UNIX OR MINGW)
38	-
39	set(unarr_SRCS
40	unarr/rar/uncompress-rar.c
41	unarr/rar/huffman-rar.c
42	@@ -31,7 +27,14 @@ set(karchive_rar_SRCS
43	KRarFileEntry.cpp
44	)
45
46	-add_library(karchive-rar STATIC ${karchive_rar_SRCS} ${unarr_SRCS})
47	+add_library(karchive-c-unarr OBJECT ${unarr_SRCS})
48	+if (UNIX OR MINGW)
49	+ target_compile_options(karchive-c-unarr PRIVATE -std=gnu99 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC)
50	+ set_property(TARGET karchive-c-unarr PROPERTY AUTOMOC OFF)
51	+endif (UNIX OR MINGW)
52	+
53	+
54	+add_library(karchive-rar STATIC ${karchive_rar_SRCS} $<TARGET_OBJECTS:karchive-c-unarr>)
55	target_link_libraries(karchive-rar
56	PUBLIC KF5::Archive
57	)

Lines 172-177 share/aclocal/cmake.m4 Link Here

(-)b/devel/cmake/pkg-plist (-8 / +58 lines)
172	%%DATADIR%%/Help/envvar/CFLAGS.rst	172	%%DATADIR%%/Help/envvar/CFLAGS.rst
173	%%DATADIR%%/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst	173	%%DATADIR%%/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
174	%%DATADIR%%/Help/envvar/CMAKE_CONFIG_TYPE.rst	174	%%DATADIR%%/Help/envvar/CMAKE_CONFIG_TYPE.rst
		175	%%DATADIR%%/Help/envvar/CMAKE_GENERATOR.rst
		176	%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_INSTANCE.rst
		177	%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_PLATFORM.rst
		178	%%DATADIR%%/Help/envvar/CMAKE_GENERATOR_TOOLSET.rst
175	%%DATADIR%%/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst	179	%%DATADIR%%/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
176	%%DATADIR%%/Help/envvar/CMAKE_NO_VERBOSE.rst	180	%%DATADIR%%/Help/envvar/CMAKE_NO_VERBOSE.rst
177	%%DATADIR%%/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst	181	%%DATADIR%%/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
Lines 196-201 share/aclocal/cmake.m4 Link Here
196	%%DATADIR%%/Help/envvar/PackageName_ROOT.rst	200	%%DATADIR%%/Help/envvar/PackageName_ROOT.rst
197	%%DATADIR%%/Help/envvar/RC.rst	201	%%DATADIR%%/Help/envvar/RC.rst
198	%%DATADIR%%/Help/envvar/RCFLAGS.rst	202	%%DATADIR%%/Help/envvar/RCFLAGS.rst
		203	%%DATADIR%%/Help/envvar/SWIFTC.rst
199	%%DATADIR%%/Help/envvar/VERBOSE.rst	204	%%DATADIR%%/Help/envvar/VERBOSE.rst
200	%%DATADIR%%/Help/generator/Borland Makefiles.rst	205	%%DATADIR%%/Help/generator/Borland Makefiles.rst
201	%%DATADIR%%/Help/generator/CodeBlocks.rst	206	%%DATADIR%%/Help/generator/CodeBlocks.rst
Lines 348-353 share/aclocal/cmake.m4 Link Here
348	%%DATADIR%%/Help/module/FindDevIL.rst	353	%%DATADIR%%/Help/module/FindDevIL.rst
349	%%DATADIR%%/Help/module/FindDoxygen.rst	354	%%DATADIR%%/Help/module/FindDoxygen.rst
350	%%DATADIR%%/Help/module/FindEXPAT.rst	355	%%DATADIR%%/Help/module/FindEXPAT.rst
		356	%%DATADIR%%/Help/module/FindEnvModules.rst
351	%%DATADIR%%/Help/module/FindFLEX.rst	357	%%DATADIR%%/Help/module/FindFLEX.rst
352	%%DATADIR%%/Help/module/FindFLTK.rst	358	%%DATADIR%%/Help/module/FindFLTK.rst
353	%%DATADIR%%/Help/module/FindFLTK2.rst	359	%%DATADIR%%/Help/module/FindFLTK2.rst
Lines 597-602 share/aclocal/cmake.m4 Link Here
597	%%DATADIR%%/Help/policy/CMP0086.rst	603	%%DATADIR%%/Help/policy/CMP0086.rst
598	%%DATADIR%%/Help/policy/CMP0087.rst	604	%%DATADIR%%/Help/policy/CMP0087.rst
599	%%DATADIR%%/Help/policy/CMP0088.rst	605	%%DATADIR%%/Help/policy/CMP0088.rst
		606	%%DATADIR%%/Help/policy/CMP0089.rst
		607	%%DATADIR%%/Help/policy/CMP0090.rst
		608	%%DATADIR%%/Help/policy/CMP0091.rst
		609	%%DATADIR%%/Help/policy/CMP0092.rst
		610	%%DATADIR%%/Help/policy/CMP0093.rst
		611	%%DATADIR%%/Help/policy/CMP0094.rst
600	%%DATADIR%%/Help/policy/DEPRECATED.txt	612	%%DATADIR%%/Help/policy/DEPRECATED.txt
601	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt	613	%%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt