CVS commit: pkgsrc/www/goaccess

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

Module Name:    pkgsrc
Committed By:   roy
Date:           Mon Mar 23 17:15:57 UTC 2020

Modified Files:
        pkgsrc/www/goaccess: Makefile distinfo options.mk
Added Files:
        pkgsrc/www/goaccess/patches: patch-src_tcbtdb.c

Log Message:
goaccess: Add support for Tokyo Cabinet to persist data


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/goaccess/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/goaccess/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/goaccess/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/goaccess/patches/patch-src_tcbtdb.c

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.23 pkgsrc/www/goaccess/Makefile:1.24
--- pkgsrc/www/goaccess/Makefile:1.23   Sun Mar 22 22:46:27 2020
+++ pkgsrc/www/goaccess/Makefile        Mon Mar 23 17:15:56 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2020/03/22 22:46:27 roy Exp $
+# $NetBSD: Makefile,v 1.24 2020/03/23 17:15:56 roy Exp $
 
 DISTNAME=      goaccess-1.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  http://tar.goaccess.io/
 

Index: pkgsrc/www/goaccess/distinfo
diff -u pkgsrc/www/goaccess/distinfo:1.16 pkgsrc/www/goaccess/distinfo:1.17
--- pkgsrc/www/goaccess/distinfo:1.16   Sun Mar 22 22:45:00 2020
+++ pkgsrc/www/goaccess/distinfo        Mon Mar 23 17:15:56 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2020/03/22 22:45:00 roy Exp $
+$NetBSD: distinfo,v 1.17 2020/03/23 17:15:56 roy Exp $
 
 SHA1 (goaccess-1.3.tar.gz) = 24e889533e8d7a0fc533e7a0ad1bb303b2bb1af4
 RMD160 (goaccess-1.3.tar.gz) = b4744d1500a86ab56c94ce3612a8121b38cb3a37
@@ -9,3 +9,4 @@ SHA1 (patch-configure) = 5ecf98e50dbbbb2
 SHA1 (patch-configure.ac) = 7cf4b8b57e2f335a81cfd81f929aafe7aa41aa79
 SHA1 (patch-src_error.c) = 522ea4010c86914715cdb40c1ac33045d4342daa
 SHA1 (patch-src_json.c) = ab8575a654299a5d08de635ca5bb71093419ca8e
+SHA1 (patch-src_tcbtdb.c) = fb0005899b08f74d0d3e6be4d5947a39fabdf278

Index: pkgsrc/www/goaccess/options.mk
diff -u pkgsrc/www/goaccess/options.mk:1.4 pkgsrc/www/goaccess/options.mk:1.5
--- pkgsrc/www/goaccess/options.mk:1.4  Sun Mar 22 22:46:27 2020
+++ pkgsrc/www/goaccess/options.mk      Mon Mar 23 17:15:56 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2020/03/22 22:46:27 roy Exp $
+# $NetBSD: options.mk,v 1.5 2020/03/23 17:15:56 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.goaccess
-PKG_SUPPORTED_OPTIONS= geoip wide-curses
-PKG_SUGGESTED_OPTIONS= wide-curses
+PKG_SUPPORTED_OPTIONS= geoip tokyocabinet wide-curses
+PKG_SUGGESTED_OPTIONS= tokyocabinet wide-curses
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,6 +11,11 @@ PKG_SUGGESTED_OPTIONS=       wide-curses
 CONFIGURE_ARGS+=       --enable-geoip=legacy
 .endif # geoip
 
+.if !empty(PKG_OPTIONS:Mtokyocabinet)
+CONFIGURE_ARGS+=       --enable-tcb=btree
+.  include "../../databases/tokyocabinet/buildlink3.mk"
+.endif #tokyocabinet
+
 .if !empty(PKG_OPTIONS:Mwide-curses)
 CONFIGURE_ARGS+=       --enable-utf8
 .endif

Added files:

Index: pkgsrc/www/goaccess/patches/patch-src_tcbtdb.c
diff -u /dev/null pkgsrc/www/goaccess/patches/patch-src_tcbtdb.c:1.1
--- /dev/null   Mon Mar 23 17:15:57 2020
+++ pkgsrc/www/goaccess/patches/patch-src_tcbtdb.c      Mon Mar 23 17:15:57 2020
@@ -0,0 +1,14 @@
+$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"