Update to 4.1.2:

*4.1.2*
 Fixes:
    - Host resources fixes for FreeBSD and NetBSD
    - ucd-snmp memory/vmstat fixes for FreeBSD-3
    - configure --enable-ipv6 fixes
    - AIX fix (use knlist)
    - fix init_master_agent calling exit
    - bad free in subagent.c
    - dont let a agentx subagent be a smux master
    - ucd-snmp/loadave fix for AIX
    - fix doing a set on a pass variable
    - snmptable fixes
    - snmpnetstat fixes for v2c exceptions
    - man page fixes

 Features:
    - Some UnixWare 5 configuration support
    - configure --enable-mini-agent --without-openssl
    - snmptrapd -n
    - snmp_log callbacks
    - noTokenWarnings and noRangeCheck in snmp.conf
    - using a counter type in snmpset/snmptrap

*4.1.1*
 Fixes:
    - Better agent handling of unauthorized requests.
    - Better "make test" support.
    - Misc bug fixes.

*4.1*
 New:
    - Many new command line flags have been added for input/output flexibility.
      (see the snmpcmd(1) manual page on the -O flag and -I flag)
    - The tools support regex matching of oids on the command line.
      (see the snmpcmd(1) manual page on the -Ib option)
    - A ucd-snmp usage tutorial has been placed on the main web page.
      (see http://ucd-snmp.ucdavis.edu/tutorial)
    - snmptable is much smarter and handles sparse tables better.
    - tkmib supports snmpv3.
    - New agent libraries to embed SNMP and AgentX agents into other programs.
      (see the snmp_agent_api(3) manual page and the tutorial)
    - SNMP over TCP is supported.
      (-T TCP on the command lines)
    - OpenSSL has replaced KMT for SHA authentication and DES encryption.
      (Get OpenSSL from http://www.openssl.org/).
    - Some easier-to-use access-control snmpd.conf directives for simple setups.
      (see the snmpd.conf(5) manual page)
    - Easier setup of SNMPv3 support for the agent.
      (see the README.snmpv3 file).
    - Command line argument parsing has been reworked for getopt() use.
      (currently backwards compatible; see the snmpcmd(1) manual page)
    - Table rows with embedded strings are dealt with for both input and output.
      (see the snmpcmd(1) manual on the -Ob flag)
    - Many more snmp.conf directives supported.
      (see the snmp.conf(5) manual page)
    - Many AgentX improvements.
    - All of our distributed mibs have been updated to be SMIv2 compliant.
    - Trap support in the agent has been cleaned up and an API created.

 Perl:
    - Joe Marzot's perl module is now included with the ucd-snmp source.
      (this should help people trying to synchronize the two packages)

 Fixes:
    - SMUX support has been reintegrated into the agent in a better way.
    - Many many others.

12 files changed, 224 insertions, 234 deletions

diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index f0eba55eff9..81bfaf9465b 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2000/08/14 23:48:24 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2000/10/13 17:55:35 kim Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
-DISTNAME=	ucd-snmp-4.0.1
+DISTNAME=	ucd-snmp-4.1.2
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
 		ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
 
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=	ucd-snmp-4.0.1-v6-20000124b.diff.gz
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
+#PATCHFILES=	ucd-snmp-4.0.1-v6-20000124b.diff.gz
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://ucd-snmp.ucdavis.edu/
@@ -22,6 +22,7 @@ BUILD_DEFS+=	USE_INET6
 .include "../../mk/bsd.prefs.mk"
 
 USE_LIBTOOL=	yes
+USE_SSL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-defaults --with-libwrap --with-logfile="/var/log/snmpd"
@@ -45,7 +46,7 @@ pre-configure:
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/etc/* ${PREFIX}/share/examples/ucd-snmp
+	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${PREFIX}/share/examples/ucd-snmp
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/snmp/dlmod
 
 .if (${OPSYS} == "NetBSD")
diff --git a/net/ucd-snmp/files/md5 b/net/ucd-snmp/files/md5
index 2b0ab219b9c..4b679cf1ef9 100644
--- a/net/ucd-snmp/files/md5
+++ b/net/ucd-snmp/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.9 2000/01/24 04:18:36 itojun Exp $
+$NetBSD: md5,v 1.10 2000/10/13 17:55:35 kim Exp $
 
-MD5 (ucd-snmp-4.0.1.tar.gz) = ba72a7b8c9efd226b72baf74d68d4511
-MD5 (ucd-snmp-4.0.1-v6-20000124b.diff.gz) = 3db3232aaa1946ea2c94e69015716643
+MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d
diff --git a/net/ucd-snmp/files/patch-sum b/net/ucd-snmp/files/patch-sum
index ffa432edb21..74f429470c4 100644
--- a/net/ucd-snmp/files/patch-sum
+++ b/net/ucd-snmp/files/patch-sum
@@ -1,10 +1,10 @@
 <<<<<<< patch-sum
 
-MD5 (patch-aa) = 18f90db165f673c2eb7ccefd485673c8
-MD5 (patch-ab) = 987a91e4342366ad14270597057310f5
-MD5 (patch-ac) = 189c05afa2b17c43454bf556bca6719b
-MD5 (patch-ad) = aa019550f1295b3fe9104932af25ce73
-MD5 (patch-ae) = 2e8ca1b22c15f96c8059d7b326abcbf2
-MD5 (patch-af) = c674692801da6be008e0c4b62893ed05
-MD5 (patch-ag) = aeb3b84bbca7d08b102ceca41ea49aa9
-MD5 (patch-ah) = e54afdfa48f64e1b9d40e20839db5010
+MD5 (patch-aa) = 0cd7c132f9c7290f6d073afcadc17c97
+MD5 (patch-ab) = 5c645e6913eabfdb0e87e48df9f6c9a8
+MD5 (patch-ac) = 3ff9d693d5560fa4442c8f59599af2a0
+MD5 (patch-ad) = e25de5b48c6a1ca959cf6ff5b8fe1e1b
+MD5 (patch-ae) = 47c0b27d1bbd9a210e416dbeddb65c11
+MD5 (patch-af) = d362de0f428d0891d01b3bb34750f38e
+MD5 (patch-ag) = 223f958d3a37d02d997eaa2fd0980160
+MD5 (patch-ah) = bab0731852a04964e9d60ffb7c0f704d
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa
index 0098e6f0203..c0772eb5746 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-aa
@@ -1,28 +1,24 @@
-$NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
---- configure.in.orig	Fri Jan 21 07:52:17 2000
-+++ configure.in	Fri Jan 21 08:04:52 2000
-@@ -407,7 +407,8 @@
-     else
-       SHLIB_CFLAGS="-Kpic"
+$NetBSD: patch-aa,v 1.11 2000/10/13 17:55:36 kim Exp $
+
+--- configure.in.orig	Sat May  6 01:46:26 2000
++++ configure.in	Wed Oct 11 19:15:06 2000
+@@ -461,3 +461,4 @@
      fi
 -    SHLIB_EXTENSION="so"
 +#   SHLIB_EXTENSION="so"
 +    SHLIB_EXTENSION="la"
- 	SHLIB_VERSION=
-     SHLIB_LD_CMD="ld -r -o"
-     SHLIB_LDCONFIG_CMD=
-@@ -712,7 +713,7 @@
- done
- module_list_o=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.o /g'`
- module_list_c=`echo "$module_list_code " | sed 's/\([^ ]\) /\1.c /g'`
--mibgroup_list_o=`echo " $module_list_o " | sed 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g'`
-+mibgroup_list_o=`echo " $module_list_o " | sed -e 's@ \([^ ]*\)\.o@ mibgroup/\1.o @g' -e 's@ mibgroup/[^ ]*/\([^ /]*\).o@ mibgroup/\1.o@g'`
- changequote([, ])
- AC_SUBST(module_list_c)
- AC_SUBST(module_list_h)
-@@ -1034,11 +1035,7 @@
- 
- AC_CHECK_STRUCT_FOR([
+     SHLIB_VERSION=
+@@ -1069,3 +1070,3 @@
+ 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 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)
++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 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 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)
+ dnl FreeBSD required headers
+@@ -1077,3 +1078,3 @@
+ 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
+@@ -1276,7 +1277,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -30,11 +26,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ], rtentry, rt_dst, no)
- 
-@@ -1049,11 +1046,7 @@
- dnl 4.4 compat
- AC_TRY_COMPILE([
+@@ -1291,7 +1288,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -42,11 +34,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ],[
- 
-@@ -1070,11 +1063,7 @@
- if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
- AC_TRY_COMPILE([
+@@ -1312,7 +1305,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -54,11 +42,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ],[
- struct rtentry rt; 
-@@ -1124,11 +1113,7 @@
- [
- AC_TRY_COMPILE([
+@@ -1366,7 +1355,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -66,11 +50,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ],[
- struct rtentry rt; 
-@@ -1145,41 +1130,25 @@
- dnl Check struct rtentry for various things.
- AC_CHECK_STRUCT_FOR([
+@@ -1387,7 +1372,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -78,9 +58,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ], rtentry, rt_unit)
- 
- AC_CHECK_STRUCT_FOR([
+@@ -1397,7 +1378,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -88,9 +66,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ], rtentry, rt_refcnt)
- 
- AC_CHECK_STRUCT_FOR([
+@@ -1407,7 +1384,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -98,9 +74,7 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ], rtentry, rt_hash)
- 
- AC_CHECK_STRUCT_FOR([
+@@ -1417,7 +1390,3 @@
  #include <sys/types.h>
 -#define KERNEL
 -#define _KERNEL
@@ -108,5 +82,3 @@ $NetBSD: patch-aa,v 1.10 2000/01/24 04:18:37 itojun Exp $
 -#undef KERNEL
 -#undef _KERNEL
  #include <net/route.h>
- ], rtentry, rt_use)
- 
diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-ab
index 906d5880f12..008d7db5b47 100644
--- a/net/ucd-snmp/patches/patch-ab
+++ b/net/ucd-snmp/patches/patch-ab
@@ -1,29 +1,25 @@
-$NetBSD: patch-ab,v 1.4 2000/01/23 10:41:10 itojun Exp $
---- snmplib/Makefile.in-	Fri Jan 21 05:38:31 2000
-+++ snmplib/Makefile.in	Fri Jan 21 05:39:59 2000
-@@ -42,30 +42,34 @@
- 	system.c vacm.c int64.c read_config.c 			\
- 	snmp_debug.c tools.c  snmp_logging.c			\
+$NetBSD: patch-ab,v 1.5 2000/10/13 17:55:36 kim Exp $
+
+--- snmplib/Makefile.in.orig	Sat Feb  5 06:15:42 2000
++++ snmplib/Makefile.in	Wed Oct 11 19:02:56 2000
+@@ -36,3 +36,4 @@
  	snmpv3.c snmpusm.c lcd_time.c keytools.c		\
--	scapi.c callback.c default_store.c snmp_alarm.c	
-+	scapi.c callback.c default_store.c snmp_alarm.c	\
+-	scapi.c callback.c default_store.c snmp_alarm.c	mt_support.c
++	scapi.c callback.c default_store.c snmp_alarm.c	mt_support.c \
 +	libwrap.c
  
- OBJS=	snmp_client.o mib.o parse.o snmp_api.o snmp.o 		\
- 	snmp_auth.o asn1.o md5.o 				\
- 	system.o vacm.o int64.o read_config.o 			\
- 	snmp_debug.o tools.o  snmp_logging.o			\
+@@ -43,3 +44,4 @@
  	snmpv3.o snmpusm.o lcd_time.o keytools.o		\
--	scapi.o callback.o default_store.o snmp_alarm.o	
-+	scapi.o callback.o default_store.o snmp_alarm.o	\
-+	libwrap.c
+-	scapi.o callback.o default_store.o snmp_alarm.o	mt_support.o
++	scapi.o callback.o default_store.o snmp_alarm.o	mt_support.o \
++	libwrap.o
  
- CFLAGS	 = @CFLAGS@ @SHLIB_CFLAGS@
+@@ -47,3 +49,3 @@
  CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@
 -CC	 = @CC@ $(CPPFLAGS)
 +CC	 = $(LIBTOOL) @CC@ $(CPPFLAGS)
  
- all: $(TARG)
+@@ -51,5 +53,7 @@
  
 -libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${OBJS}
 -	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
@@ -34,12 +30,8 @@ $NetBSD: patch-ab,v 1.4 2000/01/23 10:41:10 itojun Exp $
 +#	$(SHLIB_LD_CMD) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${OBJS}
 +#	$(RANLIB) libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
  
- installdirs:
- 	@$(SHELL) $(srcdir)/../mkinstalldirs $(libdir) $(includedir)
- 
+@@ -59,3 +63,3 @@
  install:	$(TARG) installdirs
 -	@for i in $(TARG) ; do $(INSTALL) $$i $(libdir) ; $(RANLIB) $(libdir)/$$i ; echo "install:  installed $$i in $(libdir)" ; done
 +	@for i in $(TARG) ; do $(LIBTOOL) $(INSTALL) $$i $(libdir) ; $(RANLIB) $(libdir)/$$i ; echo "install:  installed $$i in $(libdir)" ; done
  	@for i in $(INSTALLHEADERS) ; do $(INSTALL) $(srcdir)/$$i $(includedir) ; echo "install:  installed $$i in $(includedir)" ; done
- 	$(SHLIB_LDCONFIG_CMD)
- 
diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac
index 9a7270bb333..66ff079c715 100644
--- a/net/ucd-snmp/patches/patch-ac
+++ b/net/ucd-snmp/patches/patch-ac
@@ -1,56 +1,68 @@
-$NetBSD: patch-ac,v 1.3 2000/01/23 10:42:15 itojun Exp $
---- agent/Makefile.in.orig	Fri Aug 13 07:16:28 1999
-+++ agent/Makefile.in	Fri Jan 21 08:53:53 2000
-@@ -3,9 +3,11 @@
- #
- 
+$NetBSD: patch-ac,v 1.4 2000/10/13 17:55:36 kim Exp $
+
+--- agent/Makefile.in.orig	Fri Feb  4 16:15:08 2000
++++ agent/Makefile.in	Fri Oct 13 12:55:01 2000
+@@ -5,15 +5,17 @@
  TARG		= snmpd
+ LIBTARG		= libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
+ 	libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 -USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
--LOCAL_LIBS	= -L../snmplib
+-LOCAL_LIBS	= -L../snmplib -L.
 -LIBS		= $(CC_RUNTIME_ARG) -lsnmp @WRAPLIBS@ @LIBS@
+-AGENT_LIBS	= $(CC_RUNTIME_ARG) -lucdagent -lucdmibs -lsnmp @WRAPLIBS@ @LIBS@
 +#USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
-+USELIBS= ../snmplib/libsnmp.la
-+#LOCAL_LIBS	= -L../snmplib
++USELIBS= libucdagent.la libucdmibs.la ../snmplib/libsnmp.la
++#LOCAL_LIBS	= -L../snmplib -L.
 +#LIBS		= $(CC_RUNTIME_ARG) -lsnmp @WRAPLIBS@ @LIBS@
 +LIBS=	 ${USELIBS} @WRAPLIBS@ @LIBS@
- 
- CPPFLAGS	= -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib		\
++AGENT_LIBS	= $(CC_RUNTIME_ARG) $(LIBS)
+ CPPFLAGS	= -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib \
  		  -I$(srcdir) -I. -I$(srcdir)/mibgroup -Imibgroup @CPPFLAGS@
-@@ -24,23 +26,23 @@
- #	cd dlmods; $(MAKE); cd ..
- 
- getkstat: getkstat.o
--	$(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
-+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
- 
- getkstat.o: mibgroup/kernel_sunos5.c
--	$(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
-+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
- 
- getmibstat: getmibstat.o
--	$(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
-+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ $? $(LOCAL_LIBS) $(LIBS)
- 
- getmibstat.o: mibgroup/kernel_sunos5.c
--	$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
-+	$(LIBTOOL) $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
  
+-CC		= @CC@ $(CPPFLAGS) $(SHLIB_CFLAGS)
+-SPCC		= @CC@ $(CPPFLAGS)
++CC		= $(LIBTOOL) @CC@ $(CPPFLAGS) $(SHLIB_CFLAGS)
++SPCC		= $(LIBTOOL) @CC@ $(CPPFLAGS)
  
- AGENTOBJS=snmpd.o kernel.o snmp_agent.o snmp_vars.o agent_read_config.o agent_registry.o auto_nlist.o
+ MIBOBJS		= @mibgroup_list_o@ mib_modules.o
  
+@@ -49,13 +51,19 @@
+ 	${SPCC} $(CFLAGS) -o $@ ${AGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${AGENT_LIBS}  
  
- snmpd:	${MIBOBJS} ${AGENTOBJS} $(USELIBS)
--	${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}  
-+	$(LIBTOOL) ${CC} -o $@ ${AGENTOBJS} ${MIBOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}  
  
+-libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+-	$(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS}  $(SHLIB_LD_LIBS)
+-	$(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+-
+-libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${MIBOBJS}
+-	$(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS}  $(SHLIB_LD_LIBS)
+-	$(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
++libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${LIBAGENTOBJS}
++	$(CC) -o $@ $(LIBAGENTOBJS:.o=.lo) -version-info 0:0 -rpath $(PREFIX)/lib
++
++#libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
++#	$(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS}  $(SHLIB_LD_LIBS)
++#	$(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
++
++libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION): ${MIBOBJS}
++	$(CC) -o $@ $(MIBOBJS:.o=.lo) -version-info 0:0 -rpath $(PREFIX)/lib
++
++#libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${MIBOBJS}
++#	$(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS}  $(SHLIB_LD_LIBS)
++#	$(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
  
  clean:
-@@ -50,7 +52,7 @@
+ 	rm -f *.o ${TARG} ${LIBTARG}
+@@ -64,9 +72,9 @@
  
  
  install:  installdirs
 -	@$(INSTALL) $(TARG) $(sbindir) ; echo "install:  installed $(TARG) in $(sbindir) "
+-	@for i in $(INSTALLHEADERS) ; do $(INSTALL) $(srcdir)/$$i $(includedir) ; echo "install:  installed $$i in $(includedir)" ; done
+-	@for i in $(LIBTARG) ; do $(INSTALL) $$i $(libdir) ; $(RANLIB) $(libdir)/$$i ; echo "install:  installed $$i in $(libdir)" ; done
 +	@$(LIBTOOL) $(INSTALL) $(TARG) $(sbindir) ; echo "install:  installed $(TARG) in $(sbindir) "
++	@for i in $(INSTALLHEADERS) ; do $(LIBTOOL) $(INSTALL) $(srcdir)/$$i $(includedir) ; echo "install:  installed $$i in $(includedir)" ; done
++	@for i in $(LIBTARG) ; do $(LIBTOOL) $(INSTALL) $$i $(libdir) ; $(RANLIB) $(libdir)/$$i ; echo "install:  installed $$i in $(libdir)" ; done
+ 	$(SHLIB_LDCONFIG_CMD)
  #	cd dlmods ; $(MAKE) install; cd ..
  
- installdirs:
diff --git a/net/ucd-snmp/patches/patch-ad b/net/ucd-snmp/patches/patch-ad
index f2e8b9e39b1..5b6e8e0cbca 100644
--- a/net/ucd-snmp/patches/patch-ad
+++ b/net/ucd-snmp/patches/patch-ad
@@ -1,9 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2000/01/23 10:41:10 itojun Exp $
---- apps/Makefile.in.orig	Fri Aug 13 07:16:43 1999
-+++ apps/Makefile.in	Fri Jan 21 07:49:48 2000
-@@ -12,9 +12,11 @@
- SBINTARG	= snmptrapd
- SUBDIRS		= snmpnetstat
+$NetBSD: patch-ad,v 1.4 2000/10/13 17:55:36 kim Exp $
+
+--- apps/Makefile.in.orig	Tue Apr 18 06:46:55 2000
++++ apps/Makefile.in	Wed Oct 11 19:04:29 2000
+@@ -14,5 +14,7 @@
  
 -USELIBS		= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
 -LOCAL_LIBS	= -L../snmplib 
@@ -14,77 +13,74 @@ $NetBSD: patch-ad,v 1.3 2000/01/23 10:41:10 itojun Exp $
 +#LIBS		= $(CC_RUNTIME_ARG) -lsnmp @LIBS@
 +LIBS=	 ${USELIBS} @LIBS@
  
- PARSEOBJS	= snmp_parse_args.o
- 
-@@ -31,46 +33,46 @@
- 	done
- 
+@@ -33,33 +35,33 @@
  snmpwalk:    snmpwalk.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpbulkwalk:    snmpbulkwalk.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpbulkwalk.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
+ 
+ snmpbulkget:    snmpbulkget.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ snmpbulkget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpbulkget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptranslate:    snmptranslate.o $(USELIBS)
 -	${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmptranslate.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpstatus:    snmpstatus.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpstatus.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpget:    snmpget.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpget.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpdelta:    snmpdelta.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpdelta.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptable:    snmptable.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmptable.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptest:    snmptest.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmptest.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptrapd:    snmptrapd.o snmptrapd_handlers.o $(USELIBS)
 -	${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmptrapd.o snmptrapd_handlers.o $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmptrap:    snmptrap.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
- 
++	$(LIBTOOL) ${CC} -o $@ snmptrap.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
+ 	rm -f snmpinform
+@@ -68,12 +70,12 @@
  snmpset:    snmpset.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpset.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpusm:    snmpusm.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpusm.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  snmpgetnext:    snmpgetnext.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++	$(LIBTOOL) ${CC} -o $@ snmpgetnext.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
  encode_keychange:    encode_keychange.o $(PARSEOBJS) $(USELIBS)
 -	${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
-+	${LIBTOOL} ${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
- 
++	$(LIBTOOL) ${CC} -o $@ encode_keychange.o $(PARSEOBJS) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
  
- clean:
-@@ -84,8 +86,8 @@
- 	for i in $(SUBDIRS) ; do \
-         ( cd $$i ; $(MAKE) install ) ; \
+@@ -91,6 +93,6 @@
  	done
 -	@for i in $(TARG) ; do $(INSTALL) $$i $(bindir) ; echo "install:  installed $$i in $(bindir)" ; done
++	@for i in $(TARG) ; do $(LIBTOOL) $(INSTALL) $$i $(bindir) ; echo "install:  installed $$i in $(bindir)" ; done
+ 	rm -f $(bindir)/snmpinform
+ 	(cd $(bindir) && $(LN_S) snmptrap snmpinform)
 -	@for i in $(SBINTARG) ; do $(INSTALL) $$i $(sbindir) ; echo "install:  installed $$i in $(sbindir)" ; done
-+	@for i in $(TARG) ; do ${LIBTOOL} $(INSTALL) $$i $(bindir) ; echo "install:  installed $$i in $(bindir)" ; done
-+	@for i in $(SBINTARG) ; do ${LIBTOOL} $(INSTALL) $$i $(sbindir) ; echo "install:  installed $$i in $(sbindir)" ; done
++	@for i in $(SBINTARG) ; do $(LIBTOOL) $(INSTALL) $$i $(sbindir) ; echo "install:  installed $$i in $(sbindir)" ; done
  
- installdirs:
- 	@$(SHELL) $(srcdir)/../mkinstalldirs $(snmplibdir) $(bindir)
diff --git a/net/ucd-snmp/patches/patch-ae b/net/ucd-snmp/patches/patch-ae
index 62d217ced56..26c1996a809 100644
--- a/net/ucd-snmp/patches/patch-ae
+++ b/net/ucd-snmp/patches/patch-ae
@@ -1,31 +1,14 @@
-$NetBSD: patch-ae,v 1.2 2000/01/23 10:41:10 itojun Exp $
---- apps/snmpnetstat/Makefile.in.orig	Fri Jan 21 05:33:13 2000
-+++ apps/snmpnetstat/Makefile.in	Fri Jan 21 05:46:14 2000
-@@ -23,13 +23,15 @@
- CPPFLAGS=-I../.. -I$(srcdir)/../.. -I$(srcdir)/../../snmplib @CPPFLAGS@
- CC = @CC@ $(CPPFLAGS)
- 
--USELIBS=../../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
--LIBS=	 -L../../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
-+#USELIBS=../../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
-+#LIBS=	 -L../../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
-+USELIBS=../../snmplib/libsnmp.la
-+LIBS=	 ${USELIBS} @LIBS@
- 
- all: $(TARG)
- 
+$NetBSD: patch-ae,v 1.3 2000/10/13 17:55:36 kim Exp $
+
+--- apps/snmpnetstat/Makefile.in.orig	Sat Feb  5 06:15:32 2000
++++ apps/snmpnetstat/Makefile.in	Wed Oct 11 19:07:34 2000
+@@ -31,3 +31,3 @@
  snmpnetstat: ${OBJS} ${USELIBS}
--	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}
-+	${LIBTOOL} ${CC} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}
- 
- distclean: clean
- 
-@@ -49,7 +51,7 @@
- 	@$(SHELL) $(srcdir)/../../mkinstalldirs $(snmplibdir) $(bindir)
+-	${CC} -o $@ ${OBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS}
++	$(LIBTOOL) ${CC} -o $@ ${OBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS}
  
+@@ -51,3 +51,3 @@
  install: installdirs $(TARG)
 -	@for i in $(TARG) ; do $(INSTALL) $$i $(bindir) ; echo "install:  installed $$i in $(bindir)" ; done
 +	@for i in $(TARG) ; do ${LIBTOOL} $(INSTALL) $$i $(bindir) ; echo "install:  installed $$i in $(bindir)" ; done
  
- depend: 
- 	makedepend $(CPPFLAGS) $(srcdir)/*.c
diff --git a/net/ucd-snmp/patches/patch-af b/net/ucd-snmp/patches/patch-af
index fe3723a6d2c..42fde12eb16 100644
--- a/net/ucd-snmp/patches/patch-af
+++ b/net/ucd-snmp/patches/patch-af
@@ -1,25 +1,18 @@
-$NetBSD: patch-af,v 1.2 2000/01/23 10:41:10 itojun Exp $
---- agent/mibgroup/mibII/interfaces.c.orig	Fri Jan 21 05:33:12 2000
-+++ agent/mibgroup/mibII/interfaces.c	Fri Jan 21 05:46:58 2000
-@@ -121,7 +121,7 @@
- #if defined(freebsd3)
- #    define USE_SYSCTL_IFLIST
+$NetBSD: patch-af,v 1.3 2000/10/13 17:55:36 kim Exp $
+
+--- agent/mibgroup/mibII/interfaces.c.orig	Tue Mar 14 06:26:21 2000
++++ agent/mibgroup/mibII/interfaces.c	Wed Oct 11 19:03:17 2000
+@@ -134,3 +134,3 @@
  #else
 -# if defined(CTL_NET) && !defined(freebsd2)
 +# if defined(CTL_NET) && !defined(freebsd2) && !defined(netbsd1)
  #  ifdef PF_ROUTE
- #   ifdef NET_RT_IFLIST
- #    define USE_SYSCTL_IFLIST
-@@ -1549,16 +1549,31 @@
- 	    cp = strchr(saveName, '\0');
- 	    string_append_int (cp, ifnet.if_unit);
+@@ -1562,3 +1562,3 @@
  #endif
 -	    if (1 || strcmp(saveName,"lo0") != 0) {  /* XXX */
 +	    if (1) {  /* XXX */
  		/*
- 		 *  Try to find an address for this interface
- 		 */
- 
+@@ -1568,6 +1568,21 @@
  		auto_nlist(IFADDR_SYMBOL, (char *)&ia, sizeof(ia));
 +#ifdef netbsd1
 +           ia=(struct in_ifaddr *)ifnet.if_addrlist.tqh_first; 
@@ -41,5 +34,3 @@ $NetBSD: patch-af,v 1.2 2000/01/23 10:41:10 itojun Exp $
  		    ia = in_ifaddr.ia_next;
 +#endif
  		}
- 
- #if !defined(netbsd1) && !defined(freebsd2) && !defined(openbsd2) && !defined(STRUCT_IFNET_HAS_IF_ADDRLIST)
diff --git a/net/ucd-snmp/patches/patch-ag b/net/ucd-snmp/patches/patch-ag
index 192c800f4cf..295c322e25b 100644
--- a/net/ucd-snmp/patches/patch-ag
+++ b/net/ucd-snmp/patches/patch-ag
@@ -1,9 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2000/01/23 10:41:10 itojun Exp $
---- agent/mibgroup/mibII/ip.c.orig	Tue Aug 24 14:17:30 1999
-+++ agent/mibgroup/mibII/ip.c	Fri Jan 21 05:48:22 2000
-@@ -761,7 +761,11 @@
- #ifdef linux
-             return (u_char *)&((struct sockaddr_in *)&lowin_ifnet.ia_subnetmask)->sin_addr.s_addr;
+$NetBSD: patch-ag,v 1.3 2000/10/13 17:55:36 kim Exp $
+
+--- agent/mibgroup/mibII/ip.c.orig	Fri Feb  4 02:56:31 2000
++++ agent/mibgroup/mibII/ip.c	Wed Oct 11 19:03:22 2000
+@@ -767,3 +767,7 @@
  #else
 +#ifdef netbsd1
 +	    long_return = lowin_ifaddr.ia_subnetmask;
@@ -11,11 +10,7 @@ $NetBSD: patch-ag,v 1.2 2000/01/23 10:41:10 itojun Exp $
  	    long_return = ntohl(lowin_ifaddr.ia_subnetmask);
 +#endif
  	    return(u_char *) &long_return;
- #endif
- #endif
-@@ -770,7 +774,11 @@
- #if defined(linux) || defined(sunV3)
- 	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifnet.ifu_broadaddr)->sin_addr.s_addr) & 1;
+@@ -776,3 +780,7 @@
  #else
 +#ifdef netbsd1
 +	    long_return = (((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
@@ -23,5 +18,3 @@ $NetBSD: patch-ag,v 1.2 2000/01/23 10:41:10 itojun Exp $
  	    long_return = ntohl(((struct sockaddr_in *) &lowin_ifaddr.ia_broadaddr)->sin_addr.s_addr) & 1;
 +#endif
  #endif
- 	    return(u_char *) &long_return;	   
- 	case IPADREASMMAX:
diff --git a/net/ucd-snmp/patches/patch-ah b/net/ucd-snmp/patches/patch-ah
index 1d974445fb1..04fe493fd2f 100644
--- a/net/ucd-snmp/patches/patch-ah
+++ b/net/ucd-snmp/patches/patch-ah
@@ -1,12 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2000/01/23 10:41:10 itojun Exp $
---- agent/mibgroup/Makefile.in-	Fri Jan 21 05:58:34 2000
-+++ agent/mibgroup/Makefile.in	Fri Jan 21 05:58:15 2000
+$NetBSD: patch-ah,v 1.2 2000/10/13 17:55:36 kim Exp $
+
+--- agent/mibgroup/Makefile.in.orig	Fri Feb  4 16:15:15 2000
++++ agent/mibgroup/Makefile.in	Fri Oct 13 13:15:57 2000
 @@ -7,7 +7,7 @@
  # object files in the sub directory.
  
  .c.o:
 -	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+	$(LIBTOOL) $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
++	$(LIBTOOL) $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
  
  OBJS = @module_list_o@
  SRCS = @module_list_c@
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
index 732458bcdb9..7dbaeb1ff89 100644
--- a/net/ucd-snmp/pkg/PLIST
+++ b/net/ucd-snmp/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2000/08/14 23:48:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/10/13 17:55:36 kim Exp $
 bin/encode_keychange
+bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
 bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
+bin/snmpinform
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
@@ -15,31 +17,59 @@ bin/snmptrap
 bin/snmpusm
 bin/snmpwalk
 bin/tkmib
+include/ucd-snmp/agent_read_config.h
+include/ucd-snmp/agent_registry.h
+include/ucd-snmp/agent_trap.h
 include/ucd-snmp/asn1.h
+include/ucd-snmp/auto_nlist.h
 include/ucd-snmp/callback.h
 include/ucd-snmp/default_store.h
+include/ucd-snmp/ds_agent.h
+include/ucd-snmp/header_complex.h
 include/ucd-snmp/int64.h
+include/ucd-snmp/keytools.h
 include/ucd-snmp/mib.h
+include/ucd-snmp/mibincl.h
 include/ucd-snmp/parse.h
+include/ucd-snmp/read_config.h
+include/ucd-snmp/scapi.h
 include/ucd-snmp/snmp.h
-include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_agent.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_impl.h
+include/ucd-snmp/snmp_logging.h
+include/ucd-snmp/snmp_vars.h
+include/ucd-snmp/snmpv3.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/ucd-snmp-agent-includes.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
+include/ucd-snmp/util_funcs.h
+include/ucd-snmp/var_struct.h
 include/ucd-snmp/version.h
 lib/libsnmp.a
 lib/libsnmp.la
 lib/libsnmp.so.0.0
+lib/libucdagent.a
+lib/libucdagent.la
+lib/libucdagent.so.0.0
+lib/libucdmibs.a
+lib/libucdmibs.la
+lib/libucdmibs.so.0.0
+man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
 man/man1/snmpcmd.1
 man/man1/snmpd.1
 man/man1/snmpdelta.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
@@ -49,10 +79,31 @@ man/man1/snmptranslate.1
 man/man1/snmptrap.1
 man/man1/snmpusm.1
 man/man1/snmpwalk.1
+man/man3/default_store.3
 man/man3/mib_api.3
 man/man3/read_config.3
+man/man3/snmp_agent_api.3
+man/man3/snmp_alarm.3
 man/man3/snmp_api.3
+man/man3/snmp_close.3
+man/man3/snmp_free_pdu.3
+man/man3/snmp_open.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_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_timeout.3
+man/man3/snmp_trap_api.3
 man/man5/snmp.conf.5
 man/man5/snmp_config.5
 man/man5/snmpd.conf.5
@@ -61,18 +112,14 @@ man/man5/variables.5
 man/man8/snmptrapd.8
 sbin/snmpd
 sbin/snmptrapd
-share/examples/ucd-snmp/README
-share/examples/ucd-snmp/acl.conf
-share/examples/ucd-snmp/context.conf
-share/examples/ucd-snmp/party.conf
-share/examples/ucd-snmp/view.conf
-share/snmp/mibs/DLMOD-MIB.txt
+share/examples/ucd-snmp/EXAMPLE.conf
+share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
 share/snmp/mibs/EtherLike-MIB.txt
 share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-TYPES.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/IPV6-ICMP-MIB.txt
 share/snmp/mibs/IPV6-MIB.txt
 share/snmp/mibs/IPV6-TC.txt
@@ -80,7 +127,8 @@ share/snmp/mibs/IPV6-TCP-MIB.txt
 share/snmp/mibs/IPV6-UDP-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
+share/snmp/mibs/RMON-MIB.txt
+share/snmp/mibs/SNMP-COMMUNITY-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
@@ -89,20 +137,22 @@ share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
 share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
 share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
 share/snmp/mibs/SNMPv2-SMI.txt
 share/snmp/mibs/SNMPv2-TC.txt
 share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
+share/snmp/mibs/UCD-DEMO-MIB.txt
+share/snmp/mibs/UCD-DISKIO-MIB.txt
+share/snmp/mibs/UCD-DLMOD-MIB.txt
+share/snmp/mibs/UCD-IPFWACC-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
 share/snmp/mibs/UDP-MIB.txt
 @unexec /bin/rm -f %D/share/snmp/mibs/.index
-@exec mkdir -p %D/lib/snmp/dlmod
-@dirrm lib/snmp/dlmod
-@dirrm lib/snmp
 @dirrm share/snmp/mibs
 @dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@exec /bin/mkdir -p %D/lib/snmp/dlmod
+@dirrm lib/snmp/dlmod
+@dirrm lib/snmp
 @dirrm include/ucd-snmp