diff options
| author | rodent <rodent@pkgsrc.org> | 2015-05-17 21:23:28 +0000 |
|---|---|---|
| committer | rodent <rodent@pkgsrc.org> | 2015-05-17 21:23:28 +0000 |
| commit | b21ccf23b207cfae407d2c79e4bb074d6bf422f4 (patch) | |
| tree | 1dbef364089f1aec970cf70f5c22b7e6d4dfc6f9 /net/nagios-plugin-pgsql | |
| parent | 87d63a1f74d47fdac80c7f5f111e658af79bf4b7 (diff) | |
| download | pkgsrc-b21ccf23b207cfae407d2c79e4bb074d6bf422f4.tar.gz | |
Sync with nagios-plugins. Fixes broken build on FreeBSD.
Diffstat (limited to 'net/nagios-plugin-pgsql')
| -rw-r--r-- | net/nagios-plugin-pgsql/distinfo | 4 | ||||
| -rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-ak | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo index f08b14cfe84..6f17e4f6348 100644 --- a/net/nagios-plugin-pgsql/distinfo +++ b/net/nagios-plugin-pgsql/distinfo @@ -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 --git a/net/nagios-plugin-pgsql/patches/patch-ak b/net/nagios-plugin-pgsql/patches/patch-ak index 1673a20078c..84fc609863b 100644 --- a/net/nagios-plugin-pgsql/patches/patch-ak +++ b/net/nagios-plugin-pgsql/patches/patch-ak @@ -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 @@ $NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $ # 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 @@ $NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $ # 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 @@ $NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $ # 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 @@ $NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $ { 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 @@ $NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 rodent Exp $ 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); |