- Update conky and conky-awesome to 1.10.4

- Take maintainership [1]
- Options adapted to new version
- Removed LUA option since it's a mandatoory requirement now
- Use project own install target
- Fix installation of lua helper libraries
- Project moved to github
- in conky-awesome, properly use OPTIONS_EXCLUDE

PR:		212629
Submitted by:	me
Approved by:	ntarmos@ceid.upatras.gr (former maintainer) [1]

20 files changed, 300 insertions, 459 deletions

diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 73d13e85a267..338edd2cd4cc 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-awesome
 
-MAINTAINER=	ntarmos@ceid.upatras.gr
+MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Advanced, highly configurable system monitor (configured for x11-wm/awesome)
 
 MASTERDIR=	${.CURDIR}/../conky
@@ -11,8 +11,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 CONFLICTS=	conky-[0-9]*
 
-OPTIONS_EXCLUDE=	X11
-OPTIONS_GROUP=
-OPTIONS_DEFAULT=
+OPTIONS_EXCLUDE=	X11 ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 \
+			LUA_RSVG
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/conky-awesome/pkg-descr b/sysutils/conky-awesome/pkg-descr
index 4dda31f1f741..fb5ac28c0c48 100644
--- a/sysutils/conky-awesome/pkg-descr
+++ b/sysutils/conky-awesome/pkg-descr
@@ -5,4 +5,4 @@ from x11-wm/awesome. Unless you're using Awesome or some other system
 with a client pipe, you probably want the main version of Conky in
 sysutils/conky.
 
-WWW: http://conky.sourceforge.net/
+WWW: https://github.com/brndnmtthws/conky
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 135b4a7eddb6..5bf581adea17 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -2,126 +2,139 @@
 # $FreeBSD$
 
 PORTNAME=	conky
-PORTVERSION=	1.9.0
-PORTREVISION=	6
+PORTVERSION=	1.10.4
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	SF
 
-MAINTAINER=	ntarmos@ceid.upatras.gr
+MAINTAINER=	madpilot@FreeBSD.org
 COMMENT?=	Advanced, highly configurable system monitor for X11
 
+LIB_DEPENDS=	libtolua++-5.1.so:lang/tolua++
+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 gmake iconv localbase pkgconfig tar:bzip2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-portmon \
-			--disable-hddtemp \
-			--disable-alsa \
-			--disable-bmpx \
-			--disable-iostats
+USES=           cpe cmake 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
 
 PLIST_FILES=	bin/conky man/man1/conky.1.gz
-PORTEXAMPLES=	conkyrc.sample
-PORTDOCS=	README AUTHORS ChangeLog TODO NEWS \
-		docs.html variables.html config_settings.html
+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 AUDACIOUS INOTIFY LUA METAR MOC MPD NCURSES RSS \
+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 LUA_CAIRO LUA_IMLIB2
+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_CONFIGURE_ENABLE=apcupsd
+APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD
 
 ARGB_DESC=		Use an ARGB visual to draw on X11
-ARGB_CONFIGURE_ENABLE=	argb
+ARGB_CMAKE_BOOL=	BUILD_ARGB
 ARGB_IMPLIES=		X11
 
-AUDACIOUS_DESC=		Control Audacious sound player
-AUDACIOUS_CONFIGURE_ENABLE=audacious
-AUDACIOUS_LIB_DEPENDS=	libaudclient.so:multimedia/audacious
+CURL_CMAKE_BOOL=	BUILD_CURL
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DOUBLE_BUFFER_DESC=	X11 double buffering
-DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer
+DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE
 DOUBLE_BUFFER_IMPLIES=	X11
 
-IMLIB2_CONFIGURE_ENABLE=imlib2
+IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
 IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB2_IMPLIES=		X11
 
-INOTIFY_DESC=		Monitor file changes via Inotify
-INOTIFY_CONFIGURE_ENABLE=inotify
-INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
-
-LUA_USES=		lua:51
-LUA_CONFIGURE_ENABLE=	lua
-LUA_LIB_DEPENDS=	libtolua++-5.1.so:lang/tolua++
+IPV6_CMAKE_BOOL=	BUILD_IPV6
 
 LUA_CAIRO_DESC=		Lua-Cairo binding
-LUA_CAIRO_CONFIGURE_ENABLE=lua-cairo
+LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
 LUA_CAIRO_USE=		gnome=cairo
