lldb-git: Rediff patches against new sources

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Sep 22 01:15:04 2015 +0200
Changeset:	72d6a9c90cec925ea1d840d337fbff070a110e2b

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-ab
	lldb-git/patches/patch-ac
	lldb-git/patches/patch-ad
	lldb-git/patches/patch-include_llvm_Support_Host.h
	lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
	lldb-git/patches/patch-tools_llvm-shlib_Makefile

Log Message:
lldb-git: Rediff patches against new sources

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

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

diffstat:
 lldb-git/distinfo                                        | 12 ++++++------
 lldb-git/patches/patch-ab                                |  4 ++--
 lldb-git/patches/patch-ac                                |  8 ++++----
 lldb-git/patches/patch-ad                                |  4 ++--
 lldb-git/patches/patch-include_llvm_Support_Host.h       |  2 +-
 .../patch-tools_clang_tools_scan-build_scan-build        | 16 ++++++++--------
 lldb-git/patches/patch-tools_llvm-shlib_Makefile         |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 5494ac5..4f4f4a9 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -12,9 +12,9 @@ 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-ab) = 8dd0da6d47a57ac25eea358996cf874dd3289e08
-SHA1 (patch-ac) = 0f0cc98d443ec957fc5374fb491809d27e4f9d4e
-SHA1 (patch-ad) = ad1f6720e4c73e57fce10ba968b03637a133602d
-SHA1 (patch-include_llvm_Support_Host.h) = 545f9542cd2aaa6cea58d3653902b4e1a9e7189a
-SHA1 (patch-tools_clang_tools_scan-build_scan-build) = a671f1e513fb43ddc0e73751a78235ab39aeaf9d
-SHA1 (patch-tools_llvm-shlib_Makefile) = 5cd529e824a935abfe91c4b820cfd9c318e03102
+SHA1 (patch-ab) = 018bbc35044ed47a1bfb395e2d2abcda3e21a71a
+SHA1 (patch-ac) = f7e2a21ae47f531dff59438d654e674d38a58bbd
+SHA1 (patch-ad) = e8ed455c1cdcfb4df616bb83db161155048c3265
+SHA1 (patch-include_llvm_Support_Host.h) = 6017ef3b49f42309e10e575b995ecb45938b93b7
+SHA1 (patch-tools_clang_tools_scan-build_scan-build) = 643dc283372afa1790c3461189b94e1bd067ae9c
+SHA1 (patch-tools_llvm-shlib_Makefile) = f32b7aa8ff0e19c8cb4b69d23dc56eac8ca12279
diff --git a/lldb-git/patches/patch-ab b/lldb-git/patches/patch-ab
index 5be014f..12f333c 100644
--- a/lldb-git/patches/patch-ab
+++ b/lldb-git/patches/patch-ab
@@ -1,8 +1,8 @@
 $NetBSD: patch-ab,v 1.3 2013/01/03 15:19:53 adam Exp $
 
---- docs/Makefile.orig	2012-12-22 12:26:15.000000000 +0000
+--- docs/Makefile.orig	2015-09-21 20:56:17.000000000 +0000
 +++ docs/Makefile
-@@ -52,11 +52,10 @@ endif
+@@ -63,11 +63,10 @@ endif
  # 'make generated BUILD_FOR_WEBSITE=1'
  generated:: $(generated_targets)
  
diff --git a/lldb-git/patches/patch-ac b/lldb-git/patches/patch-ac
index 04975e5..8bf6dbb 100644
--- a/lldb-git/patches/patch-ac
+++ b/lldb-git/patches/patch-ac
@@ -1,8 +1,8 @@
 $NetBSD: patch-ac,v 1.9 2014/01/19 14:06:41 ryoon Exp $
 
---- Makefile.rules.orig	2013-11-14 23:51:29.000000000 +0000
+--- Makefile.rules.orig	2015-09-21 20:56:17.000000000 +0000
 +++ Makefile.rules
-@@ -808,9 +808,6 @@ endif
+@@ -847,9 +847,6 @@ endif
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.9 2014/01/19 14:06:41 ryoon Exp $
  # To create other directories, as needed, and timestamp their creation
  %/.dir:
  	$(Verb) $(MKDIR) $* > /dev/null
-@@ -954,7 +951,9 @@ install-local::
+@@ -993,7 +990,9 @@ install-local::
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.9 2014/01/19 14:06:41 ryoon Exp $
  	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
  	$(Verb)for file in $(CONFIG_FILES); do \
            if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-@@ -1248,7 +1247,7 @@ install-local:: $(DestArchiveLib)
