Upgrade to ucd-snmp 3.2, and make it work on -current.

9 files changed, 180 insertions, 114 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index b390f836bee9..73beaa683d41 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,32 +1,27 @@
 # New ports collection makefile for:	ucd-snmp
-# Version required:			3.1.3
+# Version required:			3.2
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.11 1997/05/17 17:24:59 fenner Exp $
+# $Id: Makefile,v 1.12 1997/07/02 09:39:17 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.1.3
+DISTNAME=	ucd-snmp-3.2
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-OSVERSION!=	sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN=         "does not work for 3.0 now"
-.endif
-
 GNU_CONFIGURE=	yes
 .if defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS=	--with-distdefaults
+CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
 MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
 		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmpstatus.1
-MAN3=		snmp_api.3
+		snmptrap.1 snmpstatus.1
+MAN3=		snmp_api.3 mib_api.3
 MAN5=		variables.5 snmpd.conf.5
 MAN8=		snmptrapd.8 snmpd.8
 
@@ -41,5 +36,12 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
+	@if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \
+		echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \
+		echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \
+	 fi
+
 
 .include <bsd.port.mk>
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 2d79da522fed..f0ca03cb70dd 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.1.3.tar.gz) = 2e8348d7c948cd003965dbffbd61bef3
+MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
index 10109dfaf74c..bc51520320b5 100644
--- a/net/net-snmp/pkg-plist
+++ b/net/net-snmp/pkg-plist
@@ -1,31 +1,16 @@
-bin/snmpnetstat
-bin/snmpwalk
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
 bin/snmpget
-bin/snmptrapd
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpcheck
-man/man1/snmpget.1.gz
-man/man1/snmpset.1.gz
-man/man1/snmpwalk.1.gz
-man/man1/snmpbulkwalk.1.gz
-man/man1/snmpgetnext.1.gz
-man/man1/snmptest.1.gz
-man/man1/snmpnetstat.1.gz
-man/man1/snmptranslate.1.gz
-man/man1/snmpstatus.1.gz
-man/man3/snmp_api.3.gz
-man/man5/variables.5.gz
-man/man5/snmpd.conf.5.gz
-man/man8/snmptrapd.8.gz
-man/man8/snmpd.8.gz
-lib/libsnmp.a
-lib/snmp/mib.txt
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmptrapd
+bin/snmpwalk
+etc/rc.d/snmpd.sh
 include/snmp/acl.h
 include/snmp/asn1.h
 include/snmp/context.h
@@ -39,7 +24,41 @@ include/snmp/snmp_client.h
 include/snmp/snmp_impl.h
 include/snmp/system.h
 include/snmp/view.h
-lib/snmp/mibs/ucd-snmp.txt
+lib/libsnmp.a
+lib/snmp/mibs/EtherLike-MIB.txt
+lib/snmp/mibs/HOST-RESOURCES-MIB.txt
+lib/snmp/mibs/IANAifType-MIB.txt
+lib/snmp/mibs/IF-MIB.txt
+lib/snmp/mibs/IP-MIB.txt
+lib/snmp/mibs/RFC1155-SMI.txt
+lib/snmp/mibs/RFC1213-MIB.txt
+lib/snmp/mibs/RFC1271-MIB.txt
+lib/snmp/mibs/SNMPv2-CONF.txt
+lib/snmp/mibs/SNMPv2-M2M-MIB.txt
+lib/snmp/mibs/SNMPv2-MIB.txt
+lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
+lib/snmp/mibs/SNMPv2-SMI.txt
+lib/snmp/mibs/SNMPv2-TC.txt
+lib/snmp/mibs/SNMPv2-TM.txt
+lib/snmp/mibs/TCP-MIB.txt
+lib/snmp/mibs/UCD-SNMP-MIB.txt
+lib/snmp/mibs/UDP-MIB.txt
+man/man1/snmpbulkwalk.1.gz
+man/man1/snmpget.1.gz
+man/man1/snmpgetnext.1.gz
+man/man1/snmpnetstat.1.gz
+man/man1/snmpset.1.gz
+man/man1/snmpstatus.1.gz
+man/man1/snmptest.1.gz
+man/man1/snmptranslate.1.gz
+man/man1/snmptrap.1.gz
+man/man1/snmpwalk.1.gz
+man/man3/mib_api.3.gz
+man/man3/snmp_api.3.gz
+man/man5/snmpd.conf.5.gz
+man/man5/variables.5.gz
+man/man8/snmpd.8.gz
+man/man8/snmptrapd.8.gz
 sbin/snmpd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
@@ -48,4 +67,5 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm lib/snmp/mibs
 @dirrm lib/snmp
-@dirrm include/snmp
\ No newline at end of file
+@dirrm include/snmp
+@dirrm share/examples/ucd-snmp
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index b390f836bee9..73beaa683d41 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -1,32 +1,27 @@
 # New ports collection makefile for:	ucd-snmp
