From 16bef4a29e582b09a25bc610d0f043385ee375a2 Mon Sep 17 00:00:00 2001
From: Owen Clarke <o.clarke@gmail.com>
Date: Sun, 22 Jul 2012 20:15:11 +1000
Subject: [PATCH] Bug

- Fixed platform detection of OpenBSD and NetBSD
---
 CMakeLists.txt                  | 4 ++++
 cmake.h.in                      | 1 +
 src/DOM.cpp                     | 6 ++++--
 src/commands/CmdDiagnostics.cpp | 6 ++++--
 src/commands/CmdVersion.cpp     | 6 ++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a0ffb34f..10263ca06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set (DARWIN true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
   set (FREEBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+  set (OPENBSD true)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+  set (NETBSD true)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
   set (SOLARIS true)
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/cmake.h.in b/cmake.h.in
index a3bb1aca1..f4c39065d 100644
--- a/cmake.h.in
+++ b/cmake.h.in
@@ -36,6 +36,7 @@ Override PACKAGE_LANGUAGE, then
 #cmakedefine CYGWIN
 #cmakedefine FREEBSD
 #cmakedefine OPENBSD
+#cmakedefine NETBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
 #cmakedefine WIN32
diff --git a/src/DOM.cpp b/src/DOM.cpp
index c9778fadc..de7475a4e 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -138,12 +138,14 @@ const std::string DOM::get (const std::string& name)
       return /*_cache[name] =*/ "Solaris";
 #elif defined (CYGWIN)
       return /*_cache[name] =*/ "Cygwin";
-#elif defined (OPENBSD)
-      return /*_cache[name] =*/ "OpenBSD";
 #elif defined (HAIKU)
       return /*_cache[name] =*/ "Haiku";
+#elif defined (OPENBSD)
+      return /*_cache[name] =*/ "OpenBSD";
 #elif defined (FREEBSD)
       return /*_cache[name] =*/ "FreeBSD";
+#elif defined (NETBSD)
+      return /*_cache[name] =*/ "NetBSD";
 #elif defined (LINUX)
       return /*_cache[name] =*/ "Linux";
 #else
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index b95824206..a0af04048 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -82,12 +82,14 @@ int CmdDiagnostics::execute (std::string& output)
          "Solaris"
 #elif defined (CYGWIN)
          "Cygwin"
-#elif defined (OPENBSD)
-         "OpenBSD"
 #elif defined (HAIKU)
          "Haiku"
+#elif defined (OPENBSD)
+         "OpenBSD"
 #elif defined (FREEBSD)
          "FreeBSD"
+#elif defined (NETBSD)
+         "NetBSD"
 #elif defined (LINUX)
          "Linux"
 #else
diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp
index e6eba5b8f..178051f1b 100644
--- a/src/commands/CmdVersion.cpp
+++ b/src/commands/CmdVersion.cpp
@@ -80,12 +80,14 @@ int CmdVersion::execute (std::string& output)
       << "solaris"
 #elif defined (CYGWIN)
       << "cygwin"
-#elif defined (OPENBSD)
-      << "openbsd"
 #elif defined (HAIKU)
       << "haiku"
+#elif defined (OPENBSD)
+      << "openbsd"
 #elif defined (FREEBSD)
       << "freebsd"
+#elif defined (NETBSD)
+      << "netbsd"
 #elif defined (LINUX)
       << "linux"
 #else