Fix serious problems in this package:

- Remove build fixes for NetBSD 1.2, 1.3 and 1.4 which were applied on
  every platform.
- Don't overwrite the default MIBS search path. It breaks the package if
  the "net-snmp" package is not installed. It best case it introduces
  random behaviour if either the "net-snmp" or the "scotty" package
  are installed.
Bump package revision because of these fixes.

Approved by Thomas Klausner.

1 files changed, 2 insertions, 12 deletions

diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index aae4f2b7430..9d1f4878149 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/11/10 20:15:17 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.14 2008/07/13 14:47:24 tron Exp $
 
 DISTNAME=	libsmi-0.4.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
 
@@ -20,9 +19,6 @@ USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mibdir=${MIBDIR:Q}
 CONFIGURE_ARGS+=--with-pibdir=${PIBDIR:Q}
-# this might make it easier to use scotty's and ucd-snmp's mibs,
-# and local ones too
-CONFIGURE_ARGS+=--with-smipath="${MIBDIR}:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 REPLACE_SH+=	tools/smicache.in
@@ -31,12 +27,6 @@ REPLACE_SH+=	test/*.test.in
 
 TEST_TARGET=	check
 
-# Only for systems that don't have these:
-.include "../../mk/bsd.prefs.mk"
-.if ${OS_VERSION:M1.4} || ${OS_VERSION:M1.3} || ${OS_VERSION:M1.2}
-CPPFLAGS+=	-Dstrtoll=strtoq -Dstrtoull=strtouq
-.endif
-
 post-extract:
 	rm -f ${WRKSRC}/test/smilint-smiv2.test