lldb-git: Improve patch for linking issues

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun May 1 01:29:13 2016 +0200
Changeset:	3b98601392ae356c2d51ac2527d0ca9daf77334e

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
	lldb-git/patches/patch-scripts_CMakeLists.txt
Added Files:
	lldb-git/patches/patch-CMakeLists.txt
Removed Files:
	lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py

Log Message:
lldb-git: Improve patch for linking issues

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b98601392ae356c2d51ac2527d0ca9daf77334e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/distinfo                                             |  6 +++---
 lldb-git/patches/patch-CMakeLists.txt                         | 10 ++++++++++
 lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake     |  9 +++++++--
 lldb-git/patches/patch-scripts_CMakeLists.txt                 |  2 +-
 lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py |  4 ----
 5 files changed, 21 insertions(+), 10 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 05e98c8..7d6f1e7 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,15 +12,15 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 73c166ac5a1ea43e601919d1b42744f568adfb4a
+SHA1 (patch-CMakeLists.txt) = 6f5825f6f39de4d79210948ad380e1f29117b54b
+SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 01113dd1d22fc5be9150bcc7805e8bdff73246ba
 SHA1 (patch-include_lldb_Utility_regcclass.h) = 9ed649e8deb5924feaf82a6e675f5c596367b3d6
 SHA1 (patch-include_lldb_Utility_regcname.h) = b67145f0437d3c09adc33a925d49267cd9ba4fd7
 SHA1 (patch-include_lldb_Utility_regengine.inc) = a031c43a63acab80a97cfb7727326d610d4ad9ab
 SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370c1a6b
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
-SHA1 (patch-scripts_CMakeLists.txt) = 07043853b1a923aa8fcb9124b79453eca21c01fb
-SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = 7ae3c77322192f3ca2e0479044b286b0976abff4
+SHA1 (patch-scripts_CMakeLists.txt) = 91b2c8a999be1e285e5bea69fc4b5fc5fd260839
 SHA1 (patch-source_Plugins_SymbolFile_PDB_CMakeLists.txt) = 3465152684eabea85f4ae6250db7bf01fe06cf90
 SHA1 (patch-source_Utility_CMakeLists.txt) = 5b10fe94d76135d8d5ba31862066841394dd45c1
 SHA1 (patch-source_Utility_regcomp.c) = bd315000773bab38b6fe6d119420afbcb5b83a59
diff --git a/lldb-git/patches/patch-CMakeLists.txt b/lldb-git/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..8b9f181
--- /dev/null
+++ b/lldb-git/patches/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-04-27 00:55:49.000000000 +0000
++++ CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 2.8.12.2)
+ 
+ include(cmake/modules/LLDBStandalone.cmake)
+ include(cmake/modules/LLDBConfig.cmake)
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
index 1af9270..e21cdfa 100644
--- a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
+++ b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
@@ -1,8 +1,13 @@
 $NetBSD$
 
---- cmake/modules/LLDBStandalone.cmake.orig	2016-02-05 23:28:46.000000000 +0000
+--- cmake/modules/LLDBStandalone.cmake.orig	2016-04-27 00:55:49.000000000 +0000
 +++ cmake/modules/LLDBStandalone.cmake
-@@ -6,57 +6,78 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+@@ -2,61 +2,82 @@
+ # standalone project, using LLVM as an external library:
+ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+   project(lldb)
+-  cmake_minimum_required(VERSION 2.8)
++  cmake_minimum_required(VERSION 2.8.12.2)
  
    option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
  
diff --git a/lldb-git/patches/patch-scripts_CMakeLists.txt b/lldb-git/patches/patch-scripts_CMakeLists.txt
index b61a0a3..0c244a0 100644
--- a/lldb-git/patches/patch-scripts_CMakeLists.txt
+++ b/lldb-git/patches/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- scripts/CMakeLists.txt.orig	2015-12-06 02:57:30.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2016-04-27 00:55:50.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -9,6 +9,8 @@ set(SWIG_HEADERS
    ${LLDB_SOURCE_DIR}/include/lldb/lldb-versioning.h
diff --git a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
deleted file mode 100644
index 29c3a21..0000000
--- a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD$
-
-Don't conflict with lang/py-six.
-