Tue Oct 4 07:14:57 2022 UTC ()
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.


(kim)
diff -r1.30 -r1.31 pkgsrc/sysutils/htop/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/htop/options.mk
cvs diff -r1.30 -r1.31 pkgsrc/sysutils/htop/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/htop/Makefile 2022/09/25 09:53:28 1.30
+++ pkgsrc/sysutils/htop/Makefile 2022/10/04 07:14:57 1.31
@@ -1,31 +1,25 @@ @@ -1,31 +1,25 @@
1# $NetBSD: Makefile,v 1.30 2022/09/25 09:53:28 kim Exp $ 1# $NetBSD: Makefile,v 1.31 2022/10/04 07:14:57 kim Exp $
2 2
3DISTNAME= htop-3.2.1 3DISTNAME= htop-3.2.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=htop-dev/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=htop-dev/}
7 7
8MAINTAINER= nia@NetBSD.org 8MAINTAINER= nia@NetBSD.org
9HOMEPAGE= https://htop.dev/ 9HOMEPAGE= https://htop.dev/
10COMMENT= Enhanced version of top utility 10COMMENT= Enhanced version of top utility
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= autoreconf automake 15USE_TOOLS+= autoreconf automake
16USE_CURSES= getmouse 16USE_CURSES= getmouse
17 17
18.include "options.mk" 18.include "options.mk"
19.include "../../mk/curses.buildlink3.mk" 
20 
21.if ${CURSES_TYPE} != "ncursesw" 
22# See netbsd/README.md 
23CONFIGURE_ARGS+= --disable-unicode 
24.endif 
25 19
26pre-configure: 20pre-configure:
27 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./autogen.sh 21 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./autogen.sh
28 22
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 23.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../sysutils/desktop-file-utils/desktopdb.mk" 24.include "../../sysutils/desktop-file-utils/desktopdb.mk"
31.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/htop/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/htop/options.mk 2022/09/25 09:53:28 1.1
+++ pkgsrc/sysutils/htop/options.mk 2022/10/04 07:14:57 1.2
@@ -1,10 +1,20 @@ @@ -1,10 +1,20 @@
1# $NetBSD: options.mk,v 1.1 2022/09/25 09:53:28 kim Exp $ 1# $NetBSD: options.mk,v 1.2 2022/10/04 07:14:57 kim Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.htop 3PKG_OPTIONS_VAR= PKG_OPTIONS.htop
4 4
5PKG_OPTIONS_REQUIRED_GROUPS+= curses 5PKG_OPTIONS_REQUIRED_GROUPS+= curses
6PKG_OPTIONS_GROUP.curses= curses wide-curses 6PKG_OPTIONS_GROUP.curses= curses ncurses
7 7
8PKG_SUGGESTED_OPTIONS= curses 8PKG_SUGGESTED_OPTIONS= curses
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
 11
 12.if !empty(PKG_OPTIONS:Mncurses)
 13. include "../../devel/ncursesw/buildlink3.mk"
 14.else
 15. include "../../mk/curses.buildlink3.mk"
 16. if ${CURSES_TYPE} != "ncursesw"
 17# See netbsd/README.md
 18CONFIGURE_ARGS+= --disable-unicode
 19. endif
 20.endif