diff --git a/srcpkgs/conky/patches/ascii.patch b/srcpkgs/conky/patches/ascii.patch
new file mode 100644
index 0000000000..fb13ee1db5
--- /dev/null
+++ b/srcpkgs/conky/patches/ascii.patch
@@ -0,0 +1,11 @@
+--- ./doc/config_settings.xml.orig 2015-09-09 22:46:13.283151562 -0400
++++ ./doc/config_settings.xml 2015-09-09 22:46:25.629151185 -0400
+@@ -80,7 +80,7 @@
+
+ A comma-separated list of strings to use as the bars of a graph output
+ to console/shell. The first list item is used for the minimum bar height and the
+- last item is used for the maximum. Example: " ,_,▁,▂,▃,▄,▅,▆,▇,█".
++ last item is used for the maximum.
+
+
+
diff --git a/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch b/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch
new file mode 100644
index 0000000000..abd818473a
--- /dev/null
+++ b/srcpkgs/conky/patches/ipv6_fatal_to_warning.patch
@@ -0,0 +1,11 @@
+--- ./cmake/ConkyPlatformChecks.cmake.orig 2015-09-09 16:43:45.145815169 -0400
++++ ./cmake/ConkyPlatformChecks.cmake 2015-09-09 16:44:03.281814616 -0400
+@@ -105,7 +105,7 @@
+ if(BUILD_IPV6)
+ find_file(IF_INET6 if_inet6 PATHS /proc/net)
+ if(NOT IF_INET6)
+- message(FATAL_ERROR "/proc/net/if_inet6 unavailable")
++ message(WARNING "/proc/net/if_inet6 unavailable")
+ endif(NOT IF_INET6)
+ endif(BUILD_IPV6)
+
diff --git a/srcpkgs/conky/patches/musl-fixes.patch b/srcpkgs/conky/patches/musl-fixes.patch
new file mode 100644
index 0000000000..4891f32785
--- /dev/null
+++ b/srcpkgs/conky/patches/musl-fixes.patch
@@ -0,0 +1,69 @@
+From 21b0a052af22a355321cce13abd573dbcf90dd4a Mon Sep 17 00:00:00 2001
+From: Natanael Copa
+Date: Thu, 23 Jul 2015 13:57:18 +0200
+Subject: [PATCH 2/3] Remove use of sysctl.h
+
+---
+ src/common.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/common.cc b/src/common.cc
+index 126f30a..116cd06 100644
+--- a/src/common.cc
++++ b/src/common.cc
+@@ -42,7 +42,6 @@
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include
+ #include
+--
+2.4.6
+
+
+From 3d67ed4920d31e5b17dd61684713d061d4fd7598 Mon Sep 17 00:00:00 2001
+From: Natanael Copa
+Date: Thu, 23 Jul 2015 13:58:02 +0200
+Subject: [PATCH 3/3] Use portable version of strerror_r
+
+---
+ src/c++wrap.cc | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/c++wrap.cc b/src/c++wrap.cc
+index c21b473..213f9c4 100644
+--- a/src/c++wrap.cc
++++ b/src/c++wrap.cc
+@@ -26,8 +26,14 @@
+ #include "c++wrap.hh"
+
+ #include
++
++/* force use of POSIX strerror_r instead of non-portable GNU specific */
++#ifdef _GNU_SOURCE
++#undef _GNU_SOURCE
++#endif
+ #include
+
++
+ #if !defined(HAVE_PIPE2) || !defined(HAVE_O_CLOEXEC)
+ #include
+
+@@ -62,8 +68,10 @@ namespace {
+
+ std::string strerror_r(int errnum)
+ {
+- char buf[100];
+- return strerror_r(errnum, buf, sizeof buf);
++ static thread_local char buf[100];
++ if (strerror_r(errnum, buf, sizeof buf) != 0)
++ snprintf(buf, sizeof buf, "Unknown error %i", errnum);
++ return buf;
+ }
+
+ std::pair pipe2(int flags)
+--
+2.4.6
+
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index a8f1e83a0d..b0b9ccefec 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,22 +1,32 @@
# Template file for 'conky'
pkgname=conky
-version=1.9.0
-revision=3
-build_style=gnu-configure
-configure_args="--enable-ibm --enable-curl --enable-rss --enable-weather-xoap
- --enable-imlib2 --enable-lua --enable-wlan"
-hostmakedepends="libtool pkg-config docbook2x"
+version=1.10.0
+revision=1
+build_style=cmake
+patch_args="-p1"
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release -DMAINTAINER_MODE=ON -DDOC_PATH=share/${pkgname}
+ -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON
+ -DBUILD_WEATHER_XOAP=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON"
+hostmakedepends="cmake libtool pkg-config docbook2x man-db"
makedepends="lua-devel alsa-lib-devel libglib-devel libxml2-devel libXft-devel
libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel"
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
conflicts="conky>=0"
short_desc="Lightweight system monitor for X"
maintainer="Juan RP "
-license="BSD, GPL"
+license="BSD, GPL-3"
homepage="http://conky.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
+distfiles="https://github.com/brndnmtthws/${pkgname}/archive/v${version}.tar.gz"
+checksum=f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb
-pre_configure() {
- libtoolize -f
+do_install() {
+ make -C build DESTDIR=${DESTDIR} install
+
+ vmkdir etc/conky
+ mv ${DESTDIR}/usr/share/conky/conky.conf ${DESTDIR}/etc/conky/
+ mv ${DESTDIR}/usr/share/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
+
+ vlicense COPYING
}
+