8 files changed, 76 insertions, 61 deletions

diff --git a/net-mgmt/net-snmp4/files/patch-aa b/net-mgmt/net-snmp4/files/patch-aa
index ce70b47986cb..6c287d18ac93 100644
--- a/net-mgmt/net-snmp4/files/patch-aa
+++ b/net-mgmt/net-snmp4/files/patch-aa
@@ -1,13 +1,13 @@
---- snmplib/Makefile.in~	Tue Mar 16 01:49:10 1999
-+++ snmplib/Makefile.in	Sat Apr  3 13:30:11 1999
-@@ -41,6 +41,10 @@
+--- 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 @@
  
- libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${OBJS}
- 	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
-+	ld -Bshareable -soname libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libsnmp.$(SHLIB_EXTENSION) ${OBJS}
-+	ln -f libsnmp.$(SHLIB_EXTENSION) \
-+		libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
+ 	$(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS}
++	ld -Bshareable -soname libsnmp.so.4 \
++		-o libsnmp.so ${OBJS}
++	ln -f libsnmp.so \
++		../libsnmp.so.4
+ 	$(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
  
  installdirs:
diff --git a/net-mgmt/net-snmp4/files/patch-ad b/net-mgmt/net-snmp4/files/patch-ad
index 6f28af0a528f..bd85f7453919 100644
--- a/net-mgmt/net-snmp4/files/patch-ad
+++ b/net-mgmt/net-snmp4/files/patch-ad
@@ -1,6 +1,15 @@
---- agent/mibgroup/mibII/interfaces.c~	Tue Mar 16 08:46:12 1999
-+++ agent/mibgroup/mibII/interfaces.c	Sat Apr  3 13:49:28 1999
-@@ -1745,10 +1745,18 @@
+--- agent/mibgroup/mibII/interfaces.c.orig	Fri Dec  1 14:17:21 2000
++++ agent/mibgroup/mibII/interfaces.c	Thu Jan 18 00:04:42 2001
+@@ -129,7 +129,7 @@
+ #if HAVE_SYS_SYSCTL_H
+ #include <sys/sysctl.h>
+ 
+-#ifdef freebsd3
++#if defined(freebsd3) || defined(freebsd4) || defined(freebsd5)
+ #    define USE_SYSCTL_IFLIST
+ #else
+ # if defined(CTL_NET) && !defined(freebsd2)
+@@ -1842,10 +1842,18 @@
  			physaddrbuf = 0;
  		}
  		ifm = (struct if_msghdr *)rtm;
@@ -19,7 +28,7 @@
  			int is_alias = 0;
  			ifam = (struct ifa_msghdr *)rtm;
  			ilen -= sizeof(*ifam);
-@@ -1771,6 +1779,7 @@
+@@ -1868,6 +1876,7 @@
  				}
  				sa = (struct sockaddr *)cp;
  			}
@@ -27,3 +36,12 @@
  			rtm = (struct rt_msghdr *)cp;
  		}
  	}
