MFH: r428064

- Unbreak by updating to 1.0.7
- Move master site and WWW from SF to GitHub

Approved by:	ports-secteam (junovitch)

7 files changed, 55 insertions, 36 deletions

diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index 5da3e78a0249..09b80bb2a906 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -2,27 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	logstalgia
-PORTVERSION=	1.0.3
-PORTREVISION=	9
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils www
-MASTER_SITES=	GOOGLE_CODE LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Website access log visualization tool
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
-
-LIB_DEPENDS=	libftgl.so:graphics/ftgl \
+BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		libfreetype.so:print/freetype2 \
+		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
-		libpcre.so:devel/pcre
+		libftgl.so:graphics/ftgl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	acaudwell
+GH_PROJECT=	Logstalgia:DEFAULT Core:core
+GH_TAGNAME=	d99bdb2:DEFAULT 83eba3a:core
 
 GNU_CONFIGURE=	yes
-USES=		jpeg pkgconfig
-USE_GL=		gl glu
-USE_SDL=	image sdl
+USES=		autoreconf compiler:c++0x gmake jpeg localbase:ldflags pkgconfig
+USE_GL=		gl glu glew
+USE_SDL=	image2 sdl2
+
+post-extract:
+	@${MV} ${WRKDIR}/Core-83eba3a/* ${WRKSRC}/src/core/
 
-CFLAGS+=	-L${LOCALBASE}/lib
+post-patch:
+	@${REINPLACE_CMD} -e 's| -Wno-unused-but-set-variable||' \
+		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/sysutils/logstalgia/distinfo b/sysutils/logstalgia/distinfo
index 8c53aaa3e957..3b0d25a9a18e 100644
--- a/sysutils/logstalgia/distinfo
+++ b/sysutils/logstalgia/distinfo
@@ -1,2 +1,5 @@
-SHA256 (logstalgia-1.0.3.tar.gz) = d3338a9fffb9b60ecb90986c81f27a09a18fa8627b5b884a79c70fee7f6461eb
-SIZE (logstalgia-1.0.3.tar.gz) = 841822
+TIMESTAMP = 1481103077
+SHA256 (acaudwell-Logstalgia-1.0.7-d99bdb2_GH0.tar.gz) = 401ddfa4ef9ab72ceed3ee6ddddd0d0b19880542928258c5c325f50010219e80
+SIZE (acaudwell-Logstalgia-1.0.7-d99bdb2_GH0.tar.gz) = 883062
+SHA256 (acaudwell-Core-83eba3a_GH0.tar.gz) = 4c722981d096a1615f9d1b74c10d884ae0174a6e669d1bc6257e4ff07dd2352f
+SIZE (acaudwell-Core-83eba3a_GH0.tar.gz) = 86122
diff --git a/sysutils/logstalgia/files/patch-src__logentry.h b/sysutils/logstalgia/files/patch-src__logentry.h
deleted file mode 100644
index 8b7bf5d76b05..000000000000
--- a/sysutils/logstalgia/files/patch-src__logentry.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logentry.h.orig	2011-02-15 23:52:06 UTC
-+++ src/logentry.h
-@@ -41,7 +41,7 @@ public:
-     void setSuccess();
-     void setResponseColour();
- 
--    long timestamp;
-+    time_t timestamp;
- 
-     std::string hostname;
-     std::string vhost;
diff --git a/sysutils/logstalgia/files/patch-src__logstalgia.cpp b/sysutils/logstalgia/files/patch-src__logstalgia.cpp
deleted file mode 100644
index 26faa8e65766..000000000000
--- a/sysutils/logstalgia/files/patch-src__logstalgia.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logstalgia.cpp.orig	2011-02-15 23:52:06 UTC
-+++ src/logstalgia.cpp
-@@ -392,7 +392,7 @@ std::string Logstalgia::dateAtPosition(f
-             //display date
-             char datestr[256];
- 
--            long timestamp = le.timestamp;
-+            time_t timestamp = le.timestamp;
- 
-             struct tm* timeinfo = localtime ( &timestamp );
-             strftime(datestr, 256, "%H:%M:%S %B %d, %Y", timeinfo);
diff --git a/sysutils/logstalgia/files/patch-src_core_display.h b/sysutils/logstalgia/files/patch-src_core_display.h
new file mode 100644
index 000000000000..3bf6404976bb
--- /dev/null
+++ b/sysutils/logstalgia/files/patch-src_core_display.h
@@ -0,0 +1,18 @@
+--- src/core/display.h.orig	2016-12-07 11:54:56 UTC
++++ src/core/display.h
+@@ -59,7 +59,6 @@ class SDLAppDisplay {
+ 
+     bool enable_alpha;
+     bool resizable;
+-    bool fullscreen;
+     bool frameless;
+     bool vsync;
+ 
+@@ -71,6 +70,7 @@ class SDLAppDisplay {
+     void setupExtensions();
+ public:
+     int width, height;
++    bool fullscreen;
+     int desktop_width, desktop_height;
+     int windowed_width, windowed_height;
+ 
diff --git a/sysutils/logstalgia/files/patch-src_logentry.h b/sysutils/logstalgia/files/patch-src_logentry.h
new file mode 100644
index 000000000000..a0e19d7931da
--- /dev/null
+++ b/sysutils/logstalgia/files/patch-src_logentry.h
@@ -0,0 +1,10 @@
+--- src/logentry.h.orig	2015-10-19 22:33:12 UTC
++++ src/logentry.h
+@@ -21,6 +21,7 @@
+ #include "core/vectors.h"
+ 
+ #include <string>
++#include <sys/types.h>
+ 
+ class LogEntry {
+ 
diff --git a/sysutils/logstalgia/pkg-descr b/sysutils/logstalgia/pkg-descr
index adde610984b6..55ccfec59e0a 100644
--- a/sysutils/logstalgia/pkg-descr
+++ b/sysutils/logstalgia/pkg-descr
@@ -6,4 +6,4 @@ Requests appear as colored balls which travel across the screen to arrive at the
 requested location. Successful requests are hit by the paddle while unsuccessful
 ones (eg. 404 - File Not Found) are missed and pass through.
 
-WWW: http://code.google.com/p/logstalgia/
+WWW: http://logstalgia.io/