- One more patch to fix things from my last commit

- Bump PORTREVISION

Submitted by:	maintainer

5 files changed, 67 insertions, 21 deletions

diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index b25abeb06b37..f4dd6ae4113e 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagios-plugins
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -84,6 +85,7 @@ USE_PGSQL=	YES
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 PLIST_SUB+=	SUB_PGSQL=""
 .else
+CONFIGURE_ARGS+=--with-pgsql=${NONEXISTENT}
 PLIST_SUB+=	SUB_PGSQL="@comment "
 .endif
 
@@ -95,7 +97,8 @@ PLIST_SUB+=	SUB_LDAP=""
 PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} LDFLAGS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 USE_AUTOMAKE_VER=	19
 USE_AUTOCONF_VER=	259
 USE_GMAKE=	yes
diff --git a/net-mgmt/nagios-plugins/files/patch-Makefile.am b/net-mgmt/nagios-plugins/files/patch-Makefile.am
new file mode 100644
index 000000000000..2c39f970ecc4
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- plugins/Makefile.am.orig	Fri Aug 12 14:09:44 2005
++++ plugins/Makefile.am	Fri Aug 12 14:10:51 2005
+@@ -3,7 +3,7 @@
+ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+ 
+ INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
+-@LDAPINCLUDE@ @PGINCLUDE@ 
++@LDAPINCLUDE@ @PGINCLUDE@ @RADIUSINCLUDE@ 
+ 
+ datadir = @datadir@
+ localedir = $(datadir)/locale
diff --git a/net-mgmt/nagios-plugins/files/patch-check_radius.c b/net-mgmt/nagios-plugins/files/patch-check_radius.c
index 1db024f04a85..3f3e553ac6cc 100644
--- a/net-mgmt/nagios-plugins/files/patch-check_radius.c
+++ b/net-mgmt/nagios-plugins/files/patch-check_radius.c
@@ -1,15 +1,24 @@
---- plugins/check_radius.c.orig	Wed Nov 24 01:46:39 2004
-+++ plugins/check_radius.c	Fri Dec  3 20:37:30 2004
-@@ -103,6 +103,7 @@
- 	int result;
+--- plugins/check_radius.c.orig	Sun Dec 26 02:17:44 2004
++++ plugins/check_radius.c	Fri Aug 12 13:53:36 2005
+@@ -27,7 +27,7 @@
+ #include "utils.h"
+ #include "netutils.h"
+ 
+-#include <radiusclient.h>
++#include <radiusclient-ng.h>
+ 
+ int process_arguments (int, char **);
+ void print_help (void);
+@@ -108,6 +108,7 @@
+ 	int result = STATE_UNKNOWN;
  	UINT4 client_id;
  	char *str;
 +	rc_handle *rh;
  
  	setlocale (LC_ALL, "");
  	bindtextdomain (PACKAGE, LOCALEDIR);
