Upgrade to 5.0.2.

Remove statvfs hack.

6 files changed, 42 insertions, 65 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 7e1fe6ee0321..5d5d68f659b4 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	net-snmp
-PORTVERSION=	5.0.1
-PORTREVISION=	3
+PORTVERSION=	5.0.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
 		ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/
 MASTER_SITE_SUBDIR= net-snmp
+DISTFILES=	${PORTNAME}-${PORTVERSION}a${EXTRACT_SUFX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index afe0c1b1309e..c967f71864ef 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (net-snmp-5.0.1.tar.gz) = f209cff622b4ffee830d54b68985d859
+MD5 (net-snmp-5.0.2a.tar.gz) = 18f137c812b62955123a03b35a7e2c0f
diff --git a/net/net-snmp/files/patch-aa b/net/net-snmp/files/patch-aa
index 6c287d18ac93..634f4f5ba1f8 100644
--- a/net/net-snmp/files/patch-aa
+++ b/net/net-snmp/files/patch-aa
@@ -1,6 +1,6 @@
---- snmplib/Makefile.in.orig	Mon Oct  2 11:41:46 2000
-+++ snmplib/Makefile.in	Wed Jan 17 18:29:44 2001
-@@ -70,6 +70,10 @@
+--- snmplib/Makefile.in.orig	Wed Jul 17 02:50:49 2002
++++ snmplib/Makefile.in	Mon Jul 22 12:24:37 2002
+@@ -140,6 +140,10 @@
  
  libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
  	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
@@ -10,4 +10,14 @@
 +		../libsnmp.so.4
  	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  
- installdirs:
+ #how to build dependencies
+@@ -158,6 +162,6 @@
+ #
+ # dependencies
+ #
+-ifeq ($(AUTO_DEPEND),y)
+-include $(SOURCES:.c=.d)
+-endif
++#ifeq ($(AUTO_DEPEND),y)
++#include $(SOURCES:.c=.d)
++#endif
diff --git a/net/net-snmp/files/patch-al b/net/net-snmp/files/patch-al
index c50e4967d041..89187b836b0b 100644
--- a/net/net-snmp/files/patch-al
+++ b/net/net-snmp/files/patch-al
@@ -27,56 +27,3 @@
  dnl 4.4 compat
  AC_TRY_COMPILE([
  #ifdef HAVE_SYS_PARAM_H
-@@ -2117,29 +2137,29 @@
- #endif
- ],swdevt,sw_nblksenabled)
- 
--AC_CHECK_STRUCT_FOR([
--#ifdef HAVE_SYS_STAT_H
--#include <sys/stat.h>
--#endif
--#if HAVE_SYS_STATFS_H
--#include <sys/statfs.h>
--#endif
--#if HAVE_SYS_STATVFS_H
--#include <sys/statvfs.h>
--#endif
--],statvfs,f_frsize)
--
--AC_CHECK_STRUCT_FOR([
--#ifdef HAVE_SYS_STAT_H
--#include <sys/stat.h>
--#endif
--#if HAVE_SYS_STATFS_H
--#include <sys/statfs.h>
--#endif
--#if HAVE_SYS_STATVFS_H
--#include <sys/statvfs.h>
--#endif
--],statvfs,f_files)
-+dnl AC_CHECK_STRUCT_FOR([
-+dnl #ifdef HAVE_SYS_STAT_H
-+dnl #include <sys/stat.h>
-+dnl #endif
-+dnl #if HAVE_SYS_STATFS_H
-+dnl #include <sys/statfs.h>
-+dnl #endif
-+dnl #if HAVE_SYS_STATVFS_H
-+dnl #include <sys/statvfs.h>
-+dnl #endif
-+dnl ],statvfs,f_frsize)
-+
-+dnl AC_CHECK_STRUCT_FOR([
-+dnl #ifdef HAVE_SYS_STAT_H
-+dnl #include <sys/stat.h>
-+dnl #endif
-+dnl #if HAVE_SYS_STATFS_H
-+dnl #include <sys/statfs.h>
-+dnl #endif
-+dnl #if HAVE_SYS_STATVFS_H
-+dnl #include <sys/statvfs.h>
-+dnl #endif
-+dnl ],statvfs,f_files)
- 
- AC_CHECK_STRUCT_FOR([
- #if HAVE_NLIST_H
diff --git a/net/net-snmp/files/patch-hr_storage.c b/net/net-snmp/files/patch-hr_storage.c
index 3656d5a3a3d1..1e2e66f97e0a 100644
--- a/net/net-snmp/files/patch-hr_storage.c
+++ b/net/net-snmp/files/patch-hr_storage.c
@@ -1,6 +1,24 @@
---- agent/mibgroup/host/hr_storage.c.orig	Sat Apr 20 16:30:03 2002
-+++ agent/mibgroup/host/hr_storage.c	Wed Apr 24 01:37:29 2002
-@@ -604,7 +604,15 @@
+--- agent/mibgroup/host/hr_storage.c.orig	Thu Jul  4 22:00:31 2002
++++ agent/mibgroup/host/hr_storage.c	Mon Jul 22 14:38:58 2002
+@@ -148,7 +148,7 @@
+ #define HRFS_mount	mnt_mountp
+ #define HRFS_statfs	statvfs
+ 
+-#elif defined(HAVE_STATVFS)
++#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT)
+ 
+ extern struct mntent *HRFS_entry;
+ extern int      fscount;
+@@ -563,7 +563,7 @@
+         }
+     case HRSTORE_UNITS:
+         if (store_idx < HRS_TYPE_FS_MAX)
+-#if STRUCT_STATVFS_HAS_F_FRSIZE
++#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT)
+             long_return = stat_buf.f_frsize;
+ #else
+             long_return = stat_buf.f_bsize;
+@@ -646,7 +646,15 @@
                       i++)
                      long_return += mbstat.m_mtypes[i];
  #elif defined(MBSTAT_SYMBOL)
@@ -16,7 +34,7 @@
  #elif defined(NO_DUMMY_VALUES)
                  return NULL;
  #else
-@@ -654,7 +662,15 @@
+@@ -704,7 +712,15 @@
                      * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput)
                      * mclpool.pr_size;
  #elif defined(MBSTAT_SYMBOL)
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
index c05e42b49aec..6963daa1a7f5 100644
--- a/net/net-snmp/pkg-plist
+++ b/net/net-snmp/pkg-plist
@@ -61,8 +61,11 @@ include/net-snmp/library/asn1.h
 include/net-snmp/library/callback.h
 include/net-snmp/library/check_varbind.h
 include/net-snmp/library/cmu_compat.h
+include/net-snmp/library/container.h
+include/net-snmp/library/container_binary_array.h
 include/net-snmp/library/data_list.h
 include/net-snmp/library/default_store.h
+include/net-snmp/library/factory.h
 include/net-snmp/library/getopt.h
 include/net-snmp/library/int64.h
 include/net-snmp/library/keytools.h
@@ -70,7 +73,6 @@ include/net-snmp/library/lcd_time.h
 include/net-snmp/library/md5.h
 include/net-snmp/library/mib.h
 include/net-snmp/library/mt_support.h
-include/net-snmp/library/oid_array.h
 include/net-snmp/library/oid_stash.h
 include/net-snmp/library/parse.h
 include/net-snmp/library/read_config.h