git: 43a7684f6589 - main - sysutils/conky: Fix order of some variables
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 10 Aug 2023 14:37:05 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=43a7684f65895fe24e44a7f5d53051454278401c
commit 43a7684f65895fe24e44a7f5d53051454278401c
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-08-10 14:34:42 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
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 <bsd.port.options.mk>