-@@ -112,32 +113,35 @@
- 		usage (_("Could not parse arguments\n"));
+@@ -117,32 +118,35 @@
+ 		usage4 (_("Could not parse arguments"));
  
  	str = strdup ("dictionary");
 -	if ((config_file && rc_read_config (config_file)) ||
diff --git a/net-mgmt/nagios-plugins/files/patch-check_tcp.c b/net-mgmt/nagios-plugins/files/patch-check_tcp.c
index 7ff7a885e46f..0c4bcce2dda7 100644
--- a/net-mgmt/nagios-plugins/files/patch-check_tcp.c
+++ b/net-mgmt/nagios-plugins/files/patch-check_tcp.c
@@ -1,5 +1,5 @@
---- plugins/check_tcp.c.orig	Sun Jun  5 21:43:58 2005
-+++ plugins/check_tcp.c	Thu Sep  1 12:16:31 2005
+--- plugins/check_tcp.c.orig	Sun Jun  5 19:43:58 2005
++++ plugins/check_tcp.c	Mon Aug 15 21:05:57 2005
 @@ -179,7 +179,7 @@
  		SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
  		EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
diff --git a/net-mgmt/nagios-plugins/files/patch-configure.in b/net-mgmt/nagios-plugins/files/patch-configure.in
index 9400d6f419ed..2e1616befe8b 100644
--- a/net-mgmt/nagios-plugins/files/patch-configure.in
+++ b/net-mgmt/nagios-plugins/files/patch-configure.in
@@ -1,5 +1,5 @@
 --- configure.in.orig	Mon Aug  1 23:24:51 2005
-+++ configure.in	Wed Aug  3 09:31:30 2005
++++ configure.in	Mon Aug 15 21:20:53 2005
 @@ -10,7 +10,7 @@
  RELEASE=1
  AC_SUBST(RELEASE)
@@ -18,7 +18,29 @@
  
  AC_ARG_WITH(trusted_path,
  	ACX_HELP_STRING([--with-trusted-path=PATH],
-@@ -193,27 +191,35 @@
+@@ -149,11 +147,12 @@
+ 	ACX_HELP_STRING([--with-pgsql=DIR],
+ 		[sets path to pgsql installation]),
+ 	PGSQL=$withval,)
++if test -d "$PGSQL"; then
+ AC_CHECK_LIB(crypt,main)
+ if test "$ac_cv_lib_crypt_main" = "yes"; then
+   if test -n "$PGSQL"; then
+-    LDFLAGS="$LDFLAGS -L$PGSQL/lib"
+-    CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
++    LDFLAGS="{$LDFLAGS} -L$PGSQL/lib"
++    CPPFLAGS="{$CPPFLAGS} -I$PGSQL/include"
+   fi
+   AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
+   if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
+@@ -190,30 +189,42 @@
+   AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
+   AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
+ fi
++else
++  AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
++  AC_MSG_WARN([PostgreSQL directory has not been found])
++fi
  LIBS="$_SAVEDLIBS"
  CPPFLAGS="$_SAVEDCPPFLAGS"
  
@@ -27,11 +49,12 @@
  dnl Check for radius libraries
  _SAVEDLIBS="$LIBS"
 -AC_CHECK_LIB(radiusclient,rc_read_config)
-+AC_CHECK_LIB(radiusclient,rc_read_config,,,-L${LOCALBASE}/lib)
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
++AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
++if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
    EXTRAS="$EXTRAS check_radius"
 -	RADIUSLIBS="-lradiusclient"
-+  RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"\
++  RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"\
 +  RADIUSINCLUDE="-I${LOCALBASE}/include"
    AC_SUBST(RADIUSLIBS)
 +  AC_SUBST(RADIUSINCLUDE)
@@ -60,7 +83,7 @@
    AC_CHECK_FUNCS(ldap_set_option)
    EXTRAS="$EXTRAS check_ldap"
  	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-@@ -222,6 +228,7 @@
+@@ -222,6 +233,7 @@
    AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
  fi
  LIBS="$_SAVEDLIBS"
@@ -68,7 +91,7 @@
  
  
  dnl Check for mysql libraries
-@@ -597,247 +604,11 @@
+@@ -597,247 +609,11 @@
  
  AC_PATH_PROG(PATH_TO_PS,ps)
  
@@ -321,7 +344,7 @@
  
  if test -n "$ac_cv_ps_varlist" ; then
  	AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
-@@ -1198,6 +969,8 @@
+@@ -1198,6 +974,8 @@
  AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
  	[path and arguments for invoking 'who'])
  
@@ -330,7 +353,7 @@
  AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
  if test -x "$PATH_TO_SNMPGET"
  then
-@@ -1220,7 +993,10 @@
+@@ -1220,7 +998,10 @@
  else
  	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
  fi
@@ -341,7 +364,7 @@
  AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
  AC_PATH_PROG(PATH_TO_QSTAT,qstat)
  
-@@ -1242,7 +1018,10 @@
+@@ -1242,7 +1023,10 @@
  	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
  		[path to qstat/quakestat])
  fi
@@ -352,7 +375,7 @@
  AC_PATH_PROG(PATH_TO_FPING,fping)
  if test -x "$PATH_TO_FPING"
  then
-@@ -1251,6 +1030,7 @@
+@@ -1251,6 +1035,7 @@
  else
  	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
  fi
@@ -360,7 +383,7 @@
  
  AC_PATH_PROG(PATH_TO_SSH,ssh)
  
-@@ -1313,32 +1093,12 @@
+@@ -1313,32 +1098,12 @@
  dnl end if for PATH_TO_SWAP
  fi