lldb-netbsd: Reduce diff in PlatformNetBSD::Terminate with Linux

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Dec 19 18:52:48 2016 +0100
Changeset:	383c264ded9be6df6a6df4908143cb5a90f729a6

Modified Files:
	lldb-netbsd/distinfo
	lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp

Log Message:
lldb-netbsd: Reduce diff in PlatformNetBSD::Terminate with Linux

Sponsored by <The NetBSD Foundation>

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

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

diffstat:
 lldb-netbsd/distinfo                               |  2 +-
 ...urce_Plugins_Platform_NetBSD_PlatformNetBSD.cpp | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diffs:
diff --git a/lldb-netbsd/distinfo b/lldb-netbsd/distinfo
index 49972ab..e31b479 100644
--- a/lldb-netbsd/distinfo
+++ b/lldb-netbsd/distinfo
@@ -22,7 +22,7 @@ SHA1 (patch-source_Host_netbsd_HostThreadNetBSD.cpp) = a1b0fbdad062309a845cfefe4
 SHA1 (patch-source_Host_netbsd_ProcessLauncherNetBSD.cpp) = 8b36c0b8d5c75ce501e4848ca07392a7aab68877
 SHA1 (patch-source_Host_netbsd_ThisThread.cpp) = f0d32c81bc1b8fe9aeb86519ea46ba2cb16571c2
 SHA1 (patch-source_Initialization_SystemInitializerCommon.cpp) = b8a2f94eb71dbd265701fdd62e3d36bc0d7081f1
-SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = de85a3cc6e100fcfc857d8dd9a8a946a6d9cab86
+SHA1 (patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp) = eca0281443659716f12cc781108b4de4a905e2ca
 SHA1 (patch-source_Plugins_Process_CMakeLists.txt) = c0168f81da56d9896eb414e6b8bb7262de04ac33
 SHA1 (patch-source_Plugins_Process_NetBSD_CMakeLists.txt) = df17afdf71c29d945c887e318718904793cd48ad
 SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = f83c6cdb1c66713707e723a342ddfd864048ddba
diff --git a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
index b5d00fc..dc68702 100644
--- a/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
+++ b/lldb-netbsd/patches/patch-source_Plugins_Platform_NetBSD_PlatformNetBSD.cpp
@@ -74,7 +74,21 @@ $NetBSD$
  void PlatformNetBSD::Initialize() {
    Platform::Initialize();
  
-@@ -127,20 +156,19 @@ Error PlatformNetBSD::RunShellCommand(co
+@@ -92,8 +121,11 @@ void PlatformNetBSD::Initialize() {
+ }
+ 
+ void PlatformNetBSD::Terminate() {
+-  if (g_initialize_count > 0 && --g_initialize_count == 0)
+-    PluginManager::UnregisterPlugin(PlatformNetBSD::CreateInstance);
++  if (g_initialize_count > 0) {
++    if (--g_initialize_count == 0) {
++      PluginManager::UnregisterPlugin(PlatformNetBSD::CreateInstance);
++    }
++  }
+ 
+   Platform::Terminate();
+ }
+@@ -127,20 +159,19 @@ Error PlatformNetBSD::RunShellCommand(co
  }
  
  Error PlatformNetBSD::ResolveExecutable(
@@ -99,7 +113,7 @@ $NetBSD$
        resolved_module_spec.GetFileSpec().SetFile(exe_path, true);
      }
  
-@@ -163,24 +191,46 @@ Error PlatformNetBSD::ResolveExecutable(
+@@ -163,24 +194,46 @@ Error PlatformNetBSD::ResolveExecutable(
        // We may connect to a process and use the provided executable (Don't use
        // local $PATH).
  
@@ -157,7 +171,7 @@ $NetBSD$
  
        if (!exe_module_sp || exe_module_sp->GetObjectFile() == NULL) {
          exe_module_sp.reset();
-@@ -199,7 +249,7 @@ Error PlatformNetBSD::ResolveExecutable(
+@@ -199,7 +252,7 @@ Error PlatformNetBSD::ResolveExecutable(
             ++idx) {
          error =
              ModuleList::GetSharedModule(resolved_module_spec, exe_module_sp,
@@ -166,7 +180,7 @@ $NetBSD$
          // Did we find an executable using one of the
          if (error.Success()) {
            if (exe_module_sp && exe_module_sp->GetObjectFile())
-@@ -234,8 +284,8 @@ Error PlatformNetBSD::ResolveExecutable(
+@@ -234,8 +287,8 @@ Error PlatformNetBSD::ResolveExecutable(
  
  // From PlatformMacOSX only
  Error PlatformNetBSD::GetFileWithUUID(const FileSpec &platform_file,