Attachment #140815 for bug #187521

View | Details | Raw Unified | Return to bug 187521
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	goaccess
PORTVERSION=	0.7.1
CATEGORIES=	sysutils
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}

MAINTAINER=	sbz@FreeBSD.org
COMMENT=	Real-time Apache web log analyzer

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
		GeoIP:${PORTSDIR}/net/GeoIP

GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USE_GNOME=	glib20
USES=		pkgconfig

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PLIST_FILES=	bin/${PORTNAME} \
		man/man1/goaccess.1.gz

.if !defined(NO_INSTALL_MANPAGES)
MAN1=	${PORTNAME}.1
.endif

PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO

.include <bsd.port.options.mk>

do-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif
.if !defined(NO_INSTALL_MANPAGES)
	${INSTALL_MAN} ${WRKSRC}/goaccess.1 ${STAGEDIR}${MANPREFIX}/man/man1
.endif
	${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (goaccess-0.5.tar.gz) = beabad8267099d693cf2f0a6f533ecf5b5bdcc829b4536ec56b4a68b2c7d5e0e	1	SHA256 (goaccess-0.7.1.tar.gz) = 04de880ebdedde8daeec6284783bd7f4b04d9149b08deaa5588e55f24739f49b
2	SIZE (goaccess-0.5.tar.gz) = 127068	2	SIZE (goaccess-0.7.1.tar.gz) = 163640




--- ./commons.h.orig	2012-06-04 04:16:26.000000000 +0200
+++ ./commons.h	2012-08-08 20:30:36.000000000 +0200
@@ -35,6 +35,11 @@
 #ifndef COMMONS_H_INCLUDED
 #define COMMONS_H_INCLUDED
 
+/* off_t need sys/types.h on 7.x */
+#if __FreeBSD_cc_version_ < 700022
+#include <sys/types.h>
+#endif
+
 /* Remove the __attribute__ stuff when the compiler is not GCC. */
 #if !__GNUC__
 #  define __attribute__(x) /**/

Lines 1-14 Link Here

(-)files/patch-gmenu.c (-14 lines)
1	--- ./gmenu.c.orig 2012-08-08 20:30:06.000000000 +0200
2	+++ ./gmenu.c 2012-08-08 20:30:23.000000000 +0200
3	@@ -24,6 +24,11 @@
4	#include <stdlib.h>
5	#include <string.h>
6
7	+/* off_t need sys/types.h on 7.x */
8	+#if __FreeBSD_cc_version_ < 700022
9	+#include <sys/types.h>
10	+#endif
11	+
12	#include "gmenu.h"
13	#include "error.h"
14	#include "util.h"




--- ./util.c.orig	2012-06-04 04:16:26.000000000 +0200
+++ ./util.c	2012-08-08 20:30:36.000000000 +0200
@@ -28,7 +28,7 @@
 #define _XOPEN_SOURCE 700
 
 #ifdef __FreeBSD__
-#include <sys/socket.h>
+#include <netinet/in.h>
 #endif
 
 #include <arpa/inet.h>
@@ -44,9 +44,9 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "util.h"
 #include "commons.h"
 #include "error.h"
+#include "util.h"
 
 /* helper functions */
 char *

Lines 2-5 Link Here

(-)pkg-descr (-1 / +1 lines)
2	viewer that runs in a terminal and provides fast and valuable HTTP statistics	2	viewer that runs in a terminal and provides fast and valuable HTTP statistics
3	for system administrators that require a visual report on the fly.	3	for system administrators that require a visual report on the fly.
4		4
5	WWW: http://goaccess.prosoftcorp.com/	5	WWW: http://goaccess.prosoftcorp.com/

Return to bug 187521

Lines 2-45 Link Here

(-)Makefile (-16 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= goaccess	4	PORTNAME= goaccess
5	PORTVERSION= 0.5	5	PORTVERSION= 0.7.1
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= SF	7	MASTER_SITES= SF
8	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}/	8	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
9		9
10	MAINTAINER= sbz@FreeBSD.org	10	MAINTAINER= sbz@FreeBSD.org
11	COMMENT= Real-time Apache web log analyzer	11	COMMENT= Real-time Apache web log analyzer
12		12
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \	15	LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP
17	GeoIP:${PORTSDIR}/net/GeoIP
18		16
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
		19	USE_GNOME= glib20
21	USES= pkgconfig	20	USES= pkgconfig
22		21
23	CFLAGS+= -I${LOCALBASE}/include	22	CFLAGS+= -I${LOCALBASE}/include
24	LDFLAGS+= -L${LOCALBASE}/lib	23	LDFLAGS+= -L${LOCALBASE}/lib
25		24
26	PLIST_FILES= bin/${PORTNAME}	25	PLIST_FILES= bin/${PORTNAME} \
		26	man/man1/goaccess.1.gz
27		27
28	.if !defined(NO_INSTALL_MANPAGES)
29	MAN1= ${PORTNAME}.1
30	.endif
31
32	PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO	28	PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
33		29
34	NO_STAGE= yes	30	.include <bsd.port.options.mk>
		31
35	do-install:	32	do-install:
36	.if !defined(NOPORTDOCS)	33	.if ${PORT_OPTIONS:MDOCS}
37	@${MKDIR} ${DOCSDIR}	34	@${MKDIR} ${STAGEDIR}${DOCSDIR}
38	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}	35	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
39	.endif	36	.endif
40	.if !defined(NO_INSTALL_MANPAGES)	37	.if !defined(NO_INSTALL_MANPAGES)
41	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1	38	${INSTALL_MAN} ${WRKSRC}/goaccess.1 ${STAGEDIR}${MANPREFIX}/man/man1
42	.endif	39	.endif
43	${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${PREFIX}/bin	40	${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
44		41
45	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)files/patch-commons.h (-14 lines)
1	--- ./commons.h.orig 2012-06-04 04:16:26.000000000 +0200
2	+++ ./commons.h 2012-08-08 20:30:36.000000000 +0200
3	@@ -35,6 +35,11 @@
4	#ifndef COMMONS_H_INCLUDED
5	#define COMMONS_H_INCLUDED
6
7	+/* off_t need sys/types.h on 7.x */
8	+#if __FreeBSD_cc_version_ < 700022
9	+#include <sys/types.h>
10	+#endif
11	+
12	/* Remove the __attribute__ stuff when the compiler is not GCC. */
13	#if !__GNUC__
14	# define __attribute__(x) /**/

Lines 1-22 Link Here

(-)files/patch-util.c (-22 lines)
1	--- ./util.c.orig 2012-06-04 04:16:26.000000000 +0200
2	+++ ./util.c 2012-08-08 20:30:36.000000000 +0200
3	@@ -28,7 +28,7 @@
4	#define _XOPEN_SOURCE 700
5
6	#ifdef __FreeBSD__
7	-#include <sys/socket.h>
8	+#include <netinet/in.h>
9	#endif
10
11	#include <arpa/inet.h>
12	@@ -44,9 +44,9 @@
13	#include <time.h>
14	#include <unistd.h>
15
16	-#include "util.h"
17	#include "commons.h"
18	#include "error.h"
19	+#include "util.h"
20
21	/* helper functions */
22	char *