CVS commit: pkgsrc/sysutils/nnn

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Fri Jun 14 06:47:01 UTC 2019

Modified Files:
        pkgsrc/sysutils/nnn: Makefile

Log Message:
sysutils/nnn: switch back to mk/curses.buildlink3.mk

It was rightly suggested that nnn's use of mouse functions unavailable
on NetBSD curses doesn't mean builtin curses couldn't be used elsewhere,
so switch back to mk/curses.buildlink3.mk and use INCOMPAT_CURSES to
exclude NetBSD.

Bump PKGREVISION because this could end up picking a different curses
implementation somewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/nnn/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/nnn/Makefile
diff -u pkgsrc/sysutils/nnn/Makefile:1.8 pkgsrc/sysutils/nnn/Makefile:1.9
--- pkgsrc/sysutils/nnn/Makefile:1.8    Wed Jun 12 21:11:44 2019
+++ pkgsrc/sysutils/nnn/Makefile        Fri Jun 14 06:47:01 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2019/06/12 21:11:44 sjmulder Exp $
+# $NetBSD: Makefile,v 1.9 2019/06/14 06:47:01 sjmulder Exp $
 
 DISTNAME=      nnn-2.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jarun/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -12,19 +12,20 @@ COMMENT=    Optimized, feature-packed termi
 LICENSE=       2-clause-bsd
 
 USE_TOOLS+=    gmake pkg-config
+USE_CURSES=    wide
+
+# missing mousemask(), getmouse()
+INCOMPAT_CURSES+=      NetBSD-*
+
 # 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.ncursesw:Q}
-MAKE_ENV+=     LDLIBS_CURSES=${BUILDLINK_LDADD.ncursesw:Q}
-
-# Requires mousemask(), getmouse() functions not in NetBSD curses
-.include "../../devel/ncursesw/buildlink3.mk"
+MAKE_ENV+=     CFLAGS_CURSES=${BUILDLINK_CFLAGS.curses:Q}
+MAKE_ENV+=     LDLIBS_CURSES=${BUILDLINK_LDADD.curses:Q}
 
-# 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"