Remove net-snmp workaround now that OPENBSD-PF-MIB is installed in the OS.

This commit is contained in:
sthen 2012-04-11 16:31:14 +00:00
parent 03bdc902e8
commit 276bf947ee
3 changed files with 5 additions and 1499 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2012/02/21 22:10:20 sthen Exp $
# $OpenBSD: Makefile,v 1.64 2012/04/11 16:31:14 sthen Exp $
COMMENT-main= extendable SNMP implementation
COMMENT-perl= SNMP modules for Perl
@ -9,7 +9,7 @@ DISTNAME= net-snmp-$V
MULTI_PACKAGES= -main -perl -tkmib
PKGNAME-main= ${DISTNAME}
REVISION-main= 2
REVISION-main= 3
REVISION-perl= 0
PKGNAME-perl= p5-SNMP-$V
PKGNAME-tkmib= net-snmp-tkmib-$V
@ -45,8 +45,8 @@ NET_SNMP_MIB_LIST= smux mibII/mta_sendmail
# - net-snmp default mibs (include/net-snmp/net-snmp-config.h.in)
# - this is checked in pre-configure as we don't want it to get out of sync
DEFAULT_MIBS= IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:SNMPv2-MIB:RFC1213-MIB
# - base OpenBSD mibs (/usr/share/snmp/mibs)
OPENBSD_MIBS= OPENBSD-BASE-MIB:OPENBSD-CARP-MIB:OPENBSD-MEM-MIB:OPENBSD-SENSORS-MIB:OPENBSD-SNMPD-CONF
# - base OpenBSD mibs (/usr/share/snmp/mibs), SNMPD-CONF pulls in the rest
OPENBSD_MIBS= OPENBSD-SNMPD-CONF
USE_GROFF= Yes
USE_LIBTOOL= Yes
@ -85,6 +85,5 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/net-snmp
${INSTALL_DATA} ${WRKBUILD}/EXAMPLE.conf \
${PREFIX}/share/examples/net-snmp
${INSTALL_DATA} ${FILESDIR}/OPENBSD-PF-MIB.txt ${PREFIX}/share/snmp/mibs
.include <bsd.port.mk>

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.13 2012/02/21 22:10:21 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.14 2012/04/11 16:31:14 sthen Exp $
@pkgpath net/net-snmp
@extraunexec rm -rf /var/net-snmp/*
%%SHARED%%
@ -485,7 +485,6 @@ share/snmp/mibs/NET-SNMP-TC.txt
share/snmp/mibs/NET-SNMP-VACM-MIB.txt
share/snmp/mibs/NETWORK-SERVICES-MIB.txt
share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
share/snmp/mibs/OPENBSD-PF-MIB.txt
share/snmp/mibs/RFC-1215.txt
share/snmp/mibs/RFC1155-SMI.txt
share/snmp/mibs/RFC1213-MIB.txt