From nobody Tue Sep 20 13:26:25 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MX2PZ0VRhz4cCJy; Tue, 20 Sep 2022 13:26:26 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MX2PY75f3z3NKZ; Tue, 20 Sep 2022 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663680386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWf/2p+454fsD8VSDcbacbsAGIGzi/zneChYzyy+XU4=; b=JdPsFE4OBOAS6XvukWa1uUBKjb3qW2HyxWFm9oztGcE0065bCEe/H/3Mkbhh4XjJZqb+Y6 HpF0rNodXBddfAXWFyNrXxDPzo42GbpjPU2+3wdpITzixwnOAqN6+TaXx2xdRyQGhltIdL 4T5wGRsAHovyazLDObFMqJ0Biw2HZdr5k5f9XG2fasLS36+ZLwjwjWSPafzFSW1ongZ+Ku mQiLJXJ7LYRoWm+vuzzW0ZqHu0yh5q/Iitc+fxALfZAnyf9ianYlX3eILGSdPoNtbaJv4c zpKKdk5KMkQhe641E4BboWYvqII7S+i1QM8H88FzuY4s5mgE2KEbWPwttrYUeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MX2PY68VmzkNj; Tue, 20 Sep 2022 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28KDQPr9062266; Tue, 20 Sep 2022 13:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28KDQPG7062265; Tue, 20 Sep 2022 13:26:25 GMT (envelope-from git) Date: Tue, 20 Sep 2022 13:26:25 GMT Message-Id: <202209201326.28KDQPG7062265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 26ddb168f9e1 - main - sysutils/conky: Update to 1.13.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26ddb168f9e16870240f6ea049218d062c1b536d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663680386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWf/2p+454fsD8VSDcbacbsAGIGzi/zneChYzyy+XU4=; b=v+XTjq4ZDMQb0HXvEJJjeMVBXuBkRlM02xjbA4KqnPeeev72a+8Y742/ycmSL9KQlESkp8 IHO0fGHbn8suqB1iGoF/DWRYgHrTexXO865cSPbvAgeo4eEQBRjk0xooOM1lma75BiaXZx dvG3DeFrpMIRwH9pQIDaFBI6HoX2dTVFIUV7NkubNoaKqtejzyqYQ90wuvU8E7oyunHXJw nLTIGIEJVT35efblPFC0If1ylqh4gVVuSRfLDVRCPtzLg8dlhxf3O9lIRIHo3lrlp2QzLu o/TaqmlXZZg5bj3ix+kqyUEx7vkQlEkwciZvviiGqCDA/YpzBZrMgJgQl11fuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663680386; a=rsa-sha256; cv=none; b=XIdl1Bu0eCcn50AZi0UYIDNTCpfJ4cdOMVkgGkL1mFa+LBkRRPLGFqFFTnVulA7eW/hs0e QccIkTWOXl5hTliIpHzrs2fyIxAZoztpOa66vCrhM/vGRGTGYsIiwJcSE+14d9eLj86MQL q6sPIUpn/pV6aAQoUN3KnX2awsttNzGrmLbkoIrkjvXJYmgqjEgQNLC4IU50pWk0h5XRUW jGsU6NABCLz3qjGthzsleu8Q1fNHGMDUc1GYWj9oXiK2YaC1oTs6UxAtCrQrWPF6iydI29 8GO773KdsjDgqoyuqy/cJ5WcqZcUlmueXXroYWyGCXAQmCikTB918qDd+ktLyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=26ddb168f9e16870240f6ea049218d062c1b536d commit 26ddb168f9e16870240f6ea049218d062c1b536d Author: Guido Falsi AuthorDate: 2022-09-20 13:24:34 +0000 Commit: Guido Falsi CommitDate: 2022-09-20 13:24:34 +0000 sysutils/conky: Update to 1.13.1 - Remove option referencing removed xmms2 port --- sysutils/conky/Makefile | 8 ++------ sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-src_display-console.cc | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 898285aea7ca..8921bf37c4b5 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.12.2 +PORTVERSION= 1.13.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -34,7 +34,7 @@ USE_GITHUB= yes GH_ACCOUNT= brndnmtthws OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS \ - X11 XMMS2 XOAP + X11 XOAP OPTIONS_GROUP?= X11 OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG @@ -113,10 +113,6 @@ XINERAMA_CMAKE_BOOL= BUILD_XINERAMA XINERAMA_USE= xorg=xinerama XINERAMA_IMPLIES= X11 -XMMS2_DESC= Control XMMS2 media player -XMMS2_CMAKE_BOOL= BUILD_XMMS2 -XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2 - XOAP_DESC= Display XOAP weather reports XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP XOAP_IMPLIES= CURL METAR diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 5cd0b050a1a1..032e6f51a2db 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619365300 -SHA256 (brndnmtthws-conky-v1.12.2_GH0.tar.gz) = a7eb112fe7a6bcd6c44706a53cbf6222e640cd1e585492fc654aa9e05a7bbc94 -SIZE (brndnmtthws-conky-v1.12.2_GH0.tar.gz) = 2407428 +TIMESTAMP = 1663601049 +SHA256 (brndnmtthws-conky-v1.13.1_GH0.tar.gz) = f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a +SIZE (brndnmtthws-conky-v1.13.1_GH0.tar.gz) = 2443276 diff --git a/sysutils/conky/files/patch-src_display-console.cc b/sysutils/conky/files/patch-src_display-console.cc new file mode 100644 index 000000000000..aad2f1f14886 --- /dev/null +++ b/sysutils/conky/files/patch-src_display-console.cc @@ -0,0 +1,16 @@ +--- src/display-console.cc.orig 2022-09-19 15:16:35 UTC ++++ src/display-console.cc +@@ -54,8 +54,11 @@ bool display_output_console::detect() { + } + + bool display_output_console::detect() { +- if ((out_to_stdout.get(*state) || out_to_stderr.get(*state)) && +- !out_to_ncurses.get(*state)) { ++ if ((out_to_stdout.get(*state) || out_to_stderr.get(*state)) ++#ifdef BUILD_NCURSES ++ && !out_to_ncurses.get(*state) ++#endif ++ ) { + DBGP2("Display output '%s' enabled in config.", name.c_str()); + return true; + }