[pkgsrc/trunk]: pkgsrc/www/goaccess goaccess: Use the curses framework rather...

[roy <roy%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/543f61ad677c
branches:  trunk
changeset: 425644:543f61ad677c
user:      roy <roy%pkgsrc.org@localhost>
date:      Sun Mar 22 22:46:27 2020 +0000

description:
goaccess: Use the curses framework rather than just linking to ncurses

goaccess requires getmouse(3).

diffstat:

 www/goaccess/Makefile   |  9 ++++++---
 www/goaccess/options.mk |  7 ++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r a8521cfb0936 -r 543f61ad677c www/goaccess/Makefile
--- a/www/goaccess/Makefile     Sun Mar 22 22:45:24 2020 +0000
+++ b/www/goaccess/Makefile     Sun Mar 22 22:46:27 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2020/03/08 16:51:36 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2020/03/22 22:46:27 roy Exp $
 
 DISTNAME=      goaccess-1.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://tar.goaccess.io/
 
@@ -16,7 +16,9 @@
 
 USE_LANGUAGES= c99
 USE_TOOLS+=    pkg-config aclocal autoconf automake
-USE_NCURSES=   yes
+
+USE_CURSES=    getmouse
+FAKE_NCURSES=  yes
 
 EGDIR=         ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=    ${EGDIR}/goaccess.conf ${PKG_SYSCONFDIR}/goaccess.conf
@@ -33,4 +35,5 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a8521cfb0936 -r 543f61ad677c www/goaccess/options.mk
--- a/www/goaccess/options.mk   Sun Mar 22 22:45:24 2020 +0000
+++ b/www/goaccess/options.mk   Sun Mar 22 22:46:27 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/04 22:09:55 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2020/03/22 22:46:27 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.goaccess
 PKG_SUPPORTED_OPTIONS= geoip wide-curses
@@ -12,8 +12,5 @@
 .endif # geoip
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
-.  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-utf8
-.else
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif # wide-curses
+.endif