View | Details | Raw Unified | Return to bug 208033 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/cmake-gui/Makefile (-2 / +2 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	cmake
3
PORTNAME=	cmake
4
PORTVERSION=	3.4.2
4
PORTVERSION=	3.5.0
5
CATEGORIES=	devel
5
CATEGORIES=	devel
6
MASTER_SITES=	https://www.cmake.org/files/v3.4/
6
MASTER_SITES=	https://www.cmake.org/files/v3.5/
7
PKGNAMESUFFIX=	-gui
7
PKGNAMESUFFIX=	-gui
8
8
9
MAINTAINER=	kde@FreeBSD.org
9
MAINTAINER=	kde@FreeBSD.org
(-)b/devel/cmake-modules/pkg-plist (+25 lines)
Lines 69-78 Link Here
69
%%DATADIR%%/Modules/CMakeFortranInformation.cmake
69
%%DATADIR%%/Modules/CMakeFortranInformation.cmake
70
%%DATADIR%%/Modules/CMakeGenericSystem.cmake
70
%%DATADIR%%/Modules/CMakeGenericSystem.cmake
71
%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
71
%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
72
%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
72
%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
73
%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
73
%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
74
%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
74
%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
75
%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
75
%%DATADIR%%/Modules/CMakeJavaInformation.cmake
76
%%DATADIR%%/Modules/CMakeJavaInformation.cmake
77
%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
76
%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
78
%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
77
%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
79
%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
78
%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
80
%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
Lines 169-174 Link Here
169
%%DATADIR%%/Modules/CheckVariableExists.c
171
%%DATADIR%%/Modules/CheckVariableExists.c
170
%%DATADIR%%/Modules/CheckVariableExists.cmake
172
%%DATADIR%%/Modules/CheckVariableExists.cmake
171
%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
173
%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
174
%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
175
%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
176
%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
177
%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
178
%%DATADIR%%/Modules/Compiler/ARMCC.cmake
172
%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
179
%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
173
%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
180
%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
174
%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
181
%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
Lines 194-199 Link Here
194
%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
201
%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
195
%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
202
%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
196
%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
203
%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
204
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
205
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
206
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
207
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
208
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
209
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
210
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
211
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
212
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
213
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
214
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
215
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
216
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
217
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
218
%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
219
%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
197
%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
220
%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
198
%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
221
%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
199
%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
222
%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
Lines 422-427 Link Here
422
%%DATADIR%%/Modules/FindX11.cmake
445
%%DATADIR%%/Modules/FindX11.cmake
423
%%DATADIR%%/Modules/FindXCTest.cmake
446
%%DATADIR%%/Modules/FindXCTest.cmake
424
%%DATADIR%%/Modules/FindXMLRPC.cmake
447
%%DATADIR%%/Modules/FindXMLRPC.cmake
448
%%DATADIR%%/Modules/FindXalanC.cmake
425
%%DATADIR%%/Modules/FindXercesC.cmake
449
%%DATADIR%%/Modules/FindXercesC.cmake
426
%%DATADIR%%/Modules/FindZLIB.cmake
450
%%DATADIR%%/Modules/FindZLIB.cmake
427
%%DATADIR%%/Modules/Findosg.cmake
451
%%DATADIR%%/Modules/Findosg.cmake
Lines 541-546 Link Here
541
%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
565
%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
542
%%DATADIR%%/Modules/Platform/CYGWIN.cmake
566
%%DATADIR%%/Modules/Platform/CYGWIN.cmake
543
%%DATADIR%%/Modules/Platform/Catamount.cmake
567
%%DATADIR%%/Modules/Platform/Catamount.cmake
568
%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
544
%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
569
%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
545
%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
570
%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
546
%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
571
%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
(-)b/devel/cmake/Makefile (-2 / +2 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	cmake
4
PORTNAME=	cmake
5
PORTVERSION=	3.4.2
5
PORTVERSION=	3.5.0
6
PORTREVISION?=	0
6
PORTREVISION?=	0
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	https://www.cmake.org/files/v3.4/
8
MASTER_SITES=	https://www.cmake.org/files/v3.5/
9
9
10
MAINTAINER=	kde@FreeBSD.org
10
MAINTAINER=	kde@FreeBSD.org
11
COMMENT?=	Cross-platform Makefile generator
11
COMMENT?=	Cross-platform Makefile generator
(-)b/devel/cmake/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (cmake-3.4.2.tar.gz) = da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392
1
SHA256 (cmake-3.5.0.tar.gz) = 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
2
SIZE (cmake-3.4.2.tar.gz) = 6722152
2
SIZE (cmake-3.5.0.tar.gz) = 6861686
(-)a/devel/cmake/files/patch-Modules_FindDCMTK.cmake (-10 lines)
Removed Link Here
1
--- Modules/FindDCMTK.cmake.orig	2012-07-11 12:01:05.000000000 +0200
2
+++ Modules/FindDCMTK.cmake	2012-07-11 12:01:51.000000000 +0200
3
@@ -56,6 +56,7 @@
4
     ijg12
5
     ijg16
6
     ijg8
7
+    oflog
8
     ofstd)
9
 
10
   find_library(DCMTK_${lib}_LIBRARY
(-)a/devel/cmake/files/patch-git_9d653f9c (-59 lines)
Removed Link Here
1
Fixes a crash in CMake itself when configuring x11-toolkits/fltk-devel with
2
CMake 3.4.0.
3
4
commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e
5
Author: Stephen Kelly <steveire@gmail.com>
6
Date:   Sat Aug 29 18:05:46 2015 +0200
7
8
    cmFLTKWrapUI: Remove CMake 2.2 compat code.
9
10
    CMake 3.0 dropped CMake <= 2.4 compatibility.
11
12
--- Source/cmFLTKWrapUICommand.cxx
13
+++ Source/cmFLTKWrapUICommand.cxx
14
@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass()
15
     cmSystemTools::Message(msg.c_str(),"Warning");
16
     return;
17
     }
18
-  std::vector<cmSourceFile*> srcs;
19
-  target->GetSourceFiles(srcs, "");
20
-  bool found = false;
21
-  for (unsigned int i = 0; i < srcs.size(); ++i)
22
-    {
23
-    if (srcs[i]->GetFullPath() ==
24
-        this->GeneratedSourcesClasses[0]->GetFullPath())
25
-      {
26
-      found = true;
27
-      break;
28
-      }
29
-    }
30
-  if (!found)
31
-    {
32
-    std::string msg =
33
-      "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of "
34
-      "source files that should be added to your executable or library. It "
35
-      "appears that you have not added these source files to your target. "
36
-      "You should change your CMakeLists.txt file to "
37
-      "directly add the generated files to the target. "
38
-      "For example FTLK_WRAP_UI(foo src1 src2 src3) "
39
-      "will create a variable named foo_FLTK_UI_SRCS that contains the list "
40
-      "of sources to add to your target when you call ADD_LIBRARY or "
41
-      "ADD_EXECUTABLE. For now CMake will add the sources to your target "
42
-      "for you as was done in CMake 2.0 and earlier. In the future this may "
43
-      "become an error.";
44
-    msg +="The problem was found while processing the source directory: ";
45
-    msg += this->Makefile->GetCurrentSourceDirectory();
46
-    cmSystemTools::Message(msg.c_str(),"Warning");
47
-    // first we add the rules for all the .fl to .h and .cxx files
48
-    size_t lastHeadersClass = this->GeneratedSourcesClasses.size();
49
-
50
-    // Generate code for all the .fl files
51
-    for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
52
-      {
53
-      this->Makefile->GetTargets()[this->Target]
54
-        .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath());
55
-      }
56
-    }
57
 }
