o Upgrade to 4.1.2

o Correct PLIST
o Correct MANx

PR:		18548
Submitted by:	Amakawa Shuhei <sa264@cam.ac.uk>

o Finally fix shared libraries

Submitted by:	billf, will(sorta)

4 files changed, 79 insertions, 18 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index cba8ebad748c..e6f29b277225 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucd-snmp
-PORTVERSION=	4.1.1
+PORTVERSION=	4.1.2
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -14,20 +14,27 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-CONFIGURE_ARGS=	--enable-shared
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
 USE_GMAKE=	YES
-#CFLAGS=		-g
 
-MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
-		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
+MAN1=		snmpbulkget.1 snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 \
+		snmpgetnext.1 snmpinform.1 snmpnetstat.1 snmpset.1 \
+		snmpstatus.1 snmptable.1 snmptest.1 \
 		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
-MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
+MAN3=		default_store.3 read_config.3 mib_api.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_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_send.3 \
+		snmp_sess_session.3 snmp_sess_timeout.3 snmp_timeout.3 \
+		snmp_trap_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
 MAN8=		snmptrapd.8
@@ -39,10 +46,6 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400000
-CONFIGURE_ARGS+=	--with-out-mib-modules="ucd-snmp/vmstat_freebsd2 ucd-snmp/memory_freebsd2"
-.endif
-
 SHLIB_VERSION=4
 PLIST_SUB= shlib=${SHLIB_VERSION}
 
@@ -55,6 +58,8 @@ post-install:
 	@( cd ${PREFIX}/include/ucd-snmp && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/share/snmp/mibs && ${CHMOD} 644 * )
 	@( cd ${PREFIX}/lib && ${LN} -f libsnmp.so.${SHLIB_VERSION} libsnmp.so )
+	@( cd ${PREFIX}/lib && ${LN} -f libucdmibs.so.${SHLIB_VERSION} libucdmibs.so )
+	@( cd ${PREFIX}/lib && ${LN} -f libucdagent.so.${SHLIB_VERSION} libucdagent.so )
 	@${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	@for F in ${WRKSRC}/EXAMPLE.conf  ${WRKSRC}/agent/mibgroup/examples/ucdDemoPublic.conf; do \
 		${INSTALL_DATA} $$F ${PREFIX}/share/examples/ucd-snmp ; done
@@ -66,4 +71,5 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
+
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index e8b6587c2ae2..8b00c91941d4 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-4.1.1.tar.gz) = 2f0d6130af510a8ce283dfdb557a85fa
+MD5 (ucd-snmp-4.1.2.tar.gz) = 378c8cf99e0845da4662fb72c956d20d
diff --git a/net-mgmt/net-snmp/files/patch-ak b/net-mgmt/net-snmp/files/patch-ak
new file mode 100644
index 000000000000..7ca23e85b748
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-ak
@@ -0,0 +1,21 @@
+--- agent/Makefile.in.old	Tue May 16 19:58:54 2000
++++ agent/Makefile.in	Tue May 16 20:00:26 2000
+@@ -51,10 +51,18 @@
+ 
+ libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${LIBAGENTOBJS} libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 	$(SHLIB_LD_CMD) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${LIBAGENTOBJS}  $(SHLIB_LD_LIBS)
++	ld -Bshareable -soname libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
++		-o libucdagent.$(SHLIB_EXTENSION) ${LIBAGENTOBJS}
++	ln -f libucdagent.$(SHLIB_EXTENSION) \
++	libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 	$(RANLIB) libucdagent.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 
+ libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION):    ${MIBOBJS}
+ 	$(SHLIB_LD_CMD) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) ${MIBOBJS}  $(SHLIB_LD_LIBS)
++	ld -Bshareable -soname libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION) \
++		-o libucdmibs.$(SHLIB_EXTENSION) ${MIBOBJS}
++	ln -f libucdmibs.$(SHLIB_EXTENSION) \
++	libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 	$(RANLIB) libucdmibs.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+ 
+ clean:
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 52d02eb3986c..8509ad640db2 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -1,9 +1,11 @@
 bin/encode_keychange
+bin/snmpbulkget
 bin/snmpbulkwalk
 bin/snmpcheck
 bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
+bin/snmpinform
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
@@ -15,40 +17,70 @@ bin/snmpusm
 bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
+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_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
 @dirrm include/ucd-snmp
 lib/libsnmp.so
 lib/libsnmp.so.%%shlib%%
+lib/libucdagent.so
+lib/libucdagent.so.%%shlib%%
+lib/libucdmibs.so
+lib/libucdmibs.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
-share/examples/ucd-snmp/README
-share/examples/ucdDemoPublic.conf
+share/examples/ucd-snmp/EXAMPLE.conf
+share/examples/ucd-snmp/ucdDemoPublic.conf
 @dirrm share/examples/ucd-snmp
-share/snmp/mibs/DLMOD-MIB.txt
+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
+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
@@ -57,13 +89,15 @@ 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 rm -f %D/share/snmp/mibs/.index