+@@ -1305,7 +1304,7 @@ install-local:: $(DestArchiveLib)
  $(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
  	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
  	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
diff --git a/lldb-git/patches/patch-ad b/lldb-git/patches/patch-ad
index 046cb0c..1f4dddf 100644
--- a/lldb-git/patches/patch-ad
+++ b/lldb-git/patches/patch-ad
@@ -1,8 +1,8 @@
 $NetBSD: patch-ad,v 1.6 2013/05/22 20:51:16 sbd Exp $
 
---- Makefile.config.in.orig	2012-10-01 18:40:32.000000000 +0000
+--- Makefile.config.in.orig	2015-09-21 20:56:17.000000000 +0000
 +++ Makefile.config.in
-@@ -97,11 +97,11 @@ endif
+@@ -106,11 +106,11 @@ endif
  PROJ_bindir     := $(PROJ_prefix)/bin
  PROJ_libdir     := $(PROJ_prefix)/lib
  PROJ_datadir    := $(PROJ_prefix)/share
diff --git a/lldb-git/patches/patch-include_llvm_Support_Host.h b/lldb-git/patches/patch-include_llvm_Support_Host.h
index 123cec0..5b85a27 100644
--- a/lldb-git/patches/patch-include_llvm_Support_Host.h
+++ b/lldb-git/patches/patch-include_llvm_Support_Host.h
@@ -3,7 +3,7 @@ $NetBSD: patch-include_llvm_Support_Host.h,v 1.2 2014/01/19 14:06:41 ryoon Exp $
 Fix lack of machine/endian.h on solaris
 http://permalink.gmane.org/gmane.comp.compilers.llvm.devel/63225 
 
---- include/llvm/Support/Host.h.orig	2013-06-05 09:17:26.000000000 +0000
+--- include/llvm/Support/Host.h.orig	2015-09-21 20:56:17.000000000 +0000
 +++ include/llvm/Support/Host.h
 @@ -18,6 +18,20 @@
  
diff --git a/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build b/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
index 2f0a8f0..d65214a 100644
--- a/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
+++ b/lldb-git/patches/patch-tools_clang_tools_scan-build_scan-build
@@ -2,9 +2,9 @@ $NetBSD: patch-tools_clang_tools_scan-build_scan-build,v 1.1 2014/10/01 09:41:02
 
 Adapt paths for pkgsrc installation.
 
---- tools/clang/tools/scan-build/scan-build.orig	2014-07-17 08:40:35.000000000 +0000
+--- tools/clang/tools/scan-build/scan-build.orig	2015-09-21 20:57:27.000000000 +0000
 +++ tools/clang/tools/scan-build/scan-build
-@@ -437,7 +437,7 @@ sub CopyFiles {
+@@ -462,7 +462,7 @@ sub CopyFiles {
  
    my $Dir = shift;
  
@@ -13,7 +13,7 @@ Adapt paths for pkgsrc installation.
  
    DieDiag("Cannot find 'sorttable.js'.\n")
      if (! -r $JS);
-@@ -447,7 +447,7 @@ sub CopyFiles {
+@@ -472,7 +472,7 @@ sub CopyFiles {
    DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
      if (! -r "$Dir/sorttable.js");
  
@@ -22,7 +22,7 @@ Adapt paths for pkgsrc installation.
  
    DieDiag("Cannot find 'scanview.css'.\n")
      if (! -r $CSS);
-@@ -1657,8 +1657,8 @@ $HtmlDir = GetHTMLRunDir($HtmlDir);
+@@ -1726,8 +1726,8 @@ $Options{OutputDir} = GetHTMLRunDir($Opt
  
  # Determine the location of ccc-analyzer.
  my $AbsRealBin = Cwd::realpath($RealBin);
@@ -33,12 +33,12 @@ Adapt paths for pkgsrc installation.
  
  # Portability: use less strict but portable check -e (file exists) instead of
  # non-portable -x (file is executable). On some windows ports -x just checks
-@@ -1726,7 +1726,7 @@ if (defined $OutputFormat) {
-     if ($ViewResults and -r "$HtmlDir/index.html") {
+@@ -1795,7 +1795,7 @@ if (defined $Options{OutputFormat}) {
+     if ($Options{ViewResults} and -r "$Options{OutputDir}/index.html") {
        Diag "Analysis run complete.\n";
-       Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+       Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";
 -      my $ScanView = Cwd::realpath("$RealBin/scan-view");
 +      my $ScanView = Cwd::realpath("$RealBin/../share/llvm/static-analyzer/scan-view");
        if (! -x $ScanView) { $ScanView = "scan-view"; }
-       exec $ScanView, "$HtmlDir";
+       exec $ScanView, "$Options{OutputDir}";
      }
diff --git a/lldb-git/patches/patch-tools_llvm-shlib_Makefile b/lldb-git/patches/patch-tools_llvm-shlib_Makefile
index 514291f..3f6a7c4 100644
--- a/lldb-git/patches/patch-tools_llvm-shlib_Makefile
+++ b/lldb-git/patches/patch-tools_llvm-shlib_Makefile
@@ -3,7 +3,7 @@ $NetBSD: patch-tools_llvm-shlib_Makefile,v 1.2 2015/04/26 13:08:38 tnn Exp $
 Add NetBSD support.
 Use full paths to archive files instead of -lfoo to avoid wrapper reordering.
 
---- tools/llvm-shlib/Makefile.orig	2014-08-01 06:16:03.000000000 +0000
+--- tools/llvm-shlib/Makefile.orig	2015-09-21 20:56:18.000000000 +0000
 +++ tools/llvm-shlib/Makefile
 @@ -53,18 +53,18 @@ ifeq ($(HOST_OS),Darwin)
      LLVMLibsOptions    := $(LLVMLibsOptions) -all_load