-LUA_CAIRO_IMPLIES=	LUA X11
+LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so
+LUA_CAIRO_IMPLIES=	X11
 
 LUA_IMLIB2_DESC=	Lua-Imlib2 binding
-LUA_IMLIB2_CONFIGURE_ENABLE=lua-imlib2
-LUA_IMLIB2_IMPLIES=	IMLIB2 LUA X11
+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_CONFIGURE_ENABLE=	weather-metar
-METAR_LIB_DEPENDS=	libcurl.so:ftp/curl
+METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
+METAR_IMPLIES=		CURL
 
 MOC_DESC=		Control MOC (Music On Console)
-MOC_CONFIGURE_ENABLE=	moc
+MOC_CMAKE_BOOL=		BUILD_MOC
 
 MPD_DESC=		Control MPD (Music Player Daemon)
-MPD_CONFIGURE_ENABLE=	mpd
+MPD_CMAKE_BOOL=		BUILD_MPD
 
 NCURSES_DESC=		Use ncurses to draw on terminals
-NCURSES_CONFIGURE_ENABLE=ncurses
+NCURSES_CMAKE_BOOL=	BUILD_NCURSES
+NCURSES_USES=		ncurses:port
 
 RSS_DESC=		Display RSS feeds
-RSS_CONFIGURE_ENABLE=	rss
+RSS_CMAKE_BOOL=		BUILD_RSS
 RSS_USE=		gnome=glib20,libxml2
-RSS_LIB_DEPENDS=	libcurl.so:ftp/curl
+RSS_IMPLIES=		CURL
 
 X11_USE=		xorg=x11,xext,xdamage,xfixes
-X11_CONFIGURE_ENABLE=	x11 own-window
+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_CONFIGURE_ENABLE=	xft
+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_CONFIGURE_ENABLE=	xmms2
+XMMS2_CMAKE_BOOL=	BUILD_XMMS2
 XMMS2_LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 
 XOAP_DESC=		Display XOAP weather reports
