aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2022-09-20 13:24:34 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2022-09-20 13:24:34 +0000
commit26ddb168f9e16870240f6ea049218d062c1b536d (patch)
tree373b874cdd970577eb3a27d0940f6a40c2ec4bce
parenteaf7a4ee5399b0cac5f21bdf0cec3b7c53c0ae86 (diff)
downloadports-26ddb168f9e16870240f6ea049218d062c1b536d.tar.gz
ports-26ddb168f9e16870240f6ea049218d062c1b536d.zip
sysutils/conky: Update to 1.13.1
- Remove option referencing removed xmms2 port
-rw-r--r--sysutils/conky/Makefile8
-rw-r--r--sysutils/conky/distinfo6
-rw-r--r--sysutils/conky/files/patch-src_display-console.cc16
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;
+ }