From nobody Thu Aug 10 14:37:05 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 4RM8dY6fbYz4mMC2; Thu, 10 Aug 2023 14:37:05 +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 4RM8dY6Bkkz3Z3p; Thu, 10 Aug 2023 14:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678225; 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=mvpb5Zk4xsLsIacCl5VccOOpn3ll29aZ2OOw6eol5ds=; b=rfq9zf0N27u8yfb3l44cFdB9KA3rTEKNOOf3rx2KlQG8xgQ5ydr5tfgopwBRjGwIZs9b1C zyVOq83yOXf3mv/xCNufG6UZXceDWoaGF2s+affiBPFbwE9FadjOFbPmj2pfFY151y6diu cVHz1RrDj65/9z70XkyWnDpT/XW1uOlMQnmecK1apCb/n5/X0Bz9dNgenTSlgS0BUao+Gw DgPBi0HpasoxkzB7C2ctEagzylQYsfJ9YhT0Ho0VAdX7cpujBVJMzYeZfdtE9kyRY/+XSc dosy8KQ+spCIfisRjsLTc870dFC0xjcrnu91RbKcufsfsuPbw75fuy8OUBr/zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678225; 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=mvpb5Zk4xsLsIacCl5VccOOpn3ll29aZ2OOw6eol5ds=; b=Va/NnZZGsXdDWxfEltjCHTR9NyRvZmCQnvyKNQm0Tjtlo6H+9XlMCogm8bDu6qsTbVI+8l dLNTdG7YzD9KhuLFRW/m9klaf1NTd7/a3uN2f61w7Il/Tq8yGTFSO/Dfd5V/ZzLEGHacwF kj/DCFRR1I+ZQHlItZpkw/5uyi+m20N5XPJHWqaRMECChRqSChxuyB0G0qf/5T+yRZOeyS MRsvXv/gAodnRMlygQl2zHfWeA1QX91twywqpSdg7mFxOcKF7U20WXtEOs8rf9zLgQWsbu lDnysrFqKxSE5+Rzn8/orUng5LRihDCyosY961km6TiEHZzOf+VTOe6kBD/53A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691678225; a=rsa-sha256; cv=none; b=rkQr2ZQ9L//Y0j/WjtoURNSlxvqr3nPswBZICTCFTyt3AcTDZ065cuJZdTDUlLPPwCv9te se33Tiaw6+BrYwcSr2SQoE/EH11MU1xZz9xpeTAjzFqz9Vb7rE5LI/FBOYhbTbfWElCBYF BXfWEqYidls4IZJCHIcOiRJepXufpxxdN2Sd9UCfPq2rmyrceC4s06cpkEk28bm77ThB2K XJOHe1UIcgRYBl2hxfMI7jm+TUgdXaNpdtVcwDfGL4Y8H+FTypOy3m/eRDuW35O0VvftGt wQ8etK8ZrCEDzQjki94H7CKhEQggKkEk3DF3SDK6wu6hs6gpvRfi5jpyU7oPLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RM8dY5HQsz119t; Thu, 10 Aug 2023 14:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AEb5bh042922; Thu, 10 Aug 2023 14:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AEb5MS042918; Thu, 10 Aug 2023 14:37:05 GMT (envelope-from git) Date: Thu, 10 Aug 2023 14:37:05 GMT Message-Id: <202308101437.37AEb5MS042918@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: 43a7684f6589 - main - sysutils/conky: Fix order of some variables 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: 43a7684f65895fe24e44a7f5d53051454278401c Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=43a7684f65895fe24e44a7f5d53051454278401c commit 43a7684f65895fe24e44a7f5d53051454278401c Author: Guido Falsi AuthorDate: 2023-08-10 14:34:42 +0000 Commit: Guido Falsi CommitDate: 2023-08-10 14:37:00 +0000 sysutils/conky: Fix order of some variables Correct ordering of variable to adhere to common practices. Reported by: portclippy --- sysutils/conky/Makefile | 82 ++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 633f88be9b16..04a60baedcd5 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -7,11 +7,13 @@ MAINTAINER= madpilot@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 WWW= https://github.com/brndnmtthws/conky -LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= gsed:textproc/gsed +LIB_DEPENDS= libinotify.so:devel/libinotify USES= cmake compiler:c++11-lib cpe gettext-runtime iconv \ localbase:ldflags lua:53 pkgconfig tar:bzip2 +USE_GITHUB= yes +GH_ACCOUNT= brndnmtthws CMAKE_ARGS= -DAPP_SED=${LOCALBASE}/bin/gsed \ -DBUILD_AUDACIOUS:BOOL=false \ @@ -23,64 +25,65 @@ CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky -PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua PORTDOCS= config_settings.yaml lua.yaml variables.yaml - -USE_GITHUB= yes -GH_ACCOUNT= brndnmtthws +PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD NCURSES \ RSS WAYLAND X11 XOAP +OPTIONS_DEFAULT?= ARGB DOUBLE_BUFFER LUA_CAIRO MANPAGES MOUSE_EVENTS \ + WAYLAND X11 XFT 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 +ARGB_DESC= Use an ARGB visual to draw on X11 +DOUBLE_BUFFER_DESC= X11 double buffering +LUA_CAIRO_DESC= Lua-Cairo binding +LUA_IMLIB2_DESC= Lua-Imlib2 binding +LUA_RSVG_DESC= Lua-rsvg binding +METAR_DESC= Display METAR weather reports +MOC_DESC= Control MOC (Music On Console) +MOUSE_EVENTS_DESC= Support generating mouse events +MPD_DESC= Control MPD (Music Player Daemon) +NCURSES_DESC= Use ncurses to draw on terminals +RSS_DESC= Display RSS feeds +XOAP_DESC= Display XOAP weather reports + APCUPSD_CMAKE_BOOL= BUILD_APCUPSD -ARGB_DESC= Use an ARGB visual to draw on X11 -ARGB_CMAKE_BOOL= BUILD_ARGB ARGB_IMPLIES= X11 +ARGB_CMAKE_BOOL= BUILD_ARGB -CURL_CMAKE_BOOL= BUILD_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_CMAKE_BOOL= BUILD_CURL -DOUBLE_BUFFER_DESC= X11 double buffering -DOUBLE_BUFFER_CMAKE_BOOL= BUILD_XDBE DOUBLE_BUFFER_IMPLIES= X11 +DOUBLE_BUFFER_CMAKE_BOOL= BUILD_XDBE -IMLIB2_CMAKE_BOOL= BUILD_IMLIB2 -IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_IMPLIES= X11 +IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_USE= XORG=ice,sm +IMLIB2_CMAKE_BOOL= BUILD_IMLIB2 IPV6_CMAKE_BOOL= BUILD_IPV6 -LUA_CAIRO_DESC= Lua-Cairo binding -LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO +LUA_CAIRO_IMPLIES= X11 LUA_CAIRO_USES= gnome LUA_CAIRO_USE= GNOME=cairo +LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so -LUA_CAIRO_IMPLIES= X11 -LUA_IMLIB2_DESC= Lua-Imlib2 binding +LUA_IMLIB2_IMPLIES= IMLIB2 X11 LUA_IMLIB2_CMAKE_BOOL= BUILD_LUA_IMLIB2 LUA_IMLIB2_PLIST_FILES= lib/conky/libimlib2.so -LUA_IMLIB2_IMPLIES= IMLIB2 X11 -LUA_RSVG_DESC= Lua-rsvg binding -LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG +LUA_RSVG_IMPLIES= X11 LUA_RSVG_USES= gnome LUA_RSVG_USE= GNOME=librsvg2 +LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG LUA_RSVG_PLIST_FILES= lib/conky/librsvg.so -LUA_RSVG_IMPLIES= X11 - -METAR_DESC= Display METAR weather reports -METAR_CMAKE_BOOL= BUILD_WEATHER_METAR -METAR_IMPLIES= CURL MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ @@ -89,25 +92,23 @@ MANPAGES_USES= python:build MANPAGES_CMAKE_BOOL= BUILD_DOCS MANPAGES_PLIST_FILES= man/man1/conky.1.gz -MOC_DESC= Control MOC (Music On Console) +METAR_IMPLIES= CURL +METAR_CMAKE_BOOL= BUILD_WEATHER_METAR + MOC_CMAKE_BOOL= BUILD_MOC -MOUSE_EVENTS_DESC= Support generating mouse events -MOUSE_EVENTS_CMAKE_BOOL= BUILD_MOUSE_EVENTS MOUSE_EVENTS_IMPLIES= X11 +MOUSE_EVENTS_CMAKE_BOOL= BUILD_MOUSE_EVENTS -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 +NCURSES_CMAKE_BOOL= BUILD_NCURSES -RSS_DESC= Display RSS feeds -RSS_CMAKE_BOOL= BUILD_RSS +RSS_IMPLIES= CURL RSS_USES= gnome RSS_USE= GNOME=glib20,libxml2 -RSS_IMPLIES= CURL +RSS_CMAKE_BOOL= BUILD_RSS WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.13:graphics/wayland-protocols @@ -123,19 +124,18 @@ X11_USES= xorg X11_USE= XORG=x11,xdamage,xext,xfixes X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW -XFT_CMAKE_BOOL= BUILD_XFT -XFT_USE= XORG=xft XFT_IMPLIES= X11 +XFT_USE= XORG=xft +XFT_CMAKE_BOOL= BUILD_XFT -XINERAMA_CMAKE_BOOL= BUILD_XINERAMA -XINERAMA_USE= XORG=xinerama XINERAMA_IMPLIES= X11 +XINERAMA_USE= XORG=xinerama +XINERAMA_CMAKE_BOOL= BUILD_XINERAMA -XOAP_DESC= Display XOAP weather reports -XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP XOAP_IMPLIES= CURL METAR XOAP_USES= gnome XOAP_USE= GNOME=libxml2 +XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP .include