svn commit: r351377 - in head/net-mgmt/nagios-plugins: . files

[Mathieu Arnold]

Author: mat
Date: Wed Apr 16 09:46:29 2014
New Revision: 351377
URL: http://svnweb.freebsd.org/changeset/ports/351377
QAT: https://qat.redports.org/buildarchive/r351377/

Log:
  Update to 2.0.1.
  
  Changes:	https://nagios-plugins.org/nagios-plugins-2-0-1-released/
  Sponsored by:	Absolight

Modified:
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/nagios-plugins/distinfo
  head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in
  head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Wed Apr 16 09:21:11 2014	(r351376)
+++ head/net-mgmt/nagios-plugins/Makefile	Wed Apr 16 09:46:29 2014	(r351377)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nagios-plugins
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.nagios-plugins.org/download/

Modified: head/net-mgmt/nagios-plugins/distinfo
==============================================================================
--- head/net-mgmt/nagios-plugins/distinfo	Wed Apr 16 09:21:11 2014	(r351376)
+++ head/net-mgmt/nagios-plugins/distinfo	Wed Apr 16 09:46:29 2014	(r351377)
@@ -1,2 +1,2 @@
-SHA256 (nagios-plugins-2.0.tar.gz) = ba1080648abd912f55c18b248e7065db77a87d0c72611ab16c17af8b65da7684
-SIZE (nagios-plugins-2.0.tar.gz) = 2501847
+SHA256 (nagios-plugins-2.0.1.tar.gz) = 1fb63cf8e917397c745f9a30b3eac6178d832df80f914e2498e8171408c9172a
+SIZE (nagios-plugins-2.0.1.tar.gz) = 2651400

Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in	Wed Apr 16 09:21:11 2014	(r351376)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in	Wed Apr 16 09:46:29 2014	(r351377)
@@ -1,5 +1,5 @@
---- ./plugins-scripts/subst.in.orig	2014-03-04 20:21:36.000000000 +0100
-+++ ./plugins-scripts/subst.in	2014-04-14 10:22:50.000000000 +0200
+--- ./plugins-scripts/subst.in.orig	2014-03-04 22:41:57.000000000 +0100
++++ ./plugins-scripts/subst.in	2014-04-16 11:38:35.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/usr/bin/awk
  
@@ -9,3 +9,12 @@
  
  	if (system(cmd)==0) {
  		return c;
+@@ -53,7 +53,7 @@
+ # FIXME: Prepend executables with a substitution keyword instead.
+ #
+ /^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
+-	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
++	match($0,/(\/[^ ]*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
+ 	c=substr($0,RSTART,RLENGTH);
+ 	sub(c,which(c,path));
+ }

Modified: head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am	Wed Apr 16 09:21:11 2014	(r351376)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am	Wed Apr 16 09:46:29 2014	(r351377)
@@ -1,11 +1,11 @@
---- plugins/Makefile.am.orig	Thu Jan 25 09:48:05 2007
-+++ plugins/Makefile.am	Thu Feb 22 19:32:15 2007
-@@ -2,7 +2,7 @@
+--- ./plugins/Makefile.am.orig	2014-04-16 00:19:03.000000000 +0200
++++ ./plugins/Makefile.am	2014-04-16 11:38:18.000000000 +0200
+@@ -14,7 +14,7 @@
+ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
  
- 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@
  
--INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
-+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
- 
- datadir = @datadir@
  localedir = $(datadir)/locale
+ # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this