svn commit: r489224 - in head: . sysutils/goaccess sysutils/goaccess/files
Adam Weinberger
adamw at FreeBSD.org
Thu Jan 3 21:08:54 UTC 2019
Author: adamw
Date: Thu Jan 3 21:08:51 2019
New Revision: 489224
URL: https://svnweb.freebsd.org/changeset/ports/489224
Log:
Update goaccess to 1.3.
With this release:
- The config file has moved from PREFIX/etc to ETCDIR
- The web assets are no longer installed separately (they
are compiled into the binary so this should not affect
end-users)
- NLS support (and OPTION) added
pkg-message and UPDATING entry added for conf file location
change.
Changes: https://goaccess.io/release-notes
PR: 234047
Approved by: maintainer (sbz)
Added:
head/sysutils/goaccess/files/
head/sysutils/goaccess/files/patch-src_gholder.c (contents, props changed)
head/sysutils/goaccess/files/patch-src_goaccess.c (contents, props changed)
head/sysutils/goaccess/files/patch-src_labels.h (contents, props changed)
head/sysutils/goaccess/files/pkg-message.in (contents, props changed)
Modified:
head/UPDATING
head/sysutils/goaccess/Makefile
head/sysutils/goaccess/distinfo
head/sysutils/goaccess/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Thu Jan 3 21:05:47 2019 (r489223)
+++ head/UPDATING Thu Jan 3 21:08:51 2019 (r489224)
@@ -6,6 +6,18 @@ You should get into the habit of checking this file fo
you update your ports collection, before attempting any port upgrades.
20190103:
+ AFFECTS: users of sysutils/goaccess
+ AUTHOR: adamw at FreeBSD.org
+
+ The goaccess.conf location has changed for version 1.3. To preserve
+ your settings, you must move your goaccess.conf to the new location.
+
+ OLD: ${PREFIX}/etc/goaccess.conf
+ NEW: ${PREFIX}/etc/goaccess/goaccess.conf
+
+ # mv /usr/local/etc/goaccess.conf /usr/local/etc/goaccess/goaccess.conf
+
+20190103:
AFFECTS: users of multimedia/vlc*
AUTHOR: riggs at FreeBSD.org
Modified: head/sysutils/goaccess/Makefile
==============================================================================
--- head/sysutils/goaccess/Makefile Thu Jan 3 21:05:47 2019 (r489223)
+++ head/sysutils/goaccess/Makefile Thu Jan 3 21:08:51 2019 (r489224)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= goaccess
-PORTVERSION= 1.2
-PORTREVISION= 1
+PORTVERSION= 1.3
CATEGORIES= sysutils
MASTER_SITES= http://tar.goaccess.io/
@@ -22,18 +21,22 @@ CFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include
LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
+SUB_FILES= pkg-message
-OPTIONS_DEFINE= DOCS DEBUG UTF8
+OPTIONS_DEFINE= DOCS DEBUG NLS UTF8
OPTIONS_DEFAULT= GEOIP UTF8
OPTIONS_RADIO= GEOIPDB TOKYOCABINET
OPTIONS_RADIO_GEOIPDB= GEOIP GEOIP2
OPTIONS_RADIO_TOKYOCABINET= TOKYOCABINET_BTREE TOKYOCABINET_MHASH
+OPTIONS_SUB= yes
GEOIPDB_DESC= GeoIP IP location support
GEOIP_DESC= Legacy/free database format
GEOIP2_DESC= New/paid database format
DEBUG_CONFIGURE_ON= --enable-debug
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext-runtime
UTF8_CONFIGURE_ON= --enable-utf8
GEOIP_CONFIGURE_ON= --enable-geoip=legacy
@@ -54,7 +57,7 @@ do-install-DOCS-on:
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
post-install:
- ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
- ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+ ${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf \
+ ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
.include <bsd.port.mk>
Modified: head/sysutils/goaccess/distinfo
==============================================================================
--- head/sysutils/goaccess/distinfo Thu Jan 3 21:05:47 2019 (r489223)
+++ head/sysutils/goaccess/distinfo Thu Jan 3 21:08:51 2019 (r489224)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489850741
-SHA256 (goaccess-1.2.tar.gz) = 6ba9f66540ea58fc2c17f175265f9ed76d74a8432eeac1182b74ebf4f2cd3414
-SIZE (goaccess-1.2.tar.gz) = 423103
+TIMESTAMP = 1544921228
+SHA256 (goaccess-1.3.tar.gz) = 8c775c5c24bf85a933fd6f1249004847342d6542aa533e4ec02aaf7be41d7b9b
+SIZE (goaccess-1.3.tar.gz) = 541374
Added: head/sysutils/goaccess/files/patch-src_gholder.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/goaccess/files/patch-src_gholder.c Thu Jan 3 21:08:51 2019 (r489224)
@@ -0,0 +1,10 @@
+--- src/gholder.c.orig 2018-12-16 00:54:24 UTC
++++ src/gholder.c
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <sys/socket.h>
+
+ #ifdef HAVE_LIBTOKYOCABINET
+ #include "tcabdb.h"
Added: head/sysutils/goaccess/files/patch-src_goaccess.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/goaccess/files/patch-src_goaccess.c Thu Jan 3 21:08:51 2019 (r489224)
@@ -0,0 +1,13 @@
+--- src/goaccess.c.orig 2018-12-16 01:14:48 UTC
++++ src/goaccess.c
+@@ -1202,8 +1202,10 @@ set_locale (void)
+ char *loc_ctype;
+
+ setlocale (LC_ALL, "");
++#ifdef ENABLE_NLS
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
++#endif
+
+ loc_ctype = getenv ("LC_CTYPE");
+ if (loc_ctype != NULL)
Added: head/sysutils/goaccess/files/patch-src_labels.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/goaccess/files/patch-src_labels.h Thu Jan 3 21:08:51 2019 (r489224)
@@ -0,0 +1,20 @@
+--- src/labels.h.orig 2018-11-23 02:16:45 UTC
++++ src/labels.h
+@@ -30,11 +30,17 @@
+ #ifndef LABELS_H_INCLUDED
+ #define LABELS_H_INCLUDED
+
++#ifdef ENABLE_NLS
+ #include <libintl.h>
+
+ #define _(String) dgettext (PACKAGE , String)
+ #define gettext_noop(String) String
+ #define N_(String) gettext_noop (String)
++#else
++#define _(String) String
++#define gettext_noop(String) String
++#define N_(String) String
++#endif
+
+ /* global lang attribute */
+ #define DOC_LANG _( "en")
Added: head/sysutils/goaccess/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/goaccess/files/pkg-message.in Thu Jan 3 21:08:51 2019 (r489224)
@@ -0,0 +1,8 @@
+====================================================================
+
+The goaccess.conf location has changed for goaccess-1.3. To preserve
+your settings, you must move your goaccess.conf to the new location:
+
+ mv %%PREFIX%%/etc/goaccess.conf %%ETCDIR%%/goaccess.conf
+
+====================================================================
Modified: head/sysutils/goaccess/pkg-plist
==============================================================================
--- head/sysutils/goaccess/pkg-plist Thu Jan 3 21:05:47 2019 (r489223)
+++ head/sysutils/goaccess/pkg-plist Thu Jan 3 21:08:51 2019 (r489224)
@@ -1,11 +1,8 @@
bin/goaccess
- at sample etc/goaccess.conf.sample
+%%ETCDIR%%/browsers.list
+ at sample %%ETCDIR%%/goaccess.conf.sample
man/man1/goaccess.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/app.css
-%%PORTDOCS%%%%DOCSDIR%%/app.js
-%%PORTDOCS%%%%DOCSDIR%%/bootstrap.min.css
-%%PORTDOCS%%%%DOCSDIR%%/charts.js
-%%PORTDOCS%%%%DOCSDIR%%/d3.v3.min.js
-%%PORTDOCS%%%%DOCSDIR%%/fa.min.css
-%%PORTDOCS%%%%DOCSDIR%%/hogan.min.js
-%%PORTDOCS%%%%DOCSDIR%%/tpls.html
+%%NLS%%share/locale/es/LC_MESSAGES/goaccess.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/goaccess.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/goaccess.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/goaccess.mo
More information about the svn-ports-head
mailing list