Index: head/sysutils/conky/Makefile =================================================================== --- head/sysutils/conky/Makefile (revision 489620) +++ head/sysutils/conky/Makefile (revision 489621) @@ -1,142 +1,141 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.10.8 +PORTVERSION= 1.11.1 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 LIB_DEPENDS= libtolua++-5.1.so:lang/tolua++ \ libinotify.so:devel/libinotify BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt -CONFLICTS?= conky-awesome-[0-9]* -SLAVEDIRS= sysutils/conky-awesome - USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ localbase lua:51 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 +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 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_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_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_USE= gnome=glib20,libxml2 RSS_IMPLIES= CURL 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_USE= gnome=libxml2 .include .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2} PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so .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 \ ${WRKSRC}/doc/docs.xml post-build: (cd ${WRKSRC}/doc && ${SH} docgen.sh) .include Index: head/sysutils/conky/distinfo =================================================================== --- head/sysutils/conky/distinfo (revision 489620) +++ head/sysutils/conky/distinfo (revision 489621) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518106982 -SHA256 (brndnmtthws-conky-v1.10.8_GH0.tar.gz) = 2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857 -SIZE (brndnmtthws-conky-v1.10.8_GH0.tar.gz) = 373075 +TIMESTAMP = 1545078509 +SHA256 (brndnmtthws-conky-v1.11.1_GH0.tar.gz) = 71fab859946cc2e67be46f2db53859c66369c5c87acf18fc8dfbd41b114f6d6e +SIZE (brndnmtthws-conky-v1.11.1_GH0.tar.gz) = 1091759 Index: head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake =================================================================== --- head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake (revision 489620) +++ head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake (nonexistent) @@ -1,30 +0,0 @@ -diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake -index 334b4690..ce5c109b 100644 ---- cmake/ConkyPlatformChecks.cmake -+++ cmake/ConkyPlatformChecks.cmake -@@ -30,8 +30,6 @@ check_include_files(sys/statfs.h HAVE_SYS_STATFS_H) - check_include_files(sys/param.h HAVE_SYS_PARAM_H) - check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H) - check_include_files(dirent.h HAVE_DIRENT_H) --check_include_files("soundcard.h;sys/soundcard.h;linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) --check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) - - # Check for some functions - check_function_exists(strndup HAVE_STRNDUP) -@@ -88,6 +86,16 @@ if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY - endif(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY - AND NOT OS_SOLARIS AND NOT OS_HAIKU) - -+# Check for soundcard header -+if(OS_LINUX) -+ check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H) -+ check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H) -+elseif(OS_OPENBSD) -+ check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H) -+else(OS_LINUX) -+ check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H) -+endif(OS_LINUX) -+ - if(BUILD_I18N AND OS_DRAGONFLY) - set(conky_libs ${conky_libs} -lintl) - endif(BUILD_I18N AND OS_DRAGONFLY) Property changes on: head/sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake ___________________________________________________________________ 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 Index: head/sysutils/conky/files/patch-CMakeLists.txt =================================================================== --- head/sysutils/conky/files/patch-CMakeLists.txt (revision 489620) +++ head/sysutils/conky/files/patch-CMakeLists.txt (revision 489621) @@ -1,39 +1,41 @@ ---- CMakeLists.txt.orig 2016-07-20 16:53:48 UTC +--- CMakeLists.txt.orig 2018-12-02 18:26:02 UTC +++ CMakeLists.txt -@@ -50,23 +50,25 @@ add_subdirectory(doc) +@@ -54,26 +54,27 @@ add_subdirectory(doc) add_subdirectory(src) IF(NOT DEFINED DOC_PATH) -- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}") -+ set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}") +- set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}") ++ set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}") ENDIF(NOT DEFINED DOC_PATH) -set(DOC_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf) -+ +IF(NOT DEFINED SAMPLE_PATH) -+ set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}") ++ set(SAMPLE_PATH "share/examples/${CPACK_PACKAGE_NAME}") +ENDIF(NOT DEFINED SAMPLE_PATH) +set(SAMPLE_FILES extras/convert.lua data/conky_no_x11.conf data/conky.conf) set(HTML_PATH "${DOC_PATH}/html") set(HTML_FILES doc/config_settings.html doc/docs.html doc/lua.html doc/variables.html) -set(MAN_PATH "share/man/man1") +set(MAN_PATH "man/man1") set(MAN_FILES doc/conky.1) -install(FILES ${DOC_FILES} -- DESTINATION ${DOC_PATH}) +- DESTINATION ${DOC_PATH}) +install(FILES ${SAMPLE_FILES} -+ DESTINATION ${SAMPLE_PATH}) ++ DESTINATION ${SAMPLE_PATH}) -if(MAINTAINER_MODE) -- install(FILES ${HTML_FILES} -- DESTINATION ${HTML_PATH}) +- install(FILES ${HTML_FILES} +- DESTINATION ${HTML_PATH}) +install(FILES ${HTML_FILES} -+ DESTINATION ${HTML_PATH}) ++ DESTINATION ${HTML_PATH}) -- install(FILES ${MAN_FILES} -- DESTINATION ${MAN_PATH}) +- install(FILES ${MAN_FILES} +- DESTINATION ${MAN_PATH}) -endif(MAINTAINER_MODE) +install(FILES ${MAN_FILES} -+ DESTINATION ${MAN_PATH}) ++ DESTINATION ${MAN_PATH}) + + if(CHECK_CODE_QUALITY) + # Set up clang-tidy Index: head/sysutils/conky/files/patch-src_bsdapm.cc =================================================================== --- head/sysutils/conky/files/patch-src_bsdapm.cc (revision 489620) +++ head/sysutils/conky/files/patch-src_bsdapm.cc (revision 489621) @@ -1,18 +1,29 @@ ---- src/bsdapm.cc.orig 2016-10-04 07:49:19 UTC +--- src/bsdapm.cc.orig 2018-12-16 17:16:51 UTC +++ src/bsdapm.cc -@@ -27,6 +27,10 @@ - * along with this program. If not, see . - * - */ -+ -+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ -+ || defined(__DragonFly__) \ -+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__)) - #include "config.h" - #include "conky.h" - #include "text_object.h" -@@ -208,3 +212,4 @@ void print_apm_battery_time(struct text_ - } - #endif +@@ -61,7 +61,7 @@ static int apm_getinfo(int fd, apm_info_t aip) { + return 0; } -+#endif + +-void print_apm_adapter(struct text_object *obj, char *p, int p_max_size) { ++void print_apm_adapter(struct text_object *obj, char *p, unsigned int p_max_size) { + int fd; + const char *out; + #ifdef __OpenBSD__ +@@ -109,7 +109,7 @@ void print_apm_adapter(struct text_object *obj, char * + snprintf(p, p_max_size, "%s", out); + } + +-void print_apm_battery_life(struct text_object *obj, char *p, int p_max_size) { ++void print_apm_battery_life(struct text_object *obj, char *p, unsigned int p_max_size) { + int fd; + u_int batt_life; + const char *out; +@@ -150,7 +150,7 @@ void print_apm_battery_life(struct text_object *obj, c + snprintf(p, p_max_size, "%s", out); + } + +-void print_apm_battery_time(struct text_object *obj, char *p, int p_max_size) { ++void print_apm_battery_time(struct text_object *obj, char *p, unsigned int p_max_size) { + int fd; + int batt_time; + #ifdef __OpenBSD__ Index: head/sysutils/conky/files/patch-src_bsdapm.h =================================================================== --- head/sysutils/conky/files/patch-src_bsdapm.h (nonexistent) +++ head/sysutils/conky/files/patch-src_bsdapm.h (revision 489621) @@ -0,0 +1,14 @@ +--- src/bsdapm.h.orig 2018-12-02 18:26:02 UTC ++++ src/bsdapm.h +@@ -29,8 +29,8 @@ + #ifndef _BSDAPM_H + #define _BSDAPM_H + +-void print_apm_adapter(struct text_object *, char *, int); +-void print_apm_battery_life(struct text_object *, char *, int); +-void print_apm_battery_time(struct text_object *, char *, int); ++void print_apm_adapter(struct text_object *, char *, unsigned int); ++void print_apm_battery_life(struct text_object *, char *, unsigned int); ++void print_apm_battery_time(struct text_object *, char *, unsigned int); + + #endif /* _BSDAPM_H */ Property changes on: head/sysutils/conky/files/patch-src_bsdapm.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/conky/files/patch-src_freebsd.cc =================================================================== --- head/sysutils/conky/files/patch-src_freebsd.cc (revision 489620) +++ head/sysutils/conky/files/patch-src_freebsd.cc (revision 489621) @@ -1,23 +1,11 @@ ---- src/freebsd.cc.orig 2018-11-28 18:50:47 UTC +--- src/freebsd.cc.orig 2018-12-16 17:16:51 UTC +++ src/freebsd.cc -@@ -78,7 +78,7 @@ std::mutex kvm_proc_mutex; - __attribute__((gnu_inline)) inline void - proc_find_top(struct process **cpu, struct process **mem, struct process **time); +@@ -254,6 +254,8 @@ int update_total_processes(void) { + kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes); --static short cpu_setup = 0; -+static short conky_cpu_setup = 0; + info.procs = n_processes; ++ ++ return 0; + } - static int getsysctl(const char *name, void *ptr, size_t len) - { -@@ -338,9 +338,9 @@ int update_cpu_usage(void) - extern void* global_cpu; - - /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ -- if ((cpu_setup == 0) || (!info.cpu_usage)) { -+ if ((conky_cpu_setup == 0) || (!info.cpu_usage)) { - get_cpu_count(); -- cpu_setup = 1; -+ conky_cpu_setup = 1; - } - - if (!global_cpu) { + int update_running_processes(void) { Index: head/sysutils/conky/files/patch-src_luamm.cc =================================================================== --- head/sysutils/conky/files/patch-src_luamm.cc (revision 489620) +++ head/sysutils/conky/files/patch-src_luamm.cc (revision 489621) @@ -1,39 +1,38 @@ ---- src/luamm.cc.orig 2016-10-04 07:49:19 UTC +--- src/luamm.cc.orig 2018-12-02 18:26:02 UTC +++ src/luamm.cc -@@ -57,7 +57,8 @@ namespace lua { - lua_pushstring(l, e.what()); - } - catch(...) { -- lua_pushstring(l, ptr->__cxa_exception_type()->name()); -+// lua_pushstring(l, ptr->__cxa_exception_type()->name()); -+ lua_pushstring(l, "Unknown exception"); - } - return 1; - } -@@ -344,7 +345,7 @@ namespace lua { - pushinteger(what); - pushinteger(data); - call(2, 1, 0); -- assert(isnumber(-1)); -+ assert(isanumber(-1)); - int r = tointeger(-1); - pop(); - return r; -@@ -427,7 +428,7 @@ namespace lua { +@@ -56,7 +56,7 @@ int exception_to_string(lua_State *l) { + } catch (std::exception &e) { + lua_pushstring(l, e.what()); + } catch (...) { +-#if defined(__APPLE__) && defined(__MACH__) ++#if (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD__) + // lua_pushstring(l, ptr->__cxa_exception_type()->name()); + printf( + "%s: FIXME: no member named '__cxa_exception_type' in " +@@ -345,7 +345,7 @@ int state::gc(int what, int data) { + pushinteger(what); + pushinteger(data); + call(2, 1, 0); +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r; +@@ -420,7 +420,7 @@ bool state::next(int index) { - call(2, MULTRET, 0); + call(2, MULTRET, 0); -- assert(isnumber(-1)); -+ assert(isanumber(-1)); - int r = tointeger(-1); - pop(); - return r; -@@ -466,7 +467,7 @@ namespace lua { - pushvalue(index1); - pushvalue(index2); - call(2, 1, 0); -- assert(isnumber(-1)); -+ assert(isanumber(-1)); - int r = tointeger(-1); - pop(); - return r; +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r != 0; +@@ -460,7 +460,7 @@ bool state::safe_compare(lua_CFunction trampoline, int + pushvalue(index1); + pushvalue(index2); + call(2, 1, 0); +- assert(isnumber(-1)); ++ assert(isanumber(-1)); + int r = tointeger(-1); + pop(); + return r != 0; Index: head/sysutils/conky/files/patch-src_luamm.hh =================================================================== --- head/sysutils/conky/files/patch-src_luamm.hh (revision 489620) +++ head/sysutils/conky/files/patch-src_luamm.hh (revision 489621) @@ -1,11 +1,11 @@ ---- src/luamm.hh.orig 2016-10-04 07:49:19 UTC +--- src/luamm.hh.orig 2018-12-02 18:26:02 UTC +++ src/luamm.hh -@@ -212,7 +212,7 @@ namespace lua { - bool islightuserdata(int index) throw() { return lua_islightuserdata(cobj.get(), index); } - bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); } - bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); } -- bool isnumber(int index) throw() { return lua_isnumber(cobj.get(), index); } -+ bool isanumber(int index) throw() { return lua_isnumber(cobj.get(), index); } - bool isstring(int index) throw() { return lua_isstring(cobj.get(), index); } - void pop(int n = 1) throw() { lua_pop(cobj.get(), n); } - void pushboolean(bool b) throw() { lua_pushboolean(cobj.get(), b); } +@@ -204,7 +204,7 @@ class state : private std::mutex { + } + bool isnil(int index) throw() { return lua_isnil(cobj.get(), index); } + bool isnone(int index) throw() { return lua_isnone(cobj.get(), index); } +- bool isnumber(int index) throw() { return lua_isnumber(cobj.get(), index); } ++ bool isanumber(int index) throw() { return lua_isnumber(cobj.get(), index); } + bool isstring(int index) throw() { return lua_isstring(cobj.get(), index); } + void pop(int n = 1) throw() { lua_pop(cobj.get(), n); } + void pushboolean(bool b) throw() { lua_pushboolean(cobj.get(), b); }