From 018b32447e0737503816ba9dc7e0e9d3f965dac6 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Mon, 14 Jan 2019 13:51:48 +0000
Subject: [PATCH] Import upstream patch in conky.

Obtained from:	https://github.com/brndnmtthws/conky/commit/298eb76434cc2a62c76df706ff01ccd9c77a4681
		https://github.com/brndnmtthws/conky/commit/1fc2b17eb5c93ea7d0c00e6e7448fc9bc69aa276
---
 sysutils/conky/Makefile                  |  1 +
 sysutils/conky/files/patch-src_freebsd.h | 11 +++++++++++
 sysutils/conky/files/patch-src_main.cc   | 22 +++++++++++-----------
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 sysutils/conky/files/patch-src_freebsd.h

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index cf9fd3dd198a..2c3b5998d768 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.11.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/conky/files/patch-src_freebsd.h b/sysutils/conky/files/patch-src_freebsd.h
new file mode 100644
index 000000000000..dc686b564ea9
--- /dev/null
+++ b/sysutils/conky/files/patch-src_freebsd.h
@@ -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);
diff --git a/sysutils/conky/files/patch-src_main.cc b/sysutils/conky/files/patch-src_main.cc
index e4c8a6c9411c..2af1f7ff7603 100644
--- a/sysutils/conky/files/patch-src_main.cc
+++ b/sysutils/conky/files/patch-src_main.cc
@@ -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__)
++#include "freebsd.h"
++#endif /* FreeBSD */
++
+ #ifdef BUILD_BUILTIN_CONFIG
+ #include "defconfig.h"
  
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--  kvm_close(kd);
--#endif
--
- #ifdef LEAKFREE_NCURSES
-   _nc_free_and_exit(0);  // hide false memleaks
- #endif