Sun Mar 22 22:46:27 2020 UTC ()
goaccess: Use the curses framework rather than just linking to ncurses

goaccess requires getmouse(3).


(roy)
diff -r1.22 -r1.23 pkgsrc/www/goaccess/Makefile
diff -r1.3 -r1.4 pkgsrc/www/goaccess/options.mk
cvs diff -r1.22 -r1.23 pkgsrc/www/goaccess/Makefile (expand / switch to unified diff)

--- pkgsrc/www/goaccess/Makefile 2020/03/08 16:51:36 1.22
+++ pkgsrc/www/goaccess/Makefile 2020/03/22 22:46:27 1.23
@@ -1,36 +1,39 @@ @@ -1,36 +1,39 @@
1# $NetBSD: Makefile,v 1.22 2020/03/08 16:51:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2020/03/22 22:46:27 roy Exp $
2 2
3DISTNAME= goaccess-1.3 3DISTNAME= goaccess-1.3
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://tar.goaccess.io/ 6MASTER_SITES= http://tar.goaccess.io/
7 7
8MAINTAINER= wiedi@frubar.net 8MAINTAINER= wiedi@frubar.net
9HOMEPAGE= http://goaccess.prosoftcorp.com/ 9HOMEPAGE= http://goaccess.prosoftcorp.com/
10COMMENT= Real-time web log analyzer 10COMMENT= Real-time web log analyzer
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools 13TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17USE_LANGUAGES= c99 17USE_LANGUAGES= c99
18USE_TOOLS+= pkg-config aclocal autoconf automake 18USE_TOOLS+= pkg-config aclocal autoconf automake
19USE_NCURSES= yes 19
 20USE_CURSES= getmouse
 21FAKE_NCURSES= yes
20 22
21EGDIR= ${PREFIX}/share/examples/${PKGBASE} 23EGDIR= ${PREFIX}/share/examples/${PKGBASE}
22CONF_FILES= ${EGDIR}/goaccess.conf ${PKG_SYSCONFDIR}/goaccess.conf 24CONF_FILES= ${EGDIR}/goaccess.conf ${PKG_SYSCONFDIR}/goaccess.conf
23 25
24LIBS.SunOS+= -lsocket -lnsl 26LIBS.SunOS+= -lsocket -lnsl
25CPPFLAGS.SunOS+= -D__EXTENSIONS__ 27CPPFLAGS.SunOS+= -D__EXTENSIONS__
26 28
27BROKEN_GETTEXT_DETECTION= yes 29BROKEN_GETTEXT_DETECTION= yes
28 30
29.include "options.mk" 31.include "options.mk"
30 32
31pre-configure: 33pre-configure:
32 cd ${WRKSRC} && autoreconf -fiv 34 cd ${WRKSRC} && autoreconf -fiv
33 35
34.include "../../devel/gettext-lib/buildlink3.mk" 36.include "../../devel/gettext-lib/buildlink3.mk"
35.include "../../devel/glib2/buildlink3.mk" 37.include "../../devel/glib2/buildlink3.mk"
 38.include "../../mk/curses.buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/goaccess/options.mk (expand / switch to unified diff)

--- pkgsrc/www/goaccess/options.mk 2019/11/04 22:09:55 1.3
+++ pkgsrc/www/goaccess/options.mk 2020/03/22 22:46:27 1.4
@@ -1,19 +1,16 @@ @@ -1,19 +1,16 @@
1# $NetBSD: options.mk,v 1.3 2019/11/04 22:09:55 rillig Exp $ 1# $NetBSD: options.mk,v 1.4 2020/03/22 22:46:27 roy Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.goaccess 3PKG_OPTIONS_VAR= PKG_OPTIONS.goaccess
4PKG_SUPPORTED_OPTIONS= geoip wide-curses 4PKG_SUPPORTED_OPTIONS= geoip wide-curses
5PKG_SUGGESTED_OPTIONS= wide-curses 5PKG_SUGGESTED_OPTIONS= wide-curses
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mgeoip) 9.if !empty(PKG_OPTIONS:Mgeoip)
10. include "../../net/GeoIP/buildlink3.mk" 10. include "../../net/GeoIP/buildlink3.mk"
11CONFIGURE_ARGS+= --enable-geoip=legacy 11CONFIGURE_ARGS+= --enable-geoip=legacy
12.endif # geoip 12.endif # geoip
13 13
14.if !empty(PKG_OPTIONS:Mwide-curses) 14.if !empty(PKG_OPTIONS:Mwide-curses)
15. include "../../devel/ncursesw/buildlink3.mk" 
16CONFIGURE_ARGS+= --enable-utf8 15CONFIGURE_ARGS+= --enable-utf8
17.else 16.endif
18. include "../../devel/ncurses/buildlink3.mk" 
19.endif # wide-curses