diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index a3ac017d6d2b..a32033c83f21 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,156 +1,156 @@ PORTNAME= conky -PORTVERSION= 1.15.0 +PORTVERSION= 1.16.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils 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 -USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ +USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \ localbase lua:52-53 pkgconfig tar:bzip2 CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_IBM:BOOL=false \ -DBUILD_HDDTEMP:BOOL=false \ -DBUILD_IOSTATS:BOOL=false \ -DBUILD_AUDACIOUS:BOOL=false \ -DAPP_SED=${LOCALBASE}/bin/gsed 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 USE_GITHUB= yes GH_ACCOUNT= brndnmtthws OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD \ NCURSES RSS X11 XOAP OPTIONS_GROUP?= X11 OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER MANPAGES XFT LUA_CAIRO APCUPSD_DESC= Monitor APCUPSD APCUPSD_CMAKE_BOOL= BUILD_APCUPSD ARGB_DESC= Use an ARGB visual to draw on X11 ARGB_CMAKE_BOOL= BUILD_ARGB 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 IMLIB2_CMAKE_BOOL= BUILD_IMLIB2 IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_IMPLIES= X11 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_PLIST_FILES= lib/conky/libcairo.so LUA_CAIRO_IMPLIES= X11 LUA_IMLIB2_DESC= Lua-Imlib2 binding 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_USES= gnome LUA_RSVG_USE= gnome=librsvg2 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= pandoc:textproc/hs-pandoc \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} 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 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 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 XFT_CMAKE_BOOL= BUILD_XFT XFT_USE= xorg=xft XFT_IMPLIES= X11 XINERAMA_CMAKE_BOOL= BUILD_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 .include .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2} 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 .endif post-patch: @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake .if ${LUA_DEFAULT} == 5.2 # Force using lua 5.2 @${REINPLACE_CMD} -e 's/lua.*5\.*3//' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake .elif ${LUA_DEFAULT} == 5.3 # Force using lua 5.3 @${REINPLACE_CMD} -e 's/lua.*5\.*2//' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake .endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 051644f30c77..a706ee0921c5 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665942072 -SHA256 (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = bebd54637bf8819ee395b765e3615ad28606d28a7870ac99ed1dffb1d14087b2 -SIZE (brndnmtthws-conky-v1.15.0_GH0.tar.gz) = 1800684 +TIMESTAMP = 1672086732 +SHA256 (brndnmtthws-conky-v1.16.1_GH0.tar.gz) = a293530980bf5ec2250e6d52533cb3426de66c99477ae15430215b3e4b536593 +SIZE (brndnmtthws-conky-v1.16.1_GH0.tar.gz) = 1696411 diff --git a/sysutils/conky/files/patch-src_x11.h b/sysutils/conky/files/patch-src_x11.h new file mode 100644 index 000000000000..c0a45206d133 --- /dev/null +++ b/sysutils/conky/files/patch-src_x11.h @@ -0,0 +1,16 @@ +--- src/x11.h.orig 2022-12-26 18:54:10 UTC ++++ src/x11.h +@@ -22,6 +22,7 @@ + * + */ + ++#ifdef BUILD_X11 + #pragma once + + #include +@@ -157,3 +158,5 @@ extern priv::use_xpmdb_setting use_xpmdb; + #else + extern priv::use_xpmdb_setting use_xpmdb; + #endif ++ ++#endif /* BUILD_X11 */