Remove INCOMPAT_CURSES settings for NetBSD 0.x and 1.x. Tighten up some

globs to ensure NetBSD 10 is not incorrectly matched when it is released.

4 files changed, 6 insertions, 18 deletions

diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index dfe15341dfe..72e677cb3cb 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/18 07:31:14 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	bmon-2.0.1
@@ -14,11 +14,6 @@ GNU_CONFIGURE=	yes
 MAKE_FILE=	GNUmakefile
 USE_TOOLS+=	gmake
 
-# In NetBSD 1.6.x the native curses implementation has problems with bmon.
-# So mark it as incompatible and link bmon against the
-# 3rd party ncurses library in NetBSD 1.6.x.
-INCOMPAT_CURSES= NetBSD-1.6*-*
-
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=		${PREFIX}/share/examples/bmon
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index ccac9e112d8..56b856f18d2 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2015/08/18 07:31:14 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=		ettercap-0.6.b
 PKGREVISION=		29
@@ -20,8 +20,8 @@ CONFIGURE_ARGS+=	--enable-https
 
 .include "options.mk"
 
-# putwin() appeared in 4.99.60
-INCOMPAT_CURSES=	NetBSD-[0-3]* NetBSD-4.[0-9].* NetBSD-4.99.[012345]*
+# needs putwin()
+INCOMPAT_CURSES=	NetBSD-[0-4].*
 USE_OLD_DES_API=	yes
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
diff --git a/net/nap/Makefile b/net/nap/Makefile
index e5f6951afad..ed9c73aafee 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/08/18 07:31:15 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	nap-1.4.4
 PKGREVISION=	4
@@ -11,10 +11,6 @@ COMMENT=	Terminal based Napster client similar to ircII
 
 GNU_CONFIGURE=		YES
 
-# newterm()
-INCOMPAT_CURSES=	NetBSD-1.4*-*
-INCOMPAT_CURSES+=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-Z]-*
-
 INSTALLATION_DIRS+=	share/doc/nap share/examples/nap
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index 38f7c95c6fa..44abb6949b2 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/18 07:31:16 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	ap-utils-1.3.2
@@ -15,9 +15,6 @@ COMMENT=	Wireless access points UNIX management tool
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
-
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
 .include "../../devel/gettext-lib/buildlink3.mk"