head 1.3; access; symbols pkgsrc-2017Q2:1.2.0.18 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.16 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.14 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.12 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.10 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.8 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.6 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.1.0.22 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.20 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.18 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.16 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.14 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.12 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.10 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.8 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.6 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2 pkgsrc-2012Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2017.07.04.19.46.29; author jperkin; state dead; branches; next 1.2; commitid eErhCjTdCQs9QWXz; 1.2 date 2015.04.03.18.32.09; author rodent; state Exp; branches; next 1.1; commitid cfOTgn5jOGbSSagy; 1.1 date 2012.07.25.12.07.30; author fhajny; state Exp; branches; next ; desc @@ 1.3 log @Use common patches and reset PKGREVISION. @ text @$NetBSD: patch-configure,v 1.2 2015/04/03 18:32:09 rodent Exp $ --- configure.orig 2014-06-26 16:17:37.000000000 +0000 +++ configure @@@@ -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 #endif #include @@@@ -21524,7 +21527,7 @@@@ elif test "$ac_cv_uname_s" = "SunOS"; th ac_cv_ps_cols=9 { $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 { $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 @@@@ -22982,7 +22985,7 @@@@ _ACEOF fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) +if false then { $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 $as_echo_n "checking for Net::SNMP perl module... " >&6; } @@@@ -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 #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 #include #include @@@@ -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 #include #include @ 1.2 log @Sync these too. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2012/07/25 12:01:55 fhajny Exp $ @ 1.1 log @Fix build on SunOS: - Use MACHINE_ARCH to avoid 64bit builds with ABI=32 on SunOS. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 2 Only build 64bit when MACHINE_ARCH=x86_64, on SunOS. --- configure.orig 2010-07-27 20:48:13.000000000 +0000 d5 29 a33 1 @@@@ -18068,7 +18068,7 @@@@ elif test "$ac_cv_uname_s" = "SunOS"; th d35 2 a36 2 { 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; } d40 71 a110 2 { echo "$as_me:$LINENO: using 64bit pst3" >&5 echo "$as_me: using 64bit pst3" >&6;} @