From nobody Sat Mar 25 09:31:55 2023 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 4PkDP7522yz41vvf; Sat, 25 Mar 2023 09:31:55 +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 4PkDP74Z6gz3ML6; Sat, 25 Mar 2023 09:31:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679736715; 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=i7wHyYp5xI9KfMvhwmSqMikbwEA/HoKgF/zMDHWP03k=; b=J0h3ubWaRRChrxgwaRs8vy5CQwSq+CqYLNDNj/uTBbQXVS9xQg2ov9P6S0liqZiPSYF6W3 7G0alH9aNucMypSvCI9+8dWKGeqrnc4ZqtA6TAiwltGDADAcin+7749WZq1OuT8cdw2q+E emmFu79YhHlkeVyOqMDGghNolGEsGbfAZqxMiZU6ydRRBPe7ghooVOKIQ7OR2hnRkiqjWU C4k8JajjMisSseO4y6sPwMZ04+Jm3c6bq2AgKBAUT8oyy78OU9st8hItBA+vtnJc065Gr8 z+Kjduot8XNrPVB5q9t8E134KlMJbgWefXB9FvL0xBmFUGGunsauasB/EJ0P2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679736715; 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=i7wHyYp5xI9KfMvhwmSqMikbwEA/HoKgF/zMDHWP03k=; b=WXoAOxHrBpfON70qOBrGdqrr2OCysdc4khFb0biQ6IsXwkD7vMp3BnYrJgg6ev+/V/X4br FobhXrWx8MsHfjhzE/q11Pref6ejtt+ze8tZ8V8Gi7fXrOx+9zeMcBFh1CGbGNaVoJnb7X 4gYilapG7WldcngVTdVQfHUmDReNIAZOPN2wXEZs9QAG4gNoPjCMRF8EsOaYOblNcpr6Xq lQaZ7OhVCmwOseHdOw/eHZSeQWFSEfC6Da0my8XE71JSV/MtE3Qaw9EfZ09ld34gL+PrJC SAwY0bFp+HXGt65f/80jwv5Ua9mFM5RKsyLnjb2StfZjYhKhnz+8ppaWMiMacA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679736715; a=rsa-sha256; cv=none; b=otFWpgWGwOkb738INViv5bapswhPfSeGUEdZd2qzm/Gcv942zr3nqS6A1IWeHgQicuMMzE SBzArwb00yKD9OBiqc36iCCpzNqjvW475gxzXrU3FTOSPqdCim4Ha0rj8z/rJeSfDWoFn7 mxrhmrekTzjs1o9YwVEqZnC+sN3WsoV9GOHNai7+zDNGeq9ds8yqc6ujLBbGGV25lBDH35 pciJw+uLTXtySI2Lw6x9BaOQC2G4Ye5DUTMHuumiW7TPFGxH5DIWD4ETf1WdBa45cCVsYW PPhUL4vR/ntME3cwXCUZdpE2sAWC3lxAk34uWKB3m4OUv4igoVBqD0bojh1bwg== 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 4PkDP73ghtzv5W; Sat, 25 Mar 2023 09:31:55 +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 32P9VtIb036896; Sat, 25 Mar 2023 09:31:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32P9VtmU036895; Sat, 25 Mar 2023 09:31:55 GMT (envelope-from git) Date: Sat, 25 Mar 2023 09:31:55 GMT Message-Id: <202303250931.32P9VtmU036895@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: 84ce1196d8bd - main - sysutils/conky: Update to 1.18.3 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: 84ce1196d8bd17b8db000f6d71fa3c73f2492af7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=84ce1196d8bd17b8db000f6d71fa3c73f2492af7 commit 84ce1196d8bd17b8db000f6d71fa3c73f2492af7 Author: Guido Falsi AuthorDate: 2023-03-25 09:27:10 +0000 Commit: Guido Falsi CommitDate: 2023-03-25 09:27:10 +0000 sysutils/conky: Update to 1.18.3 - Upstream now requires lua 3.5.x unconditionally - While here run portfmt(1) PR: 270397 --- sysutils/conky/Makefile | 97 +++++++++++++++++++++++++------------------------ sysutils/conky/distinfo | 6 +-- 2 files changed, 52 insertions(+), 51 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 4f11010c3a95..998faa9a857f 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.18.0 +PORTVERSION= 1.18.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -10,32 +10,33 @@ WWW= https://github.com/brndnmtthws/conky LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= gsed:textproc/gsed -USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \ - localbase:ldflags lua:52-53 pkgconfig tar:bzip2 +USES= cmake compiler:c++11-lib cpe gettext-runtime iconv \ + localbase:ldflags lua:53 pkgconfig tar:bzip2 -CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ - -DBUILD_IBM:BOOL=false \ +CMAKE_ARGS= -DAPP_SED=${LOCALBASE}/bin/gsed \ + -DBUILD_AUDACIOUS:BOOL=false \ -DBUILD_HDDTEMP:BOOL=false \ + -DBUILD_IBM:BOOL=false \ -DBUILD_IOSTATS:BOOL=false \ - -DBUILD_AUDACIOUS:BOOL=false \ - -DAPP_SED=${LOCALBASE}/bin/gsed + -DBUILD_PORT_MONITORS:BOOL=false CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua -PORTDOCS= config_settings.yaml variables.yaml lua.yaml +PORTDOCS= config_settings.yaml lua.yaml variables.yaml USE_GITHUB= yes GH_ACCOUNT= brndnmtthws -OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD \ - NCURSES RSS WAYLAND X11 XOAP +OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD NCURSES \ + RSS WAYLAND X11 XOAP -OPTIONS_GROUP?= X11 -OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 MOUSE_EVENTS XFT XINERAMA \ - LUA_CAIRO LUA_IMLIB2 LUA_RSVG -OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER MANPAGES WAYLAND XFT LUA_CAIRO MOUSE_EVENTS +OPTIONS_GROUP?= X11 +OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 LUA_CAIRO LUA_IMLIB2 LUA_RSVG \ + MOUSE_EVENTS XFT XINERAMA +OPTIONS_DEFAULT?= ARGB DOUBLE_BUFFER LUA_CAIRO MANPAGES MOUSE_EVENTS \ + WAYLAND X11 XFT APCUPSD_DESC= Monitor APCUPSD APCUPSD_CMAKE_BOOL= BUILD_APCUPSD @@ -47,21 +48,21 @@ ARGB_IMPLIES= X11 CURL_CMAKE_BOOL= BUILD_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl -DOUBLE_BUFFER_DESC= X11 double buffering -DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE -DOUBLE_BUFFER_IMPLIES= X11 +DOUBLE_BUFFER_DESC= X11 double buffering +DOUBLE_BUFFER_CMAKE_BOOL= BUILD_XDBE +DOUBLE_BUFFER_IMPLIES= X11 IMLIB2_CMAKE_BOOL= BUILD_IMLIB2 IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_IMPLIES= X11 -IMLIB2_USE= xorg=ice,sm +IMLIB2_USE= XORG=ice,sm IPV6_CMAKE_BOOL= BUILD_IPV6 LUA_CAIRO_DESC= Lua-Cairo binding LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO LUA_CAIRO_USES= gnome -LUA_CAIRO_USE= gnome=cairo +LUA_CAIRO_USE= GNOME=cairo LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so LUA_CAIRO_IMPLIES= X11 @@ -73,7 +74,7 @@ LUA_IMLIB2_IMPLIES= IMLIB2 X11 LUA_RSVG_DESC= Lua-rsvg binding LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG LUA_RSVG_USES= gnome -LUA_RSVG_USE= gnome=librsvg2 +LUA_RSVG_USE= GNOME=librsvg2 LUA_RSVG_PLIST_FILES= lib/conky/librsvg.so LUA_RSVG_IMPLIES= X11 @@ -81,72 +82,72 @@ METAR_DESC= Display METAR weather reports METAR_CMAKE_BOOL= BUILD_WEATHER_METAR METAR_IMPLIES= CURL -MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc \ +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} + pandoc:textproc/hs-pandoc 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 +MOC_DESC= Control MOC (Music On Console) +MOC_CMAKE_BOOL= BUILD_MOC -MOUSE_EVENTS_DESC= Support generating mouse events +MOUSE_EVENTS_DESC= Support generating mouse events MOUSE_EVENTS_CMAKE_BOOL= BUILD_MOUSE_EVENTS -MOUSE_EVENTS_IMPLIES= X11 +MOUSE_EVENTS_IMPLIES= X11 -MPD_DESC= Control MPD (Music Player Daemon) -MPD_CMAKE_BOOL= BUILD_MPD +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 -RSS_DESC= Display RSS feeds -RSS_CMAKE_BOOL= BUILD_RSS -RSS_USES= gnome -RSS_USE= gnome=glib20,libxml2 -RSS_IMPLIES= CURL +RSS_DESC= Display RSS feeds +RSS_CMAKE_BOOL= BUILD_RSS +RSS_USES= gnome +RSS_USE= GNOME=glib20,libxml2 +RSS_IMPLIES= CURL WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.13:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ - libwayland-client.so:graphics/wayland \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libwayland-client.so:graphics/wayland WAYLAND_USES= gnome -WAYLAND_USE= gnome=cairo,pango +WAYLAND_USE= GNOME=cairo,pango WAYLAND_CMAKE_BOOL= BUILD_WAYLAND WAYLAND_LDFLAGS= -Wl,--as-needed # pangoft2 deps: glib20, freetype2, harfbuzz -X11_USES= xorg -X11_USE= xorg=x11,xext,xdamage,xfixes -X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW -X11_VARS= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf -X11_VARS_OFF= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf +X11_USES= xorg +X11_USE= XORG=x11,xdamage,xext,xfixes +X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW +X11_VARS= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf +X11_VARS_OFF= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf -XFT_CMAKE_BOOL= BUILD_XFT -XFT_USE= xorg=xft -XFT_IMPLIES= X11 +XFT_CMAKE_BOOL= BUILD_XFT +XFT_USE= XORG=xft +XFT_IMPLIES= X11 XINERAMA_CMAKE_BOOL= BUILD_XINERAMA -XINERAMA_USE= xorg=xinerama +XINERAMA_USE= XORG=xinerama XINERAMA_IMPLIES= X11 XOAP_DESC= Display XOAP weather reports XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP XOAP_IMPLIES= CURL METAR XOAP_USES= gnome -XOAP_USE= gnome=libxml2 +XOAP_USE= GNOME=libxml2 .include .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2} -PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so +PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so .endif # disable apm on non-x86 archs .if ${ARCH} != amd64 && ${ARCH} != i386 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt .endif post-patch: diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 5d96ea75e29e..3a04c28dc066 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676741723 -SHA256 (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 17a131689ac07dbf97b817f310a2f5ecb572f31ff7ca33dd3c14a276f18ab355 -SIZE (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 1703679 +TIMESTAMP = 1678119087 +SHA256 (brndnmtthws-conky-v1.18.3_GH0.tar.gz) = 96755e1f8de852e2812e00c16050f5e98585bbe29c547edb4eb6d1e760081d93 +SIZE (brndnmtthws-conky-v1.18.3_GH0.tar.gz) = 1710600