Fix plist.

PR:		ports/60423
Submitted by:	leeym

9 files changed, 69 insertions, 21 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 3146fef..17ef310 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -51,7 +51,7 @@ MAN1=		mib2c.1 \
 		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
 		snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1
+		snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1
 MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
 		netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \
@@ -76,7 +76,14 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.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
+		snmp_timeout.3 snmp_trap_api.3 \
+		netsnmp_Container_iterator.3 netsnmp_baby_steps.3 \
+		netsnmp_cache_handler.3 netsnmp_container.3 \
+		netsnmp_deprecated.3 netsnmp_iterator_info_s.3 \
+		netsnmp_leaf.3 netsnmp_mfd_pdu_context_s.3 \
+		netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \
+		netsnmp_stash_cache.3 netsnmp_utilities.3
+
 .if !defined(WITHOUT_PERL)
 MAN3PERL=	NetSNMP::default_store.3 NetSNMP::ASN.3 NetSNMP::OID.3 \
 		NetSNMP::agent::default_store.3 \
@@ -119,7 +126,7 @@ post-build:
 
 pre-install:
 	-@[ -f ${STARTUP_FILE} ] && \
-	 (echo "Remove old ${STARTUP_FILE} before install." && exit 1)
+	 (${ECHO} "Remove old ${STARTUP_FILE} before install." && exit 1)
 
 post-install:
 	@( cd ${PREFIX}/bin && ${STRIP_CMD} ${BIN} )
@@ -132,7 +139,8 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+# Maintainer's note:
+#   Don't forget to bump library version in these ports.
+#   lang/php4,lang/php5,net/braa,net/docsis,net/ethereal,net/mbrowse,net/quagga,net/tethereal,net/zabbix,security/libfwbuilder
 
-# Dependency:
-# lang/php4,net/braa,net/docsis,net/ethereal,net/mbrowse,net/tethereal,net/zabbix,security/libfwbuilder
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp-devel/pkg-descr b/net-mgmt/net-snmp-devel/pkg-descr
index d7c5d86..c6fa637 100644
--- a/net-mgmt/net-snmp-devel/pkg-descr
+++ b/net-mgmt/net-snmp-devel/pkg-descr
@@ -1,4 +1,4 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
+This is Net-SNMP (previously known as "ucd-snmp").
 
 Various tools relating to the Simple Network Management Protocol including: 
 
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index fcd5789..844231b 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -175,15 +175,22 @@ lib/libnetsnmphelpers.so.%%shlib%%
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.so
 lib/libnetsnmpmibs.so.%%shlib%%
+lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.so
+lib/libnetsnmptrapd.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
+share/snmp/mib2c.access_functions.conf
 share/snmp/mib2c.array-user.conf
+share/snmp/mib2c.check_values.conf
+share/snmp/mib2c.check_values_local.conf
 share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
 share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
+share/snmp/mib2c.iterate_access.conf
 share/snmp/mib2c.old-api.conf
 share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
@@ -298,4 +305,5 @@ share/snmp/snmpconf-data/snmptrapd-data/traphandle
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
 %%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 3146fef..17ef310 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -51,7 +51,7 @@ MAN1=		mib2c.1 \
 		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
 		snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1
+		snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1
 MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
 		netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \
@@ -76,7 +76,14 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.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
+		snmp_timeout.3 snmp_trap_api.3 \
+		netsnmp_Container_iterator.3 netsnmp_baby_steps.3 \
+		netsnmp_cache_handler.3 netsnmp_container.3 \
+		netsnmp_deprecated.3 netsnmp_iterator_info_s.3 \
+		netsnmp_leaf.3 netsnmp_mfd_pdu_context_s.3 \
+		netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \
+		netsnmp_stash_cache.3 netsnmp_utilities.3
+
 .if !defined(WITHOUT_PERL)
 MAN3PERL=	NetSNMP::default_store.3 NetSNMP::ASN.3 NetSNMP::OID.3 \
 		NetSNMP::agent::default_store.3 \
@@ -119,7 +126,7 @@ post-build:
 
 pre-install:
 	-@[ -f ${STARTUP_FILE} ] && \
-	 (echo "Remove old ${STARTUP_FILE} before install." && exit 1)
+	 (${ECHO} "Remove old ${STARTUP_FILE} before install." && exit 1)
 
 post-install:
 	@( cd ${PREFIX}/bin && ${STRIP_CMD} ${BIN} )
@@ -132,7 +139,8 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+# Maintainer's note:
+#   Don't forget to bump library version in these ports.
+#   lang/php4,lang/php5,net/braa,net/docsis,net/ethereal,net/mbrowse,net/quagga,net/tethereal,net/zabbix,security/libfwbuilder
 
-# Dependency:
-# lang/php4,net/braa,net/docsis,net/ethereal,net/mbrowse,net/tethereal,net/zabbix,security/libfwbuilder
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp/pkg-descr b/net-mgmt/net-snmp/pkg-descr
index d7c5d86..c6fa637 100644
--- a/net-mgmt/net-snmp/pkg-descr
+++ b/net-mgmt/net-snmp/pkg-descr
@@ -1,4 +1,4 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
+This is Net-SNMP (previously known as "ucd-snmp").
 
 Various tools relating to the Simple Network Management Protocol including: 
 
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index fcd5789..844231b 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -175,15 +175,22 @@ lib/libnetsnmphelpers.so.%%shlib%%
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.so
 lib/libnetsnmpmibs.so.%%shlib%%
+lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.so
+lib/libnetsnmptrapd.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
+share/snmp/mib2c.access_functions.conf
 share/snmp/mib2c.array-user.conf
+share/snmp/mib2c.check_values.conf
+share/snmp/mib2c.check_values_local.conf
 share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
 share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
+share/snmp/mib2c.iterate_access.conf
 share/snmp/mib2c.old-api.conf
 share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
@@ -298,4 +305,5 @@ share/snmp/snmpconf-data/snmptrapd-data/traphandle
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
 %%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 3146fef..17ef310 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -51,7 +51,7 @@ MAN1=		mib2c.1 \
 		snmpbulkget.1 snmpbulkwalk.1 snmpcmd.1 snmpconf.1 \
 		snmpdelta.1 snmpdf.1 snmpget.1 snmpgetnext.1 snmpinform.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpusm.1 snmpwalk.1
+		snmptranslate.1 snmptrap.1 snmpusm.1 snmpvacm.1 snmpwalk.1
 MAN3=		add_mibdir.3 add_module_replacement.3 default_store.3 \
 		get_module_node.3 init_mib.3 init_mib_internals.3 mib_api.3 \
 		netsnmp_agent.3 netsnmp_bulk_to_next.3 netsnmp_debug.3 \
@@ -76,7 +76,14 @@ MAN3=		add_mibdir.3 add_module_replacement.3 default_store.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
+		snmp_timeout.3 snmp_trap_api.3 \
+		netsnmp_Container_iterator.3 netsnmp_baby_steps.3 \
+		netsnmp_cache_handler.3 netsnmp_container.3 \
+		netsnmp_deprecated.3 netsnmp_iterator_info_s.3 \
+		netsnmp_leaf.3 netsnmp_mfd_pdu_context_s.3 \
+		netsnmp_row_merge.3 netsnmp_scalar_group_group.3 \
+		netsnmp_stash_cache.3 netsnmp_utilities.3
+
 .if !defined(WITHOUT_PERL)
 MAN3PERL=	NetSNMP::default_store.3 NetSNMP::ASN.3 NetSNMP::OID.3 \
 		NetSNMP::agent::default_store.3 \
@@ -119,7 +126,7 @@ post-build:
 
 pre-install:
 	-@[ -f ${STARTUP_FILE} ] && \
-	 (echo "Remove old ${STARTUP_FILE} before install." && exit 1)
+	 (${ECHO} "Remove old ${STARTUP_FILE} before install." && exit 1)
 
 post-install:
 	@( cd ${PREFIX}/bin && ${STRIP_CMD} ${BIN} )
@@ -132,7 +139,8 @@ post-install:
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+# Maintainer's note:
+#   Don't forget to bump library version in these ports.
+#   lang/php4,lang/php5,net/braa,net/docsis,net/ethereal,net/mbrowse,net/quagga,net/tethereal,net/zabbix,security/libfwbuilder
 
-# Dependency:
-# lang/php4,net/braa,net/docsis,net/ethereal,net/mbrowse,net/tethereal,net/zabbix,security/libfwbuilder
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp53/pkg-descr b/net-mgmt/net-snmp53/pkg-descr
index d7c5d86..c6fa637 100644
--- a/net-mgmt/net-snmp53/pkg-descr
+++ b/net-mgmt/net-snmp53/pkg-descr
@@ -1,4 +1,4 @@
-This is UCD SNMP, a derivative of CMU's SNMP package.
+This is Net-SNMP (previously known as "ucd-snmp").
 
 Various tools relating to the Simple Network Management Protocol including: 
 
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index fcd5789..844231b 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -175,15 +175,22 @@ lib/libnetsnmphelpers.so.%%shlib%%
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.so
 lib/libnetsnmpmibs.so.%%shlib%%
+lib/libnetsnmptrapd.a
+lib/libnetsnmptrapd.so
+lib/libnetsnmptrapd.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
+share/snmp/mib2c.access_functions.conf
 share/snmp/mib2c.array-user.conf
+share/snmp/mib2c.check_values.conf
+share/snmp/mib2c.check_values_local.conf
 share/snmp/mib2c.column_defines.conf
 share/snmp/mib2c.column_enums.conf
 share/snmp/mib2c.conf
 share/snmp/mib2c.create-dataset.conf
 share/snmp/mib2c.int_watch.conf
 share/snmp/mib2c.iterate.conf
+share/snmp/mib2c.iterate_access.conf
 share/snmp/mib2c.old-api.conf
 share/snmp/mib2c.scalar.conf
 share/snmp/mibs/AGENTX-MIB.txt
@@ -298,4 +305,5 @@ share/snmp/snmpconf-data/snmptrapd-data/traphandle
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
 %%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
+%%WITHPERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
 %%WITHPERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP 2>/dev/null || true