@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/07/09 06:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/04 13:19:56 roy Exp $
 
 DISTNAME=	hunspell-1.3.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hunspell/}
 

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2013/08/27 22:11:20 richard Exp $
+# $NetBSD: options.mk,v 1.6 2017/01/04 13:19:56 roy Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.hunspell
 PKG_SUPPORTED_OPTIONS=		wide-curses
@@ -6,19 +6,11 @@
 
 .include "../../mk/bsd.options.mk"
 
-USE_NCURSES=	yes
-
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
 ###
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9].*-*)
-   CONFIGURE_ENV+=	ac_cv_lib_curses_tparm=yes
-.  include "../../mk/curses.buildlink3.mk"
-.else
-.  if !empty(PKG_OPTIONS:Mwide-curses)
-.    include "../../devel/ncursesw/buildlink3.mk"
-CPPFLAGS.SunOS+=	-D_XPG6
-.  else
-.    include "../../devel/ncurses/buildlink3.mk"
-.  endif
+INCOMPAT_CURSES=		NetBSD-[0-4].*-*
+.include "../../mk/curses.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mwide-curses)
+CPPFLAGS.SunOS+=		-D_XPG6
 .endif