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

[Guido Falsi]

Author: madpilot
Date: Mon Jan 14 13:51:48 2019
New Revision: 490255
URL: https://svnweb.freebsd.org/changeset/ports/490255

Log:
  Import upstream patch in conky.
  
  Obtained from:	https://github.com/brndnmtthws/conky/commit/298eb76434cc2a62c76df706ff01ccd9c77a4681
  		https://github.com/brndnmtthws/conky/commit/1fc2b17eb5c93ea7d0c00e6e7448fc9bc69aa276

Added:
  head/sysutils/conky/files/patch-src_freebsd.h   (contents, props changed)
Modified:
  head/sysutils/conky/Makefile
  head/sysutils/conky/files/patch-src_main.cc

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Mon Jan 14 13:45:54 2019	(r490254)
+++ head/sysutils/conky/Makefile	Mon Jan 14 13:51:48 2019	(r490255)
@@ -3,6 +3,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.11.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 

Added: head/sysutils/conky/files/patch-src_freebsd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/conky/files/patch-src_freebsd.h	Mon Jan 14 13:51:48 2019	(r490255)
@@ -0,0 +1,11 @@
+--- src/freebsd.h.orig	2019-01-08 01:26:24 UTC
++++ src/freebsd.h
+@@ -41,6 +41,8 @@
+ #include <machine/apm_bios.h>
+ #endif /* i386 || __i386__ */
+ 
++extern kvm_t *kd;
++
+ int get_entropy_avail(unsigned int *);
+ int get_entropy_poolsize(unsigned int *);
+ void print_sysctlbyname(struct text_object *, char *, unsigned int);

Modified: head/sysutils/conky/files/patch-src_main.cc
==============================================================================
--- head/sysutils/conky/files/patch-src_main.cc	Mon Jan 14 13:45:54 2019	(r490254)
+++ head/sysutils/conky/files/patch-src_main.cc	Mon Jan 14 13:51:48 2019	(r490255)
@@ -1,13 +1,13 @@
---- src/main.cc.orig	2019-01-08 01:26:24 UTC
+--- src/main.cc.orig	2019-01-10 17:32:50 UTC
 +++ src/main.cc
-@@ -359,10 +359,6 @@ int main(int argc, char **argv) {
-     return EXIT_FAILURE;
-   }
+@@ -43,6 +43,10 @@
+ #include "ccurl_thread.h"
+ #endif /* BUILD_CURL */
  
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--  kvm_close(kd);
--#endif
--
- #ifdef LEAKFREE_NCURSES
-   _nc_free_and_exit(0);  // hide false memleaks
- #endif
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#include "freebsd.h"
++#endif /* FreeBSD */
++
+ #ifdef BUILD_BUILTIN_CONFIG
+ #include "defconfig.h"
+