Remove net/net-snmp-current -- it's superseded by net/net-snmp.

15 files changed, 0 insertions, 1349 deletions

diff --git a/net/net-snmp-current/DESCR b/net/net-snmp-current/DESCR
deleted file mode 100644
index 341ba043ea6..00000000000
--- a/net/net-snmp-current/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
-
-This package contains a port and modified code of the CMU 2.1.2.1
-snmp agent.  It has been modified to allow extensibility quickly
-and easily.  It is far from the best and most configurable systems;
-but hey: its free.
-  
-We use this agent here to monitor known system problems before they
-take the machine over.  The agent can be easily configured to
-monitor the number of a given process running, run external scripts
-to check and report functional status.  Examples: mountd(s) under
-Ultrix 4.3 which tend to fork themselves crazy and eventually fill
-up the process table; On our hp700s, "amd" sometimes stops working,
-HP VUE hangs and fails to start X, etc.
diff --git a/net/net-snmp-current/Makefile b/net/net-snmp-current/Makefile
deleted file mode 100644
index 01de181e8ba..00000000000
--- a/net/net-snmp-current/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/10/02 22:06:39 wiz Exp $
-
-DISTNAME=	net-snmp-5.0.pre2
-PKGNAME=	net-snmp-5.0.0.2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
-		ftp://ucd-snmp.ucdavis.edu/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
-		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.net-snmp.org/
-COMMENT=	Extensible SNMP implementation
-
-CONFLICTS=	ucd-snmp-[0-9]*
-
-BUILD_DEFS+=	USE_INET6
-
-USE_BUILDLINK2=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-defaults
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ARGS+=	--with-logfile="/var/log/snmpd"
-#
-# smux/host do not compile
-#
-#CONFIGURE_ARGS+=	--with-mib-modules="smux host"
-#
-# NOTE: if you do not allow dummy values some tools such as
-# scotty/tkined may ignore results when they shouldn't.
-#
-CONFIGURE_ARGS+=	--with-dummy-values
-#
-# NOTE: without this the default is USER@DOMAINNAME of the package builder
-#
-CONFIGURE_ARGS+=	--with-sys-contact="default_user@contact.domain"
-CONFIGURE_ARGS+=	--with-sys-location="defaultlocation"
-CONFIGURE_ARGS+=	--enable-shared
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if (${OPSYS} == "NetBSD")
-CFLAGS+=	-Dnetbsd1
-.endif
-
-# this might make it easier to use scotty's mibs, and local ones too
-CONFIGURE_ARGS+=	--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
-
-# deal with libwrap bogosity by providing these variables to programs which
-# do not supply them:
-post-extract:
-	@${ECHO} 'int allow_severity, deny_severity;'			\
-		> ${WRKSRC}/snmplib/libwrap.c
-
-pre-configure:
-.if (${OPSYS} == NetBSD)
-.  if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "")
-	${MKDIR} ${BUILDLINK_DIR}/include/sys
-	${LN} -s ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
-.  endif
-.endif
-#
-# Adapt for the fact that the default I've seen of ac_max_sed_cmds=90
-# will not work w/ built-in sed on Solaris.
-#
-.if ${OPSYS} == SunOS
-	cd ${WRKSRC};							\
-	${SED}	's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/'	\
-		${CONFIGURE_SCRIPT} > ${CONFIGURE_SCRIPTS}.fixed;	\
-	${MV} ${CONFIGURE_SCRIPT}.fixed ${CONFIGURE_SCRIPTS}
-.endif
-
-post-build:
-	${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmpd.sh > ${WRKDIR}/snmpd
-	${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmptrapd.sh > ${WRKDIR}/snmptrapd
-
-pre-install:
-	cd ${WRKSRC}/apps/.libs; ${LN} -sf snmptrap snmpinform
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snmp
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod
-	${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d
-	${INSTALL_SCRIPT} ${WRKDIR}/snmptrapd ${PREFIX}/etc/rc.d
-
-.include "../../security/openssl/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp-current/PLIST b/net/net-snmp-current/PLIST
deleted file mode 100644
index 70ea58c38a7..00000000000
--- a/net/net-snmp-current/PLIST
+++ /dev/null
@@ -1,355 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:05 jlam Exp $
-bin/encode_keychange
-bin/fixproc
-bin/ipf-mod.pl
-bin/net-snmp-config
-bin/rsnmp
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpdelta
-bin/snmpdf
-bin/snmpget
-bin/snmpgetnext
-bin/snmpinform
-bin/snmpnetstat
-bin/snmpset
-bin/snmpstatus
-bin/snmptable
-bin/snmptest
-bin/snmptranslate
-bin/snmptrap
-bin/snmpusm
-bin/snmpvacm
-bin/snmpwalk
-bin/tkmib
-etc/rc.d/snmpd
-etc/rc.d/snmptrapd
-include/net-snmp/net-snmp-config.h
-include/net-snmp/version.h
-include/net-snmp/system/aix.h
-include/net-snmp/system/bsd.h
-include/net-snmp/system/bsdi3.h
-include/net-snmp/system/bsdi4.h
-include/net-snmp/system/bsdi.h
-include/net-snmp/system/cygwin.h
-include/net-snmp/system/darwin.h
-include/net-snmp/system/dynix.h
-include/net-snmp/system/freebsd2.h
-include/net-snmp/system/freebsd3.h
-include/net-snmp/system/freebsd4.h
-include/net-snmp/system/freebsd.h
-include/net-snmp/system/generic.h
-include/net-snmp/system/hpux.h
-include/net-snmp/system/irix.h
-include/net-snmp/system/linux.h
-include/net-snmp/system/mips.h
-include/net-snmp/system/netbsd.h
-include/net-snmp/system/openbsd.h
-include/net-snmp/system/solaris2.6.h
-include/net-snmp/system/solaris2.7.h
-include/net-snmp/system/solaris2.8.h
-include/net-snmp/system/solaris.h
-include/net-snmp/system/sunos.h
-include/net-snmp/system/svr5.h
-include/net-snmp/system/sysv.h
-include/net-snmp/system/ultrix4.h
-include/net-snmp/machine/generic.h
-include/net-snmp/net-snmp-includes.h
-include/net-snmp/config_api.h
-include/net-snmp/mib_api.h
-include/net-snmp/output_api.h
-include/net-snmp/pdu_api.h
-include/net-snmp/session_api.h
-include/net-snmp/snmpv3_api.h
-include/net-snmp/varbind_api.h
-include/net-snmp/types.h
-include/net-snmp/utilities.h
-include/net-snmp/definitions.h
-include/net-snmp/library/README
-include/net-snmp/library/asn1.h
-include/net-snmp/library/callback.h
-include/net-snmp/library/data_list.h
-include/net-snmp/library/oid_array.h
-include/net-snmp/library/default_store.h
-include/net-snmp/library/int64.h
-include/net-snmp/library/keytools.h
-include/net-snmp/library/mib.h
-include/net-snmp/library/parse.h
-include/net-snmp/library/read_config.h
-include/net-snmp/library/scapi.h
-include/net-snmp/library/snmp.h
-include/net-snmp/library/snmp_alarm.h
-include/net-snmp/library/snmp_api.h
-include/net-snmp/library/snmp_client.h
-include/net-snmp/library/snmp_debug.h
-include/net-snmp/library/snmp_impl.h
-include/net-snmp/library/snmp_logging.h
-include/net-snmp/library/snmp_parse_args.h
-include/net-snmp/library/snmp-tc.h
-include/net-snmp/library/snmpv3.h
-include/net-snmp/library/system.h
-include/net-snmp/library/tools.h
-include/net-snmp/library/transform_oids.h
-include/net-snmp/library/winservice.h
-include/net-snmp/library/cmu_compat.h
-include/net-snmp/library/getopt.h
-include/net-snmp/library/lcd_time.h
-include/net-snmp/library/mt_support.h
-include/net-snmp/library/oid_stash.h
-include/net-snmp/library/snmp_enum.h
-include/net-snmp/library/snmp_locking.h
-include/net-snmp/library/snmp_secmod.h
-include/net-snmp/library/ucd_compat.h
-include/net-snmp/library/vacm.h
-include/net-snmp/library/snmp_transport.h
-include/net-snmp/library/snmpv3-security-includes.h
-include/net-snmp/library/snmpUDPDomain.h
-include/net-snmp/library/snmpTCPDomain.h
-include/net-snmp/library/snmpUnixDomain.h
-include/net-snmp/library/snmpCallbackDomain.h
-include/net-snmp/library/snmpusm.h
-include/net-snmp/agent/agent_read_config.h
-include/net-snmp/agent/agent_registry.h
-include/net-snmp/agent/agent_index.h
-include/net-snmp/agent/agent_trap.h
-include/net-snmp/agent/auto_nlist.h
-include/net-snmp/agent/ds_agent.h
-include/net-snmp/agent/snmp_agent.h
-include/net-snmp/agent/snmp_vars.h
-include/net-snmp/agent/var_struct.h
-include/net-snmp/agent/agent_handler.h
-include/net-snmp/agent/net-snmp-agent-includes.h
-include/net-snmp/agent/agent_callbacks.h
-include/net-snmp/agent/mib_module_config.h
-include/net-snmp/agent/all_helpers.h
-include/net-snmp/agent/instance.h
-include/net-snmp/agent/multiplexer.h
-include/net-snmp/agent/bulk_to_next.h
-include/net-snmp/agent/null.h
-include/net-snmp/agent/debug_handler.h
-include/net-snmp/agent/old_api.h
-include/net-snmp/agent/read_only.h
-include/net-snmp/agent/serialize.h
-include/net-snmp/agent/set_helper.h
-include/net-snmp/agent/table_data.h
-include/net-snmp/agent/table_dataset.h
-include/net-snmp/agent/table_array.h
-include/net-snmp/agent/table.h
-include/net-snmp/agent/table_iterator.h
-include/ucd-snmp/asn1.h
-include/ucd-snmp/callback.h
-include/ucd-snmp/default_store.h
-include/ucd-snmp/int64.h
-include/ucd-snmp/keytools.h
-include/ucd-snmp/mib.h
-include/ucd-snmp/parse.h
-include/ucd-snmp/read_config.h
-include/ucd-snmp/scapi.h
-include/ucd-snmp/snmp_alarm.h
-include/ucd-snmp/snmp_api.h
-include/ucd-snmp/snmp_client.h
-include/ucd-snmp/snmp_debug.h
-include/ucd-snmp/snmp.h
-include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp_logging.h
-include/ucd-snmp/snmp_parse_args.h
-include/ucd-snmp/snmp-tc.h
-include/ucd-snmp/snmpusm.h
-include/ucd-snmp/snmpv3.h
-include/ucd-snmp/snmp_vars.h
-include/ucd-snmp/struct.h
-include/ucd-snmp/system.h
-include/ucd-snmp/tools.h
-include/ucd-snmp/transform_oids.h
-include/ucd-snmp/agent_index.h
-include/ucd-snmp/agent_read_config.h
-include/ucd-snmp/agent_registry.h
-include/ucd-snmp/agent_trap.h
-include/ucd-snmp/auto_nlist.h
-include/ucd-snmp/ds_agent.h
-include/ucd-snmp/header_complex.h
-include/ucd-snmp/mibincl.h
-include/ucd-snmp/snmp_agent.h
-include/ucd-snmp/ucd-snmp-includes.h
-include/ucd-snmp/ucd-snmp-agent-includes.h
-include/ucd-snmp/util_funcs.h
-include/ucd-snmp/var_struct.h
-include/ucd-snmp/ucd-snmp-config.h
-include/ucd-snmp/version.h
-include/ucd-snmp/mib_module_config.h
-lib/libnetsnmphelpers.a
-lib/libnetsnmphelpers.la
-lib/libnetsnmphelpers.so
-lib/libnetsnmphelpers-0.5.0.0.2.so
-lib/libnetsnmpmibs.a
-lib/libnetsnmpagent.a
-lib/libnetsnmpmibs.la
-lib/libnetsnmpmibs.so
-lib/libnetsnmpmibs-0.5.0.0.2.so
-lib/libnetsnmpagent.la
-lib/libnetsnmpagent.so
-lib/libnetsnmpagent-0.5.0.0.2.so
-lib/libnetsnmp.a
-lib/libnetsnmp.la
-lib/libnetsnmp.so
-lib/libnetsnmp-0.5.0.0.2.so
-man/man1/snmpbulkget.1
-man/man1/snmpbulkwalk.1
-man/man1/snmpcmd.1
-man/man1/snmpconf.1
-man/man1/snmpd.1
-man/man1/snmpdelta.1
-man/man1/snmpdf.1
-man/man1/snmpget.1
-man/man1/snmpgetnext.1
-man/man1/snmpinform.1
-man/man1/snmpnetstat.1
-man/man1/snmpset.1
-man/man1/snmpstatus.1
-man/man1/snmptable.1
-man/man1/snmptest.1
-man/man1/snmptranslate.1
-man/man1/snmptrap.1
-man/man1/snmpusm.1
-man/man1/snmpwalk.1
-man/man3/add_mibdir.3
-man/man3/add_module_replacement.3
-man/man3/default_store.3
-man/man3/get_module_node.3
-man/man3/init_mib.3
-man/man3/init_mib_internals.3
-man/man3/mib_api.3
-man/man3/print_description.3
-man/man3/print_mib.3
-man/man3/print_objid.3
-man/man3/print_value.3
-man/man3/print_variable.3
-man/man3/read_all_mibs.3
-man/man3/read_config.3
-man/man3/read_mib.3
-man/man3/read_module.3
-man/man3/read_module_node.3
-man/man3/read_objid.3
-man/man3/shutdown_mib.3
-man/man3/snmp_agent_api.3
-man/man3/snmp_alarm.3
-man/man3/snmp_api.3
-man/man3/snmp_api_errstring.3
-man/man3/snmp_close.3
-man/man3/snmp_error.3
-man/man3/snmp_free_pdu.3
-man/man3/snmp_open.3
-man/man3/snmp_perror.3
-man/man3/snmp_read.3
-man/man3/snmp_select_info.3
-man/man3/snmp_send.3
-man/man3/snmp_sess_api.3
-man/man3/snmp_sess_async_send.3
-man/man3/snmp_sess_close.3
-man/man3/snmp_sess_error.3
-man/man3/snmp_sess_init.3
-man/man3/snmp_sess_open.3
-man/man3/snmp_sess_perror.3
-man/man3/snmp_sess_read.3
-man/man3/snmp_sess_select_info.3
-man/man3/snmp_sess_send.3
-man/man3/snmp_sess_session.3
-man/man3/snmp_sess_timeout.3
-man/man3/snmp_set_mib_warnings.3
-man/man3/snmp_set_save_descriptions.3
-man/man3/snmp_timeout.3
-man/man3/snmp_trap_api.3
-man/man5/snmp.conf.5
-man/man5/snmp_config.5
-man/man5/snmpd.conf.5
-man/man5/snmptrapd.conf.5
-man/man5/variables.5
-man/man8/snmptrapd.8
-sbin/snmpd
-sbin/snmptrapd
-share/examples/ucd-snmp/EXAMPLE.conf
-share/snmp/mib2c.conf
-share/snmp/mib2c.iterate.conf
-share/snmp/mib2c.create-dataset.conf
-share/snmp/mib2c.array-auto.conf
-share/snmp/mib2c.array-user.conf
-share/snmp/snmpconf/snmpd.conf/system
-share/snmp/snmpconf/snmpd.conf/acl
-share/snmp/snmpconf/snmpd.conf/trapsinks
-share/snmp/snmpconf/snmpd.conf/monitor
-share/snmp/snmpconf/snmpd.conf/extending
-share/snmp/snmpconf/snmpd.conf/operation
-share/snmp/snmpconf/snmpd.conf/basic_setup
-share/snmp/snmpconf/snmp.conf/authopts
-share/snmp/snmpconf/snmp.conf/debugging
-share/snmp/snmpconf/snmp.conf/output
-share/snmp/snmpconf/snmp.conf/mibs
-share/snmp/snmpconf/snmptrapd.conf/formatting
-share/snmp/snmpconf/snmptrapd.conf/traphandle
-share/snmp/mibs/RFC1155-SMI.txt
-share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RFC-1215.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
-share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
-share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
-share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/IP-FORWARD-MIB.txt
-share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/INET-ADDRESS-MIB.txt
-share/snmp/mibs/HCNUM-TC.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-TYPES.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/IPV6-TC.txt
-share/snmp/mibs/IPV6-MIB.txt
-share/snmp/mibs/IPV6-ICMP-MIB.txt
-share/snmp/mibs/IPV6-TCP-MIB.txt
-share/snmp/mibs/IPV6-UDP-MIB.txt
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
-share/snmp/mibs/AGENTX-MIB.txt
-share/snmp/mibs/SMUX-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IANA-LANGUAGE-MIB.txt
-share/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/snmp/mibs/NET-SNMP-MIB.txt
-share/snmp/mibs/NET-SNMP-AGENT-MIB.txt
-share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
-share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/UCD-DEMO-MIB.txt
-share/snmp/mibs/UCD-IPFWACC-MIB.txt
-share/snmp/mibs/UCD-DLMOD-MIB.txt
-share/snmp/mibs/UCD-DISKIO-MIB.txt
-@unexec /bin/rm -f %D/share/snmp/mibs/.index
-@dirrm share/snmp/snmpconf/snmp.conf
-@dirrm share/snmp/snmpconf/snmpd.conf
-@dirrm share/snmp/snmpconf/snmptrapd.conf
-@dirrm share/snmp/snmpconf
-@dirrm share/snmp/mibs
-@dirrm share/snmp
-@dirrm share/examples/ucd-snmp
-@exec ${MKDIR} %D/lib/snmp/dlmod
-@dirrm lib/snmp/dlmod
-@dirrm lib/snmp
-@dirrm include/net-snmp/system
-@dirrm include/net-snmp/machine
-@dirrm include/net-snmp/library
-@dirrm include/net-snmp/agent
-@dirrm include/net-snmp
-@dirrm include/ucd-snmp
diff --git a/net/net-snmp-current/buildlink2.mk b/net/net-snmp-current/buildlink2.mk
deleted file mode 100644
index afe7f090886..00000000000
--- a/net/net-snmp-current/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/08/25 21:50:06 jlam Exp $
-
-.if !defined(NET_SNMP_BUILDLINK2_MK)
-NET_SNMP_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		net-snmp
-BUILDLINK_DEPENDS.net-snmp?=	net-snmp>=5.0.0.2
-BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.net-snmp=net-snmp
-BUILDLINK_PREFIX.net-snmp_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.net-snmp=		include/net-snmp/*
-BUILDLINK_FILES.net-snmp+=		include/ucd-snmp/*
-BUILDLINK_FILES.net-snmp+=		lib/libnetsnmp*
-
-BUILDLINK_TARGETS+=	net-snmp-buildlink
-
-net-snmp-buildlink: _BUILDLINK_USE
-
-.endif	# NET_SNMP_BUILDLINK2_MK
diff --git a/net/net-snmp-current/distinfo b/net/net-snmp-current/distinfo
deleted file mode 100644
index 2472c99b324..00000000000
--- a/net/net-snmp-current/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/10/02 22:06:39 wiz Exp $
-
-SHA1 (net-snmp-5.0.pre2.tar.gz) = 90e161451cb63af0446e2a49471f1232cde823a3
-Size (net-snmp-5.0.pre2.tar.gz) = 1949353 bytes
-SHA1 (patch-aa) = 07d2cc89577bbfb88848093edf291aeb6cb90b64
-SHA1 (patch-ab) = d5088c14c89cbeb708bbe96227b3e420278b7584
-SHA1 (patch-ad) = c40eaa2a6d73a7737a545bca9ef0926f334a9dd3
-SHA1 (patch-af) = 5d44e45c86aa858ec3817f95bc29fdb1c3bf2e23
-SHA1 (patch-ag) = 28247b6e3d530769210784b6365fed5de7e95085
-SHA1 (patch-ai) = 402ae25357af5f6c3be53bbc1b37ba999b9491ef
-SHA1 (patch-aj) = 08c9ba94913e50df3f80738e7249f1f1ea41763f
diff --git a/net/net-snmp-current/files/disklabel.h b/net/net-snmp-current/files/disklabel.h
deleted file mode 100644
index 65f14b1aace..00000000000
--- a/net/net-snmp-current/files/disklabel.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/*	$NetBSD: disklabel.h,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $							*/
-/*									*/
-/*	NetBSD: disklabel.h,v 1.60.4.4 2002/01/29 22:16:37 he Exp	*/
-
-/*
- * Copyright (c) 1987, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_DISKLABEL_H_
-#define _SYS_DISKLABEL_H_
-
-/*
- * We need <machine/types.h> for __HAVE_OLD_DISKLABEL
- */
-#ifndef _LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Each disk has a label which includes information about the hardware
- * disk geometry, filesystem partitions, and drive specific information.
- * The location of the label, as well as the number of partitions the
- * label can describe and the number of the "whole disk" (raw)
- * paritition are machine dependent.
- */
-#include <machine/disklabel.h>
-
-/*
- * The absolute maximum number of disk partitions allowed.
- * This is the maximum value of MAXPARTITIONS for which 'struct disklabel'
- * is <= DEV_BSIZE bytes long.  If MAXPARTITIONS is greater than this, beware.
- */
-#define	MAXMAXPARTITIONS	22
-#if MAXPARTITIONS > MAXMAXPARTITIONS
-#warning beware: MAXPARTITIONS bigger than MAXMAXPARTITIONS
-#endif
-
-/*
- * Ports can switch their MAXPARTITIONS once, as follows:
- *
- * - define OLDMAXPARTITIONS in <machine/disklabel.h> as the old number
- * - define MAXPARTITIONS as the new number
- * - define DISKUNIT, DISKPART and DISKMINOR macros in <machine/disklabel.h>
- *   as appropriate for the port (see the i386 one for an example).
- * - define __HAVE_OLD_DISKLABEL in <machine/types.h>
- */
-
-#if defined(_KERNEL) && defined(__HAVE_OLD_DISKLABEL) && \
-	   (MAXPARTITIONS < OLDMAXPARTITIONS)
-#error "can only grow disklabel size"
-#endif
-
-
-/*
- * Translate between device numbers and major/disk unit/disk partition.
- */
-#ifndef __HAVE_OLD_DISKLABEL
-#define	DISKUNIT(dev)	(minor(dev) / MAXPARTITIONS)
-#define	DISKPART(dev)	(minor(dev) % MAXPARTITIONS)
-#define	DISKMINOR(unit, part) \
-    (((unit) * MAXPARTITIONS) + (part))
-#endif
-#define	MAKEDISKDEV(maj, unit, part) \
-    (makedev((maj), DISKMINOR((unit), (part))))
-
-#define DISKMAGIC	((u_int32_t)0x82564557)	/* The disk magic number */
-
-#ifndef _LOCORE
-struct disklabel {
-	u_int32_t d_magic;		/* the magic number */
-	u_int16_t d_type;		/* drive type */
-	u_int16_t d_subtype;		/* controller/d_type specific */
-	char	  d_typename[16];	/* type name, e.g. "eagle" */
-
-	/*
-	 * d_packname contains the pack identifier and is returned when
-	 * the disklabel is read off the disk or in-core copy.
-	 * d_boot0 and d_boot1 are the (optional) names of the
-	 * primary (block 0) and secondary (block 1-15) bootstraps
-	 * as found in /usr/mdec.  These are returned when using
-	 * getdiskbyname(3) to retrieve the values from /etc/disktab.
-	 */
-	union {
-		char	un_d_packname[16];	/* pack identifier */
-		struct {
-			char *un_d_boot0;	/* primary bootstrap name */
-			char *un_d_boot1;	/* secondary bootstrap name */
-		} un_b;
-	} d_un;
-#define d_packname	d_un.un_d_packname
-#define d_boot0		d_un.un_b.un_d_boot0
-#define d_boot1		d_un.un_b.un_d_boot1
-
-			/* disk geometry: */
-	u_int32_t d_secsize;		/* # of bytes per sector */
-	u_int32_t d_nsectors;		/* # of data sectors per track */
-	u_int32_t d_ntracks;		/* # of tracks per cylinder */
-	u_int32_t d_ncylinders;		/* # of data cylinders per unit */
-	u_int32_t d_secpercyl;		/* # of data sectors per cylinder */
-	u_int32_t d_secperunit;		/* # of data sectors per unit */
-
-	/*
-	 * Spares (bad sector replacements) below are not counted in
-	 * d_nsectors or d_secpercyl.  Spare sectors are assumed to
-	 * be physical sectors which occupy space at the end of each
-	 * track and/or cylinder.
-	 */
-	u_int16_t d_sparespertrack;	/* # of spare sectors per track */
-	u_int16_t d_sparespercyl;	/* # of spare sectors per cylinder */
-	/*
-	 * Alternative cylinders include maintenance, replacement,
-	 * configuration description areas, etc.
-	 */
-	u_int32_t d_acylinders;		/* # of alt. cylinders per unit */
-
-			/* hardware characteristics: */
-	/*
-	 * d_interleave, d_trackskew and d_cylskew describe perturbations
-	 * in the media format used to compensate for a slow controller.
-	 * Interleave is physical sector interleave, set up by the
-	 * formatter or controller when formatting.  When interleaving is
-	 * in use, logically adjacent sectors are not physically
-	 * contiguous, but instead are separated by some number of
-	 * sectors.  It is specified as the ratio of physical sectors
-	 * traversed per logical sector.  Thus an interleave of 1:1
-	 * implies contiguous layout, while 2:1 implies that logical
-	 * sector 0 is separated by one sector from logical sector 1.
-	 * d_trackskew is the offset of sector 0 on track N relative to
-	 * sector 0 on track N-1 on the same cylinder.  Finally, d_cylskew
-	 * is the offset of sector 0 on cylinder N relative to sector 0
-	 * on cylinder N-1.
-	 */
-	u_int16_t d_rpm;		/* rotational speed */
-	u_int16_t d_interleave;		/* hardware sector interleave */
-	u_int16_t d_trackskew;		/* sector 0 skew, per track */
-	u_int16_t d_cylskew;		/* sector 0 skew, per cylinder */
-	u_int32_t d_headswitch;		/* head switch time, usec */
-	u_int32_t d_trkseek;		/* track-to-track seek, usec */
-	u_int32_t d_flags;		/* generic flags */
-#define NDDATA 5
-	u_int32_t d_drivedata[NDDATA];	/* drive-type specific information */
-#define NSPARE 5
-	u_int32_t d_spare[NSPARE];	/* reserved for future use */
-	u_int32_t d_magic2;		/* the magic number (again) */
-	u_int16_t d_checksum;		/* xor of data incl. partitions */
-
-			/* filesystem and partition information: */
-	u_int16_t d_npartitions;	/* number of partitions in following */
-	u_int32_t d_bbsize;		/* size of boot area at sn0, bytes */
-	u_int32_t d_sbsize;		/* max size of fs superblock, bytes */
-	struct	partition {		/* the partition table */
-		u_int32_t p_size;	/* number of sectors in partition */
-		u_int32_t p_offset;	/* starting sector */
-		u_int32_t p_fsize;	/* filesystem basic fragment size */
-		u_int8_t p_fstype;	/* filesystem type, see below */
-		u_int8_t p_frag;	/* filesystem fragments per block */
-		union {
-			u_int16_t cpg;	/* UFS: FS cylinders per group */
-			u_int16_t sgs;	/* LFS: FS segment shift */
-		} __partition_u1;
-#define	p_cpg	__partition_u1.cpg
-#define	p_sgs	__partition_u1.sgs
-	} d_partitions[MAXPARTITIONS];	/* actually may be more */
-};
-
-#ifdef __HAVE_OLD_DISKLABEL
-/*
- * Same as above, but with OLDMAXPARTITIONS partitions. For use in
- * the old DIOC* ioctl calls.
- */
-struct olddisklabel {
-	u_int32_t d_magic;
-	u_int16_t d_type;
-	u_int16_t d_subtype;
-	char	  d_typename[16];
-	union {
-		char	un_d_packname[16];
-		struct {
-			char *un_d_boot0;
-			char *un_d_boot1;
-		} un_b;
-	} d_un;
-	u_int32_t d_secsize;
-	u_int32_t d_nsectors;
-	u_int32_t d_ntracks;
-	u_int32_t d_ncylinders;
-	u_int32_t d_secpercyl;
-	u_int32_t d_secperunit;
-	u_int16_t d_sparespertrack;
-	u_int16_t d_sparespercyl;
-	u_int32_t d_acylinders;
-	u_int16_t d_rpm;
-	u_int16_t d_interleave;
-	u_int16_t d_trackskew;
-	u_int16_t d_cylskew;
-	u_int32_t d_headswitch;
-	u_int32_t d_trkseek;
-	u_int32_t d_flags;
-	u_int32_t d_drivedata[NDDATA];
-	u_int32_t d_spare[NSPARE];
-	u_int32_t d_magic2;
-	u_int16_t d_checksum;
-	u_int16_t d_npartitions;
-	u_int32_t d_bbsize;
-	u_int32_t d_sbsize;
-	struct	opartition {
-		u_int32_t p_size;
-		u_int32_t p_offset;
-		u_int32_t p_fsize;
-		u_int8_t p_fstype;
-		u_int8_t p_frag;
-		union {
-			u_int16_t cpg;
-			u_int16_t sgs;
-		} __partition_u1;
-	} d_partitions[OLDMAXPARTITIONS];
-};
-#endif /* __HAVE_OLD_DISKLABEL */
-#else /* _LOCORE */
-	/*
-	 * offsets for asm boot files.
-	 */
-	.set	d_secsize,40
-	.set	d_nsectors,44
-	.set	d_ntracks,48
-	.set	d_ncylinders,52
-	.set	d_secpercyl,56
-	.set	d_secperunit,60
-	.set	d_end_,276		/* size of disk label */
-#endif /* _LOCORE */
-
-/* d_type values: */
-#define	DTYPE_SMD		1		/* SMD, XSMD; VAX hp/up */
-#define	DTYPE_MSCP		2		/* MSCP */
-#define	DTYPE_DEC		3		/* other DEC (rk, rl) */
-#define	DTYPE_SCSI		4		/* SCSI */
-#define	DTYPE_ESDI		5		/* ESDI interface */
-#define	DTYPE_ST506		6		/* ST506 etc. */
-#define	DTYPE_HPIB		7		/* CS/80 on HP-IB */
-#define	DTYPE_HPFL		8		/* HP Fiber-link */
-#define	DTYPE_FLOPPY		10		/* floppy */
-#define	DTYPE_CCD		11		/* concatenated disk device */
-#define	DTYPE_VND		12		/* vnode pseudo-disk */
-#define DTYPE_ATAPI		13		/* ATAPI */
-#define	DTYPE_RAID		14		/* RAIDframe */
-#define DTYPE_LD		15		/* logical disk */
-
-#ifdef DKTYPENAMES
-static const char *const dktypenames[] = {
-	"unknown",
-	"SMD",
-	"MSCP",
-	"old DEC",
-	"SCSI",
-	"ESDI",
-	"ST506",
-	"HP-IB",
-	"HP-FL",
-	"type 9",
-	"floppy",
-	"ccd",
-	"vnd",
-	"ATAPI",
-	"RAID",
-	"ld",
-	NULL
-};
-#define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
-#endif
-
-/*
- * Filesystem type and version.
- * Used to interpret other filesystem-specific
- * per-partition information.
- */
-#define	FS_UNUSED	0		/* unused */
-#define	FS_SWAP		1		/* swap */
-#define	FS_V6		2		/* Sixth Edition */
-#define	FS_V7		3		/* Seventh Edition */
-#define	FS_SYSV		4		/* System V */
-#define	FS_V71K		5		/* V7 with 1K blocks (4.1, 2.9) */
-#define	FS_V8		6		/* Eighth Edition, 4K blocks */
-#define	FS_BSDFFS	7		/* 4.2BSD fast file system */
-#define	FS_MSDOS	8		/* MSDOS file system */
-#define	FS_BSDLFS	9		/* 4.4BSD log-structured file system */
-#define	FS_OTHER	10		/* in use, but unknown/unsupported */
-#define	FS_HPFS		11		/* OS/2 high-performance file system */
-#define	FS_ISO9660	12		/* ISO 9660, normally CD-ROM */
-#define	FS_BOOT		13		/* partition contains bootstrap */
-#define	FS_ADOS		14		/* AmigaDOS fast file system */
-#define	FS_HFS		15		/* Macintosh HFS */
-#define	FS_FILECORE	16		/* Acorn Filecore Filing System */
-#define	FS_EX2FS	17		/* Linux Extended 2 file system */
-#define	FS_NTFS		18		/* Windows/NT file system */
-#define	FS_RAID		19		/* RAIDframe component */
-#define	FS_CCD		20		/* concatenated disk component */
-
-#ifdef	FSTYPENAMES
-static const char *const fstypenames[] = {
-	"unused",
-	"swap",
-	"Version 6",
-	"Version 7",
-	"System V",
-	"4.1BSD",
-	"Eighth Edition",
-	"4.2BSD",
-	"MSDOS",
-	"4.4LFS",
-	"unknown",
-	"HPFS",
-	"ISO9660",
-	"boot",
-	"ADOS",
-	"HFS",
-	"FILECORE",
-	"Linux Ext2",
-	"NTFS",
-	"RAID",
-	"ccd",
-	NULL
-};
-#define FSMAXTYPES	(sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
-#endif
-
-#ifdef FSCKNAMES
-/* These are the names MOUNT_XXX from <sys/mount.h> */
-static const char *const fscknames[] = {
-	NULL,		/* unused */
-	NULL,		/* swap */
-	NULL,		/* Version 6 */
-	NULL,		/* Version 7 */
-	NULL,		/* System V */
-	NULL,		/* 4.1BSD */
-	NULL,		/* Eighth edition */
-	"ffs",		/* 4.2BSD */
-	"msdos",	/* MSDOS */
-	"lfs",		/* 4.4LFS */
-	NULL,		/* unknown */
-	NULL,		/* HPFS */
-	NULL,		/* ISO9660 */
-	NULL,		/* boot */
-	NULL,		/* ADOS */
-	NULL,		/* HFS */
-	NULL,		/* FILECORE */
-	"ext2fs",	/* Linux Ext2 */
-	NULL,		/* Windows/NT */
-	NULL,		/* RAID Component */
-	NULL,		/* concatenated disk component */
-	NULL		/* NULL */
-};
-#define FSMAXNAMES	(sizeof(fscknames) / sizeof(fscknames[0]) - 1)
-
-#endif
-
-#ifdef MOUNTNAMES
-/* These are the names MOUNT_XXX from <sys/mount.h> */
-static const char *const mountnames[] = {
-	NULL,		/* unused */
-	NULL,		/* swap */
-	NULL,		/* Version 6 */
-	NULL,		/* Version 7 */
-	NULL,		/* System V */
-	NULL,		/* 4.1BSD */
-	NULL,		/* Eighth edition */
-	"ffs",		/* 4.2BSD */
-	"msdos",	/* MSDOS */
-	"lfs",		/* 4.4LFS */
-	NULL,		/* unknown */
-	NULL,		/* HPFS */
-	"cd9660",	/* ISO9660 */
-	NULL,		/* boot */
-	"ados",		/* ADOS */
-	NULL,		/* HFS */
-	"filecore",	/* FILECORE */
-	"ext2fs",	/* Linux Ext2 */
-	"ntfs",		/* Windows/NT */
-	NULL,		/* RAID Component */
-	NULL,		/* concatenated disk component */
-	NULL		/* NULL */
-};
-#define FSMAXMOUNTNAMES	(sizeof(mountnames) / sizeof(mountnames[0]) - 1)
-
-#endif
-
-/*
- * flags shared by various drives:
- */
-#define		D_REMOVABLE	0x01		/* removable media */
-#define		D_ECC		0x02		/* supports ECC */
-#define		D_BADSECT	0x04		/* supports bad sector forw. */
-#define		D_RAMDISK	0x08		/* disk emulator */
-#define		D_CHAIN		0x10		/* can do back-back transfers */
-
-/*
- * Drive data for SMD.
- */
-#define	d_smdflags	d_drivedata[0]
-#define		D_SSE		0x1		/* supports skip sectoring */
-#define	d_mindist	d_drivedata[1]
-#define	d_maxdist	d_drivedata[2]
-#define	d_sdist		d_drivedata[3]
-
-/*
- * Drive data for ST506.
- */
-#define d_precompcyl	d_drivedata[0]
-#define d_gap3		d_drivedata[1]		/* used only when formatting */
-
-/*
- * Drive data for SCSI.
- */
-#define	d_blind		d_drivedata[0]
-
-#ifndef _LOCORE
-/*
- * Structure used to perform a format or other raw operation,
- * returning data and/or register values.  Register identification
- * and format are device- and driver-dependent.
- */
-struct format_op {
-	char	*df_buf;
-	int	 df_count;		/* value-result */
-	daddr_t	 df_startblk;
-	int	 df_reg[8];		/* result */
-};
-
-/*
- * Structure used internally to retrieve information about a partition
- * on a disk.
- */
-struct partinfo {
-	struct disklabel *disklab;
-	struct partition *part;
-};
-
-#ifdef _KERNEL
-struct buf_queue;
-
-void	 diskerr
-	    __P((struct buf *, char *, char *, int, int, struct disklabel *));
-void	 disksort_cylinder __P((struct buf_queue *, struct buf *));
-void	 disksort_blkno __P((struct buf_queue *, struct buf *));
-void	 disksort_tail __P((struct buf_queue *, struct buf *));
-u_int	 dkcksum __P((struct disklabel *));
-int	 setdisklabel __P((struct disklabel *, struct disklabel *, u_long,
-	    struct cpu_disklabel *));
-char	*readdisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *,
-	    struct cpu_disklabel *));
-int	 writedisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *,
-	    struct cpu_disklabel *));
-int	 bounds_check_with_label __P((struct buf *, struct disklabel *, int));
-#endif
-#endif /* _LOCORE */
-
-#if !defined(_KERNEL) && !defined(_LOCORE)
-
-#include <sys/cdefs.h>
-
-#endif
-
-#endif /* !_SYS_DISKLABEL_H_ */
diff --git a/net/net-snmp-current/files/snmpd.sh b/net/net-snmp-current/files/snmpd.sh
deleted file mode 100644
index 060ae9a30da..00000000000
--- a/net/net-snmp-current/files/snmpd.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# $NetBSD: snmpd.sh,v 1.1.1.1 2002/03/14 06:29:02 itojun Exp $
-
-# PID file:
-PF=/var/run/snmpd.pid
-
-
-if [ -f /etc/snmp/snmpd.conf ]
-then
-    SNMPD_CFG="-c /etc/snmp/snmpd.conf"
-fi
-
-case $1 in
-start)
-	if [ -x @PREFIX@/sbin/snmpd ]
-	then
-	    echo 'Starting snmpd.'
-	    @PREFIX@/sbin/snmpd -s -P ${PF} -A ${SNMPD_CFG}
-	fi
-	;;
-stop)
-	if [ -f ${PF} ]; then
-		kill `cat ${PF}`
-		rm -f ${PF}
-	else
-		echo "$0: snmpd not running or PID not recorded!" 1>&2
-	fi
-	;;
-restart)
-	sh $0 stop
-	sleep 5
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-
diff --git a/net/net-snmp-current/files/snmptrapd.sh b/net/net-snmp-current/files/snmptrapd.sh
deleted file mode 100644
index 1b3f6a9100a..00000000000
--- a/net/net-snmp-current/files/snmptrapd.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: snmptrapd.sh,v 1.1.1.1 2002/03/14 06:29:02 itojun Exp $
-
-# PID file:
-PF=/var/run/snmptrapd.pid
-
-
-case $1 in
-start)
-	if [ -x @PREFIX@/sbin/snmptrapd ]
-	then
-		echo 'Starting snmptrapd.'
-		@PREFIX@/sbin/snmptrapd -s -l 1 -u ${PF}
-	fi
-	;;
-stop)
-	if [ -f ${PF} ]; then
-		kill `cat ${PF}`
-		rm -f ${PF}
-	else
-		echo "$0: snmptrapd not running or PID not recorded!" 1>&2
-	fi
-	;;
-restart)
-	sh $0 stop
-	sleep 5
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
-esac
diff --git a/net/net-snmp-current/patches/patch-aa b/net/net-snmp-current/patches/patch-aa
deleted file mode 100644
index b1b608df32f..00000000000
--- a/net/net-snmp-current/patches/patch-aa
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- configure.in.orig	Sat Mar  9 09:55:09 2002
-+++ configure.in	Thu Mar 14 11:52:35 2002
-@@ -1425,7 +1425,7 @@
- AC_HEADER_STDC
- AC_HEADER_DIRENT
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h)
-+AC_CHECK_HEADERS(stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h)
- dnl FreeBSD required headers
- AC_CHECK_HEADERS(malloc.h sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_mib.h net/if_types.h net/if_var.h sys/queue.h osreldate.h sys/disklabel.h machine/types.h sys/socketvar.h)
- dnl Linux
-@@ -1433,7 +1433,7 @@
- dnl NetBSD required headers
- AC_CHECK_HEADERS(arpa/inet.h kvm.h sys/pool.h)
- dnl BSDi2 headers
--AC_CHECK_HEADERS(sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h)
-+AC_CHECK_HEADERS(sys/mount.h ufs/ufs/dinode.h)
- dnl BSDi3 headers
- AC_CHECK_HEADERS(sys/stat.h sys/vnode.h ufs/ufs/quota.h ufs/ufs/inode.h)
- dnl irix headers
-@@ -1682,11 +1682,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- ], sockaddr, sa_len, no)
- 
- AC_CHECK_STRUCT_FOR([
-@@ -1694,11 +1690,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- ], sockaddr, sa_union.sa_generic.sa_family2, no)
- 
- AC_CHECK_STRUCT_FOR([
-@@ -1706,11 +1698,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ], rtentry, rt_dst, no)
- 
-@@ -1724,11 +1712,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ],[
- 
-@@ -1748,11 +1732,7 @@
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- ],[
- struct rtentry rt; 
diff --git a/net/net-snmp-current/patches/patch-ab b/net/net-snmp-current/patches/patch-ab
deleted file mode 100644
index 38e6235bd70..00000000000
--- a/net/net-snmp-current/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- snmplib/Makefile.in-	Thu Mar 14 11:44:11 2002
-+++ snmplib/Makefile.in	Thu Mar 14 11:44:36 2002
-@@ -108,7 +108,7 @@
- 	snprintf.c strtol.c strtoul.c				\
- 	snmp_transport.c @transport_src_list@                   \
- 	snmp_secmod.c @security_src_list@ snmp_version.c	\
--	cmu_compat.c ucd_compat.c
-+	cmu_compat.c ucd_compat.c libwrap.c
- 
- OBJS=	snmp_client.o mib.o parse.o snmp_api.o snmp.o 		\
- 	snmp_auth.o asn1.o md5.o snmp_parse_args.o	  	\
-@@ -121,7 +121,7 @@
- 	snprintf.o strtol.o strtoul.o				\
- 	snmp_transport.o @transport_obj_list@                   \
- 	snmp_secmod.o @security_obj_list@ snmp_version.o	\
--	cmu_compat.o ucd_compat.o
-+	cmu_compat.o ucd_compat.o libwrap.o
- 
- LOBJS=	snmp_client.lo mib.lo parse.lo snmp_api.lo snmp.lo 	\
- 	snmp_auth.lo asn1.lo md5.lo snmp_parse_args.lo		\
-@@ -134,7 +134,7 @@
- 	snprintf.lo strtol.lo strtoul.lo			\
- 	snmp_transport.lo @transport_lobj_list@                 \
-         snmp_secmod.lo @security_lobj_list@ snmp_version.lo	\
--	cmu_compat.lo ucd_compat.lo
-+	cmu_compat.lo ucd_compat.lo libwrap.lo
- 
- # just in case someone wants to remove libtool, change this to OBJS.
- TOBJS=$(LOBJS)
diff --git a/net/net-snmp-current/patches/patch-ad b/net/net-snmp-current/patches/patch-ad
deleted file mode 100644
index f7e2be88542..00000000000
--- a/net/net-snmp-current/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- agent/mibgroup/host/hr_system.c-	Thu Mar 14 11:45:56 2002
-+++ agent/mibgroup/host/hr_system.c	Thu Mar 14 11:46:28 2002
-@@ -253,7 +253,7 @@
- #if HAVE_UTMPX_H
- #define setutent setutxent
- #define getutent getutxent
--#define entutent entutxent
-+#define endutent endutxent
-      struct utmpx *utmp_p;
- #else
-      struct utmp *utmp_p;
diff --git a/net/net-snmp-current/patches/patch-af b/net/net-snmp-current/patches/patch-af
deleted file mode 100644
index 800130e7509..00000000000
--- a/net/net-snmp-current/patches/patch-af
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- agent/mibgroup/mibII/interfaces.c-	Thu Mar 14 11:47:07 2002
-+++ agent/mibgroup/mibII/interfaces.c	Thu Mar 14 11:49:42 2002
-@@ -166,7 +166,7 @@
- #ifdef freebsd3
- #    define USE_SYSCTL_IFLIST
- #else
--# if defined(CTL_NET) && !defined(freebsd2)
-+# if defined(CTL_NET) && !defined(freebsd2) && !defined(netbsd1)
- #  ifdef PF_ROUTE
- #   ifdef NET_RT_IFLIST
- #    ifndef netbsd1
-@@ -1783,19 +1783,36 @@
- 	    cp = strchr(saveName, '\0');
- 	    string_append_int (cp, ifnet.if_unit);
- #endif
--	    if (1 || strcmp(saveName,"lo0") != 0) {  /* XXX */
-+	    if (1) {  /* XXX */
- 		/*
- 		 *  Try to find an address for this interface
- 		 */
- 
- 		auto_nlist(IFADDR_SYMBOL, (char *)&ia, sizeof(ia));
-+#ifdef netbsd1
-+		ia = (struct in_ifaddr *)ifnet.if_addrlist.tqh_first;
-+#endif
- 		while (ia) {
- 		    klookup((unsigned long)ia ,  (char *)&in_ifaddr, sizeof(in_ifaddr));
-+{
-+#ifdef netbsd1
-+#define CP(x)	((char *)(x))
-+		    char *cp; struct sockaddr *sa;
-+		    cp = (CP(in_ifaddr.ia_ifa.ifa_addr) - CP(ia)) +
-+                        CP(&in_ifaddr); sa = (struct sockaddr *)cp;
-+
-+if (sa->sa_family == AF_INET)
-+#endif
- 		    if (in_ifaddr.ia_ifp == ifnetaddr) {
-                         has_ipaddr = 1; /* this IF has IP-address */
-                         break;
-                     }
-+}
-+#ifdef netbsd1
-+		    ia = (struct in_ifaddr *)in_ifaddr.ia_ifa.ifa_list.tqe_next;
-+#else
- 		    ia = in_ifaddr.ia_next;
-+#endif
- 		}
- 
- #if !defined(netbsd1) && !defined(freebsd2) && !defined(openbsd2) && !defined(STRUCT_IFNET_HAS_IF_ADDRLIST)
diff --git a/net/net-snmp-current/patches/patch-ag b/net/net-snmp-current/patches/patch-ag
deleted file mode 100644
index 858f59f26f2..00000000000
--- a/net/net-snmp-current/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- agent/mibgroup/mibII/ipAddr.c.orig	Sat Feb  9 00:45:11 2002
-+++ agent/mibgroup/mibII/ipAddr.c	Thu Mar 14 12:07:44 2002
-@@ -279,6 +279,8 @@
- 	    long_return = lowin_ifaddr.BcastAddr;
- #elif defined(linux) || defined(sunV3)
- 	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifnet.ifu_broadaddr)->sin_addr.s_addr) & 1;
-+#elif defined(netbsd1)
-+	    long_return = ((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr & 1;
- #else
- 	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
- #endif
diff --git a/net/net-snmp-current/patches/patch-ai b/net/net-snmp-current/patches/patch-ai
deleted file mode 100644
index f1f079b89eb..00000000000
--- a/net/net-snmp-current/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/03/14 06:29:03 itojun Exp $
-
---- Makefile.rules-	Thu Mar 14 14:42:54 2002
-+++ Makefile.rules	Thu Mar 14 14:43:00 2002
-@@ -21,7 +21,7 @@
- 	        done \
- 	fi
- 
--install: installheaders installlibs installprogs $(OTHERINSTALL)
-+install: installheaders installlibs installprogs installsubdirs $(OTHERINSTALL)
- 
- installprogs: installbin installsbin
- 
diff --git a/net/net-snmp-current/patches/patch-aj b/net/net-snmp-current/patches/patch-aj
deleted file mode 100644
index dcb496176f1..00000000000
--- a/net/net-snmp-current/patches/patch-aj
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/10/02 22:06:39 wiz Exp $
-
---- configure.orig	Sat Mar  9 07:26:54 2002
-+++ configure
-@@ -9167,7 +9167,7 @@ EOF
- 
- fi
- 
--for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h sys/vm.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h
-+for ac_hdr in stdarg.h string.h fcntl.h limits.h sys/file.h sys/ioctl.h syslog.h unistd.h netinet/tcpip.h netinet/in.h netinet/ip.h netinet/ip_icmp.h net/if.h netdb.h sys/dmap.h machine/pte.h xti.h sys/sockio.h sys/socket.h sys/un.h fstab.h sys/fs.h mtab.h ufs/fs.h ufs/ffs/fs.h sys/fixpoint.h machine/param.h vm/vm.h sys/vmmeter.h sys/vmparam.h sys/vmmac.h sys/vmsystm.h sys/mbuf.h sys/time.h sys/swap.h inet/mib2.h sys/statvfs.h sys/vfs.h sys/mnttab.h sys/user.h sys/proc.h sys/select.h mntent.h sys/mntent.h kstat.h utsname.h sys/utsname.h sys/cdefs.h getopt.h locale.h pthread.h sys/loadavg.h regex.h linux/tasks.h pwd.h grp.h utmpx.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -9327,7 +9327,7 @@ else
- fi
- done
- 
--for ac_hdr in sys/mount.h vm/swap_pager.h ufs/ufs/dinode.h
-+for ac_hdr in sys/mount.h ufs/ufs/dinode.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -12446,11 +12446,7 @@ cat > conftest.$ac_ext <<EOF
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- 
- 
- int main() {
-@@ -12515,11 +12511,7 @@ cat > conftest.$ac_ext <<EOF
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- 
- 
- int main() {
-@@ -12584,11 +12576,7 @@ cat > conftest.$ac_ext <<EOF
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- 
-@@ -12640,11 +12628,7 @@ cat > conftest.$ac_ext <<EOF
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- int main() {
-@@ -12678,11 +12662,7 @@ cat > conftest.$ac_ext <<EOF
- #include <sys/param.h>
- #endif
- #include <sys/types.h>
--#define KERNEL
--#define _KERNEL
- #include <sys/socket.h>
--#undef KERNEL
--#undef _KERNEL
- #include <net/route.h>
- 
- int main() {