diff options
| -rw-r--r-- | www/goaccess/Makefile | 6 | ||||
| -rw-r--r-- | www/goaccess/PLIST | 10 | ||||
| -rw-r--r-- | www/goaccess/distinfo | 13 | ||||
| -rw-r--r-- | www/goaccess/patches/patch-Makefile.am | 10 | ||||
| -rw-r--r-- | www/goaccess/patches/patch-configure.ac | 18 |
5 files changed, 42 insertions, 15 deletions
diff --git a/www/goaccess/Makefile b/www/goaccess/Makefile index f052a3feeb2..6b7d8d60071 100644 --- a/www/goaccess/Makefile +++ b/www/goaccess/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2016/03/17 00:39:25 wiedi Exp $ +# $NetBSD: Makefile,v 1.13 2016/11/17 22:33:54 wiedi Exp $ -DISTNAME= goaccess-0.9.8 +DISTNAME= goaccess-1.1 CATEGORIES= www MASTER_SITES= http://tar.goaccess.io/ @@ -23,7 +23,7 @@ CPPFLAGS.SunOS+= -D__EXTENSIONS__ .include "options.mk" pre-configure: - cd ${WRKSRC} && aclocal && automake --add-missing + cd ${WRKSRC} && autoreconf -fiv .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/goaccess/PLIST b/www/goaccess/PLIST index 31c6ba96d79..b4497cc5781 100644 --- a/www/goaccess/PLIST +++ b/www/goaccess/PLIST @@ -1,4 +1,12 @@ -@comment $NetBSD: PLIST,v 1.2 2014/06/14 09:56:16 wiedi Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/11/17 22:33:54 wiedi Exp $ bin/goaccess man/man1/goaccess.1 +share/doc/goaccess/app.css +share/doc/goaccess/app.js +share/doc/goaccess/bootstrap.min.css +share/doc/goaccess/charts.js +share/doc/goaccess/d3.v3.min.js +share/doc/goaccess/fa.min.css +share/doc/goaccess/hogan.min.js +share/doc/goaccess/tpls.html share/examples/goaccess/goaccess.conf diff --git a/www/goaccess/distinfo b/www/goaccess/distinfo index 0cf9ba3cd8a..9b27c6a254e 100644 --- a/www/goaccess/distinfo +++ b/www/goaccess/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2016/03/17 00:39:25 wiedi Exp $ +$NetBSD: distinfo,v 1.12 2016/11/17 22:33:54 wiedi Exp $ -SHA1 (goaccess-0.9.8.tar.gz) = 35d3cd6004c566e017d3e2702d5fc0f566655766 -RMD160 (goaccess-0.9.8.tar.gz) = fcf5ff2b905f9ee1047d00ef3b674e5570a8db47 -SHA512 (goaccess-0.9.8.tar.gz) = 40ce161c14f058d5482b90c1fe9c88a7ca8abf063bc041597b23390c5715466bde9bda58beb6e5b61d578a0f7b7d7860a9b3d2056812cc96564d3208e17703e1 -Size (goaccess-0.9.8.tar.gz) = 277618 bytes -SHA1 (patch-Makefile.am) = 8bb0bbd6595be0ac32ecbc7990716a24092504f0 +SHA1 (goaccess-1.1.tar.gz) = 392aac6236a8d6cbe87fcd44cf9ecb3621bfbf5a +RMD160 (goaccess-1.1.tar.gz) = f1b4a9d2ed06faf19caf5acb87b8ee6bed63e15f +SHA512 (goaccess-1.1.tar.gz) = d0d2cb37921ed510d3ee6d8ce65809d50092e9ba1e0234d86798f0ef71c90d88f506b667c1c02207ed33bb8aebdcea18af17bb3c8de1932d6bb3d61922ef6e4a +Size (goaccess-1.1.tar.gz) = 411861 bytes +SHA1 (patch-Makefile.am) = 780091c644a7d4d6e8311f0cbdef0146796df602 +SHA1 (patch-configure.ac) = e9e6c47f579c11bb03a625b2854c6540f2fb877b diff --git a/www/goaccess/patches/patch-Makefile.am b/www/goaccess/patches/patch-Makefile.am index e9ae7da35c4..feabd07b6bc 100644 --- a/www/goaccess/patches/patch-Makefile.am +++ b/www/goaccess/patches/patch-Makefile.am @@ -1,11 +1,11 @@ -$NetBSD: patch-Makefile.am,v 1.2 2015/06/04 21:32:35 wiedi Exp $ +$NetBSD: patch-Makefile.am,v 1.3 2016/11/17 22:33:54 wiedi Exp $ deploy example config in the correct place ---- Makefile.am.orig 2015-05-25 17:21:15.000000000 +0000 +--- Makefile.am.orig 2016-09-30 02:28:08.000000000 +0000 +++ Makefile.am -@@ -2,7 +2,7 @@ - bin_PROGRAMS = goaccess - AUTOMAKE_OPTIONS = subdir-objects +@@ -60,7 +60,7 @@ chartsjs.h: bin2c$(EXEEXT) resources/js/ + appjs.h: bin2c$(EXEEXT) resources/js/app.js + ./bin2c resources/js/app.js src/appjs.h app_js -confdir = $(sysconfdir) +confdir = $(PREFIX)/share/examples/goaccess diff --git a/www/goaccess/patches/patch-configure.ac b/www/goaccess/patches/patch-configure.ac new file mode 100644 index 00000000000..4ac10d0ac2d --- /dev/null +++ b/www/goaccess/patches/patch-configure.ac @@ -0,0 +1,18 @@ +$NetBSD: patch-configure.ac,v 1.1 2016/11/17 22:33:54 wiedi Exp $ + +remove ncursesw hack which actually breaks osx + +--- configure.ac.orig 2016-11-08 01:35:09.000000000 +0000 ++++ configure.ac +@@ -75,11 +75,6 @@ AC_ARG_ENABLE(utf8, [ --enable-utf8 E + + if test "$utf8" = "yes"; then + libncursesw=ncursesw +- # Simply called libncurses on OS X +- case "$host_os" in +- *darwin*) libncursesw=ncurses +- ;; +- esac + + AC_CHECK_LIB([$libncursesw], [mvaddwstr], [], + [AC_MSG_ERROR([*** Missing development libraries for ncursesw])]) |