- Update to 0.7.1

- Update pkg-descr
- Support STAGEDIR
- Drop FreeBSD 7.x support

PR:		ports/187521
Submitted by:	lwhsu

6 files changed, 18 insertions, 71 deletions

diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index bd279830e315..52fdd7e8bae8 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -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}
-
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=	${PORTNAME}.1
-.endif
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz
 
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/,} ${PREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
-	${INSTALL_SCRIPT} ${PORTNAME:S,^,${WRKSRC}/,} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/goaccess/distinfo b/sysutils/goaccess/distinfo
index dd50a555de79..e237abdf16dc 100644
--- a/sysutils/goaccess/distinfo
+++ b/sysutils/goaccess/distinfo
@@ -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
diff --git a/sysutils/goaccess/files/patch-commons.h b/sysutils/goaccess/files/patch-commons.h
deleted file mode 100644
index 802f0c0a5bed..000000000000
--- a/sysutils/goaccess/files/patch-commons.h
+++ /dev/null
@@ -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) /**/
diff --git a/sysutils/goaccess/files/patch-gmenu.c b/sysutils/goaccess/files/patch-gmenu.c
deleted file mode 100644
index 04dbb143bf5c..000000000000
--- a/sysutils/goaccess/files/patch-gmenu.c
+++ /dev/null
@@ -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"
diff --git a/sysutils/goaccess/files/patch-util.c b/sysutils/goaccess/files/patch-util.c
deleted file mode 100644
index 318e6fa25dd6..000000000000
--- a/sysutils/goaccess/files/patch-util.c
+++ /dev/null
@@ -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 *
diff --git a/sysutils/goaccess/pkg-descr b/sysutils/goaccess/pkg-descr
index db733cacceee..fa587a2e989b 100644
--- a/sysutils/goaccess/pkg-descr
+++ b/sysutils/goaccess/pkg-descr
@@ -2,4 +2,4 @@ GoAccess is an open source real-time Apache web log analyzer and interactive
 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/