58
 
59
 
(-)b/devel/cmake/pkg-plist (-1 / +7 lines)
Lines 39-44 share/aclocal/cmake.m4 Link Here
39
%%DATADIR%%/Help/command/build_name.rst
39
%%DATADIR%%/Help/command/build_name.rst
40
%%DATADIR%%/Help/command/cmake_host_system_information.rst
40
%%DATADIR%%/Help/command/cmake_host_system_information.rst
41
%%DATADIR%%/Help/command/cmake_minimum_required.rst
41
%%DATADIR%%/Help/command/cmake_minimum_required.rst
42
%%DATADIR%%/Help/command/cmake_parse_arguments.rst
42
%%DATADIR%%/Help/command/cmake_policy.rst
43
%%DATADIR%%/Help/command/cmake_policy.rst
43
%%DATADIR%%/Help/command/configure_file.rst
44
%%DATADIR%%/Help/command/configure_file.rst
44
%%DATADIR%%/Help/command/continue.rst
45
%%DATADIR%%/Help/command/continue.rst
Lines 296-305 share/aclocal/cmake.m4 Link Here
296
%%DATADIR%%/Help/module/FindHTMLHelp.rst
297
%%DATADIR%%/Help/module/FindHTMLHelp.rst
297
%%DATADIR%%/Help/module/FindHg.rst
298
%%DATADIR%%/Help/module/FindHg.rst
298
%%DATADIR%%/Help/module/FindITK.rst
299
%%DATADIR%%/Help/module/FindITK.rst
299
%%DATADIR%%/Help/module/FindIntl.rst
300
%%DATADIR%%/Help/module/FindIce.rst
300
%%DATADIR%%/Help/module/FindIce.rst
301
%%DATADIR%%/Help/module/FindIcotool.rst
301
%%DATADIR%%/Help/module/FindIcotool.rst
302
%%DATADIR%%/Help/module/FindImageMagick.rst
302
%%DATADIR%%/Help/module/FindImageMagick.rst
303
%%DATADIR%%/Help/module/FindIntl.rst
303
%%DATADIR%%/Help/module/FindJNI.rst
304
%%DATADIR%%/Help/module/FindJNI.rst
304
%%DATADIR%%/Help/module/FindJPEG.rst
305
%%DATADIR%%/Help/module/FindJPEG.rst
305
%%DATADIR%%/Help/module/FindJasper.rst
306
%%DATADIR%%/Help/module/FindJasper.rst
Lines 370-375 share/aclocal/cmake.m4 Link Here
370
%%DATADIR%%/Help/module/FindX11.rst
371
%%DATADIR%%/Help/module/FindX11.rst
371
%%DATADIR%%/Help/module/FindXCTest.rst
372
%%DATADIR%%/Help/module/FindXCTest.rst
372
%%DATADIR%%/Help/module/FindXMLRPC.rst
373
%%DATADIR%%/Help/module/FindXMLRPC.rst
374
%%DATADIR%%/Help/module/FindXalanC.rst
373
%%DATADIR%%/Help/module/FindXercesC.rst
375
%%DATADIR%%/Help/module/FindXercesC.rst
374
%%DATADIR%%/Help/module/FindZLIB.rst
376
%%DATADIR%%/Help/module/FindZLIB.rst
375
%%DATADIR%%/Help/module/Findosg.rst
377
%%DATADIR%%/Help/module/Findosg.rst
Lines 706-711 share/aclocal/cmake.m4 Link Here
706
%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
708
%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
707
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
709
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
708
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
710
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
711
%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
709
%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
712
%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
710
%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
713
%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
711
%%DATADIR%%/Help/prop_tgt/LABELS.rst
714
%%DATADIR%%/Help/prop_tgt/LABELS.rst
Lines 802-807 share/aclocal/cmake.m4 Link Here
802
%%DATADIR%%/Help/release/3.2.rst
805
%%DATADIR%%/Help/release/3.2.rst
803
%%DATADIR%%/Help/release/3.3.rst
806
%%DATADIR%%/Help/release/3.3.rst
804
%%DATADIR%%/Help/release/3.4.rst
807
%%DATADIR%%/Help/release/3.4.rst
808
%%DATADIR%%/Help/release/3.5.rst
805
%%DATADIR%%/Help/release/dev.txt
809
%%DATADIR%%/Help/release/dev.txt
806
%%DATADIR%%/Help/release/index.rst
810
%%DATADIR%%/Help/release/index.rst
807
%%DATADIR%%/Help/variable/APPLE.rst
811
%%DATADIR%%/Help/variable/APPLE.rst
Lines 884-889 share/aclocal/cmake.m4 Link Here
884
%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
888
%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
885
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
889
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
886
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
890
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
891
%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
887
%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
892
%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
888
%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
893
%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
889
%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
894
%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
Lines 935-940 share/aclocal/cmake.m4 Link Here
935
%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
940
%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
936
%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
941
%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
937
%%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
942
%%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
943
%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
938
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
944
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
939
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
945
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
940
%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst
946
%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst

Return to bug 208033