From owner-svn-ports-head@freebsd.org Mon Jan 14 13:51:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20E4B14A0A9B; Mon, 14 Jan 2019 13:51:50 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AE66489663; Mon, 14 Jan 2019 13:51:49 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 856323C6E; Mon, 14 Jan 2019 13:51:49 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0EDpnS3069040; Mon, 14 Jan 2019 13:51:49 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0EDpnAB069037; Mon, 14 Jan 2019 13:51:49 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201901141351.x0EDpnAB069037@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 14 Jan 2019 13:51:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490255 - in head/sysutils/conky: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/sysutils/conky: . files X-SVN-Commit-Revision: 490255 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AE66489663 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 13:51:50 -0000 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 + #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" +