diff options
Diffstat (limited to 'net/nagios-plugin-snmp/patches/patch-configure')
| -rw-r--r-- | net/nagios-plugin-snmp/patches/patch-configure | 103 |
1 files changed, 95 insertions, 8 deletions
diff --git a/net/nagios-plugin-snmp/patches/patch-configure b/net/nagios-plugin-snmp/patches/patch-configure index a35c0f1c113..765268b17fd 100644 --- a/net/nagios-plugin-snmp/patches/patch-configure +++ b/net/nagios-plugin-snmp/patches/patch-configure @@ -1,14 +1,101 @@ -$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:32 fhajny Exp $ +$NetBSD: patch-configure,v 1.2 2015/04/03 18:45:12 rodent Exp $ -Only build 64bit when MACHINE_ARCH=x86_64, on SunOS. ---- configure.orig 2010-07-27 20:48:13.000000000 +0000 +--- configure.orig 2014-06-26 16:17:37.000000000 +0000 +++ configure -@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th +@@ -17188,7 +17188,7 @@ _ACEOF + + fi + +- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then ++ if false; then + EXTRAS="$EXTRAS check_radius\$(EXEEXT)" + RADIUSLIBS="-lradiusclient" + +@@ -17363,7 +17363,7 @@ _ACEOF + + fi + +- if test "$ac_cv_lib_ldap_main" = "yes"; then ++ if false; then + LDAPLIBS="-lldap -llber"\ + LDAPINCLUDE="-I/usr/include/ldap" + +@@ -18791,6 +18791,9 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #ifdef HAVE_UNISTD_H ++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 ++#undef _FILE_OFFSET_BITS ++#endif + #include <unistd.h> + #endif + #include <netinet/in.h> +@@ -21524,7 +21527,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; } + { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5 + $as_echo "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;} + { $as_echo "$as_me:$LINENO: using 64bit pst3" >&5 + $as_echo "$as_me: using 64bit pst3" >&6;} +@@ -22521,7 +22524,7 @@ fi + then + { $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5 + $as_echo_n "checking for nslookup syntax... " >&6; } +- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null ++ if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep -F "Invalid option: sil" >/dev/null + then + ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" + { $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 +@@ -23134,7 +23137,7 @@ IFS=$as_save_IFS + esac + fi + PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING +-if test -n "$PATH_TO_FPING"; then ++if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then + { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5 + $as_echo "$PATH_TO_FPING" >&6; } + else +@@ -23174,7 +23177,7 @@ IFS=$as_save_IFS + esac + fi + PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6 +-if test -n "$PATH_TO_FPING6"; then ++if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then + { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5 + $as_echo "$PATH_TO_FPING6" >&6; } + else +@@ -23750,6 +23753,10 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 ++#undef _FILE_OFFSET_BITS ++#endif ++ + #ifdef HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif +@@ -23812,6 +23819,10 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 ++#undef _FILE_OFFSET_BITS ++#endif ++ + #include <unistd.h> + #include <sys/types.h> + #include <sys/param.h> +@@ -24003,6 +24014,10 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + ++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 ++#undef _FILE_OFFSET_BITS ++#endif ++ + #include <sys/types.h> + #include <sys/param.h> + #include <sys/stat.h> |