Sun May 24 05:00:36 2020 UTC ()
nvi: Enable wide-curses by default

noted by ottavio on freenode - I suspect most people installing
this package expect it to have utf8 support if they're using
an OS that defaults to ncurses


(nia)
diff -r1.52 -r1.53 pkgsrc/editors/nvi/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/nvi/options.mk
cvs diff -r1.52 -r1.53 pkgsrc/editors/nvi/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/nvi/Makefile 2019/06/08 10:40:57 1.52
+++ pkgsrc/editors/nvi/Makefile 2020/05/24 05:00:36 1.53
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.52 2019/06/08 10:40:57 rillig Exp $ 1# $NetBSD: Makefile,v 1.53 2020/05/24 05:00:36 nia Exp $
2 2
3DISTNAME= nvi-1.81.6 3DISTNAME= nvi-1.81.6
4PKGREVISION= 11 4PKGREVISION= 12
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://www.kotnet.org/~skimo/nvi/devel/ 10#HOMEPAGE= http://www.kotnet.org/~skimo/nvi/devel/
11COMMENT= Berkeley nvi with additional features 11COMMENT= Berkeley nvi with additional features
12 12
13.include "options.mk" 13.include "options.mk"
14 14
15CONFIGURE_DIRS= build.unix 15CONFIGURE_DIRS= build.unix
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= sh aclocal automake autoheader autoconf 17USE_TOOLS+= sh aclocal automake autoheader autoconf
cvs diff -r1.2 -r1.3 pkgsrc/editors/nvi/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/nvi/options.mk 2008/02/21 21:17:45 1.2
+++ pkgsrc/editors/nvi/options.mk 2020/05/24 05:00:36 1.3
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: options.mk,v 1.2 2008/02/21 21:17:45 jlam Exp $ 1# $NetBSD: options.mk,v 1.3 2020/05/24 05:00:36 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nvi 3PKG_OPTIONS_VAR= PKG_OPTIONS.nvi
4PKG_SUPPORTED_OPTIONS= # empty 4PKG_SUPPORTED_OPTIONS= # empty
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7 7
8NVI_NON_WIDE_PLATFORMS= NetBSD-[0-3].*-* # missing swprintf() 8NVI_NON_WIDE_PLATFORMS= NetBSD-[0-3].*-* # missing swprintf()
9.for _pattern_ in ${NVI_NON_WIDE_PLATFORMS} 9.for _pattern_ in ${NVI_NON_WIDE_PLATFORMS}
10. if !empty(MACHINE_PLATFORM:M${_pattern_}) 10. if !empty(MACHINE_PLATFORM:M${_pattern_})
11NVI_NON_WIDE_PLATFORM= yes 11NVI_NON_WIDE_PLATFORM= yes
12. endif 12. endif
13.endfor 13.endfor
14 14
15# Only support the ``wide-curses'' option on platforms that have the 15# Only support the ``wide-curses'' option on platforms that have the
16# necessary wide character support. 16# necessary wide character support.
17# 17#
18.if !defined(NVI_NON_WIDE_PLATFORM) 18.if !defined(NVI_NON_WIDE_PLATFORM)
19PKG_SUPPORTED_OPTIONS+= wide-curses 19PKG_SUPPORTED_OPTIONS+= wide-curses
 20PKG_SUGGESTED_OPTIONS+= wide-curses
20PKG_LEGACY_OPTS+= ncursesw:wide-curses 21PKG_LEGACY_OPTS+= ncursesw:wide-curses
21.endif 22.endif
22 23
23.include "../../mk/bsd.options.mk" 24.include "../../mk/bsd.options.mk"
24 25
25### 26###
26### Wide curses support; otherwise, default to using narrow curses. 27### Wide curses support; otherwise, default to using narrow curses.
27### 28###
28.if !empty(PKG_OPTIONS:Mwide-curses) 29.if !empty(PKG_OPTIONS:Mwide-curses)
29. include "../../devel/ncursesw/buildlink3.mk" 30. include "../../devel/ncursesw/buildlink3.mk"
30CONFIGURE_ARGS+= --enable-widechar 31CONFIGURE_ARGS+= --enable-widechar
31.else 32.else
32. include "../../mk/curses.buildlink3.mk" 33. include "../../mk/curses.buildlink3.mk"