[pkgsrc/trunk]: pkgsrc/textproc/hunspell hunspell: Allow NetBSD curses to cou...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5684782f9408
branches:  trunk
changeset: 770292:5684782f9408
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Nov 28 19:24:19 2021 +0000

description:
hunspell: Allow NetBSD curses to count as "wide curses"

diffstat:

 textproc/hunspell/Makefile   |   8 +++++---
 textproc/hunspell/options.mk |  14 +++-----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diffs (55 lines):

diff -r e8cbe125892d -r 5684782f9408 textproc/hunspell/Makefile
--- a/textproc/hunspell/Makefile        Sun Nov 28 18:38:22 2021 +0000
+++ b/textproc/hunspell/Makefile        Sun Nov 28 19:24:19 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2021/05/24 19:54:25 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2021/11/28 19:24:19 nia Exp $
 
 DISTNAME=      hunspell-1.7.0
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hunspell/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -17,6 +17,8 @@
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++03
 
+CPPFLAGS.SunOS+=       -D_XPG6
+
 CONFIGURE_ARGS+=       --with-ui
 
 PKGCONFIG_OVERRIDE+=   hunspell.pc.in
@@ -39,7 +41,7 @@
        
 
 .include "options.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e8cbe125892d -r 5684782f9408 textproc/hunspell/options.mk
--- a/textproc/hunspell/options.mk      Sun Nov 28 18:38:22 2021 +0000
+++ b/textproc/hunspell/options.mk      Sun Nov 28 19:24:19 2021 +0000
@@ -1,17 +1,9 @@
-# $NetBSD: options.mk,v 1.8 2021/05/03 09:46:59 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2021/11/28 19:24:19 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.hunspell
+
+# handled by curses framework
 PKG_SUPPORTED_OPTIONS=         wide-curses
 PKG_SUGGESTED_OPTIONS=         wide-curses
 
 .include "../../mk/bsd.options.mk"
-
-###
-### Wide curses support; otherwise, default to using narrow curses.
-###
-.if !empty(PKG_OPTIONS:Mwide-curses)
-.include "../../devel/ncursesw/buildlink3.mk"
-CPPFLAGS.SunOS+=               -D_XPG6
-.else
-.include "../../mk/curses.buildlink3.mk"
-.endif