edb-debugger: message($$QMAKE_HOST.arch) shows amd64 on NetBSD

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jan 7 04:56:13 2016 +0100
Changeset:	2427edf414dc55c80e0afb06832bd384a4a72a99

Modified Files:
	edb-debugger/distinfo
	edb-debugger/patches/patch-plugins_plugins.pri
	edb-debugger/patches/patch-src_src.pro

Log Message:
edb-debugger: message($$QMAKE_HOST.arch) shows amd64 on NetBSD

This looks odd, we seem to be the only known to me platform which uses
QMAKE_HOST.arch=amd64, instead of x86_64.

OpenBSD, FreeBSD, Linux, Windows and MacOSX define QMAKE_HOST.arch as x86_64.

According to:
https://github.com/malikcjm/qtcreator/blob/cd7b6e0414c867f708ada0d1cbb4c0173a27be4b/src/shared/proparser/qmakeevaluator.cpp#L1034

QMAKE_HOST.arch maps to `sysctl hw.machine` and it's represented as
'amd64' on NetBSD. So it looks like we are unique here.

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

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

diffstat:
 edb-debugger/distinfo                          | 4 ++--
 edb-debugger/patches/patch-plugins_plugins.pri | 9 +++++++++
 edb-debugger/patches/patch-src_src.pro         | 6 ++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diffs:
diff --git a/edb-debugger/distinfo b/edb-debugger/distinfo
index 5146d8c..5a81415 100644
--- a/edb-debugger/distinfo
+++ b/edb-debugger/distinfo
@@ -17,6 +17,6 @@ SHA1 (patch-plugins_DebuggerCore_unix_netbsd_PlatformState.cpp) = 4ae2040b5ce277
 SHA1 (patch-plugins_DebuggerCore_unix_netbsd_PlatformState.h) = 3affef2a2462fc7952e7eee38cba19ee7d0fa2bc
 SHA1 (patch-plugins_HeapAnalyzer_DialogHeap.cpp) = 7e58098de5024568ad5db428d772507283d83d31
 SHA1 (patch-plugins_ProcessProperties_DialogProcessProperties.cpp) = b115da629d9cc9342d360765866c6d5059fd774b
-SHA1 (patch-plugins_plugins.pri) = fe6aa23cdba0938e01a465475517eca8499af78e
+SHA1 (patch-plugins_plugins.pri) = 98faafa752786f32be035b3c9760159baad2034d
 SHA1 (patch-src_Debugger.cpp) = ba7425b45916b72e6ed81f01b413d03989dcac9f
-SHA1 (patch-src_src.pro) = 2f1515fcb18544080eb846ea1337610a400ecc89
+SHA1 (patch-src_src.pro) = a3e6d14c9db3f707022b1d710e68d7b3c0996354
diff --git a/edb-debugger/patches/patch-plugins_plugins.pri b/edb-debugger/patches/patch-plugins_plugins.pri
index 7f746bd..81fffa8 100644
--- a/edb-debugger/patches/patch-plugins_plugins.pri
+++ b/edb-debugger/patches/patch-plugins_plugins.pri
@@ -16,3 +16,12 @@ $NetBSD$
  
  	# arch include paths
  	macx {
+@@ -34,7 +35,7 @@ unix {
+ 		include(plugins-x86_64.pri)
+ 	}
+ 
+-	!macx:contains(QMAKE_HOST.arch, x86_64) {
++	!macx:contains(QMAKE_HOST.arch, x86_64|amd64) {
+ 		INCLUDEPATH += $$LEVEL/include/arch/x86_64
+ 		include(plugins-x86_64.pri)
+ 	}
diff --git a/edb-debugger/patches/patch-src_src.pro b/edb-debugger/patches/patch-src_src.pro
index d250294..9ba736e 100644
--- a/edb-debugger/patches/patch-src_src.pro
+++ b/edb-debugger/patches/patch-src_src.pro
@@ -29,10 +29,11 @@ $NetBSD$
  	macx-* {
  		VPATH       += $$LEVEL/include/os/unix/osx
  		INCLUDEPATH += $$LEVEL/include/os/unix/osx /opt/local/include
-@@ -201,6 +196,16 @@ unix {
+@@ -201,7 +196,17 @@ unix {
  		INCLUDEPATH += arch/x86_64 $$LEVEL/include/arch/x86_64
  	}
  
+-	!macx:contains(QMAKE_HOST.arch, x86_64) {
 +	netbsd-* {
 +		VPATH       += $$LEVEL/include/os/unix/netbsd
 +		INCLUDEPATH += $$LEVEL/include/os/unix/netbsd
@@ -43,9 +44,10 @@ $NetBSD$
 +		INCLUDEPATH += $$LEVEL/include/os/unix/openbsd /usr/local/include
 +	}
 +
- 	!macx:contains(QMAKE_HOST.arch, x86_64) {
++	!macx:contains(QMAKE_HOST.arch, x86_64|amd64) {
  		VPATH       += arch/x86_64 $$LEVEL/include/arch/x86_64
  		INCLUDEPATH += arch/x86_64 $$LEVEL/include/arch/x86_64
+ 	}
 @@ -221,6 +226,6 @@ unix {
  	linux-g++*   : QMAKE_LFLAGS += -rdynamic $$(LDFLAGS)
  	macx-clang*  : QMAKE_LFLAGS += -rdynamic $$(LDFLAGS)