Mon Mar 23 17:15:57 2020 UTC ()
goaccess: Add support for Tokyo Cabinet to persist data


(roy)
diff -r1.23 -r1.24 pkgsrc/www/goaccess/Makefile
diff -r1.16 -r1.17 pkgsrc/www/goaccess/distinfo
diff -r1.4 -r1.5 pkgsrc/www/goaccess/options.mk
diff -r0 -r1.1 pkgsrc/www/goaccess/patches/patch-src_tcbtdb.c
cvs diff -r1.23 -r1.24 pkgsrc/www/goaccess/Makefile (expand / switch to unified diff)

--- pkgsrc/www/goaccess/Makefile 2020/03/22 22:46:27 1.23
+++ pkgsrc/www/goaccess/Makefile 2020/03/23 17:15:56 1.24
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2020/03/22 22:46:27 roy Exp $ 1# $NetBSD: Makefile,v 1.24 2020/03/23 17:15:56 roy Exp $
2 2
3DISTNAME= goaccess-1.3 3DISTNAME= goaccess-1.3
4PKGREVISION= 2 4PKGREVISION= 3
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
cvs diff -r1.16 -r1.17 pkgsrc/www/goaccess/distinfo (expand / switch to unified diff)

--- pkgsrc/www/goaccess/distinfo 2020/03/22 22:45:00 1.16
+++ pkgsrc/www/goaccess/distinfo 2020/03/23 17:15:56 1.17
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.16 2020/03/22 22:45:00 roy Exp $ 1$NetBSD: distinfo,v 1.17 2020/03/23 17:15:56 roy Exp $
2 2
3SHA1 (goaccess-1.3.tar.gz) = 24e889533e8d7a0fc533e7a0ad1bb303b2bb1af4 3SHA1 (goaccess-1.3.tar.gz) = 24e889533e8d7a0fc533e7a0ad1bb303b2bb1af4
4RMD160 (goaccess-1.3.tar.gz) = b4744d1500a86ab56c94ce3612a8121b38cb3a37 4RMD160 (goaccess-1.3.tar.gz) = b4744d1500a86ab56c94ce3612a8121b38cb3a37
5SHA512 (goaccess-1.3.tar.gz) = 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1 5SHA512 (goaccess-1.3.tar.gz) = 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
6Size (goaccess-1.3.tar.gz) = 541374 bytes 6Size (goaccess-1.3.tar.gz) = 541374 bytes
7SHA1 (patch-Makefile.am) = f0fb958f91856fa8996c4e6691207c77a47af6d0 7SHA1 (patch-Makefile.am) = f0fb958f91856fa8996c4e6691207c77a47af6d0
8SHA1 (patch-configure) = 5ecf98e50dbbbb2a435b70fb8194f6a039c5c99e 8SHA1 (patch-configure) = 5ecf98e50dbbbb2a435b70fb8194f6a039c5c99e
9SHA1 (patch-configure.ac) = 7cf4b8b57e2f335a81cfd81f929aafe7aa41aa79 9SHA1 (patch-configure.ac) = 7cf4b8b57e2f335a81cfd81f929aafe7aa41aa79
10SHA1 (patch-src_error.c) = 522ea4010c86914715cdb40c1ac33045d4342daa 10SHA1 (patch-src_error.c) = 522ea4010c86914715cdb40c1ac33045d4342daa
11SHA1 (patch-src_json.c) = ab8575a654299a5d08de635ca5bb71093419ca8e 11SHA1 (patch-src_json.c) = ab8575a654299a5d08de635ca5bb71093419ca8e
 12SHA1 (patch-src_tcbtdb.c) = fb0005899b08f74d0d3e6be4d5947a39fabdf278
cvs diff -r1.4 -r1.5 pkgsrc/www/goaccess/options.mk (expand / switch to unified diff)

--- pkgsrc/www/goaccess/options.mk 2020/03/22 22:46:27 1.4
+++ pkgsrc/www/goaccess/options.mk 2020/03/23 17:15:56 1.5
@@ -1,16 +1,21 @@ @@ -1,16 +1,21 @@
1# $NetBSD: options.mk,v 1.4 2020/03/22 22:46:27 roy Exp $ 1# $NetBSD: options.mk,v 1.5 2020/03/23 17:15:56 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 tokyocabinet wide-curses
5PKG_SUGGESTED_OPTIONS= wide-curses 5PKG_SUGGESTED_OPTIONS= tokyocabinet 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:Mtokyocabinet)
 15CONFIGURE_ARGS+= --enable-tcb=btree
 16. include "../../databases/tokyocabinet/buildlink3.mk"
 17.endif #tokyocabinet
 18
14.if !empty(PKG_OPTIONS:Mwide-curses) 19.if !empty(PKG_OPTIONS:Mwide-curses)
15CONFIGURE_ARGS+= --enable-utf8 20CONFIGURE_ARGS+= --enable-utf8
16.endif 21.endif
File Added: pkgsrc/www/goaccess/patches/Attic/patch-src_tcbtdb.c
$NetBSD: patch-src_tcbtdb.c,v 1.1 2020/03/23 17:15:57 roy Exp $

va_list requires stdarg.h

--- src/tcbtdb.c.orig	2020-03-23 16:42:43.613997461 +0000
+++ src/tcbtdb.c	2020-03-23 16:43:08.793204575 +0000
@@ -37,6 +37,7 @@
 #include <tcutil.h>
 #include <fcntl.h>
 #include <sys/types.h>
+#include <stdarg.h>
 #include <unistd.h>
 
 #include "tcbtdb.h"