[pkgsrc/trunk]: pkgsrc/net Sync with nagios-plugins. Fixes broken build on Fr...

[rodent <rodent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/49081e7d3e51
branches:  trunk
changeset: 651940:49081e7d3e51
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sun May 17 21:23:28 2015 +0000

description:
Sync with nagios-plugins. Fixes broken build on FreeBSD.

diffstat:

 net/nagios-plugin-mysql/distinfo         |   4 ++--
 net/nagios-plugin-mysql/patches/patch-ak |  14 +++++++-------
 net/nagios-plugin-pgsql/distinfo         |   4 ++--
 net/nagios-plugin-pgsql/patches/patch-ak |  14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diffs (150 lines):

diff -r 58671d400b96 -r 49081e7d3e51 net/nagios-plugin-mysql/distinfo
--- a/net/nagios-plugin-mysql/distinfo  Sun May 17 21:19:12 2015 +0000
+++ b/net/nagios-plugin-mysql/distinfo  Sun May 17 21:23:28 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/04/03 18:21:12 rodent Exp $
+$NetBSD: distinfo,v 1.11 2015/05/17 21:23:28 rodent Exp $
 
 SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
 RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
 Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
-SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3
 SHA1 (patch-configure) = 8aa67c3eb339d57d225df7dc106b888dd2d37da3
diff -r 58671d400b96 -r 49081e7d3e51 net/nagios-plugin-mysql/patches/patch-ak
--- a/net/nagios-plugin-mysql/patches/patch-ak  Sun May 17 21:19:12 2015 +0000
+++ b/net/nagios-plugin-mysql/patches/patch-ak  Sun May 17 21:23:28 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2015/04/03 18:32:09 rodent Exp $
+$NetBSD: patch-ak,v 1.5 2015/05/17 21:23:28 rodent Exp $
 
 --- gl/mountlist.c.orig        2014-03-04 21:41:56.000000000 +0000
 +++ gl/mountlist.c
@@ -7,7 +7,7 @@
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
  # else
 -#  define FS_TYPE(Ent) mnt_names[(Ent).f_type]
-+#  ifdef STAT_STATVFS
++#  if defined(STAT_STATVFS)
 +#   define FS_TYPE(Ent) mnt_names[(Ent).f_fsid]
 +#  else
 +#   define FS_TYPE(Ent) mnt_names[(Ent).f_type]
@@ -19,7 +19,7 @@
  # include <sys/statfs.h>
  #endif
  
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H)
 +#include <sys/statvfs.h>
 +#endif
 +
@@ -39,14 +39,14 @@
  # endif
  
  static char *
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
 +fsp_to_string (const struct statvfs *fsp)
 +#else
  fsp_to_string (const struct statfs *fsp)
 +#endif
  {
 -# if HAVE_STRUCT_STATFS_F_FSTYPENAME
-+# if defined HAVE_STRUCT_STATFS_F_FSTYPENAME || defined STAT_STATVFS
++# if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || defined(STAT_STATVFS)
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
@@ -54,7 +54,7 @@
    {
      int numsys, counter;
      size_t bufsize;
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
 +    struct statvfs *stats;
 +#else
      struct statfs *stats;
@@ -66,7 +66,7 @@
  
      bufsize = (1 + numsys) * sizeof *stats;
      stats = xmalloc (bufsize);
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS)
 +    numsys = getfsstat ((struct statvfs *)stats, bufsize, MNT_NOWAIT);
 +#else
      numsys = getfsstat (stats, bufsize, MNT_NOWAIT);
diff -r 58671d400b96 -r 49081e7d3e51 net/nagios-plugin-pgsql/distinfo
--- a/net/nagios-plugin-pgsql/distinfo  Sun May 17 21:19:12 2015 +0000
+++ b/net/nagios-plugin-pgsql/distinfo  Sun May 17 21:23:28 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2015/04/03 18:34:16 rodent Exp $
+$NetBSD: distinfo,v 1.12 2015/05/17 21:23:29 rodent Exp $
 
 SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
 RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
 Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
-SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3
 SHA1 (patch-configure) = 8aa67c3eb339d57d225df7dc106b888dd2d37da3
diff -r 58671d400b96 -r 49081e7d3e51 net/nagios-plugin-pgsql/patches/patch-ak
--- a/net/nagios-plugin-pgsql/patches/patch-ak  Sun May 17 21:19:12 2015 +0000
+++ b/net/nagios-plugin-pgsql/patches/patch-ak  Sun May 17 21:23:28 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $
+$NetBSD: patch-ak,v 1.5 2015/05/17 21:23:29 rodent Exp $
 
 --- gl/mountlist.c.orig        2014-03-04 21:41:56.000000000 +0000
 +++ gl/mountlist.c
@@ -7,7 +7,7 @@
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
  # else
 -#  define FS_TYPE(Ent) mnt_names[(Ent).f_type]
-+#  ifdef STAT_STATVFS
++#  if defined(STAT_STATVFS)
 +#   define FS_TYPE(Ent) mnt_names[(Ent).f_fsid]
 +#  else
 +#   define FS_TYPE(Ent) mnt_names[(Ent).f_type]
@@ -19,7 +19,7 @@
  # include <sys/statfs.h>
  #endif
  
-+#ifdef HAVE_SYS_STATVFS_H
++#if defined(HAVE_SYS_STATVFS_H)
 +#include <sys/statvfs.h>
 +#endif
 +
@@ -39,14 +39,14 @@
  # endif
  
  static char *
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
 +fsp_to_string (const struct statvfs *fsp)
 +#else
  fsp_to_string (const struct statfs *fsp)
 +#endif
  {
 -# if HAVE_STRUCT_STATFS_F_FSTYPENAME
-+# if defined HAVE_STRUCT_STATFS_F_FSTYPENAME || defined STAT_STATVFS
++# if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || defined(STAT_STATVFS)
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
@@ -54,7 +54,7 @@
    {
      int numsys, counter;
      size_t bufsize;
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS) && !defined(__FreeBSD__)
 +    struct statvfs *stats;
 +#else
      struct statfs *stats;
@@ -66,7 +66,7 @@
  
      bufsize = (1 + numsys) * sizeof *stats;
      stats = xmalloc (bufsize);
-+#ifdef STAT_STATVFS
++#if defined(STAT_STATVFS)
 +    numsys = getfsstat ((struct statvfs *)stats, bufsize, MNT_NOWAIT);
 +#else
      numsys = getfsstat (stats, bufsize, MNT_NOWAIT);