Update to 1.0.8

5 files changed, 36 insertions, 38 deletions

diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index 9b4d6ff07fcd..02e14effec4b 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	logstalgia
-PORTVERSION=	1.0.7
-PORTREVISION=	7
+PORTVERSION=	1.0.8
 CATEGORIES=	sysutils www
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -12,6 +11,8 @@ COMMENT=	Website access log visualization tool
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_powerpc64=	fails to compile: custom.cpp: 'sscanf' was not declared in this scope
+
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
@@ -19,20 +20,18 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libpng.so:graphics/png \
 		libftgl.so:graphics/ftgl
 
-BROKEN_powerpc64=	fails to compile: custom.cpp: 'sscanf' was not declared in this scope
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	acaudwell
-GH_PROJECT=	Logstalgia:DEFAULT Core:core
-GH_TAGNAME=	d99bdb2:DEFAULT 83eba3a:core
-
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:c++0x gmake jpeg localbase:ldflags pkgconfig
 USE_GL=		gl glu glew
 USE_SDL=	image2 sdl2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	acaudwell
+GH_PROJECT=	Logstalgia:DEFAULT Core:core
+GH_TAGNAME=	32067aa:DEFAULT 683d98b:core
+
 post-extract:
-	@${MV} ${WRKDIR}/Core-83eba3a/* ${WRKSRC}/src/core/
+	@${MV} ${WRKDIR}/Core-*/* ${WRKSRC}/src/core/
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -Wno-unused-but-set-variable||' \
diff --git a/sysutils/logstalgia/distinfo b/sysutils/logstalgia/distinfo
index 3b0d25a9a18e..aaf41eadcbb6 100644
--- a/sysutils/logstalgia/distinfo
+++ b/sysutils/logstalgia/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1506846364
+SHA256 (acaudwell-Logstalgia-1.0.8-32067aa_GH0.tar.gz) = 526c5241246d393056e86e43d8f4ff9c8769d7aac71833d251c0607791cdf7fc
+SIZE (acaudwell-Logstalgia-1.0.8-32067aa_GH0.tar.gz) = 904301
+SHA256 (acaudwell-Core-683d98b_GH0.tar.gz) = c1dc0ed46c6290c1ffb7f0124df9d31d4d3ccf95db138d0fd1e38a660ea0e939
+SIZE (acaudwell-Core-683d98b_GH0.tar.gz) = 86388
diff --git a/sysutils/logstalgia/files/patch-src_FileWatcher_FileWatcherOSX.cpp b/sysutils/logstalgia/files/patch-src_FileWatcher_FileWatcherOSX.cpp
new file mode 100644
index 000000000000..65cc9d152e6a
--- /dev/null
+++ b/sysutils/logstalgia/files/patch-src_FileWatcher_FileWatcherOSX.cpp
@@ -0,0 +1,14 @@
+--- src/FileWatcher/FileWatcherOSX.cpp.orig	2017-10-01 03:38:27 UTC
++++ src/FileWatcher/FileWatcherOSX.cpp
+@@ -229,7 +229,11 @@ namespace FW
+ 		void addAll()
+ 		{
+ 			// add base dir
++#ifdef O_EVTONLY
+ 			int fd = open(mDirName.c_str(), O_RDONLY | O_EVTONLY);
++#else
++			int fd = open(mDirName.c_str(), O_RDONLY );
++#endif
+ 			EV_SET(&mChangeList[0], fd, EVFILT_VNODE,
+ 				   EV_ADD | EV_ENABLE | EV_ONESHOT,
+ 				   NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_ATTRIB,
diff --git a/sysutils/logstalgia/files/patch-src_core_display.h b/sysutils/logstalgia/files/patch-src_core_display.h
deleted file mode 100644
index 3bf6404976bb..000000000000
--- a/sysutils/logstalgia/files/patch-src_core_display.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
index a0e19d7931da..7312e5df1364 100644
--- a/sysutils/logstalgia/files/patch-src_logentry.h
+++ b/sysutils/logstalgia/files/patch-src_logentry.h
@@ -1,10 +1,13 @@
---- src/logentry.h.orig	2015-10-19 22:33:12 UTC
+--- src/logentry.h.orig	2017-09-29 02:04:47 UTC
 +++ src/logentry.h
-@@ -21,6 +21,7 @@
- #include "core/vectors.h"
+@@ -24,6 +24,10 @@
+ #include <vector>
+ #include <map>
  
- #include <string>
++#ifdef __FreeBSD__
 +#include <sys/types.h>
- 
++#endif
++
  class LogEntry {
  
+ private: