- Add pkgNG support for HOST-RESOURCES-MIB::hrSWInstalled*

- Add STAGE support
- Bump PORTREVISION

3 files changed, 333 insertions, 85 deletions

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index a6623f46925c..cd2c2acc485d 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	net-
@@ -12,9 +12,11 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	An extendable SNMP implementation
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libpkg.so:${PORTSDIR}/ports-mgmt/pkg
+
 OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
 		DMALLOC MYSQL AX_SOCKONLY UNPRIVILEGED SMUX
 OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX
@@ -43,14 +45,14 @@ CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \
 		--with-sys-location="${NET_SNMP_SYS_LOCATION}" \
 		--with-logfile="${NET_SNMP_LOGFILE}" \
 		--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
-		--with-gnu-ld --with-libwrap --with-ldflags="-lm -lkvm -ldevstat"
+		--with-gnu-ld --with-libwrap \
+		--with-ldflags="-lm -lkvm -ldevstat -lpkg -L${LOCALBASE}/lib"
 SUB_FILES=	pkg-message
 
 .if defined(BATCH)
 CONFIGURE_ARGS+=--with-defaults
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
@@ -81,7 +83,7 @@ PLIST_SUB+=	PYUNINSTALL="@unexec ${PYEASYINSTALL_CMD} ${PYEASYUNINSTALL_UNINSTAL
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
+CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
 
 .if ${PORT_OPTIONS:MDUMMY}
 CONFIGURE_ARGS+=--with-dummy-values
@@ -113,7 +115,7 @@ PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDMALLOC}
-LIB_DEPENDS+=	dmalloc:${PORTSDIR}/devel/dmalloc
+LIB_DEPENDS+=	libdmalloc.so:${PORTSDIR}/devel/dmalloc
 CONFIGURE_ARGS+=--with-dmalloc=${LOCALBASE}
 .endif
 
@@ -184,72 +186,6 @@ CONFIGURE_ARGS+=--with-mib-modules="${NET_SNMP_WITH_MIB_MODULE_LIST}"
 CONFIGURE_ARGS+=--with-out-mib-modules="${NET_SNMP_WITHOUT_MIB_MODULE_LIST}"
 .endif
 
-MAN1=		agentxtrap.1 encode_keychange.1 fixproc.1 mib2c.1 mib2c-update.1 \
-		net-snmp-config.1 net-snmp-create-v3-user.1 snmp-bridge-mib.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 snmpvacm.1 snmpwalk.1 \
-		tkmib.1 traptoemail.1
-MAN3=		add_mibdir.3 add_module_replacement.3 \
-		config_perror.3 config_pwarn.3 \
-		default_store.3 fprint_description.3 \
-		fprint_objid.3 fprint_value.3 fprint_variable.3 \
-		get_module_node.3 \
-		netsnmp_agent_api.3 netsnmp_config_api.3 netsnmp_init_mib.3 \
-		netsnmp_mib_api.3 netsnmp_pdu_api.3 netsnmp_read_module.3 \
-		netsnmp_sess_api.3 netsnmp_session_api.3 netsnmp_trap_api.3 \
-		netsnmp_varbind_api.3 print_description.3 print_mib.3 \
-		print_objid.3 print_value.3 print_variable.3 read_all_mibs.3 \
-		read_configs.3 read_config_print_usage.3 \
-		read_mib.3 read_objid.3 read_premib_configs.3 \
-		register_app_config_handler.3 \
-		register_config_handler.3 register_mib_handlers.3 \
-		send_easy_trap.3 send_trap_vars.3 send_v2trap.3 \
-		shutdown_mib.3 snmp_alarm.3 snmp_alarm_register.3 \
-		snmp_alarm_register_hr.3 snmp_alarm_unregister.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_async_send.3 \
-		snmp_sess_close.3 snmp_sess_error.3 snmp_sess_init.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 snprint_objid.3 snprint_value.3 \
-		snprint_variable.3 unregister_app_config_handler.3 \
-		unregister_config_handler.3 \
-		unregister_all_config_handlers.3 \
-		register_prenetsnmp_mib_handler.3 \
-		register_const_config_handler.3 \
-		register_app_prenetsnmp_mib_handler.3 \
-		snprint_description.3 \
-		snmp_varlist_add_variable.3 \
-		snmp_set_var_value.3 \
-		snmp_set_var_typed_value.3 \
-		snmp_set_var_typed_integer.3 \
-		snmp_set_var_objid.3 \
-		snmp_set_mib_errors.3 snmp_pdu_create.3 \
-		snmp_pdu_add_variable.3 snmp_parse_oid.3 snmp_free_varbind.3 \
-		snmp_free_var.3 snmp_fix_pdu.3 snmp_clone_varbind.3 \
-		snmp_clone_pdu.3 snmp_add_null_var.3
-
-.if ${PORT_OPTIONS:MPERL}
-MAN3PERL=	NetSNMP::ASN.3 NetSNMP::OID.3 NetSNMP::agent.3 \
-		NetSNMP::TrapReceiver.3 \
-		NetSNMP::agent::default_store.3 \
-		NetSNMP::default_store.3 \
-		NetSNMP::netsnmp_request_infoPtr.3 SNMP.3
-MAN3PERLPREFIX=	${PREFIX}/lib/perl5/${PERL_VER}
-_MANPAGES+=	${MAN3PERL:S%^%${MAN3PERLPREFIX}/man/man3/%}
-.endif
-
-MAN5=		mib2c.conf.5 snmp.conf.5 snmp_config.5 snmpd.conf.5 \
-		snmpd.examples.5 snmpd.internal.5 \
-		snmptrapd.conf.5 variables.5
-MAN8=		snmpd.8 snmptrapd.8
-
 BIN_FILES=	snmpbulkwalk snmpget snmpgetnext snmpset \
 		snmpstatus snmptest snmptranslate snmptrap snmpwalk
 SBIN_FILES=	snmpd snmptrapd
