Index: head/sysutils/conky/Makefile =================================================================== --- head/sysutils/conky/Makefile (revision 543552) +++ head/sysutils/conky/Makefile (revision 543553) @@ -1,153 +1,152 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.11.5 +PORTVERSION= 1.11.6 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt \ gsed:textproc/gsed USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ localbase lua:52 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 \ -DBUILD_DOCS:BOOL=true \ -DAPP_SED=${LOCALBASE}/bin/gsed CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky man/man1/conky.1.gz PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua PORTDOCS= html/config_settings.html html/docs.html html/lua.html html/variables.html USE_GITHUB= yes GH_ACCOUNT= brndnmtthws OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS \ X11 XMMS2 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 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 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 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 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 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(RELEASE true\)/\1/' \ -e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \ ${WRKSRC}/cmake/Conky.cmake @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ -e 's/ -lbsd/ -lintl -linotify/' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake @${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \ ${WRKSRC}/doc/docgen.sh post-build: (cd ${WRKSRC}/doc && ${SH} docgen.sh) .include Index: head/sysutils/conky/distinfo =================================================================== --- head/sysutils/conky/distinfo (revision 543552) +++ head/sysutils/conky/distinfo (revision 543553) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565781705 -SHA256 (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13 -SIZE (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 2400965 +TIMESTAMP = 1595871488 +SHA256 (brndnmtthws-conky-v1.11.6_GH0.tar.gz) = e7c01e4910744851e05f85f0a0aab3f5068215b1af850515189ac40e7deeb26d +SIZE (brndnmtthws-conky-v1.11.6_GH0.tar.gz) = 2402216 Index: head/sysutils/conky/files/patch-src_core.cc =================================================================== --- head/sysutils/conky/files/patch-src_core.cc (revision 543552) +++ head/sysutils/conky/files/patch-src_core.cc (nonexistent) @@ -1,11 +0,0 @@ ---- src/core.cc.orig 2019-08-12 21:53:54 UTC -+++ src/core.cc -@@ -1077,7 +1077,7 @@ struct text_object *construct_text_object(char *s, con - obj->data.s = STRNDUP_ARG; - obj->callbacks.iftest = &if_existing_iftest; - obj->callbacks.free = &gen_free_opaque; --#ifdef __linux__ -+#if defined(__linux__) || defined(__FreeBSD__) - END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument") obj->data.s = - STRNDUP_ARG; - obj->callbacks.iftest = &check_mount; Property changes on: head/sysutils/conky/files/patch-src_core.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property