pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/nnn sysutils/nnn: require ncurses



details:   https://anonhg.NetBSD.org/pkgsrc/rev/beb41dc7a9b6
branches:  trunk
changeset: 396933:beb41dc7a9b6
user:      sjmulder <sjmulder%pkgsrc.org@localhost>
date:      Wed Jun 12 20:52:37 2019 +0000

description:
sysutils/nnn: require ncurses

nnn is not compatible with NetBSD curses, requiring mouse and
set_escdelay() functions. Use ncurses instead.

Bump PKGREVISION.

diffstat:

 sysutils/nnn/Makefile |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 4c14e01496a6 -r beb41dc7a9b6 sysutils/nnn/Makefile
--- a/sysutils/nnn/Makefile     Wed Jun 12 20:41:05 2019 +0000
+++ b/sysutils/nnn/Makefile     Wed Jun 12 20:52:37 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2019/05/29 10:18:50 sjmulder Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/12 20:52:37 sjmulder Exp $
 
 DISTNAME=      nnn-2.5
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jarun/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,17 +12,20 @@
 LICENSE=       2-clause-bsd
 
 USE_TOOLS+=    gmake pkg-config
-USE_CURSES=    wide
-
 # build without readline unless option set (see options.mk)
 BUILD_TARGET=  norl
 
 MAKE_ENV+=     MANPREFIX=${PREFIX}/${PKGMANDIR}
 MAKE_ENV+=     CFLAGS_OPTIMIZATION=
-MAKE_ENV+=     CFLAGS_CURSES=${BUILDLINK_CFLAGS.curses:Q}
-MAKE_ENV+=     LDLIBS_CURSES=${BUILDLINK_LDADD.curses:Q}
+MAKE_ENV+=     CFLAGS_CURSES=${BUILDLINK_CFLAGS.ncursesw:Q}
+MAKE_ENV+=     LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q}
 
+# Requries mousemask(), getmouse(), set_escdelay() functions not in NetBSD
+# curses
+.include "../../devel/ncursesw/buildlink3.mk"
+
+# After ncursesw so readline doesn't add the non-wide ncurses which
+# would sabotage the ncursesw buildlink with '__nonexistent__'
 .include "options.mk"
 
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index