From nobody Mon Oct 17 08:13:11 2022 X-Original-To: dev-commits-ports-main@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 4MrV9g5Nyzz4fD8x; Mon, 17 Oct 2022 08:13:11 +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 4MrV9g4qskz3NWn; Mon, 17 Oct 2022 08:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665994391; 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=3JQpGLluFA2c4SJJ/4Xd1Kow6I74ePb7OAoR10ce8KE=; b=TfysIXdPoJh4O+lHFfuLnlv7iu1vRyU/mTVMNAduvKwe75vGT/rDEM0UoEUrQ2A81LrOzR aFvpdJiCVfVUC0s4PXMoPk+96YZu+v2iJxdhwjC0LXHsjpz1KB0/9Oas+1FX2eJQtWtb1o 7TfIdSXsmCO8/t0VHPguSIfTjVk+3Ajl1WTPtFNRQKVH9VgF5NhY99f3vn3wX2RluCRsjw a7dc2GR1mhTz5elEBeZfuxmI+hpaw2BAwHVs9g7NATHXXPRDAiMGiBoiX+FK/fsib1iIu/ 0O4s70JjYqhuPrmW+Vou1gcm+McRfbqudW69jpCL06i3e4hXTaD0/M5uitIDdA== 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 4MrV9g3tCTzlGh; Mon, 17 Oct 2022 08:13:11 +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 29H8DBIV056933; Mon, 17 Oct 2022 08:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29H8DBqw056932; Mon, 17 Oct 2022 08:13:11 GMT (envelope-from git) Date: Mon, 17 Oct 2022 08:13:11 GMT Message-Id: <202210170813.29H8DBqw056932@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: 0373037a24b2 - main - sysutils/conky: Update to 1.15.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0373037a24b21009518f9c6bee719024cdfaa596 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665994391; 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=3JQpGLluFA2c4SJJ/4Xd1Kow6I74ePb7OAoR10ce8KE=; b=UJfYIMxnBbgoNrFVxQecW98+MIIuecbA8v7jdGbA1FPW9x2AmutF9CZRWGS9iKVcmBDrtd 07CU6u/dmdTTaDxKp93nSM9YfyXyYY1/suZvm3deApItn+RADgE29WjBl3xTIZFwBNw7Kh nSC/sPYCZjcgEKT4C/q8wTWHfMDtGTcknmnENoMI0+HaFR3j0wpQJSIYbG9r473vj9gEmh vSQtQLeMeTh0vHC6f4X6Y7o7P8zn/2FOm0e0J5Uy7DFdx+SkxYbjL8UudR8nPvWBK6+KOU FTrBgyX4d8ae5DE8nv5vUUHYC4z9RGghsykHQX9DiG6u/uS8C+rU1I92DJ5wJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665994391; a=rsa-sha256; cv=none; b=xMZrpl0bF7WR1YDH+w8Pud97TiqBqiP9xKUL8wkx+Zq7D5jw4+AkXqeXRJXjncXSlEJCw4 Yz9dnYPzXp7VDrc638mPnqbOtNeHsY/nRJvLbuJqAR2OR3NnbEHWl9r/b5JgootfH/yQ3X tYAKZjhK75v9d6ZbARRFKio1GuyNkgNQ4+9M6hhH7C0silqTZXRg6qoqVeVJXZo8vOdIbW LnveSo0cr0LcvdP5Zaf2VOuC4444etMNYmewY24Fv/eW9A0DpBFZB4X/zZDqBfHyylhNVy tB/A0QnogvNH4BYFNDlXgyHtmXJZW7tZVZQ0o2ROT0hvlnIWfnc27LyrasBOGA== 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=0373037a24b21009518f9c6bee719024cdfaa596 commit 0373037a24b21009518f9c6bee719024cdfaa596 Author: Guido Falsi AuthorDate: 2022-10-17 08:12:23 +0000 Commit: Guido Falsi CommitDate: 2022-10-17 08:13:06 +0000 sysutils/conky: Update to 1.15.0 - Sort option helpers - Remove REINPLACE_CMD duplicating patch file - Remove patch merged upstream --- sysutils/conky/Makefile | 16 +++++++--------- sysutils/conky/distinfo | 6 +++--- sysutils/conky/files/patch-src_freebsd.cc | 30 ------------------------------ 3 files changed, 10 insertions(+), 42 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 051ed6e1f437..a3ac017d6d2b 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.14.0 +PORTVERSION= 1.15.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -80,12 +80,6 @@ METAR_DESC= Display METAR weather reports METAR_CMAKE_BOOL= BUILD_WEATHER_METAR METAR_IMPLIES= CURL -MOC_DESC= Control MOC (Music On Console) -MOC_CMAKE_BOOL= BUILD_MOC - -MPD_DESC= Control MPD (Music Player Daemon) -MPD_CMAKE_BOOL= BUILD_MPD - MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} @@ -93,6 +87,12 @@ MANPAGES_USES= python:3.7+,build MANPAGES_CMAKE_BOOL= BUILD_DOCS MANPAGES_PLIST_FILES= man/man1/conky.1.gz +MOC_DESC= Control MOC (Music On Console) +MOC_CMAKE_BOOL= BUILD_MOC + +MPD_DESC= Control MPD (Music Player Daemon) +MPD_CMAKE_BOOL= BUILD_MPD + NCURSES_DESC= Use ncurses to draw on terminals NCURSES_CMAKE_BOOL= BUILD_NCURSES NCURSES_USES= ncurses:port @@ -135,8 +135,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt .endif post-patch: - @${REINPLACE_CMD} -e 's/^# \(set(RELEASE true\)/\1/' \ - ${WRKSRC}/cmake/Conky.cmake @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake .if ${LUA_DEFAULT} == 5.2 diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 7ac4fe2c5c49..051644f30c77 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665603150 -SHA256 (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964 -SIZE (brndnmtthws-conky-v1.14.0_GH0.tar.gz) = 1797564 +TIMESTAMP = 1665942072 +SHA256 (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2 +SIZE (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = 1800684 diff --git a/sysutils/conky/files/patch-src_freebsd.cc b/sysutils/conky/files/patch-src_freebsd.cc deleted file mode 100644 index 2b9fc160c295..000000000000 --- a/sysutils/conky/files/patch-src_freebsd.cc +++ /dev/null @@ -1,30 +0,0 @@ ---- src/freebsd.cc.orig 2022-10-12 18:18:08 UTC -+++ src/freebsd.cc -@@ -460,6 +460,27 @@ int get_battery_perct(const char *) { - return batcapacity; - } - -+void get_battery_power_draw(char *buffer, unsigned int n, const char *bat) { -+ int rate = 0; -+ double ret = 0; -+ -+ /* -+ * hw.acpi.battery.rate returns battery discharge rate in mW, -+ * or -1 (according to docs, but also 0 in practice) when not discharging. -+ * -+ * ref. acpi_battery(4) -+ */ -+ if (GETSYSCTL("hw.acpi.battery.rate", rate)) { -+ fprintf(stderr, "Cannot read sysctl \"hw.acpi.battery.rate\"\n"); -+ } -+ -+ if (rate > 0) { -+ ret = (double)rate/(double)1000; -+ } -+ -+ snprintf(buffer, n, "%.1f", ret); -+} -+ - double get_battery_perct_bar(struct text_object *obj) { - int batperct = get_battery_perct(obj->data.s); - return batperct;