Remove some unneeded patches, patch configure and Makefile.in instead of

configure.ac and Makefile.am so USES=autoreconf can be removed (avoids a
problem with upcoming devel/libtool update)

PR:		194068

5 files changed, 22 insertions, 462 deletions

diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 01ffaf283a0c..7ad2807a884e 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	monitoring-plugins-*
 
-USES=		charsetfix gmake perl5 libtool autoreconf
-CHARSETFIX_MAKEFILEIN=Makefile.am
+USES=		charsetfix gmake perl5 libtool
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
@@ -76,24 +75,26 @@ CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
 
 CONFIGURE_ENV=	PERL=${PERL}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-QSTAT_CONFIGURE_ENABLE=	qstat
+QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
+			ac_cv_path_PATH_TO_QSTAT=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
-FPING_CONFIGURE_ENABLE=	fping
+FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
+			ac_cv_path_PATH_TO_FPING6=
 
 NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-NETSNMP_CONFIGURE_ENABLE=	snmp
+NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
+			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
@@ -153,12 +154,12 @@ post-patch:
 	check_users.c
 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
 .endfor
-	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
+	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in
 	# add a fake PATH so that it gets set to a correct value during build.
 	@${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|" ${WRKSRC}/plugins-scripts/*.pl
 .if ${PORT_OPTIONS:MJAIL}
-	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios-plugins/files/patch-configure b/net-mgmt/nagios-plugins/files/patch-configure
new file mode 100644
index 000000000000..b995fb7f62f4
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2014-06-26 16:17:37 UTC
++++ configure
+@@ -21787,7 +21787,7 @@ then
+ $as_echo "$ac_cv_ps_command" >&6; }
+ 
+ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-	egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
++	egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
+ then
+ 	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
+ 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
diff --git a/net-mgmt/nagios-plugins/files/patch-configure.ac b/net-mgmt/nagios-plugins/files/patch-configure.ac
deleted file mode 100644
index 0951b3768cab..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-configure.ac
+++ /dev/null
@@ -1,423 +0,0 @@
---- configure.ac.orig	2014-06-26 16:17:12 UTC
-+++ configure.ac
-@@ -13,8 +13,6 @@
- RELEASE=1
- AC_SUBST(RELEASE)
- 
--AC_PREFIX_DEFAULT(/usr/local/nagios)
--
- dnl Deprecated configure options
- 
- 
-@@ -45,6 +43,7 @@
- gl_EARLY
- AC_PROG_GCC_TRADITIONAL
- AC_PROG_LIBTOOL
-+AC_PROG_RANLIB
- 
- AM_PROG_CC_C_O
- 
-@@ -216,8 +215,8 @@
- AC_CHECK_LIB(crypt,main)
- if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; 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
-@@ -261,10 +260,10 @@
- dnl Check for DBI libraries
- AS_IF([test "x$with_dbi" != "xno"], [
-   _SAVEDLIBS="$LIBS"
--  AC_CHECK_LIB(dbi,dbi_initialize)
-+  AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
-   if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
-     EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
--  	DBILIBS="-ldbi"
-+  	DBILIBS="-L${LOCALBASE}/lib -ldbi"
-     AC_SUBST(DBILIBS)
-   else
-     AC_MSG_WARN([Skipping dbi plugin])
-@@ -278,22 +277,17 @@
- dnl Check for radius libraries
- AS_IF([test "x$with_radius" != "xno"], [
-   _SAVEDLIBS="$LIBS"
--  AC_CHECK_LIB(radiusclient,rc_read_config)
--  if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
--    EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
--  	RADIUSLIBS="-lradiusclient"
--    AC_SUBST(RADIUSLIBS)
--  else
--    AC_CHECK_LIB(radiusclient-ng,rc_read_config)
-+    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\$(EXEEXT)"
--    	  RADIUSLIBS="-lradiusclient-ng"
-+      RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"
-+      RADIUSINCLUDE="-I${LOCALBSE}/include"
-       AC_SUBST(RADIUSLIBS)
-+      AC_SUBST(RADIUSINCLUDE)
-     else
-       AC_MSG_WARN([Skipping radius plugin])
-       AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
-     fi
--  fi
-   LIBS="$_SAVEDLIBS"
- ])
- 
-@@ -302,12 +296,13 @@
- dnl Check for LDAP libraries
- AS_IF([test "x$with_ldap" != "xno"], [
-   _SAVEDLIBS="$LIBS"
--  AC_CHECK_LIB(ldap,main,,,-llber)
--  if test "$ac_cv_lib_ldap_main" = "yes"; then
--    LDAPLIBS="-lldap -llber"\
--    LDAPINCLUDE="-I/usr/include/ldap"
-+  AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
-+  if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
-+    LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber"
-+    LDAPINCLUDE="-I${LOCALBASE}/include"
-     AC_SUBST(LDAPLIBS)
-     AC_SUBST(LDAPINCLUDE)
-+    LIBS="-L${LOCALBASE}/lib $LIBS"
-     AC_CHECK_FUNCS(ldap_set_option)
-     EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
-   	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-@@ -755,22 +750,10 @@
- dnl 	ac_cv_ps_cols=8
- dnl 	AC_MSG_RESULT([$ac_cv_ps_command])
- 
--dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
--dnl so test for this first...
--elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
--	egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
--dnl Should also work for FreeBSD 5.2.1 and 5.3
--dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
-+dnl FreeBSD 5.x and above
-+dnl  STAT COMMAND               VSZ   RSS USER       UID   PID  PPID COMMAND
- elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
--	egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
-+	egrep -i ["^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
- then
- 	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
-@@ -778,9 +761,8 @@
- 	ac_cv_ps_cols=9
- 	AC_MSG_RESULT([$ac_cv_ps_command])
- 
--dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
--dnl Limitation: Only first 16 chars returned for ucomm field
--dnl Must come before ps -weo
-+dnl FreeBSD 4.x
-+dnl  STAT   UID   PID  PPID   VSZ  RSS %CPU UCOMM            COMMAND
- elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
- 	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
- then
-@@ -790,209 +772,6 @@
- 	ac_cv_ps_cols=9
- 	AC_MSG_RESULT([$ac_cv_ps_command])
- 
--dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
--elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
--	ac_cv_ps_cols=10
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl FreeBSD
--elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \
--	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl BSD-like mode in RH 6.1
--elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
--	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl SunOS 4.1.3:
--dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
--dnl Need the head -1 otherwise test will work because arguments are found
--elif ps -laxnwww 2>/dev/null | head -1 | \
--	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
--then
--	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
--	ac_cv_ps_format="%*s %d %d %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl Debian Linux / procps v1.2.9:
--dnl  FLAGS   UID   PID  PPID PRI  NI   SIZE   RSS WCHAN       STA TTY TIME COMMAND
--dnl    100     0     1     0   0   0    776    76  c0131c8c   S  ffff  0:11 init [2]
--dnl
--elif ps laxnwww 2>/dev/null | \
--	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
--then
--	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS laxnwww"
--	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
--elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
--dnl Has /usr/bin/ps and /sbin/ps - force sbin version
--dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
--dnl of 1500). Will need big changes to check_procs to support
--elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
--	egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
--	ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
--	ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl AIX 4.3.3 and 5.1 do not have an rss field
--elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
--	egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
--
--dnl Solaris 2.6
--elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
--	# There must be no space between the %s and %n due to a wierd problem in sscanf where
--	# it will return %n as longer than the line length
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=9
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl wonder who takes state instead of stat
--elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
--	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
--	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl IRIX 53
--elif ps -el 2>/dev/null | \
--	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
--	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl IRIX 63
--elif ps -el 2>/dev/null | \
--	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
--	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=6
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl AIX 4.1:
--dnl     F S      UID   PID  PPID   C PRI NI ADDR  SZ  RSS   WCHAN    TTY  TIME CMD
--dnl    303 A        0     0     0 120  16 -- 1c07  20   24              -  0:45 swapper
--elif ps -el 2>/dev/null | \
--	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
--	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=6
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl AIX?
--elif ps glaxen 2>/dev/null | \
--	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
--then
--	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS glaxen"
--	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl MacOSX / Darwin
--dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
--dnl Some truncation will happen in UCOMM column
--dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
--dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
--elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \
--	egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
--then
--	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
--	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
--	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
--dnl UnixWare
--elif ps -Al 2>/dev/null | \
--	egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
--then
--	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
--	ac_cv_ps_command="$PATH_TO_PS -Al"
--	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
--	ac_cv_ps_cols=8
--	AC_MSG_RESULT([$ac_cv_ps_command])
--
- else
- 	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
- fi
-@@ -1391,6 +1170,8 @@
- 	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
- fi
- 
-+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
-+if test x$enable_snmp = xyes; then
- AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
- AC_ARG_WITH(snmpget_command,
-             ACX_HELP_STRING([--with-snmpget-command=PATH],
-@@ -1421,7 +1202,10 @@
- else
- 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
- fi
-+fi
- 
-+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
-+if test x$enable_qstat = xyes; then
- AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
- AC_PATH_PROG(PATH_TO_QSTAT,qstat)
- AC_ARG_WITH(qstat_command,
-@@ -1446,7 +1230,10 @@
- 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
- 		[path to qstat/quakestat])
- fi
-+fi
- 
-+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
-+if test x$enable_fping = xyes; then
- AC_PATH_PROG(PATH_TO_FPING,fping)
- AC_PATH_PROG(PATH_TO_FPING6,fping6)
- 
-@@ -1467,6 +1254,7 @@
- else
- 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
- fi
-+fi
- 
- AC_PATH_PROG(PATH_TO_SSH,ssh)
- AC_ARG_WITH(ssh_command,
-@@ -1537,32 +1325,12 @@
- dnl end if for PATH_TO_SWAP
- fi
- 
--AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
--if (test -n "$PATH_TO_SWAPINFO")
--then
--AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
--if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
--then
--	ac_cv_have_swap=yes
--	ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
--
--	if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
--	then
--		ac_cv_swap_format=["%*s %f %*d %f"]
--		ac_cv_swap_conv=1024
--		AC_MSG_RESULT([using FreeBSD format swapinfo])
--	fi
--
--elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
--then
--	ac_cv_have_swap=yes
--	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
--	ac_cv_swap_format=["%*s %f %*d %f"]
--	ac_cv_swap_conv=1024
--	AC_MSG_RESULT([using HP-UX format swapinfo])
--fi
--dnl end if for PATH_TO_SWAPINFO
--fi
-+PATH_TO_SWAPINFO="/usr/sbin/swapinfo"
-+ac_cv_have_swap=yes
-+ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
-+ac_cv_swap_format=["%*s %f %*d %f"]
-+ac_cv_swap_conv=1024
-+AC_MSG_RESULT([using FreeBSD format swapinfo])
- 
- AC_PATH_PROG(PATH_TO_LSPS,lsps)
- if (test -n "$PATH_TO_LSPS")
-@@ -1755,7 +1523,7 @@
- AC_SUBST(DEPLIBS)
- 
- AM_GNU_GETTEXT([external], [need-ngettext])
--AM_GNU_GETTEXT_VERSION(0.15)
-+AM_GNU_GETTEXT_VERSION(0.18)
- 
- dnl Check for Redhat spopen problem
- dnl Wierd problem where ECHILD is returned from a wait call in error
diff --git a/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4 b/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4
deleted file mode 100644
index afefbe4ede66..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4
+++ /dev/null
@@ -1,18 +0,0 @@
---- gl/m4/extensions.m4.orig	2014-03-04 21:41:56 UTC
-+++ gl/m4/extensions.m4
-@@ -16,6 +16,7 @@
- #     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
- # or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
- # the fix is
-+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
- #   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
- #      but always AC_REQUIREd,
- #   2) to ensure that for each occurrence of
-@@ -49,6 +50,7 @@
-        except with this defined.])
-     AC_DEFINE([_MINIX], [1],
-       [Define to 1 if on MINIX.])
-+])
-     AC_DEFINE([_NETBSD_SOURCE], [1],
-       [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
-   fi
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am b/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
deleted file mode 100644
index ad6b8ac86766..000000000000
--- a/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/Makefile.am.orig	2014-05-20 19:15:34 UTC
-+++ plugins/Makefile.am
-@@ -14,7 +14,7 @@
- VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
- 
- AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
--	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
-+	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
- 
- localedir = $(datadir)/locale
- # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this