Update conky to 1.11.4

6 files changed, 12 insertions, 71 deletions

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index c037fe357249..ee96e4022aeb 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	conky
-PORTVERSION=	1.11.3
-PORTREVISION=	1
+PORTVERSION=	1.11.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -22,7 +21,8 @@ CMAKE_ARGS+=	-DBUILD_PORT_MONITORS:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
 		-DBUILD_HDDTEMP:BOOL=false \
 		-DBUILD_IOSTATS:BOOL=false \
-		-DBUILD_AUDACIOUS:BOOL=false
+		-DBUILD_AUDACIOUS:BOOL=false \
+		-DBUILD_DOCS:BOOL=true
 CONFLICTS?=	conky-awesome-[0-9]*
 
 SLAVEDIRS=	sysutils/conky-awesome
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 98655e7b4233..67df210061b2 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550919299
-SHA256 (brndnmtthws-conky-v1.11.3_GH0.tar.gz) = 0140e749537d4d05bf33fbac436e54756faa26021e16f2bca418e9eeea724eb4
-SIZE (brndnmtthws-conky-v1.11.3_GH0.tar.gz) = 2390099
+TIMESTAMP = 1561367318
+SHA256 (brndnmtthws-conky-v1.11.4_GH0.tar.gz) = 344637646c15c4cb7cf0afdde4651ee3100f7812e7bb8434ca757eba5c621a48
+SIZE (brndnmtthws-conky-v1.11.4_GH0.tar.gz) = 2400814
diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt
index 8c283c18cc79..72d5a7d5b727 100644
--- a/sysutils/conky/files/patch-CMakeLists.txt
+++ b/sysutils/conky/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2019-01-08 01:26:24 UTC
+--- CMakeLists.txt.orig	2019-06-23 14:50:35 UTC
 +++ CMakeLists.txt
 @@ -72,9 +72,12 @@ if(BUILD_TESTS)
  endif()
@@ -8,14 +8,14 @@
 +  set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}")
  endif(NOT DEFINED DOC_PATH)
 -set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
-+IF(NOT DEFINED SAMPLE_PATH)
++if(NOT DEFINED SAMPLE_PATH)
 +  set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}")
-+ENDIF(NOT DEFINED SAMPLE_PATH)
++endif(NOT DEFINED SAMPLE_PATH)
 +set(SAMPLE_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf)
  
  set(HTML_PATH "${DOC_PATH}/html")
  set(HTML_FILES
-@@ -83,16 +86,14 @@ set(HTML_FILES
+@@ -83,10 +86,10 @@ set(HTML_FILES
      doc/lua.html
      doc/variables.html)
  
@@ -26,13 +26,5 @@
 -install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH})
 +install(FILES ${SAMPLE_FILES} DESTINATION ${SAMPLE_PATH})
  
--if(MAINTAINER_MODE)
--  install(FILES ${HTML_FILES} DESTINATION ${HTML_PATH})
-+install(FILES ${HTML_FILES} DESTINATION ${HTML_PATH})
- 
--  install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH})
--endif(MAINTAINER_MODE)
-+install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH})
- 
- if(CHECK_CODE_QUALITY)
-   # Set up clang-tidy
+ if(BUILD_DOCS)
+   install(FILES ${HTML_FILES} DESTINATION ${HTML_PATH})
diff --git a/sysutils/conky/files/patch-src_conky.cc b/sysutils/conky/files/patch-src_conky.cc
deleted file mode 100644
index 4eb8bf51b789..000000000000
--- a/sysutils/conky/files/patch-src_conky.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/conky.cc.orig	2018-02-07 14:16:39 UTC
-+++ src/conky.cc
-@@ -132,7 +132,7 @@
- #include <microhttpd.h>
- #endif
- 
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
- #include <bsd/bsd.h>
- #endif
- 
diff --git a/sysutils/conky/files/patch-src_luamm.cc b/sysutils/conky/files/patch-src_luamm.cc
deleted file mode 100644
index 0bbd10d54b1d..000000000000
--- a/sysutils/conky/files/patch-src_luamm.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/luamm.cc.orig	2019-01-08 01:26:24 UTC
-+++ src/luamm.cc
-@@ -336,7 +336,7 @@ int state::gc(int what, int data) {
-   pushinteger(what);
-   pushinteger(data);
-   call(2, 1, 0);
--  assert(isnumber(-1));
-+  assert(isanumber(-1));
-   int r = tointeger(-1);
-   pop();
-   return r;
-@@ -411,7 +411,7 @@ bool state::next(int index) {
- 
-   call(2, MULTRET, 0);
- 
--  assert(isnumber(-1));
-+  assert(isanumber(-1));
-   int r = tointeger(-1);
-   pop();
-   return r != 0;
-@@ -451,7 +451,7 @@ bool state::safe_compare(lua_CFunction trampoline, int
-   pushvalue(index1);
-   pushvalue(index2);
-   call(2, 1, 0);
--  assert(isnumber(-1));
-+  assert(isanumber(-1));
-   int r = tointeger(-1);
-   pop();
-   return r != 0;
diff --git a/sysutils/conky/files/patch-src_luamm.hh b/sysutils/conky/files/patch-src_luamm.hh
deleted file mode 100644
index d5870f0b6479..000000000000
--- a/sysutils/conky/files/patch-src_luamm.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/luamm.hh.orig	2018-12-02 18:26:02 UTC
-+++ src/luamm.hh
-@@ -204,7 +204,7 @@ class state : private std::mutex {
-   }
-   bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); }
-   bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); }
--  bool isnumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
-+  bool isanumber(int index) throw() { return lua_isnumber(cobj.get(), index); }
-   bool isstring(int index) throw() { return lua_isstring(cobj.get(), index); }
-   void pop(int n = 1) throw() { lua_pop(cobj.get(), n); }
-   void pushboolean(bool b) throw() { lua_pushboolean(cobj.get(), b); }