Use the curses framework.diff -r1.22 -r1.23 pkgsrc/textproc/hunspell/Makefile
(roy)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.22 2016/07/09 06:39:05 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.23 2017/01/04 13:19:56 roy Exp $ | |
2 | 2 | |||
3 | DISTNAME= hunspell-1.3.3 | 3 | DISTNAME= hunspell-1.3.3 | |
4 | PKGREVISION= 4 | 4 | PKGREVISION= 5 | |
5 | CATEGORIES= textproc | 5 | CATEGORIES= textproc | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hunspell/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hunspell/} | |
7 | 7 | |||
8 | MAINTAINER= ahoka@NetBSD.org | 8 | MAINTAINER= ahoka@NetBSD.org | |
9 | HOMEPAGE= http://hunspell.sourceforge.net/ | 9 | HOMEPAGE= http://hunspell.sourceforge.net/ | |
10 | COMMENT= Improved spellchecker | 10 | COMMENT= Improved spellchecker | |
11 | LICENSE= mpl-1.1 OR gnu-lgpl-v2.1 OR gnu-gpl-v2 | 11 | LICENSE= mpl-1.1 OR gnu-lgpl-v2.1 OR gnu-gpl-v2 | |
12 | 12 | |||
13 | WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | 13 | WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | |
14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= pkg-config perl:run | 16 | USE_TOOLS+= pkg-config perl:run | |
17 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes |
@@ -1,24 +1,16 @@ | @@ -1,24 +1,16 @@ | |||
1 | # $NetBSD: options.mk,v 1.5 2013/08/27 22:11:20 richard Exp $ | 1 | # $NetBSD: options.mk,v 1.6 2017/01/04 13:19:56 roy Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hunspell | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hunspell | |
4 | PKG_SUPPORTED_OPTIONS= wide-curses | 4 | PKG_SUPPORTED_OPTIONS= wide-curses | |
5 | PKG_SUGGESTED_OPTIONS= # empty | 5 | PKG_SUGGESTED_OPTIONS= # empty | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | USE_NCURSES= yes | |||
10 | ||||
11 | ### | 9 | ### | |
12 | ### Wide curses support; otherwise, default to using narrow curses. | 10 | ### Wide curses support; otherwise, default to using narrow curses. | |
13 | ### | 11 | ### | |
14 | .if !empty(MACHINE_PLATFORM:MNetBSD-[5-9].*-*) | 12 | INCOMPAT_CURSES= NetBSD-[0-4].*-* | |
15 | CONFIGURE_ENV+= ac_cv_lib_curses_tparm=yes | 13 | .include "../../mk/curses.buildlink3.mk" | |
16 | . include "../../mk/curses.buildlink3.mk" | 14 | .if !empty(PKG_OPTIONS:Mwide-curses) | |
17 | .else | 15 | CPPFLAGS.SunOS+= -D_XPG6 | |
18 | . if !empty(PKG_OPTIONS:Mwide-curses) | |||
19 | . include "../../devel/ncursesw/buildlink3.mk" | |||
20 | CPPFLAGS.SunOS+= -D_XPG6 | |||
21 | . else | |||
22 | . include "../../devel/ncurses/buildlink3.mk" | |||
23 | . endif | |||
24 | .endif | 16 | .endif |