Update ucd-snmp to 3.5, inspired by pr 5880 by Jeff Rizzo.

XXX The configure script sets KERNEL and _KERNEL before including
XXX <sys/socket.h> for whatever reason. This breaks some little
XXX programms which detect options for configure, one of those
XXX should detect the rtentry style, on NetBSD-current where
XXX <sys/socket.h> includes opt_compat_*.h files. patch-aa
XXX workarounds this, but a clean solution should be found and
XXX feedbacked to the author.

5 files changed, 26 insertions, 31 deletions

diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 224890e7cde..b57464175af 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1998/06/22 12:58:35 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/08/03 19:36:00 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
-DISTNAME=	ucd-snmp
-PKGNAME=	ucd-snmp-3.4
-WRKSRC=		${WRKDIR}/ucd-snmp-3.4
+DISTNAME=	ucd-snmp-3.5
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -12,6 +10,8 @@ MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/ \
 
 MAINTAINER=	packages@netbsd.org
 
+CONFLICTS=	ucd-snmp-3.4
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-defaults
 
diff --git a/net/ucd-snmp/files/md5 b/net/ucd-snmp/files/md5
index 264bbe59f4c..77e78e6d0bc 100644
--- a/net/ucd-snmp/files/md5
+++ b/net/ucd-snmp/files/md5
@@ -1 +1 @@
-MD5 (ucd-snmp.tar.gz) = 0f8f683f15452dacd6e23711865f9884
+MD5 (ucd-snmp-3.5.tar.gz) = 96b50f6e41da6f78ae7f0de158823fa8
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa
index a8438e39122..c79581442f1 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-aa
@@ -1,25 +1,18 @@
---- agent/mibgroup/ip.c.orig	Sat May 23 18:46:55 1998
-+++ agent/mibgroup/ip.c	Sat May 23 18:52:17 1998
-@@ -6,6 +6,12 @@
- #include "mib_module_config.h"
+--- configure-orig	Fri Jun 19 22:14:25 1998
++++ configure	Mon Aug  3 16:44:56 1998
+@@ -4599,11 +4599,11 @@
+ #include "confdefs.h"
  
- #include <config.h>
-+
-+#if HAVE_SYS_SYSCTL_H
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- #if defined(IFNET_NEEDS_KERNEL) && !defined(_KERNEL)
- #define _KERNEL 1
- #define _I_DEFINED_KERNEL
-@@ -24,9 +30,6 @@
- #endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
--#endif
--#if HAVE_SYS_SYSCTL_H
--#include <sys/sysctl.h>
- #endif
- #if HAVE_SYS_SYSMP_H
- #include <sys/sysmp.h>
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
++/* #define KERNEL
++#define _KERNEL */
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
++/* #undef KERNEL
++#undef _KERNEL */
+ #include <net/route.h>
+ 
+ int main() {
diff --git a/net/ucd-snmp/pkg/COMMENT b/net/ucd-snmp/pkg/COMMENT
index fe1c53bd8fe..3f074689fb4 100644
--- a/net/ucd-snmp/pkg/COMMENT
+++ b/net/ucd-snmp/pkg/COMMENT
@@ -1 +1 @@
-An extensible SNMP implementation 
+an extensible SNMP implementation.
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
index fe1d20805ac..1024000b2d0 100644
--- a/net/ucd-snmp/pkg/PLIST
+++ b/net/ucd-snmp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/05/24 12:31:13 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/08/03 19:36:01 frueauf Exp $
 bin/snmpbulkwalk
 bin/snmpcheck
 bin/snmpdelta
@@ -23,6 +23,7 @@ include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpcmd.1.gz
 man/man1/snmpd.1.gz
 man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
@@ -52,6 +53,7 @@ share/snmp/mibs/HOST-RESOURCES-MIB.txt
 share/snmp/mibs/IANAifType-MIB.txt
 share/snmp/mibs/IF-MIB.txt
 share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
 share/snmp/mibs/RFC1271-MIB.txt