diff options
Diffstat (limited to 'net/nagios-plugins/patches/patch-ab')
| -rw-r--r-- | net/nagios-plugins/patches/patch-ab | 78 |
1 files changed, 47 insertions, 31 deletions
diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab index 0390e11ef48..54743f0c16e 100644 --- a/net/nagios-plugins/patches/patch-ab +++ b/net/nagios-plugins/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ +$NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ ---- configure.orig 2006-04-19 12:52:19.000000000 +0900 +--- configure.orig 2007-12-13 23:42:38.000000000 +0100 +++ configure -@@ -24395,7 +24395,7 @@ _ACEOF +@@ -1058,7 +1058,7 @@ dvidir='${docdir}' + pdfdir='${docdir}' + psdir='${docdir}' + libdir='${exec_prefix}/lib' +-localedir='${datarootdir}/locale' ++localedir='${datarootdir}/nagios/locale' + mandir='${datarootdir}/man' + + ac_prev= +@@ -21137,7 +21137,7 @@ _ACEOF fi @@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ if test -n "$PGSQL"; then LDFLAGS="$LDFLAGS -L$PGSQL/lib" CPPFLAGS="$CPPFLAGS -I$PGSQL/include" -@@ -25040,7 +25040,7 @@ _ACEOF +@@ -21746,7 +21746,7 @@ _ACEOF fi @@ -20,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ EXTRAS="$EXTRAS check_radius" RADIUSLIBS="-lradiusclient" -@@ -25121,7 +25121,7 @@ _ACEOF +@@ -21901,7 +21901,7 @@ _ACEOF fi @@ -29,70 +38,77 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" -@@ -30212,7 +30212,7 @@ fi +@@ -25688,7 +25688,7 @@ fi then - echo "$as_me:$LINENO: checking for nslookup syntax" >&5 - echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for nslookup syntax" >&5 + echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&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 | fgrep "Invalid option: sil" >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" - echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 -@@ -30530,7 +30530,7 @@ else - echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 +@@ -25911,7 +25911,7 @@ echo "${ECHO_T}no" >&6; } fi + -if test -x "$PATH_TO_LMSTAT" +if false then cat >>confdefs.h <<_ACEOF -@@ -30698,7 +30698,7 @@ if test "${with_snmpget_command+set}" = - withval="$with_snmpget_command" - PATH_TO_SNMPGET=$withval - fi; +@@ -26082,7 +26082,7 @@ if test "${with_snmpget_command+set}" = + withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval + fi + -if test -n "$PATH_TO_SNMPGET" +if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no" then cat >>confdefs.h <<_ACEOF -@@ -30765,7 +30765,7 @@ _ACEOF +@@ -26141,7 +26141,7 @@ if test "${with_snmpgetnext_command+set} + withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval + fi + +-if test -n "$PATH_TO_SNMPGETNEXT" ++if test -n "$PATH_TO_SNMPGETNEXT" -a "$PATH_TO_SNMPGETNEXT" != "no" + then + + cat >>confdefs.h <<_ACEOF +@@ -26150,7 +26150,7 @@ _ACEOF fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) +if false then - echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 - echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6 -@@ -30929,7 +30929,7 @@ if test "${with_fping_command+set}" = se - withval="$with_fping_command" - PATH_TO_FPING=$withval - fi; + { echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 + echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; } +@@ -26317,7 +26317,7 @@ if test "${with_fping_command+set}" = se + withval=$with_fping_command; PATH_TO_FPING=$withval + fi + -if test -n "$PATH_TO_FPING" +if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no" then cat >>confdefs.h <<_ACEOF -@@ -32115,7 +32115,7 @@ _ACEOF - +@@ -27533,7 +27533,7 @@ if test -n "$PATH_TO_APTGET" ; then fi + -if test -f plugins/check_nt.c ; then +if false ; then EXTRAS="$EXTRAS check_nt" elif test -f ../plugins/check_nt.c ; then EXTRAS="$EXTRAS check_nt" -@@ -41104,6 +41104,12 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF +@@ -45418,6 +45418,10 @@ do + case $ac_option in + # Handling of the options. -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + : Avoid regenerating within pkgsrc + exit 0 + : Avoid regenerating within pkgsrc + exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; |