Date: Fri, 11 Jan 2019 19:46:22 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489991 - in head/sysutils/conky: . files Message-ID: <201901111946.x0BJkMA2071383@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri Jan 11 19:46:22 2019 New Revision: 489991 URL: https://svnweb.freebsd.org/changeset/ports/489991 Log: Update conky to 1.11.2 New version uses an embedded version of toloa++ and drops support for lua 5.1 Added: head/sysutils/conky/files/patch-cmake_Conky.cmake (contents, props changed) head/sysutils/conky/files/patch-src_main.cc (contents, props changed) Deleted: head/sysutils/conky/files/patch-doc_docs.xml head/sysutils/conky/files/patch-src_bsdapm.cc head/sysutils/conky/files/patch-src_bsdapm.h head/sysutils/conky/files/patch-src_freebsd.cc Modified: head/sysutils/conky/Makefile head/sysutils/conky/distinfo head/sysutils/conky/files/patch-CMakeLists.txt head/sysutils/conky/files/patch-src_luamm.cc Modified: head/sysutils/conky/Makefile ============================================================================== --- head/sysutils/conky/Makefile Fri Jan 11 19:26:42 2019 (r489990) +++ head/sysutils/conky/Makefile Fri Jan 11 19:46:22 2019 (r489991) @@ -2,21 +2,20 @@ # $FreeBSD$ PORTNAME= conky -PORTVERSION= 1.11.1 +PORTVERSION= 1.11.2 DISTVERSIONPREFIX= v 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 +LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ - localbase lua:51 pkgconfig tar:bzip2 + localbase lua:53 pkgconfig tar:bzip2 CMAKE_ARGS+= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_IBM:BOOL=false \ @@ -132,8 +131,7 @@ post-patch: -e 's/ -lbsd/ -lintl -linotify/' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake @${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \ - ${WRKSRC}/doc/docgen.sh \ - ${WRKSRC}/doc/docs.xml + ${WRKSRC}/doc/docgen.sh post-build: (cd ${WRKSRC}/doc && ${SH} docgen.sh) Modified: head/sysutils/conky/distinfo ============================================================================== --- head/sysutils/conky/distinfo Fri Jan 11 19:26:42 2019 (r489990) +++ head/sysutils/conky/distinfo Fri Jan 11 19:46:22 2019 (r489991) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545078509 -SHA256 (brndnmtthws-conky-v1.11.1_GH0.tar.gz) = 71fab859946cc2e67be46f2db53859c66369c5c87acf18fc8dfbd41b114f6d6e -SIZE (brndnmtthws-conky-v1.11.1_GH0.tar.gz) = 1091759 +TIMESTAMP = 1547073048 +SHA256 (brndnmtthws-conky-v1.11.2_GH0.tar.gz) = 1acf9dae9ce1a762309ab6b600a0464c2e054420d416b515ff39658430a0e819 +SIZE (brndnmtthws-conky-v1.11.2_GH0.tar.gz) = 2373307 Modified: head/sysutils/conky/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/conky/files/patch-CMakeLists.txt Fri Jan 11 19:26:42 2019 (r489990) +++ head/sysutils/conky/files/patch-CMakeLists.txt Fri Jan 11 19:46:22 2019 (r489991) @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2018-12-02 18:26:02 UTC +--- CMakeLists.txt.orig 2019-01-08 01:26:24 UTC +++ CMakeLists.txt -@@ -54,26 +54,27 @@ add_subdirectory(doc) - add_subdirectory(src) +@@ -72,9 +72,12 @@ if(BUILD_TESTS) + endif() - IF(NOT DEFINED DOC_PATH) + if(NOT DEFINED DOC_PATH) - set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}-${VERSION}") + set(DOC_PATH "share/doc/${CPACK_PACKAGE_NAME}") - ENDIF(NOT DEFINED DOC_PATH) + 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}") @@ -14,28 +14,25 @@ +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(HTML_FILES +@@ -83,16 +86,14 @@ set(HTML_FILES + 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}) -+install(FILES ${SAMPLE_FILES} -+ DESTINATION ${SAMPLE_PATH}) +-install(FILES ${DOC_FILES} DESTINATION ${DOC_PATH}) ++install(FILES ${SAMPLE_FILES} 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}) ++install(FILES ${HTML_FILES} 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}) ++install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH}) if(CHECK_CODE_QUALITY) # Set up clang-tidy Added: head/sysutils/conky/files/patch-cmake_Conky.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/patch-cmake_Conky.cmake Fri Jan 11 19:46:22 2019 (r489991) @@ -0,0 +1,11 @@ +--- cmake/Conky.cmake.orig 2019-01-08 01:26:24 UTC ++++ cmake/Conky.cmake +@@ -18,7 +18,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-# set(RELEASE true) ++set(RELEASE true) + + # Set system vars + if(CMAKE_SYSTEM_NAME MATCHES "Linux") Modified: head/sysutils/conky/files/patch-src_luamm.cc ============================================================================== --- head/sysutils/conky/files/patch-src_luamm.cc Fri Jan 11 19:26:42 2019 (r489990) +++ head/sysutils/conky/files/patch-src_luamm.cc Fri Jan 11 19:46:22 2019 (r489991) @@ -1,15 +1,6 @@ ---- src/luamm.cc.orig 2018-12-02 18:26:02 UTC +--- src/luamm.cc.orig 2019-01-08 01:26:24 UTC +++ src/luamm.cc -@@ -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) { +@@ -336,7 +336,7 @@ int state::gc(int what, int data) { pushinteger(what); pushinteger(data); call(2, 1, 0); @@ -18,7 +9,7 @@ int r = tointeger(-1); pop(); return r; -@@ -420,7 +420,7 @@ bool state::next(int index) { +@@ -411,7 +411,7 @@ bool state::next(int index) { call(2, MULTRET, 0); @@ -27,7 +18,7 @@ int r = tointeger(-1); pop(); return r != 0; -@@ -460,7 +460,7 @@ bool state::safe_compare(lua_CFunction trampoline, int +@@ -451,7 +451,7 @@ bool state::safe_compare(lua_CFunction trampoline, int pushvalue(index1); pushvalue(index2); call(2, 1, 0); Added: head/sysutils/conky/files/patch-src_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/patch-src_main.cc Fri Jan 11 19:46:22 2019 (r489991) @@ -0,0 +1,13 @@ +--- src/main.cc.orig 2019-01-08 01:26:24 UTC ++++ src/main.cc +@@ -359,10 +359,6 @@ int main(int argc, char **argv) { + return EXIT_FAILURE; + } + +-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +- kvm_close(kd); +-#endif +- + #ifdef LEAKFREE_NCURSES + _nc_free_and_exit(0); // hide false memleaks + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901111946.x0BJkMA2071383>