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.

31 files changed, 36 insertions, 111 deletions

diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 3a5183e0cf9..b1775406fdf 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/08/18 07:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/08 11:57:48 jperkin Exp $
 #
 
 DISTNAME=	cmp3-2.0pre6
@@ -16,8 +16,6 @@ DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools
 
 WRKSRC=			${WRKDIR}/cmp3-kenrevs
 USE_TOOLS+=		gmake
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*
 
 INSTALLATION_DIRS=	bin
 
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index df629e83f35..4a55667a046 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2015/08/18 07:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2015/09/08 11:57:48 jperkin Exp $
 
 DISTNAME=	mp3info-0.8.5a
 PKGNAME=	g${DISTNAME}
@@ -16,9 +16,6 @@ CONFLICTS=	mp3info-[0-9]*
 
 USE_TOOLS+=	pkg-config
 
-# wgetnstr()
-INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/curses.buildlink3.mk"
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 5bdfea0e26c..cd8cdf0d04a 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/18 07:31:02 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:48 jperkin Exp $
 #
 
 DISTNAME=	juke-0.7
@@ -12,9 +12,6 @@ COMMENT=	Simple ncurses based jukebox
 
 GNU_CONFIGURE=	YES
 
-# halfdelay()
-INCOMPAT_CURSES=	NetBSD-1.[45]*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-L]-*
-
 EGDIR=		${PREFIX}/share/examples/juke
 
 CONF_FILES=	${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index fbbca86ed96..88d881042ca 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/08/18 07:31:02 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/09/08 11:57:48 jperkin Exp $
 #
 
 DISTNAME=		tcd-2.2.0
@@ -13,7 +13,6 @@ COMMENT=		Audio CD player using ncurses and SDL
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INCOMPAT_CURSES+=	NetBSD-1.6*-*
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 842aa767d87..dbc74afb9b4 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2015/09/08 11:57:49 jperkin Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=	15
@@ -29,8 +29,6 @@ MAKE_ENV+=		SHELL=${SH:Q}
 
 CHECK_PERMS_SKIP+=	lib/X11/xmcd/discog/*
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-S]*-*
-
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
 ARCH=	Solaris
diff --git a/chat/centerim/Makefile b/chat/centerim/Makefile
index ca2e3234b5d..63edfac9295 100644
--- a/chat/centerim/Makefile
+++ b/chat/centerim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	centerim-4.22.10
@@ -25,10 +25,7 @@ REPLACE_PERL+=		misc/cimconv
 REPLACE_PYTHON+=	misc/CenterIMLog2HTML.py
 REPLACE_AWK+=		misc/cimformathistory
 
-INCOMPAT_CURSES+=	NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
-INCOMPAT_CURSES+=	NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-*
-INCOMPAT_CURSES+=	NetBSD-2.*-* NetBSD-3.*-*	# see PR 29060
-INCOMPAT_CURSES+=	NetBSD-4.*-* NetBSD-5.*-*
+INCOMPAT_CURSES+=	NetBSD-[0-5].*-* # see PR 29060
 
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
diff --git a/chat/gtmess/Makefile b/chat/gtmess/Makefile
index c0e91111e25..4e541c424ba 100644
--- a/chat/gtmess/Makefile
+++ b/chat/gtmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=		gtmess-0.91
@@ -18,8 +18,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_search_iconv=${BUILDLINK_LDADD.iconv:Q}
 CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 
-INCOMPAT_CURSES=	NetBSD-1.*-*
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile
index b157c369329..75a1c481e23 100644
--- a/chat/licq-gui-console/Makefile
+++ b/chat/licq-gui-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	licq-1.3.5
@@ -24,8 +24,6 @@ SHLIBTOOL_OVERRIDE=	# empty
 CONFIGURE_DIRS=		plugins/console
 OVERRIDE_DIRDEPTH=	3
 
-INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
-
 # the cdk on NetBSD 4.0 isn't compatible; also force the check
 # initCDKScreen() to succeed, the configure script test fails due
 # to missing -lm
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index 10f7f213932..f07a350f220 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2015/04/25 14:20:28 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	licq-1.3.5
@@ -28,8 +28,6 @@ SHLIBTOOL_OVERRIDE=	# empty
 OVERRIDE_DIRDEPTH=	3
 CONFIGURE_DIRS=		plugins/qt-gui
 
-INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
-
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 6eab5bf5163..51ef080022b 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.36 2014/08/11 12:06:00 tron Exp $
+# $NetBSD: builtin.mk,v 1.37 2015/09/08 11:57:49 jperkin Exp $
 
 BUILTIN_PKG:=	ncurses
 
@@ -88,8 +88,7 @@ H_NCURSES=		/usr/include/curses.h
 # Some platforms don't have a curses implementation that can replace
 # ncurses.
 #
-_INCOMPAT_CURSES?=	NetBSD-0.*-* NetBSD-1.[0123]*-*			\
-			NetBSD-1.4.*-* NetBSD-1.4[A-X]-*
+_INCOMPAT_CURSES?=
 .    for _pattern_ in ${_INCOMPAT_CURSES} ${INCOMPAT_CURSES}
 .      if !empty(MACHINE_PLATFORM:M${_pattern_})
 USE_BUILTIN.ncurses=	no
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index a04fb5bc11a..8e66b876151 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:06 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	hnb-1.9.17
@@ -10,8 +10,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hnb.sourceforge.net/
 COMMENT=	Hierarchical data organizer
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-U]-*
-
 USE_TOOLS+=		gmake
 
 BUILD_DIRS=		src
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index 66a496d6213..f15c8f7c8e7 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/08/18 07:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	angband-3.0.3
@@ -21,9 +21,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_TOOLS+=	gzip pax
 USE_GAMESGROUP=	yes
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-M]-*
-
 SPOILERFILE=	angband-spoilers.tar.gz
 
 GNU_CONFIGURE=		yes
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index cb219a88a8d..9de5df211c8 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/09/08 11:57:49 jperkin Exp $
 
 DISTNAME=	dopewars-1.5.12
 PKGREVISION=	23
@@ -20,9 +20,6 @@ CONFIGURE_ARGS+=	--without-esd
 CONFIGURE_ARGS+=	--without-sdl
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/games
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
-
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 7af9e7e4701..6e1b75adea6 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/09/08 11:57:49 jperkin Exp $
 
 DISTNAME=	frotz-2.43
 PKGREVISION=	5
@@ -18,9 +18,6 @@ MAKE_ENV+=	SOUND_LIB=${LIBOSSAUDIO}
 MAKE_ENV+=	SOUND_DEV=${DEVOSSSOUND}
 .endif
 
-# setscrreg()
-INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
-
 SAMPLEDIR=	${PREFIX}/share/examples/frotz
 DOCDIR=		${PREFIX}/share/doc/frotz
 
diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index 517c47e22fd..149322b0ff7 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2015/09/08 11:57:49 jperkin Exp $
 #
 
 DISTNAME=	hugov31_unix_source
@@ -16,9 +16,6 @@ SITES.hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_TOOLS+=	gmake
-# uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-*
-INCOMPAT_CURSES+=	NetBSD-1.6.*-* NetBSD-1.6[A-L]*-*
 WRKSRC=		${WRKDIR}/hugov3.1.02
 
 LIBDIR=		${PREFIX}/share/hugo
diff --git a/games/level9/Makefile b/games/level9/Makefile
index 349c0aec041..225a4a3fb6d 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/09/08 11:57:49 jperkin Exp $
 
 DISTNAME=		Level9_5.1_Source
 PKGNAME=		level9-5.1
@@ -13,9 +13,6 @@ COMMENT=		Curses port of the Level 9 text adventure interpreter
 LICENSE=		gnu-gpl-v2
 
 WRKSRC=			${WRKDIR}/Unix
-# uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+=	NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-*
-INCOMPAT_CURSES+=	NetBSD-1.6.*-* NetBSD-1.6[A-L]*-*
 
 INSTALLATION_DIRS=	bin share/doc/level9
 
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index b887eb61197..2f0e7b1d450 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/08/18 07:31:10 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2015/09/08 11:57:49 jperkin Exp $
 
 DISTNAME=	libcaca-0.99.beta18
 PKGNAME=	${DISTNAME:S/beta//}
@@ -16,7 +16,6 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
 PKGCONFIG_OVERRIDE+=	caca/caca.pc.in
 
 CHECK_FILES_SKIP+=	${PREFIX}/lib/libcucul.*
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index c8e77e08aa2..7a9e23ebce0 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/08/18 07:31:10 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=		nhc98src-1.22
 PKGNAME=		nhc98-1.22
@@ -35,9 +35,6 @@ BUILD_MAKE_FLAGS+=	PKGSRC_M32=${M32}
 
 PLIST_SUBST+=		HARCH=`${WRKSRC}/script/harch`
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
-
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index b101e583ce1..e27bab4000b 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/08/18 07:31:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	pfqueue-0.5.6
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-INCOMPAT_CURSES=	NetBSD-1.*-*
 FAKE_NCURSES=	yes
 
 .include "options.mk"
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index fbf92aed168..784d7e9ce9f 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2015/08/18 07:31:01 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	dialog-1.2-20150528
 PKGREVISION=	2
@@ -17,8 +17,6 @@ MAKE_FILE=	makefile
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--with-libtool
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-P]-*
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		rpath
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index 67a2d97f52c..7ebe8469eda 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	reed-5.4
 PKGREVISION=	8
@@ -15,9 +15,6 @@ HAS_CONFIGURE=		YES
 USE_TOOLS+=		perl:run
 REPLACE_PERL=		breed fix_bookmarks.pl wrap
 
-# wgetnstr()
-INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
-
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 70149e5980b..a4799790f42 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2015/08/18 07:31:14 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	vfu-3.04
@@ -16,9 +16,6 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	perl:run
 REPLACE_PERL+=	rx/rx_*
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-U]-*
-
 DOCDIR=		${PREFIX}/share/doc/vfu
 EGDIR=		${PREFIX}/share/examples/vfu
 
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"
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index 3a7e4060558..6fc6112f7d4 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	ccze-0.2.1
 PKGREVISION=	4
@@ -9,8 +9,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://bonehunter.rulez.org/software/ccze/
 COMMENT=	Log coloriser, fast and light on resources
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6*-*
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 BUILDLINK_TRANSFORM+=	rm:-Wmulticharacter
diff --git a/sysutils/ncdu/Makefile b/sysutils/ncdu/Makefile
index 3c17d8e0c61..9c1f2ba120e 100644
--- a/sysutils/ncdu/Makefile
+++ b/sysutils/ncdu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/08/18 07:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	ncdu-1.10
 PKGREVISION=	2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://dev.yorhel.nl/ncdu
 LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
-INCOMPAT_CURSES=	NetBSD-[0-5]*-*
+INCOMPAT_CURSES=	NetBSD-[0-5].*-*
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 665b1d87f66..a4bfb57d452 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/08/17 17:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	vifm-0.7.8
@@ -14,9 +14,6 @@ COMMENT=	Ncurses based file manager with vi like keybindings
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake perl
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
-
 ppre-configure:
 	@${SED} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
 		-e "s,/usr/local,${PREFIX},g" \
diff --git a/www/apachetop/Makefile b/www/apachetop/Makefile
index 645942895c4..0082bbc5214 100644
--- a/www/apachetop/Makefile
+++ b/www/apachetop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/08/18 07:31:19 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/09/08 11:57:50 jperkin Exp $
 #
 
 DISTNAME=	apachetop-0.12.5
@@ -14,10 +14,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-logfile=${VARBASE}/log/httpd/access_log
 USE_LANGUAGES=		c c++
 
-# NetBSD releases which do not include wattr_on() et al.
-INCOMPAT_CURSES=	NetBSD-1.5*-*
-INCOMPAT_CURSES=	NetBSD-1.6-* NetBSD-1.6.*-* NetBSD-1.6[A-Q]-*
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 940da1210aa..d679974bfda 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2015/08/18 07:31:20 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2015/09/08 11:57:50 jperkin Exp $
 
 DISTNAME=	wml-2.0.11
 PKGREVISION=	3
@@ -25,9 +25,6 @@ CONFIGURE_ARGS+= --with-perl=${PERL5:Q} \
 
 TEST_TARGET=	test
 
-INCOMPAT_CURSES=	NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
-INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
-
 PERL_ARCHNAME_cmd=	eval `${PERL5} -V:archname 2>/dev/null`; \
 			${ECHO} $${archname}
 PLIST_SUBST+=		PERL_ARCHNAME=${PERL_ARCHNAME_cmd:sh}