pkgsrc-Changes archive

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

Re: CVS commit: pkgsrc/sysutils/nnn



Thomas Klausner wrote:
> I usually prefer to keep using curses.mk and setting
> 
>   INCOMPAT_CURSES=NetBSD-*
> 
> instead, so the pattern can be updated when NetBSD's libcurses gets
> the missing functionality.

Seems like a good suggestion. Patch attached, ok? CCing leot@ who has
kindly been looking over my shoulder.

Sijmen
Index: sysutils/nnn/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/nnn/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sysutils/nnn/Makefile       12 Jun 2019 21:11:44 -0000      1.8
+++ sysutils/nnn/Makefile       12 Jun 2019 21:53:38 -0000
@@ -12,19 +12,20 @@
 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"


Home | Main Index | Thread Index | Old Index