CVS commit: pkgsrc/textproc/hunspell

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 28 19:24:20 UTC 2021

Modified Files:
        pkgsrc/textproc/hunspell: Makefile options.mk

Log Message:
hunspell: Allow NetBSD curses to count as "wide curses"


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/hunspell/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/hunspell/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/hunspell/Makefile
diff -u pkgsrc/textproc/hunspell/Makefile:1.37 pkgsrc/textproc/hunspell/Makefile:1.38
--- pkgsrc/textproc/hunspell/Makefile:1.37      Mon May 24 19:54:25 2021
+++ pkgsrc/textproc/hunspell/Makefile   Sun Nov 28 19:24:19 2021
@@ -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_TOOLS+=           pkg-config perl:run autorec
 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 @@ post-patch:
        
 
 .include "options.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/hunspell/options.mk
diff -u pkgsrc/textproc/hunspell/options.mk:1.8 pkgsrc/textproc/hunspell/options.mk:1.9
--- pkgsrc/textproc/hunspell/options.mk:1.8     Mon May  3 09:46:59 2021
+++ pkgsrc/textproc/hunspell/options.mk Sun Nov 28 19:24:19 2021
@@ -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