Add DESTDIR support and LICENSE

5 files changed, 22 insertions, 51 deletions

diff --git a/net/nagios-plugin-snmp/Makefile b/net/nagios-plugin-snmp/Makefile
index 8faea72f298..c9443a4f228 100644
--- a/net/nagios-plugin-snmp/Makefile
+++ b/net/nagios-plugin-snmp/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2010/01/17 12:02:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/08 22:50:17 morr Exp $
 #
 
 PKGNAME=	nagios-plugin-snmp-${PLUGINSVERSION}
-PKGREVISION=	1
 CATEGORIES=	net sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Nagios snmp plugins
+LICENSE=	gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins
 DEPENDS+=	p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index 99696d05d25..2ac86cc64d4 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2010/03/09 02:07:38 taca Exp $
+$NetBSD: distinfo,v 1.9 2011/04/08 22:50:17 morr Exp $
 
-SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c
-RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a
-Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes
+SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
+RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
+Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
 SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
-SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
-SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
-SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
+SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
+SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
+SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
diff --git a/net/nagios-plugin-snmp/patches/patch-ak b/net/nagios-plugin-snmp/patches/patch-ak
index c3b74c269cd..f873d9b23ea 100644
--- a/net/nagios-plugin-snmp/patches/patch-ak
+++ b/net/nagios-plugin-snmp/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
 
---- gl/mountlist.c.orig	2007-01-24 23:47:25.000000000 +0100
+--- gl/mountlist.c.orig	2010-07-27 20:47:15.000000000 +0000
 +++ gl/mountlist.c
-@@ -57,7 +57,11 @@ char *strstr ();
+@@ -52,7 +52,11 @@
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
  # else
@@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
  # endif
  #endif /* MOUNTED_GETFSSTAT */
  
-@@ -104,6 +108,10 @@ char *strstr ();
+@@ -99,6 +103,10 @@
  # include <sys/statfs.h>
  #endif
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
  #ifdef MOUNTED_LISTMNTENT
  # include <mntent.h>
  #endif
-@@ -178,7 +186,7 @@ char *strstr ();
+@@ -169,7 +177,7 @@
  
  #if MOUNTED_GETMNTINFO
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
  static char *
  fstype_to_string (short int t)
  {
-@@ -275,9 +283,13 @@ fstype_to_string (short int t)
+@@ -266,9 +274,13 @@ fstype_to_string (short int t)
  # endif
  
  static char *
@@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
-@@ -413,7 +425,11 @@ read_file_system_list (bool need_fs_type
- 
- #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
-   {
-+#ifdef STAT_STATVFS
-+    struct statvfs *fsp;
-+#else
-     struct statfs *fsp;
-+#endif
-     int entries;
- 
-     entries = getmntinfo (&fsp, MNT_NOWAIT);
-@@ -601,9 +617,17 @@ read_file_system_list (bool need_fs_type
+@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type
    {
      int numsys, counter;
      size_t bufsize;
@@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
      if (numsys < 0)
        return (NULL);
      if (SIZE_MAX / sizeof *stats <= numsys)
-@@ -666,10 +690,18 @@ read_file_system_list (bool need_fs_type
- # ifdef GETFSTYP			/* SVR3.  */
- 	if (need_fs_type)
- 	  {
-+#ifdef STAT_STATVFS
-+	    struct statvfs fsd;
-+#else
- 	    struct statfs fsd;
-+#endif
- 	    char typebuf[FSTYPSZ];
- 
-+#ifdef STAT_STATVFS
-+	    if (statvfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
-+#else
- 	    if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
-+#endif
- 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
- 	      {
- 		me->me_type = xstrdup (typebuf);
diff --git a/net/nagios-plugin-snmp/patches/patch-al b/net/nagios-plugin-snmp/patches/patch-al
index a88fb89ef0b..fba98f4d902 100644
--- a/net/nagios-plugin-snmp/patches/patch-al
+++ b/net/nagios-plugin-snmp/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: patch-al,v 1.3 2011/04/08 22:50:17 morr Exp $
 
---- contrib/check_axis.sh.orig	2003-05-26 12:09:23.000000000 +0200
+--- contrib/check_axis.sh.orig	2010-07-27 20:47:15.000000000 +0000
 +++ contrib/check_axis.sh
 @@ -5,7 +5,7 @@ port=$2
  usr=$3
diff --git a/net/nagios-plugin-snmp/patches/patch-am b/net/nagios-plugin-snmp/patches/patch-am
index 495de47227e..aab635bf6f9 100644
--- a/net/nagios-plugin-snmp/patches/patch-am
+++ b/net/nagios-plugin-snmp/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2006/10/16 08:40:45 seb Exp $
+$NetBSD: patch-am,v 1.2 2011/04/08 22:50:17 morr Exp $
 
---- contrib/check_mssql.sh.orig	2003-08-05 09:56:13.000000000 +0000
+--- contrib/check_mssql.sh.orig	2010-07-27 20:47:15.000000000 +0000
 +++ contrib/check_mssql.sh
 @@ -35,10 +35,10 @@ pswd=$3
  srv=$4