Attachment 200153 Details for Bug 234047 – 1.3

[patch] 1.3

goaccess-1.3.patch (text/plain), 5.15 KB, created by Adam Weinberger on 2018-12-16 14:19:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2018-12-16 14:19:31 UTC

Size: 5.15 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487588)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	goaccess
>-PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTVERSION=	1.3
> CATEGORIES=	sysutils
> MASTER_SITES=	http://tar.goaccess.io/
> 
>@@ -23,11 +22,12 @@
> 
> PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
> 
>-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
>@@ -34,6 +34,8 @@
> 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 +56,7 @@
> 	${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 487588)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-src_gholder.c
>===================================================================
>--- files/patch-src_gholder.c	(nonexistent)
>+++ files/patch-src_gholder.c	(working copy)
>@@ -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"
>
>Property changes on: files/patch-src_gholder.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_goaccess.c
>===================================================================
>--- files/patch-src_goaccess.c	(nonexistent)
>+++ files/patch-src_goaccess.c	(working copy)
>@@ -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)
>
>Property changes on: files/patch-src_goaccess.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_labels.h
>===================================================================
>--- files/patch-src_labels.h	(nonexistent)
>+++ files/patch-src_labels.h	(working copy)
>@@ -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")
>
>Property changes on: files/patch-src_labels.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 487588)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,8 @@
> bin/goaccess
>-@sample etc/goaccess.conf.sample
>+%%ETCDIR%%/browsers.list
>+@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

Actions: View | Diff

Attachments on bug 234047: 200140 | 200153