6 files changed, 6 insertions, 155 deletions

diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index 4b686d46ba8c..289b6cd77e24 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.4.0
+PORTVERSION=	3.4.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v3.4/
 PKGNAMESUFFIX=	-gui
@@ -10,6 +10,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt-based GUI for CMake
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/devel/cmake-gui/files/patch-git_16f5d184 b/devel/cmake-gui/files/patch-git_16f5d184
deleted file mode 100644
index c37e37082a24..000000000000
--- a/devel/cmake-gui/files/patch-git_16f5d184
+++ /dev/null
@@ -1,22 +0,0 @@
-Fixes the build with recent GCCs (at least 4.8+).
-
-commit 16f5d1843b3720729f50376f522550fcfa787a3c
-Author: Kylie McClain <somasissounds@gmail.com>
-Date:   Wed Nov 25 18:12:06 2015 -0500
-
-    Include `sys/types.h` header to get `mode_t`
-
-    Do not depend on it being included by other system headers.
-    It is not included by others on musl-libc, for example.
-
---- Source/cmStandardIncludes.h
-+++ Source/cmStandardIncludes.h
-@@ -54,6 +54,8 @@
- 
- #if defined( _MSC_VER )
- typedef unsigned short mode_t;
-+#else
-+# include <sys/types.h>
- #endif
- 
- // use this class to shrink the size of symbols in .o files
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 2d51af5b28de..12cf976bd3aa 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.4.0
+PORTVERSION=	3.4.1
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v3.4/
@@ -11,6 +11,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT?=	Cross-platform Makefile generator
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 USE_KDE4=	# env
 CONFIGURE_ENV=	MAKE=make
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 925fadc2c235..32cbb86fe57c 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.4.0.tar.gz) = a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
-SIZE (cmake-3.4.0.tar.gz) = 6719859
+SHA256 (cmake-3.4.1.tar.gz) = d41462bdd80dc37f0d5608167b354bb3af8c068eee640be04c907154c5c113e2
+SIZE (cmake-3.4.1.tar.gz) = 6721965
diff --git a/devel/cmake/files/patch-git_16f5d184 b/devel/cmake/files/patch-git_16f5d184
deleted file mode 100644
index c37e37082a24..000000000000
--- a/devel/cmake/files/patch-git_16f5d184
+++ /dev/null
@@ -1,22 +0,0 @@
-Fixes the build with recent GCCs (at least 4.8+).
-
-commit 16f5d1843b3720729f50376f522550fcfa787a3c
-Author: Kylie McClain <somasissounds@gmail.com>
-Date:   Wed Nov 25 18:12:06 2015 -0500
-
-    Include `sys/types.h` header to get `mode_t`
-
-    Do not depend on it being included by other system headers.
-    It is not included by others on musl-libc, for example.
-
---- Source/cmStandardIncludes.h
-+++ Source/cmStandardIncludes.h
-@@ -54,6 +54,8 @@
- 
- #if defined( _MSC_VER )
- typedef unsigned short mode_t;
-+#else
-+# include <sys/types.h>
- #endif
- 
- // use this class to shrink the size of symbols in .o files
diff --git a/devel/cmake/files/patch-git_9682de56 b/devel/cmake/files/patch-git_9682de56
deleted file mode 100644
index 84c186c35dab..000000000000
--- a/devel/cmake/files/patch-git_9682de56
+++ /dev/null
@@ -1,107 +0,0 @@
-Required for building devel/libcxxrt.
-
-commit 9682de566e264c53018cccd05465f2c5d91ccf73
-Author: Brad King <brad.king@kitware.com>
-Date:   Mon Nov 23 10:13:38 2015 -0500
-
-    Revert "Disable shared library support when compiler links statically" (#15855)
-
-    In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler
-    links statically, 2015-09-30) we tried to detect when the compiler is
-    not capable of linking shared libraries (possibly due to flags in use).
-    However, the approach is not robust against flags like `-nostdlib`.
-    Revert it for now pending another solution to the original problem.
-
---- Modules/CMakeCCompiler.cmake.in
-+++ Modules/CMakeCCompiler.cmake.in
-@@ -2,7 +2,6 @@ set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
- set(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@")
- set(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@")
- set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@")
--set(CMAKE_C_COMPILER_LINKS_STATICALLY "@CMAKE_C_COMPILER_LINKS_STATICALLY@")
- set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "@CMAKE_C_STANDARD_COMPUTED_DEFAULT@")
- set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@")
- set(CMAKE_C90_COMPILE_FEATURES "@CMAKE_C90_COMPILE_FEATURES@")
---- Modules/CMakeCInformation.cmake
-+++ Modules/CMakeCInformation.cmake
-@@ -75,10 +75,6 @@ if(CMAKE_C_SIZEOF_DATA_PTR)
-   unset(CMAKE_C_ABI_FILES)
- endif()
- 
--if(CMAKE_C_COMPILER_LINKS_STATICALLY)
--  set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
--endif()
--
- # This should be included before the _INIT variables are
- # used to initialize the cache.  Since the rule variables
- # have if blocks on them, users can still define them here.
---- Modules/CMakeCXXCompiler.cmake.in
-+++ Modules/CMakeCXXCompiler.cmake.in
-@@ -2,7 +2,6 @@ set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
- set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@")
- set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@")
- set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@")
--set(CMAKE_CXX_COMPILER_LINKS_STATICALLY "@CMAKE_CXX_COMPILER_LINKS_STATICALLY@")
- set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_CXX_STANDARD_COMPUTED_DEFAULT@")
- set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@")
- set(CMAKE_CXX98_COMPILE_FEATURES "@CMAKE_CXX98_COMPILE_FEATURES@")
---- Modules/CMakeCXXInformation.cmake
-+++ Modules/CMakeCXXInformation.cmake
-@@ -74,10 +74,6 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR)
-   unset(CMAKE_CXX_ABI_FILES)
- endif()
- 
--if(CMAKE_CXX_COMPILER_LINKS_STATICALLY)
--  set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
--endif()
--
- # This should be included before the _INIT variables are
- # used to initialize the cache.  Since the rule variables
- # have if blocks on them, users can still define them here.
---- Modules/CMakeDetermineCompilerId.cmake
-+++ Modules/CMakeDetermineCompilerId.cmake
-@@ -106,7 +106,6 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
-   set(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}"
-     PARENT_SCOPE)
-   set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX}" PARENT_SCOPE)
--  set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY "${CMAKE_${lang}_COMPILER_LINKS_STATICALLY}" PARENT_SCOPE)
-   set(CMAKE_${lang}_COMPILER_VERSION "${CMAKE_${lang}_COMPILER_VERSION}" PARENT_SCOPE)
-   set(CMAKE_${lang}_SIMULATE_ID "${CMAKE_${lang}_SIMULATE_ID}" PARENT_SCOPE)
-   set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE)
-@@ -530,13 +529,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
-       endif()
-     endif()
- 
--    if(UNIX)
--      execute_process(COMMAND file "${file}" OUTPUT_VARIABLE out ERROR_VARIABLE out)
--      if(out MATCHES "statically linked")
--        set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY 1 PARENT_SCOPE)
--      endif()
--    endif()
--
-     # Check if a valid compiler and platform were found.
-     if(COMPILER_ID AND NOT COMPILER_ID_TWICE)
-       set(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}")
---- Modules/CMakeFortranCompiler.cmake.in
-+++ Modules/CMakeFortranCompiler.cmake.in
-@@ -2,7 +2,6 @@ set(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@")
- set(CMAKE_Fortran_COMPILER_ARG1 "@CMAKE_Fortran_COMPILER_ARG1@")
- set(CMAKE_Fortran_COMPILER_ID "@CMAKE_Fortran_COMPILER_ID@")
- set(CMAKE_Fortran_COMPILER_VERSION "@CMAKE_Fortran_COMPILER_VERSION@")
--set(CMAKE_Fortran_COMPILER_LINKS_STATICALLY "@CMAKE_Fortran_COMPILER_LINKS_STATICALLY@")
- set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@")
- set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@")
- set(CMAKE_Fortran_SIMULATE_VERSION "@CMAKE_Fortran_SIMULATE_VERSION@")
---- Modules/CMakeFortranInformation.cmake
-+++ Modules/CMakeFortranInformation.cmake
-@@ -51,10 +51,6 @@ if(CMAKE_Fortran_SIZEOF_DATA_PTR)
-   unset(CMAKE_Fortran_ABI_FILES)
- endif()
- 
--if(CMAKE_Fortran_COMPILER_LINKS_STATICALLY)
--  set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
--endif()
--
- # This should be included before the _INIT variables are
- # used to initialize the cache.  Since the rule variables
- # have if blocks on them, users can still define them here.