Import upstream patch in conky.

Obtained from:	298eb76434
		1fc2b17eb5
This commit is contained in:
Guido Falsi 2019-01-14 13:51:48 +00:00
parent 870dee8617
commit 018b32447e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=490255
3 changed files with 23 additions and 11 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= conky
PORTVERSION= 1.11.2
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

View file

@ -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);

View file

@ -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