@@ -287,7 +223,7 @@ pre-everything::
 
 post-patch:
 .for filename in ${SCRIPT_FILES}
-	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/local/${filename}
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/local/${filename}
 .endfor
 .if ${OSVERSION} >= 900007
 	@${REINPLACE_CMD} -e 's!utmp_p->ut_name!utmp_p->ut_user!' \
@@ -295,8 +231,8 @@ post-patch:
 .endif
 
 post-configure:
-	${FIND} ${WRKSRC} -name Makefile | \
-	 ${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
+	@${FIND} ${WRKSRC} -name Makefile | \
+		${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
 .for hdr in sys/mbuf.h netinet/in_pcb.h netinet/in_var.h netinet/ip6.h
 	@${REINPLACE_CMD} -E -e '\
 		s!^.*#undef.*(HAVE_${hdr:U:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \
@@ -315,7 +251,7 @@ post-build:
 	${FIND} ${WRKSRC}/perl -name Makefile | \
 	${XARGS} ${REINPLACE_CMD} -E -e '\
 		s!^(PREFIX) = .*!\1 = ${PREFIX}!; \
-		s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${MAN3PERLPREFIX}/man/man3!; \
+		s!^(INSTALLMAN3DIR|INSTALLSITEMAN3DIR) = .*!\1 = ${PREFIX}/man/man3!; \
 		s!^(INSTALLSITELIB|INSTALLSITEARCH) = /usr/local/(.*)!\1 = ${PREFIX}/\2!; \
 		s! doc_(perl|site|\$$\(INSTALLDIRS\))_install$$!!; \
 		'
@@ -324,20 +260,20 @@ post-build:
 .endif
 
 post-install: strip-files install-config-files install-doc-files display-message
-	${MKDIR} /var/agentx
+	@${MKDIR} ${STAGEDIR}/var/agentx
 
 strip-files:
-	cd ${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}
-	cd ${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}
+	(cd ${STAGEDIR}${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES})
+	(cd ${STAGEDIR}${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES})
 
 install-config-files:
-	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${DATADIR}/snmpd.conf.example
+	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf ${STAGEDIR}${DATADIR}/snmpd.conf.example
 
 install-doc-files:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for filename in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${filename} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DOCSDIR}
 . endfor
 .endif
 
diff --git a/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_pkginfo.c b/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_pkginfo.c
new file mode 100644
index 000000000000..24c321cf0e09
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_pkginfo.c
@@ -0,0 +1,169 @@
+--- ./agent/mibgroup/host/data_access/swinst_pkginfo.c.orig	2014-04-09 19:21:59.000000000 -0400
++++ ./agent/mibgroup/host/data_access/swinst_pkginfo.c	2014-04-09 19:22:03.000000000 -0400
+@@ -32,6 +32,13 @@
+ #include <pkginfo.h>
+ #endif
+ 
++#define HAVE_LIBPKG
++
++#ifdef HAVE_LIBPKG
++#define restrict
++#include <pkg.h>
++#endif
++
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/library/container.h>
+@@ -97,52 +104,118 @@
+     size_t                date_len;
+     int                   i = 1;
+     netsnmp_swinst_entry *entry;
++#ifdef HAVE_LIBPKG
++    struct pkgdb *db = NULL;
++    struct pkgdb_it *it = NULL;
++    struct pkg *pkg = NULL;
++    char pkgname[ SNMP_MAXPATH ];
++    char pkgdate[ BUFSIZ ];
++    int pkgng = 0;
++#endif
+ 
+-    if ( !pkg_directory[0] ) {
+-        return 1;    /* Can't report installed packages
+-                         if there isn't a list of them! */
++#ifdef HAVE_LIBPKG
++    if (pkg_init(NULL, NULL)) {
++	snmp_log( LOG_ERR, "SWInst: error initializing pkgng db\n" );
++	return 1;
+     }
+-    d = opendir( pkg_directory );
+-    if (!d)
++
++    if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
++	snmp_log( LOG_ERR, "SWInst: error opening pkgng db\n" );
+ 	return 1;
+-    while ((dp = readdir(d)) != NULL) {
+-        if ( '.' == dp->d_name[0] )
+-            continue;
+-        entry = netsnmp_swinst_entry_create( i++ );
+-        if (NULL == entry)
+-            continue;   /* error already logged by function */
+-        CONTAINER_INSERT(container, entry);
++    }
++
++    if (pkg_status(NULL) == PKG_STATUS_ACTIVE) {
++	pkgng = 1;
++    } else {
++	snmp_log( LOG_INFO, "SWInst: not a pkgng system\n" );
++    }
++#endif
++
++#ifdef HAVE_LIBPKG
++    // if we are using FreeBSD's pkgng
++    if (pkgng) {
++	if ((it = pkgdb_query(db, NULL, MATCH_ALL)) == NULL) {
++	    snmp_log( LOG_ERR, "SWInst: error querying pkgng db\n" );
++	    return 1;
++	}
++
++	while (pkgdb_it_next(it, &pkg, PKG_LOAD_BASIC) == EPKG_OK) {
++	    pkg_snprintf(pkgname, sizeof(pkgname), "%n-%v", pkg, pkg);
++	    pkg_snprintf(pkgdate, sizeof(pkgdate), "%t", pkg);
++
++	    entry = netsnmp_swinst_entry_create( i++ );
++
++	    if (NULL == entry)
++		continue;   /* error already logged by function */
++
++	    CONTAINER_INSERT(container, entry);
++
++	    entry->swName_len = snprintf( entry->swName, sizeof(entry->swName),
++					  "%s", pkgname );
++	    if (entry->swName_len >= sizeof(entry->swName))
++		entry->swName_len = sizeof(entry->swName)-1;
++
++            install_time = atoi(pkgdate);
++            cp = date_n_time( &install_time, &date_len );
++            memcpy( entry->swDate, cp, date_len );
++            entry->swDate_len = date_len;
++	}
++
++	pkgdb_it_free(it);
++	pkgdb_close(db);
++	pkg_shutdown();
++    } else {
++#endif
++	if ( !pkg_directory[0] ) {
++	    return 1;    /* Can't report installed packages
++                         if there isn't a list of them! */
++    	}
++
++    	d = opendir( pkg_directory );
++    	if (!d)
++	    return 1;
++
++	while ((dp = readdir(d)) != NULL) {
++	    if ( '.' == dp->d_name[0] )
++		continue;
++	    entry = netsnmp_swinst_entry_create( i++ );
++	    if (NULL == entry)
++		continue;   /* error already logged by function */
++	    CONTAINER_INSERT(container, entry);
+ 
+ #ifdef HAVE_PKGINFO
+-        v = pkgparam( dp->d_name, "VERSION" );
+-        c = pkgparam( dp->d_name, "CATEGORY" );
++	    v = pkgparam( dp->d_name, "VERSION" );
++	    c = pkgparam( dp->d_name, "CATEGORY" );
+ 
+-        entry->swName_len = snprintf( entry->swName, sizeof(entry->swName),
+-                                      "%s-%s", dp->d_name, v );
+-	if (entry->swName_len >= sizeof(entry->swName))
+-	    entry->swName_len = sizeof(entry->swName)-1;
+-        entry->swType = (NULL != strstr( c, "system"))
+-                        ? 2      /* operatingSystem */
+-                        : 4;     /*  application    */
++	    entry->swName_len = snprintf( entry->swName, sizeof(entry->swName),
++					  "%s-%s", dp->d_name, v );
++	    if (entry->swName_len >= sizeof(entry->swName))
++		entry->swName_len = sizeof(entry->swName)-1;
++	    entry->swType = (NULL != strstr( c, "system"))
++			    ? 2      /* operatingSystem */
++			    : 4;     /*  application    */
+ 
+-        /* Do we need to free 'v' & 'c' ??? */
++	    /* Do we need to free 'v' & 'c' ??? */
+ #else
+-        entry->swName_len = snprintf( entry->swName, sizeof(entry->swName),
+-                                      "%s", dp->d_name );
+-	if (entry->swName_len >= sizeof(entry->swName))
+-	    entry->swName_len = sizeof(entry->swName)-1;
++	    entry->swName_len = snprintf( entry->swName, sizeof(entry->swName),
++					  "%s", dp->d_name );
++	    if (entry->swName_len >= sizeof(entry->swName))
++		entry->swName_len = sizeof(entry->swName)-1;
+ 
+-        /* no information about O/S vs application packages ??? */
++	    /* no information about O/S vs application packages ??? */
+ #endif
+ 
+-        snprintf( buf, BUFSIZ, "%s/%s", pkg_directory, dp->d_name );
+-        stat( buf, &stat_buf );
+-        install_time = stat_buf.st_mtime;
+-        cp = date_n_time( &install_time, &date_len );
+-        memcpy( entry->swDate, cp, date_len );
+-        entry->swDate_len = date_len;
++	    snprintf( buf, BUFSIZ, "%s/%s", pkg_directory, dp->d_name );
++	    stat( buf, &stat_buf );
++	    install_time = stat_buf.st_mtime;
++	    cp = date_n_time( &install_time, &date_len );
++	    memcpy( entry->swDate, cp, date_len );
++	    entry->swDate_len = date_len;
++	}
++    	closedir( d );
++#ifdef HAVE_LIBPKG
+     }
+-    closedir( d );
++#endif
+ 
+     DEBUGMSGTL(("swinst:load:arch"," loaded %d entries\n",
+                 (int)CONTAINER_SIZE(container)));
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 69d14e699ace..a3d8d431c85c 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -210,29 +210,171 @@ include/net-snmp/varbind_api.h
 include/net-snmp/version.h
 lib/libnetsnmp.a
 lib/libnetsnmp.la
+lib/libnetsnmp.so
 lib/libnetsnmp.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so
 @unexec rm -f %B/libnetsnmp.so 2> /dev/null || true
 lib/libnetsnmpagent.a
 lib/libnetsnmpagent.la
+lib/libnetsnmpagent.so
 lib/libnetsnmpagent.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so
 @unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true
 lib/libnetsnmphelpers.a
 lib/libnetsnmphelpers.la
+lib/libnetsnmphelpers.so
 lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so
 @unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true
 lib/libnetsnmpmibs.a
 lib/libnetsnmpmibs.la
+lib/libnetsnmpmibs.so
 lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so
 @unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true
 lib/libnetsnmptrapd.a
 lib/libnetsnmptrapd.la
+lib/libnetsnmptrapd.so
 lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%
 @exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so
 @unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true
+man/man1/agentxtrap.1.gz
+man/man1/encode_keychange.1.gz
+man/man1/fixproc.1.gz
+man/man1/mib2c-update.1.gz
+man/man1/mib2c.1.gz
+man/man1/net-snmp-config.1.gz
+man/man1/net-snmp-create-v3-user.1.gz
+man/man1/snmp-bridge-mib.1.gz
+man/man1/snmpbulkget.1.gz
+man/man1/snmpbulkwalk.1.gz
+man/man1/snmpcmd.1.gz
+man/man1/snmpconf.1.gz
+man/man1/snmpdelta.1.gz
+man/man1/snmpdf.1.gz
+man/man1/snmpget.1.gz
+man/man1/snmpgetnext.1.gz
+man/man1/snmpinform.1.gz
+man/man1/snmpnetstat.1.gz
+man/man1/snmpset.1.gz
+man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
+man/man1/snmptest.1.gz
+man/man1/snmptranslate.1.gz
+man/man1/snmptrap.1.gz
+man/man1/snmpusm.1.gz
+man/man1/snmpvacm.1.gz
+man/man1/snmpwalk.1.gz
+man/man1/tkmib.1.gz
+man/man1/traptoemail.1.gz
+man/man3/add_mibdir.3.gz
+man/man3/add_module_replacement.3.gz
+man/man3/config_perror.3.gz
+man/man3/config_pwarn.3.gz
+man/man3/default_store.3.gz
+man/man3/fprint_description.3.gz
+man/man3/fprint_objid.3.gz
+man/man3/fprint_value.3.gz
+man/man3/fprint_variable.3.gz
+man/man3/get_module_node.3.gz
+man/man3/netsnmp_agent_api.3.gz
+man/man3/netsnmp_config_api.3.gz
+man/man3/netsnmp_init_mib.3.gz
+man/man3/netsnmp_mib_api.3.gz
+man/man3/netsnmp_pdu_api.3.gz
+man/man3/netsnmp_read_module.3.gz
+man/man3/netsnmp_sess_api.3.gz
+man/man3/netsnmp_session_api.3.gz
+man/man3/netsnmp_trap_api.3.gz
+man/man3/netsnmp_varbind_api.3.gz
+man/man3/print_description.3.gz
+man/man3/print_mib.3.gz
+man/man3/print_objid.3.gz
+man/man3/print_value.3.gz
+man/man3/print_variable.3.gz
+man/man3/read_all_mibs.3.gz
+man/man3/read_config_print_usage.3.gz
+man/man3/read_configs.3.gz
+man/man3/read_mib.3.gz
+man/man3/read_objid.3.gz
+man/man3/read_premib_configs.3.gz
+man/man3/register_app_config_handler.3.gz
+man/man3/register_app_prenetsnmp_mib_handler.3.gz
+man/man3/register_config_handler.3.gz
+man/man3/register_const_config_handler.3.gz
+man/man3/register_mib_handlers.3.gz
+man/man3/register_prenetsnmp_mib_handler.3.gz
+man/man3/send_easy_trap.3.gz
+man/man3/send_trap_vars.3.gz
+man/man3/send_v2trap.3.gz
+man/man3/shutdown_mib.3.gz
+man/man3/snmp_add_null_var.3.gz
+man/man3/snmp_alarm.3.gz
+man/man3/snmp_alarm_register.3.gz
+man/man3/snmp_alarm_register_hr.3.gz
+man/man3/snmp_alarm_unregister.3.gz
+man/man3/snmp_api_errstring.3.gz
+man/man3/snmp_clone_pdu.3.gz
+man/man3/snmp_clone_varbind.3.gz
+man/man3/snmp_close.3.gz
+man/man3/snmp_error.3.gz
+man/man3/snmp_fix_pdu.3.gz
+man/man3/snmp_free_pdu.3.gz
+man/man3/snmp_free_var.3.gz
+man/man3/snmp_free_varbind.3.gz
+man/man3/snmp_open.3.gz
+man/man3/snmp_parse_oid.3.gz
+man/man3/snmp_pdu_add_variable.3.gz
+man/man3/snmp_pdu_create.3.gz
+man/man3/snmp_perror.3.gz
+man/man3/snmp_read.3.gz
+man/man3/snmp_select_info.3.gz
+man/man3/snmp_send.3.gz
+man/man3/snmp_sess_async_send.3.gz
+man/man3/snmp_sess_close.3.gz
+man/man3/snmp_sess_error.3.gz
+man/man3/snmp_sess_init.3.gz
+man/man3/snmp_sess_open.3.gz
+man/man3/snmp_sess_perror.3.gz
+man/man3/snmp_sess_read.3.gz
+man/man3/snmp_sess_select_info.3.gz
+man/man3/snmp_sess_send.3.gz
+man/man3/snmp_sess_session.3.gz
+man/man3/snmp_sess_timeout.3.gz
+man/man3/snmp_set_mib_errors.3.gz
+man/man3/snmp_set_mib_warnings.3.gz
+man/man3/snmp_set_save_descriptions.3.gz
+man/man3/snmp_set_var_objid.3.gz
+man/man3/snmp_set_var_typed_integer.3.gz
+man/man3/snmp_set_var_typed_value.3.gz
+man/man3/snmp_set_var_value.3.gz
+man/man3/snmp_timeout.3.gz
+man/man3/snmp_varlist_add_variable.3.gz
+man/man3/snprint_description.3.gz
+man/man3/snprint_objid.3.gz
+man/man3/snprint_value.3.gz
+man/man3/snprint_variable.3.gz
+man/man3/unregister_all_config_handlers.3.gz
+man/man3/unregister_app_config_handler.3.gz
+man/man3/unregister_config_handler.3.gz
+man/man5/mib2c.conf.5.gz
+man/man5/snmp.conf.5.gz
+man/man5/snmp_config.5.gz
+man/man5/snmpd.conf.5.gz
+man/man5/snmpd.examples.5.gz
+man/man5/snmpd.internal.5.gz
+man/man5/snmptrapd.conf.5.gz
+man/man5/variables.5.gz
+man/man8/snmpd.8.gz
+man/man8/snmptrapd.8.gz
+%%WITH_PERL%%man/man3/NetSNMP::ASN.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::OID.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::TrapReceiver.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::agent.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::agent::default_store.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::default_store.3.gz
+%%WITH_PERL%%man/man3/NetSNMP::netsnmp_request_infoPtr.3.gz
+%%WITH_PERL%%man/man3/SNMP.3.gz
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Makefile.subs.pl
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/ASN.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/OID.pm
@@ -452,7 +594,7 @@ sbin/snmptrapd
 %%DATADIR%%/snmpconf-data/snmptrapd-data/runtime
 %%DATADIR%%/snmpconf-data/snmptrapd-data/snmpconf-config
 %%DATADIR%%/snmpconf-data/snmptrapd-data/traphandle
-@dirrm %%DATADIR%%/mib2c-data/
+@dirrm %%DATADIR%%/mib2c-data
 @dirrm %%DATADIR%%/snmpconf-data/snmptrapd-data
 @dirrm %%DATADIR%%/snmpconf-data/snmpd-data
 @dirrm %%DATADIR%%/snmpconf-data/snmp-data
@@ -476,10 +618,11 @@ sbin/snmptrapd
 %%WITH_PYTHON%%%%PYINSTALL%%
 %%WITH_PYTHON%%%%PYUNINSTALL%%
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp_python-%%PYDISTUTILS_PKGVERSION%%-py%%PYTHON_VER%%.egg
-@exec mkdir -p /var/agentx
 @dirrm include/net-snmp/system
 @dirrm include/net-snmp/machine
 @dirrm include/net-snmp/library
 @dirrm include/net-snmp/agent
 @dirrm include/net-snmp
-@unexec rmdir /var/agentx 2>/dev/null || true
+@cwd /
+@exec mkdir -p var/agentx
+@unexec rmdir var/agentx 2>/dev/null || true