aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorwen <wen@FreeBSD.org>2017-06-14 15:48:44 +0800
committerwen <wen@FreeBSD.org>2017-06-14 15:48:44 +0800
commit3b80ce63ce2e6ba1cfacd8b6df37cd301317c3a7 (patch)
treef813a490e3c99fbd84b9d3410b34e3b930722f73 /sysutils
parentf280de59e9a850287e17e0c99f77624d58893a6b (diff)
downloadfreebsd-ports-gnome-3b80ce63ce2e6ba1cfacd8b6df37cd301317c3a7.tar.gz
freebsd-ports-gnome-3b80ce63ce2e6ba1cfacd8b6df37cd301317c3a7.tar.zst
freebsd-ports-gnome-3b80ce63ce2e6ba1cfacd8b6df37cd301317c3a7.zip
- Update to lnav 0.8.2
- Add optional dependency on libcurl - Fix crash on i386 - Add USES=compiler:c++14-lang - Remove USES=python PR: 219477 Submitted by: tom@hur.st(maintainer)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/lnav/Makefile16
-rw-r--r--sysutils/lnav/distinfo6
-rw-r--r--sysutils/lnav/files/patch-src_extension-functions.cc11
-rw-r--r--sysutils/lnav/files/patch-src_logfile.cc16
4 files changed, 43 insertions, 6 deletions
diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile
index bbdb3f83d77e..80d5b60c1fe2 100644
--- a/sysutils/lnav/Makefile
+++ b/sysutils/lnav/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= lnav
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.2
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= tom@hur.st
@@ -17,10 +16,21 @@ LIB_DEPENDS= libpcrecpp.so:devel/pcre
USE_GITHUB= yes
GH_ACCOUNT= tstack
-USES= autoreconf execinfo gmake ncurses python sqlite readline
+USES= autoreconf compiler:c++14-lang execinfo gmake ncurses sqlite readline
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static
PLIST_FILES= bin/lnav man/man1/lnav.1.gz
+OPTIONS_DEFINE= CURL
+OPTIONS_DEFAULT=CURL
+CURL_DESC= Use libcurl for remote log file support
+
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+CURL_CONFIGURE_WITH= libcurl
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/lnav ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/lnav.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+
.include <bsd.port.mk>
diff --git a/sysutils/lnav/distinfo b/sysutils/lnav/distinfo
index 90df8d01a24c..1b15e743fe25 100644
--- a/sysutils/lnav/distinfo
+++ b/sysutils/lnav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472227481
-SHA256 (tstack-lnav-v0.8.1_GH0.tar.gz) = 7f5f5f453f291db03036b26c1eb20933c8a9eb095108edeb3d6b65ab79187009
-SIZE (tstack-lnav-v0.8.1_GH0.tar.gz) = 856480
+TIMESTAMP = 1497410260
+SHA256 (tstack-lnav-v0.8.2_GH0.tar.gz) = 50afb1dec659d6169ba7f6f16642e53cc680eade6f460d73a180f9e9470d6016
+SIZE (tstack-lnav-v0.8.2_GH0.tar.gz) = 930155
diff --git a/sysutils/lnav/files/patch-src_extension-functions.cc b/sysutils/lnav/files/patch-src_extension-functions.cc
new file mode 100644
index 000000000000..f2a64e0d2dd0
--- /dev/null
+++ b/sysutils/lnav/files/patch-src_extension-functions.cc
@@ -0,0 +1,11 @@
+--- 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_logfile.cc b/sysutils/lnav/files/patch-src_logfile.cc
new file mode 100644
index 000000000000..81b5f3dc23fa
--- /dev/null
+++ b/sysutils/lnav/files/patch-src_logfile.cc
@@ -0,0 +1,16 @@
+--- 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;