Fix build on SunOS:

- Use MACHINE_ARCH to avoid 64bit builds with ABI=32 on SunOS.

10 files changed, 80 insertions, 5 deletions

diff --git a/net/nagios-plugin-ldap/distinfo b/net/nagios-plugin-ldap/distinfo
index 7db3daacfec..bce58dd100d 100644
--- a/net/nagios-plugin-ldap/distinfo
+++ b/net/nagios-plugin-ldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/05/24 15:22:18 marino Exp $
+$NetBSD: distinfo,v 1.9 2012/07/25 12:07:29 fhajny Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
@@ -6,4 +6,5 @@ Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
 SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
 SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
 SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
+SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
 SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
diff --git a/net/nagios-plugin-ldap/patches/patch-configure b/net/nagios-plugin-ldap/patches/patch-configure
new file mode 100644
index 00000000000..f73f7f50b2c
--- /dev/null
+++ b/net/nagios-plugin-ldap/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:29 fhajny Exp $
+
+Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
+ echo "$as_me: using 64bit pst3" >&6;}
diff --git a/net/nagios-plugin-mysql/distinfo b/net/nagios-plugin-mysql/distinfo
index 23cac4f8374..bce58dd100d 100644
--- a/net/nagios-plugin-mysql/distinfo
+++ b/net/nagios-plugin-mysql/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/05/24 15:24:06 marino Exp $
+$NetBSD: distinfo,v 1.9 2012/07/25 12:07:29 fhajny Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
@@ -6,4 +6,5 @@ Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
 SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
 SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
 SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
+SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
 SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
diff --git a/net/nagios-plugin-mysql/patches/patch-configure b/net/nagios-plugin-mysql/patches/patch-configure
new file mode 100644
index 00000000000..d3465703a12
--- /dev/null
+++ b/net/nagios-plugin-mysql/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:30 fhajny Exp $
+
+Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
+ echo "$as_me: using 64bit pst3" >&6;}
diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo
index 894c7fd17db..e759e496386 100644
--- a/net/nagios-plugin-pgsql/distinfo
+++ b/net/nagios-plugin-pgsql/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/05/24 15:26:14 marino Exp $
+$NetBSD: distinfo,v 1.10 2012/07/25 12:07:30 fhajny Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
@@ -6,4 +6,5 @@ Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
 SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
 SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
 SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
+SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
 SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
diff --git a/net/nagios-plugin-pgsql/patches/patch-configure b/net/nagios-plugin-pgsql/patches/patch-configure
new file mode 100644
index 00000000000..d3465703a12
--- /dev/null
+++ b/net/nagios-plugin-pgsql/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:30 fhajny Exp $
+
+Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
+ echo "$as_me: using 64bit pst3" >&6;}
diff --git a/net/nagios-plugin-radius/distinfo b/net/nagios-plugin-radius/distinfo
index 03a308c7bf7..90ee71b91f0 100644
--- a/net/nagios-plugin-radius/distinfo
+++ b/net/nagios-plugin-radius/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2012/05/24 15:27:58 marino Exp $
+$NetBSD: distinfo,v 1.8 2012/07/25 12:07:31 fhajny Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = 979c47b31f7b2811b9ba8e8231b3d8a05c763e5c
 SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
 SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
 SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
+SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
 SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
diff --git a/net/nagios-plugin-radius/patches/patch-configure b/net/nagios-plugin-radius/patches/patch-configure
new file mode 100644
index 00000000000..ab3301f6bb6
--- /dev/null
+++ b/net/nagios-plugin-radius/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:31 fhajny Exp $
+
+Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
+ echo "$as_me: using 64bit pst3" >&6;}
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index 146d37c9c8b..a1447b89f37 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2012/05/24 15:29:43 marino Exp $
+$NetBSD: distinfo,v 1.11 2012/07/25 12:07:31 fhajny Exp $
 
 SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
 RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
@@ -8,4 +8,5 @@ SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
 SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
 SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
 SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
+SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
 SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
diff --git a/net/nagios-plugin-snmp/patches/patch-configure b/net/nagios-plugin-snmp/patches/patch-configure
new file mode 100644
index 00000000000..a35c0f1c113
--- /dev/null
+++ b/net/nagios-plugin-snmp/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:32 fhajny Exp $
+
+Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+         ac_cv_ps_cols=9
+         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
++	if test "$MACHINE_ARCH" = "x86_64" ; then
+ 		pst3_use_64bit=1
+ 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
+ echo "$as_me: using 64bit pst3" >&6;}