aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2023-03-25 09:27:10 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2023-03-25 09:27:10 +0000
commit84ce1196d8bd17b8db000f6d71fa3c73f2492af7 (patch)
tree902a93f21b7fe2108294a219fa9242f4135d1773
parent54fae90523b5ac93c2163373c25cc5aa6da988bc (diff)
downloadports-84ce1196d8bd17b8db000f6d71fa3c73f2492af7.tar.gz
ports-84ce1196d8bd17b8db000f6d71fa3c73f2492af7.zip
sysutils/conky: Update to 1.18.3
- Upstream now requires lua 3.5.x unconditionally - While here run portfmt(1) PR: 270397
-rw-r--r--sysutils/conky/Makefile97
-rw-r--r--sysutils/conky/distinfo6
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 <bsd.port.options.mk>
.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