[pkgsrc/trunk]: pkgsrc/sysutils/htop htop: Fix options for selecting curses type

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/00a2544d6830
branches:  trunk
changeset: 386249:00a2544d6830
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue Oct 04 07:14:57 2022 +0000

description:
htop: Fix options for selecting curses type

Users can now select ncurses for enabling unicode characters on NetBSD.
It was not sufficient (or even correct, most likely) to use "wide-curses"
for this.

diffstat:

 sysutils/htop/Makefile   |  10 ++--------
 sysutils/htop/options.mk |  16 +++++++++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (53 lines):

diff -r bef53e20373b -r 00a2544d6830 sysutils/htop/Makefile
--- a/sysutils/htop/Makefile    Tue Oct 04 07:14:11 2022 +0000
+++ b/sysutils/htop/Makefile    Tue Oct 04 07:14:57 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2022/09/25 09:53:28 kim Exp $
+# $NetBSD: Makefile,v 1.31 2022/10/04 07:14:57 kim Exp $
 
 DISTNAME=      htop-3.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=htop-dev/}
 
@@ -16,12 +16,6 @@
 USE_CURSES=    getmouse
 
 .include "options.mk"
-.include "../../mk/curses.buildlink3.mk"
-
-.if ${CURSES_TYPE} != "ncursesw"
-# See netbsd/README.md
-CONFIGURE_ARGS+=       --disable-unicode
-.endif
 
 pre-configure:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./autogen.sh
diff -r bef53e20373b -r 00a2544d6830 sysutils/htop/options.mk
--- a/sysutils/htop/options.mk  Tue Oct 04 07:14:11 2022 +0000
+++ b/sysutils/htop/options.mk  Tue Oct 04 07:14:57 2022 +0000
@@ -1,10 +1,20 @@
-# $NetBSD: options.mk,v 1.1 2022/09/25 09:53:28 kim Exp $
+# $NetBSD: options.mk,v 1.2 2022/10/04 07:14:57 kim Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.htop
+PKG_OPTIONS_VAR=               PKG_OPTIONS.htop
 
 PKG_OPTIONS_REQUIRED_GROUPS+=  curses
-PKG_OPTIONS_GROUP.curses=      curses wide-curses
+PKG_OPTIONS_GROUP.curses=      curses ncurses
 
 PKG_SUGGESTED_OPTIONS=         curses
 
 .include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+. include "../../devel/ncursesw/buildlink3.mk"
+.else
+. include "../../mk/curses.buildlink3.mk"
+. if ${CURSES_TYPE} != "ncursesw"
+# See netbsd/README.md
+CONFIGURE_ARGS+=               --disable-unicode
+. endif
+.endif