diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
deleted file mode 100644
index 396602033a5..00000000000
--- a/net/ucd-snmp/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $OpenBSD: Makefile,v 1.38 2003/04/22 15:15:57 danh Exp $
-
-COMMENT=	"extendible SNMP implementation"
-
-VERSION=	4.2.6
-DISTNAME=	ucd-snmp-${VERSION}
-CATEGORIES=     net
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
-
-HOMEPAGE=	http://net-snmp.sourceforge.net/
-
-MAINTAINER=	Dan Harnett <danh@openbsd.org>
-
-PERMIT_PACKAGE_CDROM=	Yes 
-PERMIT_PACKAGE_FTP=	Yes 
-PERMIT_DISTFILES_CDROM=	Yes 
-PERMIT_DISTFILES_FTP=	Yes 
-
-CONFIGURE_STYLE= gnu dest
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --with-defaults --with-logfile='/var/log/snmpd' \
-		 --with-persistent-directory='/var/ucd-snmp' \
-		 --with-libwrap='/usr' --with-openssl --with-zlib \
-		 --with-sys-contact='default@' \
-		 --with-sys-location='Default Location'
-CONFIGURE_ENV=	VERSION_INFO='42:6:0'
-NO_REGRESS=	Yes
-
-SNMP_BIN=	encode_keychange snmpbulkget snmpbulkwalk snmpdelta \
-		snmpdf snmpget snmpgetnext snmpnetstat snmpset snmpstatus \
-		snmptable snmptest snmptranslate snmptrap snmpusm snmpvacm \
-		snmpwalk 
-SNMP_SBIN=	snmpd snmptrapd
-
-post-extract:
-	@cp ${FILESDIR}/openbsd3.h ${WRKSRC}/s/openbsd3.h
-
-post-install:
-	@cd ${PREFIX}/bin && strip ${SNMP_BIN}
-	@cd ${PREFIX}/sbin && strip ${SNMP_SBIN}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/README.snmpv3 ${PREFIX}/share/doc/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/AGENT.txt ${PREFIX}/share/doc/ucd-snmp
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf \
-		${PREFIX}/share/examples/ucd-snmp
-
-.include <bsd.port.mk>
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo
deleted file mode 100644
index cd929b87bab..00000000000
--- a/net/ucd-snmp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1
-RMD160 (ucd-snmp-4.2.6.tar.gz) = 96b31aa57b94c41497d3ada2b83640edce5b2c7e
-SHA1 (ucd-snmp-4.2.6.tar.gz) = aa189ddd76091bf2d1327f4c5ce51acf4e595ad9
diff --git a/net/ucd-snmp/files/openbsd3.h b/net/ucd-snmp/files/openbsd3.h
deleted file mode 100644
index a17a640949e..00000000000
--- a/net/ucd-snmp/files/openbsd3.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "netbsd.h"
-
-#define netbsd1 1 	/* we're really close to this */
-
-#undef TOTAL_MEMORY_SYMBOL
diff --git a/net/ucd-snmp/patches/patch-Makefile_in b/net/ucd-snmp/patches/patch-Makefile_in
deleted file mode 100644
index 5f78d9912ee..00000000000
--- a/net/ucd-snmp/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2001/01/05 09:19:46 danh Exp $
---- Makefile.in.orig	Sun Nov 19 15:58:05 2000
-+++ Makefile.in	Fri Jan  5 02:22:03 2001
-@@ -61,7 +61,6 @@ install:    all installdirs
- 
- installdirs:
- 	@$(SHELL) $(srcdir)/mkinstalldirs $(snmplibdir) $(mibdir) $(includedir)
--	@-$(SHELL) $(srcdir)/mkinstalldirs $(persistentdir)
- 
- apps/snmpget$(EXEEXT) apps/snmpgetnext$(EXEEXT) apps/snmpset$(EXEEXT) apps/snmptranslate$(EXEEXT) apps/snmpwalk$(EXEEXT) apps/snmpbulkwalk$(EXEEXT) apps/snmptest$(EXEEXT) apps/snmptrapd$(EXEEXT) apps/snmpnetstat/snmpnetstat$(EXEEXT) agent/snmpd$(EXEEXT): makeall
- 
diff --git a/net/ucd-snmp/patches/patch-Makefile_top b/net/ucd-snmp/patches/patch-Makefile_top
deleted file mode 100644
index 9ed80f9fc31..00000000000
--- a/net/ucd-snmp/patches/patch-Makefile_top
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.top.orig	Fri Feb 15 20:00:19 2002
-+++ Makefile.top	Tue Apr 22 10:29:09 2003
-@@ -6,6 +6,7 @@ srcdir		= @srcdir@
- top_srcdir	= @top_srcdir@
- VPATH		= @srcdir@
- VERSION		= @VERSION@
-+VERSION_INFO  	= @VERSION_INFO@
- @SET_MAKE@
- 
- #
-@@ -52,10 +53,10 @@ SHVFLAGS	= @SHVFLAGS@
- # Misc Compiling Stuff
- CC	        = @CC@
- # version number is prefixed by a 0 for a better shared library version number
--LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) $(SHVFLAGS) -o
-+LIB_LD_CMD      = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -version-info $(VERSION_INFO) -o
- LIB_EXTENSION   = la
- LIB_VERSION     =
--LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
-+LIB_LDCONFIG_CMD = :
- LINK		= $(LIBTOOL) --mode=link $(CC)
- # RANLIB 	= @RANLIB@
- RANLIB		= :
diff --git a/net/ucd-snmp/patches/patch-agent_Makefile_in b/net/ucd-snmp/patches/patch-agent_Makefile_in
deleted file mode 100644
index daae750cff8..00000000000
--- a/net/ucd-snmp/patches/patch-agent_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-agent_Makefile_in,v 1.2 2001/01/05 09:19:46 danh Exp $
---- agent/Makefile.in.orig	Sun Nov 19 15:58:06 2000
-+++ agent/Makefile.in	Fri Jan  5 03:15:00 2001
-@@ -88,7 +88,6 @@ install:  installdirs
- 
- installdirs:
- 	@$(SHELL) $(srcdir)/../mkinstalldirs $(sbindir) $(snmplibdir) $(includedir) $(libdir)
--	@-$(SHELL) $(srcdir)/../mkinstalldirs $(persistentdir)
- 
- 
- dependlocal: 
diff --git a/net/ucd-snmp/patches/patch-agent_mibgroup_mibII_interfaces_c b/net/ucd-snmp/patches/patch-agent_mibgroup_mibII_interfaces_c
deleted file mode 100644
index 09d1e5a80af..00000000000
--- a/net/ucd-snmp/patches/patch-agent_mibgroup_mibII_interfaces_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- agent/mibgroup/mibII/interfaces.c.orig	Mon Jun 10 06:10:24 2002
-+++ agent/mibgroup/mibII/interfaces.c	Tue Apr 22 10:28:42 2003
-@@ -1889,11 +1889,10 @@ static int Interface_Scan_Get_Count (voi
- 
- #else	/* hpux11 */
- 
--static time_t scan_time = 0;
--
- static int Interface_Scan_Get_Count (void)
- {
--        time_t time_now = time(NULL);
-+        static time_t scan_time = 0;
-+	time_t time_now = time(NULL);
-     
- 	if (!Interface_Count || (time_now > scan_time + 60)) {
-             scan_time = time_now;
diff --git a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_dlmod_c b/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_dlmod_c
deleted file mode 100644
index 24d4d36621f..00000000000
--- a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_dlmod_c
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.2 2002/02/19 14:19:54 danh Exp $
---- agent/mibgroup/ucd-snmp/dlmod.c.orig	Fri Oct  5 11:50:42 2001
-+++ agent/mibgroup/ucd-snmp/dlmod.c	Mon Feb 18 12:39:29 2002
-@@ -175,7 +175,11 @@ dlmod_load_module(struct dlmod *dlm)
- 	if (dlm->status == DLMOD_ERROR) 
- 	    return;
-     }
-+#ifdef __ELF__
-     snprintf(sym_init, sizeof(sym_init), "init_%s", dlm->name);
-+#else
-+    snprintf(sym_init, sizeof(sym_init), "_init_%s", dlm->name);
-+#endif 
-     dl_init = dlsym(dlm->handle, sym_init);
-     if (dl_init == NULL) {
- 	dlclose(dlm->handle);
-@@ -199,7 +203,11 @@ dlmod_unload_module (struct dlmod *dlm)
-     if (!dlm || dlm->status != DLMOD_LOADED) 
- 	return;
- 
-+#ifdef __ELF__
-     snprintf(sym_deinit, sizeof(sym_deinit), "deinit_%s", dlm->name);
-+#else
-+    snprintf(sym_deinit, sizeof(sym_deinit), "_deinit_%s", dlm->name);
-+#endif
-     dl_deinit = dlsym(dlm->handle, sym_deinit);
-     if (dl_deinit == NULL) {
- 	snprintf(dlm->error, sizeof(dlm->error), 
diff --git a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_memory_netbsd1_c b/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_memory_netbsd1_c
deleted file mode 100644
index 0856f96b7c2..00000000000
--- a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_memory_netbsd1_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-agent_mibgroup_ucd-snmp_memory_netbsd1_c,v 1.1 2001/11/10 22:15:34 wilfried Exp $
---- agent/mibgroup/ucd-snmp/memory_netbsd1.c.orig	Tue Sep 11 23:47:19 2001
-+++ agent/mibgroup/ucd-snmp/memory_netbsd1.c	Sat Nov 10 21:07:38 2001
-@@ -19,7 +19,7 @@
- #include <sys/sysctl.h>
- #include <sys/vmmeter.h>
-  
--#include <vm/vm_param.h>
-+#include <uvm/uvm_param.h>
- #include <uvm/uvm_extern.h>
-  
- #include <time.h>
diff --git a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_vmstat_netbsd1_c b/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_vmstat_netbsd1_c
deleted file mode 100644
index 7d068bb6e27..00000000000
--- a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd-snmp_vmstat_netbsd1_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-agent_mibgroup_ucd-snmp_vmstat_netbsd1_c,v 1.1 2001/11/10 22:15:34 wilfried Exp $
---- agent/mibgroup/ucd-snmp/vmstat_netbsd1.c.orig	Sun Sep 16 23:52:28 2001
-+++ agent/mibgroup/ucd-snmp/vmstat_netbsd1.c	Sat Nov 10 21:07:42 2001
-@@ -20,7 +20,7 @@
- #include <sys/vmmeter.h>
- #include <sys/sched.h>
- 
--#include <vm/vm_param.h>
-+#include <uvm/uvm_param.h>
- #include <uvm/uvm_extern.h>
- 
- #include <time.h>
diff --git a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd_snmp_h b/net/ucd-snmp/patches/patch-agent_mibgroup_ucd_snmp_h
deleted file mode 100644
index d7f9892796f..00000000000
--- a/net/ucd-snmp/patches/patch-agent_mibgroup_ucd_snmp_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-agent_mibgroup_ucd_snmp_h,v 1.4 2003/04/22 15:11:05 danh Exp $
---- agent/mibgroup/ucd_snmp.h.orig	Thu Feb  7 10:39:26 2002
-+++ agent/mibgroup/ucd_snmp.h	Tue Apr 22 10:28:42 2003
-@@ -34,8 +34,10 @@ config_arch_require(freebsd5, ucd-snmp/v
- config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
- config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
- config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)
--config_arch_require(openbsd2, ucd-snmp/vmstat_netbsd1)
--config_arch_require(openbsd2, ucd-snmp/memory_netbsd1)
-+config_arch_require(openbsd2, ucd-snmp/vmstat_freebsd2)
-+config_arch_require(openbsd2, ucd-snmp/memory_freebsd2)
-+config_arch_require(openbsd3, ucd-snmp/vmstat_netbsd1)
-+config_arch_require(openbsd3, ucd-snmp/memory_netbsd1)
- config_arch_require(bsdi4, ucd-snmp/vmstat_bsdi4)
- config_arch_require(darwin1, ucd-snmp/vmstat_freebsd2)
- config_arch_require(darwin1, ucd-snmp/memory_freebsd2)
diff --git a/net/ucd-snmp/patches/patch-configure b/net/ucd-snmp/patches/patch-configure
deleted file mode 100644
index e4f2ccc7e59..00000000000
--- a/net/ucd-snmp/patches/patch-configure
+++ /dev/null
@@ -1,83 +0,0 @@
---- configure.orig	Fri Oct 11 08:10:26 2002
-+++ configure	Tue Apr 22 10:28:42 2003
-@@ -4696,7 +4696,10 @@ openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-+  sys_lib_search_path_spec="/usr/lib"
-+  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-     case "$host_os" in
-     openbsd2.[89] | openbsd2.[89].*)
-       shlibpath_overrides_runpath=no
-@@ -6674,27 +6677,6 @@ fi
- echo "$ac_t""$EXTRACPPFLAGS" 1>&6
- 
- 
--if test "x$prefix" = "xNONE"; then
--  prefix=/usr/local
--fi
--
--fch=`echo $prefix | sed 's/\(.\).*/\1/'`
--if test $fch != "/" ; then
--   prefix=`pwd`/$prefix
--   echo "adjusting prefix to $prefix"
--fi
--
--if test "x$exec_prefix" = "xNONE"; then
--  exec_prefix=$prefix
--fi
--
--fch=`echo $exec_prefix | sed 's/\(.\).*/\1/'`
--if test $fch != "/" ; then
--   exec_prefix=`pwd`/$exec_prefix
--   echo "adjusting exec_prefix to $exec_prefix"
--fi
--
--
- SNMPLIBPATH=""
- tmpset="$libdir/snmp"
- while test "x$tmpset" != "x$SNMPLIBPATH"; do
-@@ -7601,6 +7583,7 @@ echo "configure:7601: checking for TCP w
- 	cat > conftest.$ac_ext <<EOF
- #line 7603 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <tcpd.h>
- 		     int allow_severity = 0;
- 		     int deny_severity  = 0;
-@@ -7723,6 +7706,7 @@ echo "configure:7723: checking for TCP w
- 	    cat > conftest.$ac_ext <<EOF
- #line 7725 "configure"
- #include "confdefs.h"
-+#include <sys/types.h>
- #include <tcpd.h>
- 		         int allow_severity = 0;
- 	                 int deny_severity  = 0;
-@@ -8576,7 +8560,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lcrypto  $LIBS"
-+LIBS="-lcrypto -ldes $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 8582 "configure"
- #include "confdefs.h"
-@@ -8610,7 +8594,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lcrypto $LIBS"
-+  LIBS="-lcrypto -ldes $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -16631,6 +16615,7 @@ s%@AUTOCONF@%$AUTOCONF%g
- s%@AUTOHEADER@%$AUTOHEADER%g
- s%@UNAMEPROG@%$UNAMEPROG%g
- s%@VERSION@%$VERSION%g
-+s%@VERSION_INFO@%$VERSION_INFO%g
- s%@target@%$target%g
- s%@target_alias@%$target_alias%g
- s%@target_cpu@%$target_cpu%g
diff --git a/net/ucd-snmp/patches/patch-ltmain_sh b/net/ucd-snmp/patches/patch-ltmain_sh
deleted file mode 100644
index fbef4b42eb8..00000000000
--- a/net/ucd-snmp/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,79 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.5 2003/04/22 15:11:05 danh Exp $
---- ltmain.sh.orig	Fri Mar  1 10:17:36 2002
-+++ ltmain.sh	Tue Apr 22 10:28:42 2003
-@@ -1054,12 +1054,34 @@ compiler."
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
-+	    ;;
-+	  esac
-+	elif test "X$arg" = "X-lc_r"; then
-+	  case $host in
-+	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -4446,40 +4471,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
diff --git a/net/ucd-snmp/patches/patch-s_openbsd3_h b/net/ucd-snmp/patches/patch-s_openbsd3_h
deleted file mode 100644
index c7a452a07ba..00000000000
--- a/net/ucd-snmp/patches/patch-s_openbsd3_h
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-s_openbsd3_h,v 1.1 2003/01/24 20:06:57 henning Exp $
---- s/openbsd3.h.orig	Fri Jan 24 19:40:18 2003
-+++ s/openbsd3.h	Fri Jan 24 19:41:26 2003
-@@ -3,3 +3,5 @@
- #define netbsd1 1 	/* we're really close to this */
- 
- #undef TOTAL_MEMORY_SYMBOL
-+#undef HAVE_VM_VM_H
-+#undef HAVE_VM_SWAP_PAGER_H
diff --git a/net/ucd-snmp/patches/patch-s_openbsd_h b/net/ucd-snmp/patches/patch-s_openbsd_h
deleted file mode 100644
index 044a7c39e2d..00000000000
--- a/net/ucd-snmp/patches/patch-s_openbsd_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-s_openbsd_h,v 1.1 2001/10/11 19:16:19 danh Exp $
---- s/openbsd.h.orig	Thu Oct 11 14:17:38 2001
-+++ s/openbsd.h	Thu Oct 11 14:22:03 2001
-@@ -1,7 +1,6 @@
- #include "netbsd.h"
- 
- #define netbsd1 1 /* we're really close to this */
--#define UVM
- 
- #undef MBPOOL_SYMBOL
- #undef MCLPOOL_SYMBOL
diff --git a/net/ucd-snmp/patches/patch-snmplib_scapi_c b/net/ucd-snmp/patches/patch-snmplib_scapi_c
deleted file mode 100644
index da15109b8b7..00000000000
--- a/net/ucd-snmp/patches/patch-snmplib_scapi_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-snmplib_scapi_c,v 1.1 2002/06/16 20:02:19 pvalchev Exp $
---- snmplib/scapi.c.orig	Sun Jun 16 13:48:32 2002
-+++ snmplib/scapi.c	Sun Jun 16 13:48:55 2002
-@@ -56,6 +56,7 @@
- #include <openssl/hmac.h>
- #include <openssl/evp.h>
- #include <openssl/rand.h>
-+#include <des.h>
- #endif
- 
- #ifdef QUITFUN
diff --git a/net/ucd-snmp/pkg/DEINSTALL b/net/ucd-snmp/pkg/DEINSTALL
deleted file mode 100644
index 85e4d5ecc52..00000000000
--- a/net/ucd-snmp/pkg/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.4 2004/04/14 18:59:08 xsa Exp $
-#
-# de-installation of ucd-snmp
-
-PERSISTENT_DIR=/var/ucd-snmp
-
-if [ -d ${PERSISTENT_DIR} ]; then
-	rm -rf ${PERSISTENT_DIR}
-fi
-if [ ${PKG_DELETE_EXTRA} != Yes -a -f ${SYSCONFDIR}/snmpd.conf ]; then
-	echo "+------------"
-	echo "| If you do not plan on re-installing or upgrading this"
-	echo "| package, it is safe to remove ${SYSCONFDIR}/snmpd.conf"
-	echo "+------------"
-fi
-
-exit 0
diff --git a/net/ucd-snmp/pkg/DESCR b/net/ucd-snmp/pkg/DESCR
deleted file mode 100644
index 89ae985c54f..00000000000
--- a/net/ucd-snmp/pkg/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-This  is UCD SNMP, a derivative of CMU's SNMP package.  From
-the README:
-
-    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/ucd-snmp/pkg/INSTALL b/net/ucd-snmp/pkg/INSTALL
deleted file mode 100644
index e1725e81723..00000000000
--- a/net/ucd-snmp/pkg/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.2 2000/06/29 21:20:06 jakob Exp $
-#
-# post-installation setup of ucd-snmp
-
-PERSISTENT_DIR=/var/ucd-snmp
-
-create_persistent()
-{
-	install -d -m 755 -o root -g wheel ${1}
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	create_persistent ${PERSISTENT_DIR}
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-exit 0
diff --git a/net/ucd-snmp/pkg/MESSAGE b/net/ucd-snmp/pkg/MESSAGE
deleted file mode 100644
index e1c8415b592..00000000000
--- a/net/ucd-snmp/pkg/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-+------------
-| By default, the configuration files and mib modules for snmpd are in stored 
-| in ${PREFIX}/share/snmp.  An example configuration has been installed in
-| ${PREFIX}/share/examples/ucd-snmp/EXAMPLE.conf.  Extra documentation has
-| also been installed in ${PREFIX}/share/doc/ucd-snmp.
-|
-| To have snmpd start at boot time, you must have an entry similar to the 
-| following in /etc/rc.local.
-|
-| 	if [ -x ${PREFIX}/sbin/snmpd ]; then
-|		${PREFIX}/sbin/snmpd -c ${SYSCONFDIR}/snmpd.conf && echo -n ' snmpd'
-|	fi
-|
-| This will start snmpd and use ${SYSCONFDIR}/snmpd.conf for the configuration. 
-| (see snmpd(1) and snmpd.conf(5) for more options)
-+------------
diff --git a/net/ucd-snmp/pkg/PFRAG.shared b/net/ucd-snmp/pkg/PFRAG.shared
deleted file mode 100644
index cfb4214ba1a..00000000000
--- a/net/ucd-snmp/pkg/PFRAG.shared
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 18:17:47 espie Exp $
-@lib lib/libsnmp.so.42.6
-@lib lib/libucdagent.so.42.6
-@lib lib/libucdmibs.so.42.6
diff --git a/net/ucd-snmp/pkg/PLIST b/net/ucd-snmp/pkg/PLIST
deleted file mode 100644
index 3c4be0e1dce..00000000000
--- a/net/ucd-snmp/pkg/PLIST
+++ /dev/null
@@ -1,227 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.14 2004/09/18 13:01:48 espie Exp $
-@conflict net-snmp-*
-@unexec rm -f %D/share/snmp/mibs/.index
-@mode 0555
-bin/encode_keychange
-bin/mib2c
-bin/snmpbulkget
-bin/snmpbulkwalk
-bin/snmpcheck
-bin/snmpconf
-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
-@mode
-include/ucd-snmp/
-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/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/mib_module_config.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-tc.h
-include/ucd-snmp/snmp.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_parse_args.h
-include/ucd-snmp/snmp_vars.h
-include/ucd-snmp/snmpusm.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/libucdagent.a
-lib/libucdagent.la
-lib/libucdmibs.a
-lib/libucdmibs.la
-@man man/man1/snmpbulkget.1
-@man man/man1/snmpbulkwalk.1
-@man man/man1/snmpcmd.1
-@man man/man1/snmpconf.1
-@man man/man1/snmpd.1
-@man man/man1/snmpdelta.1
-@man man/man1/snmpdf.1
-@man man/man1/snmpget.1
-@man man/man1/snmpgetnext.1
-@man man/man1/snmpinform.1
-@man man/man1/snmpnetstat.1
-@man man/man1/snmpset.1
-@man man/man1/snmpstatus.1
-@man man/man1/snmptable.1
-@man man/man1/snmptest.1
-@man man/man1/snmptranslate.1
-@man man/man1/snmptrap.1
-@man man/man1/snmpusm.1
-@man man/man1/snmpwalk.1
-@man man/man3/add_mibdir.3
-@man man/man3/add_module_replacement.3
-@man man/man3/default_store.3
-@man man/man3/get_module_node.3
-@man man/man3/init_mib.3
-@man man/man3/init_mib_internals.3
-@man man/man3/mib_api.3
-@man man/man3/print_description.3
-@man man/man3/print_mib.3
-@man man/man3/print_objid.3
-@man man/man3/print_value.3
-@man man/man3/print_variable.3
-@man man/man3/read_all_mibs.3
-@man man/man3/read_config.3
-@man man/man3/read_mib.3
-@man man/man3/read_module.3
-@man man/man3/read_module_node.3
-@man man/man3/read_objid.3
-@man man/man3/shutdown_mib.3
-@man man/man3/snmp_agent_api.3
-@man man/man3/snmp_alarm.3
-@man man/man3/snmp_api.3
-@man man/man3/snmp_api_errstring.3
-@man man/man3/snmp_close.3
-@man man/man3/snmp_error.3
-@man man/man3/snmp_free_pdu.3
-@man man/man3/snmp_open.3
-@man man/man3/snmp_perror.3
-@man man/man3/snmp_read.3
-@man man/man3/snmp_select_info.3
-@man man/man3/snmp_send.3
-@man man/man3/snmp_sess_api.3
-@man man/man3/snmp_sess_async_send.3
-@man man/man3/snmp_sess_close.3
-@man man/man3/snmp_sess_error.3
-@man man/man3/snmp_sess_init.3
-@man man/man3/snmp_sess_open.3
-@man man/man3/snmp_sess_perror.3
-@man man/man3/snmp_sess_read.3
-@man man/man3/snmp_sess_select_info.3
-@man man/man3/snmp_sess_send.3
-@man man/man3/snmp_sess_session.3
-@man man/man3/snmp_sess_timeout.3
-@man man/man3/snmp_set_mib_warnings.3
-@man man/man3/snmp_set_save_descriptions.3
-@man man/man3/snmp_timeout.3
-@man man/man3/snmp_trap_api.3
-@man man/man5/snmp.conf.5
-@man man/man5/snmp_config.5
-@man man/man5/snmpd.conf.5
-@man man/man5/snmptrapd.conf.5
-@man man/man5/variables.5
-@man man/man8/snmptrapd.8
-@mode 0555
-sbin/snmpd
-sbin/snmptrapd
-@mode
-share/doc/ucd-snmp/
-share/doc/ucd-snmp/AGENT.txt
-share/doc/ucd-snmp/FAQ
-share/doc/ucd-snmp/README
-share/doc/ucd-snmp/README.snmpv3
-share/examples/ucd-snmp/
-share/examples/ucd-snmp/EXAMPLE.conf
-share/snmp/
-share/snmp/mib2c.conf
-share/snmp/mib2c.storage.conf
-share/snmp/mib2c.vartypes.conf
-share/snmp/mibs/
-share/snmp/mibs/AGENTX-MIB.txt
-share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-share/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-share/snmp/mibs/EtherLike-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/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-share/snmp/mibs/IANA-LANGUAGE-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-INVERTED-STACK-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/INET-ADDRESS-MIB.txt
-share/snmp/mibs/IP-FORWARD-MIB.txt
-share/snmp/mibs/IP-MIB.txt
-share/snmp/mibs/IPV6-ICMP-MIB.txt
-share/snmp/mibs/IPV6-MIB.txt
-share/snmp/mibs/IPV6-TC.txt
-share/snmp/mibs/IPV6-TCP-MIB.txt
-share/snmp/mibs/IPV6-UDP-MIB.txt
-share/snmp/mibs/RFC-1215.txt
-share/snmp/mibs/RFC1155-SMI.txt
-share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/RMON-MIB.txt
-share/snmp/mibs/SMUX-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
-share/snmp/mibs/SNMP-PROXY-MIB.txt
-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-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
-share/snmp/snmpconf/
-share/snmp/snmpconf/snmp.conf/
-share/snmp/snmpconf/snmp.conf/authopts
-share/snmp/snmpconf/snmp.conf/debugging
-share/snmp/snmpconf/snmp.conf/mibs
-share/snmp/snmpconf/snmp.conf/output
-share/snmp/snmpconf/snmpd.conf/
-share/snmp/snmpconf/snmpd.conf/acl
-share/snmp/snmpconf/snmpd.conf/basic_setup
-share/snmp/snmpconf/snmpd.conf/extending
-share/snmp/snmpconf/snmpd.conf/monitor
-share/snmp/snmpconf/snmpd.conf/operation
-share/snmp/snmpconf/snmpd.conf/system
-share/snmp/snmpconf/snmpd.conf/trapsinks
-share/snmp/snmpconf/snmptrapd.conf/
-share/snmp/snmpconf/snmptrapd.conf/formatting
-share/snmp/snmpconf/snmptrapd.conf/traphandle
-%%SHARED%%
-@extra ${SYSCONFDIR}/snmpd.conf