Date: Thu, 13 Mar 2014 14:02:52 +0800 (CST) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: sbz@FreeBSD.org Subject: ports/187521: [PATCH] sysutils/goaccess: update to 0.7.1 Message-ID: <20140313060252.3AFDD57572@lwbsd.csie.net> Resent-Message-ID: <201403130620.s2D6K0ra072217@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187521
>Category: ports
>Synopsis: [PATCH] sysutils/goaccess: update to 0.7.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 13 06:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Li-Wen Hsu
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lwbsd.cs.nctu.edu.tw 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Thu Dec 27 15:07:23 CST 2012
>Description:
- Update to 0.7.1
- Support STAGEDIR
- Drop FreeBSD 7.x support
Port maintainer (sbz@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.03 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:
--- goaccess-0.7.1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348038)
+++ Makefile (working copy)
@@ -2,44 +2,41 @@
# $FreeBSD$
PORTNAME= goaccess
-PORTVERSION= 0.5
+PORTVERSION= 0.7.1
CATEGORIES= sysutils
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}/
+MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= sbz@FreeBSD.org
COMMENT= Real-time Apache web log analyzer
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 \
- GeoIP:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS= libGeoIP.so:${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}
+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
-NO_STAGE= yes
+.include <bsd.port.options.mk>
+
do-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif
.if !defined(NO_INSTALL_MANPAGES)
- ${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/goaccess.1 ${STAGEDIR}${MANPREFIX}/man/man1
.endif
- ${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (revision 348038)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (goaccess-0.5.tar.gz) = beabad8267099d693cf2f0a6f533ecf5b5bdcc829b4536ec56b4a68b2c7d5e0e
-SIZE (goaccess-0.5.tar.gz) = 127068
+SHA256 (goaccess-0.7.1.tar.gz) = 04de880ebdedde8daeec6284783bd7f4b04d9149b08deaa5588e55f24739f49b
+SIZE (goaccess-0.7.1.tar.gz) = 163640
Index: files/patch-commons.h
===================================================================
--- files/patch-commons.h (revision 348038)
+++ files/patch-commons.h (working copy)
@@ -1,14 +0,0 @@
---- ./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) /**/
Index: files/patch-gmenu.c
===================================================================
--- files/patch-gmenu.c (revision 348038)
+++ files/patch-gmenu.c (working copy)
@@ -1,14 +0,0 @@
---- ./gmenu.c.orig 2012-08-08 20:30:06.000000000 +0200
-+++ ./gmenu.c 2012-08-08 20:30:23.000000000 +0200
-@@ -24,6 +24,11 @@
- #include <stdlib.h>
- #include <string.h>
-
-+/* off_t need sys/types.h on 7.x */
-+#if __FreeBSD_cc_version_ < 700022
-+#include <sys/types.h>
-+#endif
-+
- #include "gmenu.h"
- #include "error.h"
- #include "util.h"
Index: files/patch-util.c
===================================================================
--- files/patch-util.c (revision 348038)
+++ files/patch-util.c (working copy)
@@ -1,22 +0,0 @@
---- ./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 *
Index: pkg-descr
===================================================================
--- pkg-descr (revision 348038)
+++ pkg-descr (working copy)
@@ -2,4 +2,4 @@
viewer that runs in a terminal and provides fast and valuable HTTP statistics
for system administrators that require a visual report on the fly.
-WWW: http://goaccess.prosoftcorp.com/
+WWW: http://goaccess.prosoftcorp.com/
--- goaccess-0.7.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140313060252.3AFDD57572>