5 files changed, 58 insertions, 9 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index ba1d73f67c33..e9b22d22dd51 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucd-snmp
-PORTVERSION=	4.2.1
+PORTVERSION=	4.2.3
 CATEGORIES=	net ipv6
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ucd-snmp.ucdavis.edu/ \
@@ -37,11 +37,14 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		print_description.3 print_mib.3 print_objid.3 print_value.3 \
 		print_variable.3 read_all_mibs.3 read_config.3 read_mib.3 \
 		read_module.3 read_module_node.3 read_objid.3 shutdown_mib.3 \
-		snmp_agent_api.3 snmp_alarm.3 snmp_api.3 snmp_close.3 \
-		snmp_free_pdu.3 snmp_open.3 snmp_read.3 snmp_select_info.3 \
+		snmp_agent_api.3 snmp_alarm.3 snmp_api.3 \
+		snmp_api_errstring.3 snmp_close.3 \
+		snmp_error.3 snmp_free_pdu.3 snmp_open.3 snmp_perror.3 \
+		snmp_read.3 snmp_select_info.3 \
 		snmp_send.3 snmp_sess_api.3 snmp_sess_async_send.3 \
 		snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.3 \
-		snmp_sess_open.3 snmp_sess_read.3 snmp_sess_select_info.3 \
+		snmp_sess_open.3 snmp_sess_perror.3 \
+		snmp_sess_read.3 snmp_sess_select_info.3 \
 		snmp_sess_send.3 snmp_sess_session.3 snmp_sess_timeout.3 \
 		snmp_set_mib_warnings.3 snmp_set_save_descriptions.3 \
 		snmp_timeout.3 snmp_trap_api.3
@@ -63,9 +66,6 @@ CONFIGURE_ARGS+= --enable-ipv6
 SHLIB_VERSION=	4
 PLIST_SUB+=	shlib=${SHLIB_VERSION}
 
-post-patch:
-	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
-
 post-install:
 	@( cd ${PREFIX}/bin && strip ${BIN} )
 	@( cd ${PREFIX}/sbin && strip ${SBIN} )
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index 3d3fe91c8098..cfb7dd91771d 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-4.2.1.tar.gz) = 192d467185c8e7142c155d5e162b1e97
+MD5 (ucd-snmp-4.2.3.tar.gz) = e42df4c7558b5f12cd442b36428ec4bb
diff --git a/net-mgmt/net-snmp/files/freebsd4.h b/net-mgmt/net-snmp/files/freebsd4.h
deleted file mode 100644
index e0774c7e4cd6..000000000000
--- a/net-mgmt/net-snmp/files/freebsd4.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "freebsd3.h"
diff --git a/net-mgmt/net-snmp/files/patch-aclocal.m4 b/net-mgmt/net-snmp/files/patch-aclocal.m4
new file mode 100644
index 000000000000..bff5d4a1df3a
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-aclocal.m4
@@ -0,0 +1,48 @@
+--- aclocal.m4.orig	Tue Sep 18 17:08:01 2001
++++ aclocal.m4	Mon Jan 21 10:38:40 2002
+@@ -196,8 +196,23 @@
+ AC_DEFUN([AC_PROG_LIBTOOL],
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ 
++# Save cache, so that ltconfig can load it
++AC_CACHE_SAVE
++
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
++|| AC_MSG_ERROR([libtool configure failed])
++
++# Reload cache, that may have been modified by ltconfig
++AC_CACHE_LOAD
++
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -224,6 +239,11 @@
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
++case "$target" in
++NONE) lt_target="$host" ;;
++*) lt_target="$target" ;;
++esac
++
+ _LT_AC_PROG_ECHO_BACKSLASH
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+@@ -875,7 +895,7 @@
+ # All known linkers require a `.a' archive for static linking (except M$VC,
+ # which needs '.lib').
+ libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ ofile="$default_ofile"
+ with_gnu_ld="$lt_cv_prog_gnu_ld"
+ need_locks="$enable_libtool_lock"
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index aadf657f6f07..942480e5ea90 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -34,10 +34,12 @@ 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