Received: by mail.netbsd.org (Postfix, from userid 605) id 2EED084F18; Tue, 4 Oct 2022 07:14:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5F82184F15 for ; Tue, 4 Oct 2022 07:14:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id oTge0-RUKlNj for ; Tue, 4 Oct 2022 07:14:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id CF14884D12 for ; Tue, 4 Oct 2022 07:14:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CC632FA90; Tue, 4 Oct 2022 07:14:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1664867697257030" MIME-Version: 1.0 Date: Tue, 4 Oct 2022 07:14:57 +0000 From: "Kimmo Suominen" Subject: CVS commit: pkgsrc/sysutils/htop To: pkgsrc-changes@NetBSD.org Reply-To: kim@netbsd.org X-Mailer: log_accum Message-Id: <20221004071457.CC632FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1664867697257030 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kim Date: Tue Oct 4 07:14:57 UTC 2022 Modified Files: pkgsrc/sysutils/htop: Makefile options.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/htop/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/htop/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1664867697257030 Content-Disposition: inline Content-Length: 1733 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/htop/Makefile diff -u pkgsrc/sysutils/htop/Makefile:1.30 pkgsrc/sysutils/htop/Makefile:1.31 --- pkgsrc/sysutils/htop/Makefile:1.30 Sun Sep 25 09:53:28 2022 +++ pkgsrc/sysutils/htop/Makefile Tue Oct 4 07:14:57 2022 @@ -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_TOOLS+= autoreconf automake 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 Index: pkgsrc/sysutils/htop/options.mk diff -u pkgsrc/sysutils/htop/options.mk:1.1 pkgsrc/sysutils/htop/options.mk:1.2 --- pkgsrc/sysutils/htop/options.mk:1.1 Sun Sep 25 09:53:28 2022 +++ pkgsrc/sysutils/htop/options.mk Tue Oct 4 07:14:57 2022 @@ -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 --_----------=_1664867697257030--