+ Rename the "ncursesw" option to "wide-curses" and get rid of the "ncurses" option. "wide-curses" now just toggles whether we use wide or narrow curses, which is a much simpler knob for users. Bump the PKGREVISION to 2.diff -r1.4 -r1.5 pkgsrc/textproc/hunspell/Makefile
(jlam)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2007/10/09 19:19:15 martti Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2008/02/22 17:04:34 jlam Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= hunspell-1.1.12-2 | 4 | DISTNAME= hunspell-1.1.12-2 | |
5 | PKGNAME= ${DISTNAME:C/-([0-9]+)$/.\1/} | 5 | PKGNAME= ${DISTNAME:C/-([0-9]+)$/.\1/} | |
6 | PKGREVISION= 1 | 6 | PKGREVISION= 2 | |
7 | CATEGORIES= textproc | 7 | CATEGORIES= textproc | |
8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hunspell/} | 8 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hunspell/} | |
9 | 9 | |||
10 | MAINTAINER= adam.hoka@gmail.com | 10 | MAINTAINER= adam.hoka@gmail.com | |
11 | HOMEPAGE= http://hunspell.sourceforge.net/ | 11 | HOMEPAGE= http://hunspell.sourceforge.net/ | |
12 | COMMENT= Improved spellchecker | 12 | COMMENT= Improved spellchecker | |
13 | 13 | |||
14 | WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | 14 | WRKSRC= ${WRKDIR}/${DISTNAME:C/-[0-9]+$//} | |
15 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
17 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
18 | USE_PKGLOCALEDIR= yes | 18 | USE_PKGLOCALEDIR= yes | |
19 | USE_LANGUAGES= c c++ | 19 | USE_LANGUAGES= c c++ |
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: options.mk,v 1.1.1.1 2007/09/11 17:40:29 wiz Exp $ | 1 | # $NetBSD: options.mk,v 1.2 2008/02/22 17:04:34 jlam Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hunspell | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.hunspell | |
4 | PKG_OPTIONS_REQUIRED_GROUPS= display | 4 | PKG_SUPPORTED_OPTIONS= wide-curses | |
5 | PKG_OPTIONS_GROUP.display= ncurses ncursesw | 5 | PKG_SUGGESTED_OPTIONS= # empty | |
6 | PKG_SUGGESTED_OPTIONS= ncurses | 6 | PKG_LEGACY_OPTS+= ncursesw:wide-curses | |
7 | 7 | |||
8 | .include "../../mk/bsd.options.mk" | 8 | .include "../../mk/bsd.options.mk" | |
9 | 9 | |||
10 | .if !empty(PKG_OPTIONS:Mncurses) | 10 | USE_NCURSES= yes | |
11 | USE_NCURSES= yes | |||
12 | . include "../../devel/ncurses/buildlink3.mk" | |||
13 | .endif | |||
14 | 11 | |||
15 | .if !empty(PKG_OPTIONS:Mncursesw) | 12 | .if !empty(PKG_OPTIONS:Mwide-curses) | |
16 | . include "../../devel/ncursesw/buildlink3.mk" | 13 | . include "../../devel/ncursesw/buildlink3.mk" | |
14 | .else | |||
15 | . include "../../devel/ncurses/buildlink3.mk" | |||
17 | .endif | 16 | .endif |