+@@ -1982,7 +1991,7 @@
+ 		if (ifmd.ifmd_data.ifi_lastchange.tv_sec == 0 &&
+ 		    ifmd.ifmd_data.ifi_lastchange.tv_usec == 0) {
+ 			long_return = 0;
+-		else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec)
++		} else if (ifmd.ifmd_data.ifi_lastchange.tv_sec < starttime.tv_sec) {
+ 		    long_return = 0;
+ 		} else {
+ 		    long_return = (u_long)
diff --git a/net-mgmt/net-snmp4/files/patch-ah b/net-mgmt/net-snmp4/files/patch-ah
index b80222ba72eb..194cbf3574b9 100644
--- a/net-mgmt/net-snmp4/files/patch-ah
+++ b/net-mgmt/net-snmp4/files/patch-ah
@@ -1,8 +1,7 @@
---- local/tkmib.orig	Wed Jul 21 19:06:52 1999
-+++ local/tkmib	Sat Aug 28 02:37:57 1999
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
+--- local/tkmib~	Wed Jul 26 08:53:26 2000
++++ local/tkmib	Wed Jan 17 18:32:52 2001
+@@ -1,4 +1,3 @@
+-#!/usr/bin/perl
+ #!/usr/bin/perl -w
  
  require 5;
- 
diff --git a/net-mgmt/net-snmp4/files/patch-ak b/net-mgmt/net-snmp4/files/patch-ak
index 7ca23e85b748..8a9d310cd7a0 100644
--- a/net-mgmt/net-snmp4/files/patch-ak
+++ b/net-mgmt/net-snmp4/files/patch-ak
@@ -1,21 +1,21 @@
---- agent/Makefile.in.old	Tue May 16 19:58:54 2000
-+++ agent/Makefile.in	Tue May 16 20:00:26 2000
-@@ -51,10 +51,18 @@
+--- agent/Makefile.in.orig	Sun Nov 19 12:58:06 2000
++++ agent/Makefile.in	Wed Jan 17 18:37:02 2001
+@@ -68,10 +68,18 @@
  
- libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS}  $(SHLIB_LD_LIBS)
-+	ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS}
-+	ln -f libucdagent.$(SHLIB_EXTENSION) \
-+	libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ libucdagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+ 	$(LIB_LD_CMD) libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
++	ld -Bshareable -soname libucdagent.$(LIB_EXTENSION)$(LIB_VERSION) \
++		-o libucdagent.so ${LIBAGENTOBJS}
++	ln -f libucdagent.so \
++		../libucdagent.so.4
+ 	$(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
  
- libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${MIBOBJS}
- 	$(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS}  $(SHLIB_LD_LIBS)
-+	ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
-+		-o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS}
-+	ln -f libucdmibs.$(SHLIB_EXTENSION) \
-+	libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
- 	$(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
+ 	$(LIB_LD_CMD) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS)
++	ld -Bshareable -soname libucdmibs.so.4 \
++		-o libucdmibs.so ${MIBOBJS}
++	ln -f libucdmibs.so \
++		../libucdmibs.so.4
+ 	$(RANLIB) libucdmibs.$(LIB_EXTENSION)$(LIB_VERSION)
  
  clean:
diff --git a/net-mgmt/net-snmp4/files/patch-am b/net-mgmt/net-snmp4/files/patch-am
deleted file mode 100644
index 0ad08d546705..000000000000
--- a/net-mgmt/net-snmp4/files/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
-+++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
-@@ -9,6 +9,9 @@
- #include <sys/time.h>
- #include <sys/proc.h>
- #include <sys/dkstat.h>
-+#ifdef freebsd5
-+#include <sys/bio.h>
-+#endif
- #include <sys/buf.h>
- #include <sys/uio.h>
- #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp4/files/patch-an b/net-mgmt/net-snmp4/files/patch-an
deleted file mode 100644
index 8153ba8c5653..000000000000
--- a/net-mgmt/net-snmp4/files/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
-@@ -10,6 +10,9 @@
- #include <sys/time.h>
- #include <sys/proc.h>
- #include <sys/dkstat.h>
-+#ifdef freebsd5
-+#include <sys/bio.h>
-+#endif
- #include <sys/buf.h>
- #include <sys/uio.h>
- #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp4/files/patch-ao b/net-mgmt/net-snmp4/files/patch-ao
new file mode 100644
index 000000000000..9ba64ec94695
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-ao
@@ -0,0 +1,11 @@
+--- agent/mibgroup/host/hr_filesys.c.orig	Wed Jan 17 19:09:48 2001
++++ agent/mibgroup/host/hr_filesys.c	Wed Jan 17 19:10:22 2001
+@@ -38,7 +38,7 @@
+ #include <stdlib.h>
+ #endif
+ 
+-#if defined(freebsd3) || defined(bsdi4)
++#if defined(freebsd3) || defined(bsdi4) || defined(freebsd4) || defined(freebsd5)
+ #if HAVE_GETFSSTAT
+ #if defined(MFSNAMELEN)
+ #define MOUNT_NFS	"nfs"
diff --git a/net-mgmt/net-snmp4/files/patch-ap b/net-mgmt/net-snmp4/files/patch-ap
new file mode 100644
index 000000000000..4d2ec3fa92ab
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-ap
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig	Thu Jan 18 01:37:31 2001
++++ man/Makefile.in	Thu Jan 18 01:37:39 2001
+@@ -2,7 +2,7 @@
+ 
+ MAN1 = snmpcmd.1 snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 snmpbulkget.1 \
+ 	snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 snmpstatus.1 \
+-	snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1
++	snmptrap.1 snmpdelta.1 snmptable.1 snmpusm.1 snmpinform.1 snmpdf.1 snmpconf.1
+ MAN1G = snmpd.1
+ MAN3 = snmp_agent_api.3 snmp_api.3 mib_api.3 snmp_sess_api.3 snmp_trap_api.3 \
+ 	snmp_alarm.3 snmp_close.3 snmp_free_pdu.3 snmp_open.3 snmp_read.3 \