View | Details | Raw Unified | Return to bug 234047 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +7 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	goaccess
4
PORTNAME=	goaccess
5
PORTVERSION=	1.2
5
PORTVERSION=	1.3
6
PORTREVISION=	1
7
CATEGORIES=	sysutils
6
CATEGORIES=	sysutils
8
MASTER_SITES=	http://tar.goaccess.io/
7
MASTER_SITES=	http://tar.goaccess.io/
9
8
Lines 23-33 Link Here
23
22
24
PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
23
PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
25
24
26
OPTIONS_DEFINE=	DOCS DEBUG UTF8
25
OPTIONS_DEFINE=	DOCS DEBUG NLS UTF8
27
OPTIONS_DEFAULT=	GEOIP UTF8
26
OPTIONS_DEFAULT=	GEOIP UTF8
28
OPTIONS_RADIO=	GEOIPDB TOKYOCABINET
27
OPTIONS_RADIO=	GEOIPDB TOKYOCABINET
29
OPTIONS_RADIO_GEOIPDB=	GEOIP GEOIP2
28
OPTIONS_RADIO_GEOIPDB=	GEOIP GEOIP2
30
OPTIONS_RADIO_TOKYOCABINET=	TOKYOCABINET_BTREE TOKYOCABINET_MHASH
29
OPTIONS_RADIO_TOKYOCABINET=	TOKYOCABINET_BTREE TOKYOCABINET_MHASH
30
OPTIONS_SUB=	yes
31
31
32
GEOIPDB_DESC=	GeoIP IP location support
32
GEOIPDB_DESC=	GeoIP IP location support
33
GEOIP_DESC=	Legacy/free database format
33
GEOIP_DESC=	Legacy/free database format
Lines 34-39 Link Here
34
GEOIP2_DESC=	New/paid database format
34
GEOIP2_DESC=	New/paid database format
35
35
36
DEBUG_CONFIGURE_ON=	--enable-debug
36
DEBUG_CONFIGURE_ON=	--enable-debug
37
NLS_CONFIGURE_ENABLE=	nls
38
NLS_USES=		gettext-runtime
37
UTF8_CONFIGURE_ON=	--enable-utf8
39
UTF8_CONFIGURE_ON=	--enable-utf8
38
40
39
GEOIP_CONFIGURE_ON=	--enable-geoip=legacy
41
GEOIP_CONFIGURE_ON=	--enable-geoip=legacy
Lines 54-60 Link Here
54
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
56
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
55
57
56
post-install:
58
post-install:
57
	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
59
	${MV} ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf \
58
		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
60
		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
59
61
60
.include <bsd.port.mk>
62
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1489850741
1
TIMESTAMP = 1544921228
2
SHA256 (goaccess-1.2.tar.gz) = 6ba9f66540ea58fc2c17f175265f9ed76d74a8432eeac1182b74ebf4f2cd3414
2
SHA256 (goaccess-1.3.tar.gz) = 8c775c5c24bf85a933fd6f1249004847342d6542aa533e4ec02aaf7be41d7b9b
3
SIZE (goaccess-1.2.tar.gz) = 423103
3
SIZE (goaccess-1.3.tar.gz) = 541374
(-)files/patch-src_gholder.c (+10 lines)
Line 0 Link Here
1
--- src/gholder.c.orig	2018-12-16 00:54:24 UTC
2
+++ src/gholder.c
3
@@ -34,6 +34,7 @@
4
 #include <string.h>
5
 #include <netinet/in.h>
6
 #include <arpa/inet.h>
7
+#include <sys/socket.h>
8
 
9
 #ifdef HAVE_LIBTOKYOCABINET
10
 #include "tcabdb.h"
(-)files/patch-src_goaccess.c (+13 lines)
Line 0 Link Here
1
--- src/goaccess.c.orig	2018-12-16 01:14:48 UTC
2
+++ src/goaccess.c
3
@@ -1202,8 +1202,10 @@ set_locale (void)
4
   char *loc_ctype;
5
 
6
   setlocale (LC_ALL, "");
7
+#ifdef HAVE_LIBINTL_H
8
   bindtextdomain (PACKAGE, LOCALEDIR);
9
   textdomain (PACKAGE);
10
+#endif
11
 
12
   loc_ctype = getenv ("LC_CTYPE");
13
   if (loc_ctype != NULL)
(-)files/patch-src_labels.h (+20 lines)
Line 0 Link Here
1
--- src/labels.h.orig	2018-11-23 02:16:45 UTC
2
+++ src/labels.h
3
@@ -30,11 +30,17 @@
4
 #ifndef LABELS_H_INCLUDED
5
 #define LABELS_H_INCLUDED
6
 
7
+#ifdef HAVE_LIBINTL_H
8
 #include <libintl.h>
9
 
10
 #define _(String) dgettext (PACKAGE , String)
11
 #define gettext_noop(String) String
12
 #define N_(String) gettext_noop (String)
13
+#else
14
+#define _(String) String
15
+#define gettext_noop(String) String
16
+#define N_(String) String
17
+#endif
18
 
19
 /* global lang attribute */
20
 #define DOC_LANG                 _( "en")
(-)pkg-plist (-9 / +6 lines)
Lines 1-11 Link Here
1
bin/goaccess
1
bin/goaccess
2
@sample etc/goaccess.conf.sample
2
%%ETCDIR%%/browsers.list
3
@sample %%ETCDIR%%/goaccess.conf.sample
3
man/man1/goaccess.1.gz
4
man/man1/goaccess.1.gz
4
%%PORTDOCS%%%%DOCSDIR%%/app.css
5
%%NLS%%share/locale/es/LC_MESSAGES/goaccess.mo
5
%%PORTDOCS%%%%DOCSDIR%%/app.js
6
%%NLS%%share/locale/fr/LC_MESSAGES/goaccess.mo
6
%%PORTDOCS%%%%DOCSDIR%%/bootstrap.min.css
7
%%NLS%%share/locale/ja/LC_MESSAGES/goaccess.mo
7
%%PORTDOCS%%%%DOCSDIR%%/charts.js
8
%%NLS%%share/locale/zh_CN/LC_MESSAGES/goaccess.mo
8
%%PORTDOCS%%%%DOCSDIR%%/d3.v3.min.js
9
%%PORTDOCS%%%%DOCSDIR%%/fa.min.css
10
%%PORTDOCS%%%%DOCSDIR%%/hogan.min.js
11
%%PORTDOCS%%%%DOCSDIR%%/tpls.html

Return to bug 234047