5 files changed, 17 insertions, 33 deletions

diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile
index 4a483be4165d..5d6ecd6c9dbe 100644
--- a/sysutils/lnav/Makefile
+++ b/sysutils/lnav/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	lnav
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	tom@hur.st
@@ -14,10 +13,11 @@ LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libpcrecpp.so:devel/pcre
 
+USES=		autoreconf compiler:c++14-lang gmake ncurses sqlite readline
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tstack
 
-USES=		autoreconf compiler:c++14-lang gmake ncurses sqlite readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 
diff --git a/sysutils/lnav/distinfo b/sysutils/lnav/distinfo
index 1b15e743fe25..a802b36e60e1 100644
--- a/sysutils/lnav/distinfo
+++ b/sysutils/lnav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497410260
-SHA256 (tstack-lnav-v0.8.2_GH0.tar.gz) = 50afb1dec659d6169ba7f6f16642e53cc680eade6f460d73a180f9e9470d6016
-SIZE (tstack-lnav-v0.8.2_GH0.tar.gz) = 930155
+TIMESTAMP = 1547589952
+SHA256 (tstack-lnav-v0.8.4_GH0.tar.gz) = 17cf1692f914c8cf2191040365ef481c32d4faf054f7c89e5c573aef7b988d2a
+SIZE (tstack-lnav-v0.8.4_GH0.tar.gz) = 1073367
diff --git a/sysutils/lnav/files/patch-src_extension-functions.cc b/sysutils/lnav/files/patch-src_extension-functions.cc
deleted file mode 100644
index f2a64e0d2dd0..000000000000
--- a/sysutils/lnav/files/patch-src_extension-functions.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/extension-functions.cc.orig	2017-04-19 14:17:53 UTC
-+++ src/extension-functions.cc
-@@ -269,7 +269,7 @@ static const int xtra_utf8_bits[] =  {
- ** masking the character with utf8_mask[N] must produce a non-zero
- ** result.  Otherwise, we have an (illegal) overlong encoding.
- */
--static const long utf_mask[] = {
-+static const unsigned long utf_mask[] = {
-   0x00000000,
-   0xffffff80,
-   0xfffff800,
diff --git a/sysutils/lnav/files/patch-src_lnav__log.cc b/sysutils/lnav/files/patch-src_lnav__log.cc
new file mode 100644
index 000000000000..ed8bda145789
--- /dev/null
+++ b/sysutils/lnav/files/patch-src_lnav__log.cc
@@ -0,0 +1,11 @@
+--- src/lnav_log.cc.orig	2018-08-27 14:23:13 UTC
++++ src/lnav_log.cc
+@@ -255,7 +255,7 @@ void log_msg(lnav_log_level_t level, const char *src_f
+         localtm.tm_sec,
+         (int)(curr_time.tv_usec / 1000),
+         LEVEL_NAMES[level],
+-        basename((char *)src_file),
++        src_file,
+         line_number);
+     rc = vsnprintf(&line[prefix_size], MAX_LOG_LINE_SIZE - prefix_size,
+         fmt, args);
diff --git a/sysutils/lnav/files/patch-src_logfile.cc b/sysutils/lnav/files/patch-src_logfile.cc
deleted file mode 100644
index 81b5f3dc23fa..000000000000
--- a/sysutils/lnav/files/patch-src_logfile.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/logfile.cc.orig	2017-05-23 18:53:47 UTC
-+++ src/logfile.cc
-@@ -92,10 +92,10 @@ throw (error)
- 
-         loo.loo_fd.close_on_exec();
- 
--        log_info("Creating logfile: fd=%d; size=%d; mtime=%d; filename=%s",
-+        log_info("Creating logfile: fd=%d; size=%" PRId64 "; mtime=%" PRId64 "; filename=%s",
-                  (int) loo.loo_fd,
--                 this->lf_stat.st_size,
--                 this->lf_stat.st_mtime,
-+                 (long long) this->lf_stat.st_size,
-+                 (long long) this->lf_stat.st_mtime,
-                  filename.c_str());
- 
-         this->lf_valid_filename = true;