CVS commit: pkgsrc/www/goaccess

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Sun Mar 22 22:46:27 UTC 2020

Modified Files:
        pkgsrc/www/goaccess: Makefile options.mk

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

goaccess requires getmouse(3).


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/goaccess/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/goaccess/options.mk

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

Modified files:

Index: pkgsrc/www/goaccess/Makefile
diff -u pkgsrc/www/goaccess/Makefile:1.22 pkgsrc/www/goaccess/Makefile:1.23
--- pkgsrc/www/goaccess/Makefile:1.22   Sun Mar  8 16:51:36 2020
+++ pkgsrc/www/goaccess/Makefile        Sun Mar 22 22:46:27 2020
@@ -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 @@ GNU_CONFIGURE=        yes
 
 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 @@ pre-configure:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/goaccess/options.mk
diff -u pkgsrc/www/goaccess/options.mk:1.3 pkgsrc/www/goaccess/options.mk:1.4
--- pkgsrc/www/goaccess/options.mk:1.3  Mon Nov  4 22:09:55 2019
+++ pkgsrc/www/goaccess/options.mk      Sun Mar 22 22:46:27 2020
@@ -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 @@ CONFIGURE_ARGS+=      --enable-geoip=legacy
 .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