-# Version required:			3.1.3
+# Version required:			3.2
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.11 1997/05/17 17:24:59 fenner Exp $
+# $Id: Makefile,v 1.12 1997/07/02 09:39:17 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.1.3
+DISTNAME=	ucd-snmp-3.2
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-OSVERSION!=	sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN=         "does not work for 3.0 now"
-.endif
-
 GNU_CONFIGURE=	yes
 .if defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS=	--with-distdefaults
+CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
 MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
 		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmpstatus.1
-MAN3=		snmp_api.3
+		snmptrap.1 snmpstatus.1
+MAN3=		snmp_api.3 mib_api.3
 MAN5=		variables.5 snmpd.conf.5
 MAN8=		snmptrapd.8 snmpd.8
 
@@ -41,5 +36,12 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
+	@if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \
+		echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \
+		echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \
+	 fi
+
 
 .include <bsd.port.mk>
diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo
index 2d79da522fed..f0ca03cb70dd 100644
--- a/net/net-snmp4/distinfo
+++ b/net/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.1.3.tar.gz) = 2e8348d7c948cd003965dbffbd61bef3
+MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist
index 10109dfaf74c..bc51520320b5 100644
--- a/net/net-snmp4/pkg-plist
+++ b/net/net-snmp4/pkg-plist
@@ -1,31 +1,16 @@
-bin/snmpnetstat
-bin/snmpwalk
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
 bin/snmpget
-bin/snmptrapd
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpcheck
-man/man1/snmpget.1.gz
-man/man1/snmpset.1.gz
-man/man1/snmpwalk.1.gz
-man/man1/snmpbulkwalk.1.gz
-man/man1/snmpgetnext.1.gz
-man/man1/snmptest.1.gz
-man/man1/snmpnetstat.1.gz
-man/man1/snmptranslate.1.gz
-man/man1/snmpstatus.1.gz
-man/man3/snmp_api.3.gz
-man/man5/variables.5.gz
-man/man5/snmpd.conf.5.gz
-man/man8/snmptrapd.8.gz
-man/man8/snmpd.8.gz
-lib/libsnmp.a
-lib/snmp/mib.txt
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmptrapd
+bin/snmpwalk
+etc/rc.d/snmpd.sh
 include/snmp/acl.h
 include/snmp/asn1.h
 include/snmp/context.h
@@ -39,7 +24,41 @@ include/snmp/snmp_client.h
 include/snmp/snmp_impl.h
 include/snmp/system.h
 include/snmp/view.h
-lib/snmp/mibs/ucd-snmp.txt
+lib/libsnmp.a
+lib/snmp/mibs/EtherLike-MIB.txt
+lib/snmp/mibs/HOST-RESOURCES-MIB.txt
+lib/snmp/mibs/IANAifType-MIB.txt
+lib/snmp/mibs/IF-MIB.txt
+lib/snmp/mibs/IP-MIB.txt
+lib/snmp/mibs/RFC1155-SMI.txt
+lib/snmp/mibs/RFC1213-MIB.txt
+lib/snmp/mibs/RFC1271-MIB.txt
+lib/snmp/mibs/SNMPv2-CONF.txt
+lib/snmp/mibs/SNMPv2-M2M-MIB.txt
+lib/snmp/mibs/SNMPv2-MIB.txt
+lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
+lib/snmp/mibs/SNMPv2-SMI.txt
+lib/snmp/mibs/SNMPv2-TC.txt
+lib/snmp/mibs/SNMPv2-TM.txt
+lib/snmp/mibs/TCP-MIB.txt
+lib/snmp/mibs/UCD-SNMP-MIB.txt
+lib/snmp/mibs/UDP-MIB.txt
+man/man1/snmpbulkwalk.1.gz
+man/man1/snmpget.1.gz
+man/man1/snmpgetnext.1.gz
+man/man1/snmpnetstat.1.gz
+man/man1/snmpset.1.gz
+man/man1/snmpstatus.1.gz
+man/man1/snmptest.1.gz
+man/man1/snmptranslate.1.gz
+man/man1/snmptrap.1.gz
+man/man1/snmpwalk.1.gz
+man/man3/mib_api.3.gz
+man/man3/snmp_api.3.gz
+man/man5/snmpd.conf.5.gz
+man/man5/variables.5.gz
+man/man8/snmpd.8.gz
+man/man8/snmptrapd.8.gz
 sbin/snmpd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
@@ -48,4 +67,5 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm lib/snmp/mibs
 @dirrm lib/snmp
-@dirrm include/snmp
\ No newline at end of file
+@dirrm include/snmp
+@dirrm share/examples/ucd-snmp
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index b390f836bee9..73beaa683d41 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,32 +1,27 @@
 # New ports collection makefile for:	ucd-snmp
-# Version required:			3.1.3
+# Version required:			3.2
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.11 1997/05/17 17:24:59 fenner Exp $
+# $Id: Makefile,v 1.12 1997/07/02 09:39:17 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.1.3
+DISTNAME=	ucd-snmp-3.2
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-OSVERSION!=	sysctl -n kern.osreldate
-.if ${OSVERSION} >= 300000
-BROKEN=         "does not work for 3.0 now"
-.endif
-
 GNU_CONFIGURE=	yes
 .if defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS=	--with-distdefaults
+CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
 MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
 		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmpstatus.1
-MAN3=		snmp_api.3
+		snmptrap.1 snmpstatus.1
+MAN3=		snmp_api.3 mib_api.3
 MAN5=		variables.5 snmpd.conf.5
 MAN8=		snmptrapd.8 snmpd.8
 
@@ -41,5 +36,12 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/etc/* ; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
+	@if [ ! -f ${PREFIX}/etc/rc.d/snmpd.sh ]; then \
+		echo "Creating ${PREFIX}/etc/rc.d/snmpd.sh startup file."; \
+		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/snmpd.sh; \
+		echo "[ -x /usr/local/sbin/snmpd ] && /usr/local/sbin/snmpd && echo -n ' snmpd'" >> ${PREFIX}/etc/rc.d/snmpd.sh; \
+		chmod 751 ${PREFIX}/etc/rc.d/snmpd.sh; \
+	 fi
+
 
 .include <bsd.port.mk>
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo
index 2d79da522fed..f0ca03cb70dd 100644
--- a/net/ucd-snmp/distinfo
+++ b/net/ucd-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.1.3.tar.gz) = 2e8348d7c948cd003965dbffbd61bef3
+MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
diff --git a/net/ucd-snmp/pkg-plist b/net/ucd-snmp/pkg-plist
index 10109dfaf74c..bc51520320b5 100644
--- a/net/ucd-snmp/pkg-plist
+++ b/net/ucd-snmp/pkg-plist
@@ -1,31 +1,16 @@
-bin/snmpnetstat
-bin/snmpwalk
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
 bin/snmpget
-bin/snmptrapd
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpcheck
-man/man1/snmpget.1.gz
-man/man1/snmpset.1.gz
-man/man1/snmpwalk.1.gz
-man/man1/snmpbulkwalk.1.gz
-man/man1/snmpgetnext.1.gz
-man/man1/snmptest.1.gz
-man/man1/snmpnetstat.1.gz
-man/man1/snmptranslate.1.gz
-man/man1/snmpstatus.1.gz
-man/man3/snmp_api.3.gz
-man/man5/variables.5.gz
-man/man5/snmpd.conf.5.gz
-man/man8/snmptrapd.8.gz
-man/man8/snmpd.8.gz
-lib/libsnmp.a
-lib/snmp/mib.txt
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmptrapd
+bin/snmpwalk
+etc/rc.d/snmpd.sh
 include/snmp/acl.h
 include/snmp/asn1.h
 include/snmp/context.h
@@ -39,7 +24,41 @@ include/snmp/snmp_client.h
 include/snmp/snmp_impl.h
 include/snmp/system.h
 include/snmp/view.h
-lib/snmp/mibs/ucd-snmp.txt
+lib/libsnmp.a
+lib/snmp/mibs/EtherLike-MIB.txt
+lib/snmp/mibs/HOST-RESOURCES-MIB.txt
+lib/snmp/mibs/IANAifType-MIB.txt
+lib/snmp/mibs/IF-MIB.txt
+lib/snmp/mibs/IP-MIB.txt
+lib/snmp/mibs/RFC1155-SMI.txt
+lib/snmp/mibs/RFC1213-MIB.txt
+lib/snmp/mibs/RFC1271-MIB.txt
+lib/snmp/mibs/SNMPv2-CONF.txt
+lib/snmp/mibs/SNMPv2-M2M-MIB.txt
+lib/snmp/mibs/SNMPv2-MIB.txt
+lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
+lib/snmp/mibs/SNMPv2-SMI.txt
+lib/snmp/mibs/SNMPv2-TC.txt
+lib/snmp/mibs/SNMPv2-TM.txt
+lib/snmp/mibs/TCP-MIB.txt
+lib/snmp/mibs/UCD-SNMP-MIB.txt
+lib/snmp/mibs/UDP-MIB.txt
+man/man1/snmpbulkwalk.1.gz
+man/man1/snmpget.1.gz
+man/man1/snmpgetnext.1.gz
+man/man1/snmpnetstat.1.gz
+man/man1/snmpset.1.gz
+man/man1/snmpstatus.1.gz
+man/man1/snmptest.1.gz
+man/man1/snmptranslate.1.gz
+man/man1/snmptrap.1.gz
+man/man1/snmpwalk.1.gz
+man/man3/mib_api.3.gz
+man/man3/snmp_api.3.gz
+man/man5/snmpd.conf.5.gz
+man/man5/variables.5.gz
+man/man8/snmpd.8.gz
+man/man8/snmptrapd.8.gz
 sbin/snmpd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
@@ -48,4 +67,5 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm lib/snmp/mibs
 @dirrm lib/snmp
-@dirrm include/snmp
\ No newline at end of file
+@dirrm include/snmp
+@dirrm share/examples/ucd-snmp