-XOAP_CONFIGURE_ENABLE=	weather-xoap
-XOAP_LIB_DEPENDS=	libcurl.so:ftp/curl
+XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
+XOAP_IMPLIES=		CURL
 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
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,imlib_context_disconnect_display();,,g' \
-		${WRKSRC}/src/imlib2.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${STAGEDIR}${EXAMPLESDIR}/conkyrc.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README AUTHORS ChangeLog TODO NEWS
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for i in docs.html variables.html config_settings.html
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	@${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/' \
+		${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 <bsd.port.mk>
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index aaff92eb10a8..eac3970d973a 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,2 +1,3 @@
-SHA256 (conky-1.9.0.tar.bz2) = baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f
-SIZE (conky-1.9.0.tar.bz2) = 626555
+TIMESTAMP = 1470249422
+SHA256 (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = ed61ffb3be9fd24965d40401c7d54553e732038f3da2e03454915779384f59b4
+SIZE (brndnmtthws-conky-v1.10.4_GH0.tar.gz) = 365145
diff --git a/sysutils/conky/files/patch-CMakeLists.txt b/sysutils/conky/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..94de2304e102
--- /dev/null
+++ b/sysutils/conky/files/patch-CMakeLists.txt
@@ -0,0 +1,39 @@
+--- CMakeLists.txt.orig	2016-07-20 16:53:48 UTC
++++ CMakeLists.txt
+@@ -50,23 +50,25 @@ 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}")
+ 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}")
++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})
++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 ${MAN_FILES}
+-		DESTINATION ${MAN_PATH})
+-endif(MAINTAINER_MODE)
++install(FILES ${MAN_FILES}
++	DESTINATION ${MAN_PATH})
diff --git a/sysutils/conky/files/patch-configure b/sysutils/conky/files/patch-configure
deleted file mode 100644
index 4a632c13256e..000000000000
--- a/sysutils/conky/files/patch-configure
+++ /dev/null
@@ -1,303 +0,0 @@
---- configure.orig	2012-05-03 21:47:40 UTC
-+++ configure
-@@ -895,6 +895,7 @@ enable_xdamage
- enable_xft
- enable_nvidia
- enable_alsa
-+enable_inotify
- enable_debug
- enable_testing
- enable_profiling
-@@ -1620,6 +1621,7 @@ Optional Features:
-   --enable-nvidia         enable if you want nvidia support [default=no]
-   --disable-alsa          disable if you do not want ALSA support
-                           [default=yes]
-+  --enable-inotify        enable if you want inotify support [default=no]
-   --enable-debug          compile with debug symbols [default=no]
-   --enable-testing        use strict compiler flags for testing [default=no]
-   --enable-profiling      specify compiler flags for use with gprof and gcov
-@@ -11930,7 +11932,11 @@ case $uname in
-   Linux*)
-     WANT_SYSINFO=yes
-     ;;
--  FreeBSD*|GNU/kFreeBSD*)
-+  FreeBSD*)
-+    WANT_KVM=yes
-+    WANT_DEVSTAT=yes
-+    ;;
-+  GNU/kFreeBSD*)
-     WANT_KVM=yes
-     WANT_DEVSTAT=yes
-     WANT_OPTRESET=yes
-@@ -14046,12 +14052,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14064,12 +14070,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_LIBS="$LUA51_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14088,14 +14094,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         else
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LUA51_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
-+	as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
- 
- $LUA51_PKG_ERRORS
- 
-@@ -14139,12 +14145,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14157,12 +14163,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_LIBS="$LUA51_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14181,14 +14187,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         else
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LUA51_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
-+	as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
- 
- $LUA51_PKG_ERRORS
- 
-@@ -14302,12 +14308,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14320,12 +14326,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_LIBS="$LUA51_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14344,14 +14350,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         else
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LUA51_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
-+	as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
- 
- $LUA51_PKG_ERRORS
- 
-@@ -14395,12 +14401,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_CFLAGS="$LUA51_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_CFLAGS=`$PKG_CONFIG --cflags "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14413,12 +14419,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_LUA51_LIBS="$LUA51_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua5.1 >= 5.1" 2>/dev/null`
-+  pkg_cv_LUA51_LIBS=`$PKG_CONFIG --libs "lua-5.1 >= 5.1" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14437,14 +14443,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         else
--	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1"`
-+	        LUA51_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LUA51_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (lua5.1 >= 5.1) were not met:
-+	as_fn_error $? "Package requirements (lua-5.1 >= 5.1) were not met:
- 
- $LUA51_PKG_ERRORS
- 
-@@ -16998,18 +17004,63 @@ fi
- 
- done
- 
--# check if we have inotify support
--for ac_header in sys/inotify.h
--do :
--  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
-+
-+# Check whether --enable-inotify was given.
-+if test "${enable_inotify+set}" = set; then :
-+  enableval=$enable_inotify; want_inotify="$enableval"
-+else
-+  want_inotify=no
-+fi
-+
-+if test x$want_inotify = xyes; then
-+    ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
- if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_SYS_INOTIFY_H 1
--_ACEOF
-+ 
-+else
-+  want_inotify=no
-+fi
-+
-+fi
-+if test x$want_inotify = xyes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -linotify" >&5
-+$as_echo_n "checking for inotify_init in -linotify... " >&6; }
-+if ${ac_cv_lib_inotify_inotify_init+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linotify  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#include <sys/inotify.h>
- 
-+char inotify_init ();
-+int
-+main ()
-+{
-+return inotify_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_inotify_inotify_init=yes
-+else
-+  ac_cv_lib_inotify_inotify_init=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inotify_inotify_init" >&5
-+$as_echo "$ac_cv_lib_inotify_inotify_init" >&6; }
-+if test "x$ac_cv_lib_inotify_inotify_init" = xyes; then :
-+  conky_LIBS="$conky_LIBS -linotify"
-+else
-+  want_inotify=yes
- fi
- 
--done
-+fi
- 
- 
- 
diff --git a/sysutils/conky/files/patch-doc_docgen.sh b/sysutils/conky/files/patch-doc_docgen.sh
new file mode 100644
index 000000000000..5e7c2e62e1f6
--- /dev/null
+++ b/sysutils/conky/files/patch-doc_docgen.sh
@@ -0,0 +1,16 @@
+--- doc/docgen.sh.orig	2016-07-20 16:53:48 UTC
++++ doc/docgen.sh
+@@ -1,8 +1,11 @@
+ #!/bin/sh
+ 
+-xsltproc http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl docs.xml > docs.html && \
++xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl docs.xml > docs.html && \
++xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl variables.xml > variables.html && \
++xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl config_settings.xml > config_settings.html && \
++xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl lua.xml > lua.html && \
+ db2x_xsltproc -s man docs.xml -o docs.mxml && \
+-db2x_manxml docs.mxml && \
++db2x_manxml docs.mxml
+ { echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2 && \
+ mv conky.2 conky.1 && \
+ man ./conky.1 | col -b > README && \
diff --git a/sysutils/conky/files/patch-doc_docs.xml b/sysutils/conky/files/patch-doc_docs.xml
new file mode 100644
index 000000000000..4b0656f9aa1c
--- /dev/null
+++ b/sysutils/conky/files/patch-doc_docs.xml
@@ -0,0 +1,10 @@
+--- doc/docs.xml.orig	2016-07-20 16:53:48 UTC
++++ doc/docs.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
++"LOCALBASE/share/xml/docbook/4.4/docbookx.dtd"
+ [
+ <!ENTITY command_options SYSTEM "command_options.xml">
+ <!ENTITY config_settings SYSTEM "config_settings.xml">
diff --git a/sysutils/conky/files/patch-lua-cairo.pkg b/sysutils/conky/files/patch-lua-cairo.pkg
deleted file mode 100644
index 1997a39f186c..000000000000
--- a/sysutils/conky/files/patch-lua-cairo.pkg
+++ /dev/null
@@ -1,10 +0,0 @@
---- lua/cairo.pkg.orig	2012-05-03 21:08:27 UTC
-+++ lua/cairo.pkg
-@@ -4,6 +4,7 @@ $#include <cairo.h>
- $#include <cairo-xlib.h>
- $#include <X11/Xlib.h>
- $#include "libcairo-helper.h"
-+$#define tolua_outside
- /*
-  * This code was mostly copied from cairo.h and cairo-xlib.h with comments
-  * removed.  The licence noticed below is present for the sake of clarity.
diff --git a/sysutils/conky/files/patch-src-conky.c b/sysutils/conky/files/patch-src-conky.c
deleted file mode 100644
index 3af04ec76a8c..000000000000
--- a/sysutils/conky/files/patch-src-conky.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/conky.c.orig	2012-05-03 21:22:21 UTC
-+++ src/conky.c
-@@ -119,7 +119,7 @@
- #include "openbsd.h"
- #endif
- 
--#if defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
- #include <bsd/bsd.h>
- #endif
- 
-@@ -4292,7 +4292,8 @@ static void set_default_configurations(v
- 
- 	free_templates();
- 
--	free(current_mail_spool);
-+	if (current_mail_spool)
-+		free(current_mail_spool);
- 	{
- 		char buf[256];
- 
-@@ -5662,6 +5663,7 @@ void initialisation(int argc, char **arg
- 			current_mail_spool = strndup(buf, text_buffer_size);
- 		}
- 	}
-+	pthread_mutex_init(&kvm_proc_mutex, NULL);
- #endif
- 
- 	/* handle other command line arguments */
-@@ -5971,7 +5973,7 @@ int main(int argc, char **argv)
- 
- void alarm_handler(void) {
- 	if(childpid > 0) {
--		kill(childpid, SIGTERM);
-+		kill(childpid, SIGKILL);
- 	}
- }
- 
diff --git a/sysutils/conky/files/patch-src-freebsd.h b/sysutils/conky/files/patch-src-freebsd.h
deleted file mode 100644
index 7ec921d791b3..000000000000
--- a/sysutils/conky/files/patch-src-freebsd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/freebsd.h.orig	2012-05-03 21:08:27 UTC
-+++ src/freebsd.h
-@@ -10,6 +10,7 @@
- #include <fcntl.h>
- #include <kvm.h>
- #include <pthread.h>
-+#include <stdbool.h>
- #if (defined(i386) || defined(__i386__))
- #include <machine/apm_bios.h>
- #endif /* i386 || __i386__ */
diff --git a/sysutils/conky/files/patch-src-fs.c b/sysutils/conky/files/patch-src-fs.c
deleted file mode 100644
index fd6744c62c06..000000000000
--- a/sysutils/conky/files/patch-src-fs.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/fs.c.orig	2012-05-03 21:08:27 UTC
-+++ src/fs.c
-@@ -118,9 +118,15 @@ struct fs_stat *prepare_fs_stat(const ch
- 
- static void update_fs_stat(struct fs_stat *fs)
- {
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+	struct statfs s;
-+
-+	if (statfs(fs->path, &s) == 0) {
-+#else
- 	struct statfs64 s;
- 
- 	if (statfs64(fs->path, &s) == 0) {
-+#endif
- 		fs->size = (long long)s.f_blocks * s.f_bsize;
- 		/* bfree (root) or bavail (non-roots) ? */
- 		fs->avail = (long long)s.f_bavail * s.f_bsize;
diff --git a/sysutils/conky/files/patch-src_c++wrap.cc b/sysutils/conky/files/patch-src_c++wrap.cc
new file mode 100644
index 000000000000..c764660b5fab
--- /dev/null
+++ b/sysutils/conky/files/patch-src_c++wrap.cc
@@ -0,0 +1,10 @@
+--- src/c++wrap.cc.orig	2016-07-20 16:53:48 UTC
++++ src/c++wrap.cc
+@@ -26,6 +26,7 @@
+ #include "c++wrap.hh"
+ 
+ #include <unistd.h>
++#include <stdio.h>
+ 
+ /* force use of  POSIX strerror_r instead of non-portable GNU specific */
+ #ifdef _GNU_SOURCE
diff --git a/sysutils/conky/files/patch-src_conky.cc b/sysutils/conky/files/patch-src_conky.cc
new file mode 100644
index 000000000000..4a30994d0f22
--- /dev/null
+++ b/sysutils/conky/files/patch-src_conky.cc
@@ -0,0 +1,45 @@
+--- src/conky.cc.orig	2016-07-20 16:53:48 UTC
++++ src/conky.cc
+@@ -129,7 +129,7 @@
+ #include <microhttpd.h>
+ #endif
+ 
+-#if defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD_kernel__) && (__FreeBSD_kernel__ + 0)
+ #include <bsd/bsd.h>
+ #endif
+ 
+@@ -728,13 +728,6 @@ int percent_print(char *buf, int size, u
+ 	return spaced_print(buf, size, "%u", pad_percents.get(*state), value);
+ }
+ 
+-#if defined(__FreeBSD__)
+-unsigned long long llabs(long long num) {
+-       if(num < 0) return -num;
+-       else return num;
+-}
+-#endif
+-
+ /* converts from bytes to human readable format (K, M, G, T)
+  *
+  * The algorithm always divides by 1024, as unit-conversion of byte
+@@ -1811,8 +1804,8 @@ int draw_each_line_inner(char *s, int sp
+ #endif /* BUILD_X11 */
+ 				case GOTO:
+ 					if (current->arg >= 0) {
+-						cur_x = (int) current->arg;
+ #ifdef BUILD_X11
++						cur_x = (int) current->arg;
+ 						//make sure shades are 1 pixel to the right of the text
+ 						if(draw_mode == BG) cur_x++;
+ #endif /* BUILD_X11 */
+@@ -1934,7 +1927,9 @@ static void draw_text(void)
+ 
+ static void draw_stuff(void)
+ {
++#ifdef BUILD_X11
+ 	text_offset_x = text_offset_y = 0;
++#endif
+ #ifdef BUILD_IMLIB2
+ 	cimlib_render(text_start_x, text_start_y, window.width, window.height);
+ #endif /* BUILD_IMLIB2 */
diff --git a/sysutils/conky/files/patch-src_core.cc b/sysutils/conky/files/patch-src_core.cc
new file mode 100644
index 000000000000..5796e807d9ea
--- /dev/null
+++ b/sysutils/conky/files/patch-src_core.cc
@@ -0,0 +1,17 @@
+--- src/core.cc.orig	2016-07-20 16:53:48 UTC
++++ src/core.cc
+@@ -898,11 +898,12 @@ struct text_object *construct_text_objec
+ 			return NULL;
+ 		}
+ 	} else
+-#ifdef __linux__
+ 	OBJ(addr, &update_net_stats)
+ 		parse_net_stat_arg(obj, arg, free_at_crash);
+ 		obj->callbacks.print = &print_addr;
+-	END OBJ(addrs, &update_net_stats)
++	END
++#ifdef __linux__
++	OBJ(addrs, &update_net_stats)
+ 		parse_net_stat_arg(obj, arg, free_at_crash);
+ 		obj->callbacks.print = &print_addrs;
+ #ifdef BUILD_IPV6
diff --git a/sysutils/conky/files/patch-src-freebsd.c b/sysutils/conky/files/patch-src_freebsd.cc
index d80d3a2d887a..0e89b18f9fe1 100644
--- a/sysutils/conky/files/patch-src-freebsd.c
+++ b/sysutils/conky/files/patch-src_freebsd.cc
@@ -1,10 +1,10 @@
---- src/freebsd.c.orig	2012-05-03 21:08:27 UTC
-+++ src/freebsd.c
-@@ -283,11 +283,7 @@ int update_running_processes(void)
- 	pthread_mutex_lock(&kvm_proc_mutex);
+--- src/freebsd.cc.orig	2016-07-20 16:53:48 UTC
++++ src/freebsd.cc
+@@ -295,11 +295,7 @@ int update_running_processes(void)
+ 	std::lock_guard<std::mutex> guard(kvm_proc_mutex);
  	p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
  	for (i = 0; i < n_processes; i++) {
--#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
+-#if (__FreeBSD__ < 5) && !defined(__FreeBSD_kernel__)
 -		if (p[i].kp_proc.p_stat == SRUN) {
 -#else
  		if (p[i].ki_stat == SRUN) {
@@ -12,7 +12,7 @@
  			cnt++;
  		}
  	}
-@@ -464,7 +460,7 @@ void get_battery_stuff(char *buf, unsign
+@@ -475,7 +471,7 @@ void get_battery_stuff(char *buf, unsign
  			break;
  		case BATTERY_STATUS:
  			if (batstate == 1) // Discharging
@@ -21,7 +21,7 @@
  			else
  				snprintf(buf, n, batstate == 2 ? "charging (%d%%)" :
  						(batstate == 7 ? "absent/on AC" : "charged (%d%%)"),
-@@ -497,26 +493,10 @@ static int check_bat(const char *bat)
+@@ -508,26 +504,10 @@ static int check_bat(const char *bat)
  
  int get_battery_perct(const char *bat)
  {
@@ -50,8 +50,8 @@
 +	return batcapacity;
  }
  
- int get_battery_perct_bar(const char *bar)
-@@ -970,11 +950,14 @@ void get_battery_short_status(char *buff
+ double get_battery_perct_bar(struct text_object *obj)
+@@ -745,11 +725,14 @@ void get_battery_short_status(char *buff
  	if (0 == strncmp("charging", buffer, 8)) {
  		buffer[0] = 'C';
  		memmove(buffer + 1, buffer + 8, n - 8);
diff --git a/sysutils/conky/files/patch-src_freebsd.h b/sysutils/conky/files/patch-src_freebsd.h
new file mode 100644
index 000000000000..5f87b37d0ad1
--- /dev/null
+++ b/sysutils/conky/files/patch-src_freebsd.h
@@ -0,0 +1,10 @@
+--- src/freebsd.h.orig	2016-07-20 16:53:48 UTC
++++ src/freebsd.h
+@@ -7,6 +7,7 @@
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #include <sys/ucred.h>
++#include <strings.h>
+ #include <fcntl.h>
+ #include <kvm.h>
+ #if (defined(i386) || defined(__i386__))
diff --git a/sysutils/conky/files/patch-src_luamm.cc b/sysutils/conky/files/patch-src_luamm.cc
new file mode 100644
index 000000000000..2d28deba36a5
--- /dev/null
+++ b/sysutils/conky/files/patch-src_luamm.cc
@@ -0,0 +1,39 @@
+--- src/luamm.cc.orig	2016-07-20 16:53:48 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 {
+ 
+ 		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;
diff --git a/sysutils/conky/files/patch-src_luamm.hh b/sysutils/conky/files/patch-src_luamm.hh
new file mode 100644
index 000000000000..460d16036788
--- /dev/null
+++ b/sysutils/conky/files/patch-src_luamm.hh
@@ -0,0 +1,21 @@
+--- src/luamm.hh.orig	2016-07-20 16:53:48 UTC
++++ src/luamm.hh
+@@ -25,7 +25,9 @@
+ #include <assert.h>
+ #include <memory>
+ #include <mutex>
++#include <exception>
+ #include <stdexcept>
++#include <string>
+ 
+ #include <lua.hpp>
+ 
+@@ -210,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); }
diff --git a/sysutils/conky/pkg-descr b/sysutils/conky/pkg-descr
index 7dc355cb020a..964124949a2d 100644
--- a/sysutils/conky/pkg-descr
+++ b/sysutils/conky/pkg-descr
@@ -1,3 +1,3 @@
 Conky is an advanced, highly configurable system monitor for X
 
-WWW: http://conky.sourceforge.net/
+WWW: https://github.com/brndnmtthws/conky