svn commit: r505074 - in head/sysutils/conky: . files

[Guido Falsi]

Author: madpilot
Date: Tue Jun 25 07:59:08 2019
New Revision: 505074
URL: https://svnweb.freebsd.org/changeset/ports/505074

Log:
  Update conky to 1.11.4

Deleted:
  head/sysutils/conky/files/patch-src_conky.cc
  head/sysutils/conky/files/patch-src_luamm.cc
  head/sysutils/conky/files/patch-src_luamm.hh
Modified:
  head/sysutils/conky/Makefile
  head/sysutils/conky/distinfo
  head/sysutils/conky/files/patch-CMakeLists.txt

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Tue Jun 25 07:38:18 2019	(r505073)
+++ head/sysutils/conky/Makefile	Tue Jun 25 07:59:08 2019	(r505074)
@@ -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

Modified: head/sysutils/conky/distinfo
==============================================================================
--- head/sysutils/conky/distinfo	Tue Jun 25 07:38:18 2019	(r505073)
+++ head/sysutils/conky/distinfo	Tue Jun 25 07:59:08 2019	(r505074)
@@ -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

Modified: head/sysutils/conky/files/patch-CMakeLists.txt
==============================================================================
--- head/sysutils/conky/files/patch-CMakeLists.txt	Tue Jun 25 07:38:18 2019	(r505073)
+++ head/sysutils/conky/files/patch-CMakeLists.txt	Tue Jun 25 07:59:08 2019	(r505074)
@@ -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})