Re: CVS commit: pkgsrc/sysutils/nnn

[Thomas Klausner <wiz%NetBSD.org@localhost>]

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.
 Thomas

On Wed, Jun 12, 2019 at 08:52:37PM +0000, Sijmen J. Mulder wrote:
> Module Name:  pkgsrc
> Committed By: sjmulder
> Date:         Wed Jun 12 20:52:37 UTC 2019
> 
> Modified Files:
>       pkgsrc/sysutils/nnn: Makefile
> 
> Log Message:
> sysutils/nnn: require ncurses
> 
> nnn is not compatible with NetBSD curses, requiring mouse and
> set_escdelay() functions. Use ncurses instead.
> 
> Bump PKGREVISION.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.6 -r1.7 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.6 pkgsrc/sysutils/nnn/Makefile:1.7
> --- pkgsrc/sysutils/nnn/Makefile:1.6  Wed May 29 10:18:50 2019
> +++ pkgsrc/sysutils/nnn/Makefile      Wed Jun 12 20:52:37 2019
> @@ -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 @@ COMMENT=  Optimized, feature-packed termi
>  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"
>