Merge pull request #207 from Ypnose/master

conky updates

srcpkgs/conky-cli/template

@@ -0,0 +1,32 @@
+# Template file for 'conky-cli'
+pkgname=conky-cli
+_pkgname=conky
+version=1.9.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-lua --disable-x11 --disable-xft --disable-imlib2 
+ --disable-own-window --disable-xdamage --disable-double-buffer --enable-curl
+ --enable-wlan --enable-rss --enable-ibm"
+hostmakedepends="pkg-config"
+makedepends="ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel"
+short_desc="Conky command line without X11"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="BSD, GPL"
+homepage="http://conky.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
+wrksrc="${_pkgname}-${version}"
+
+do_install() {
+	make PREFIX=/usr DESTDIR=$DESTDIR install
+	vinstall COPYING 644 usr/share/licenses/$_pkgname
+}
+
+conky-cli_package() {
+	conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
+	provides="conky-${version}"
+	conflicts="conky>=0"
+	pkg_install() {
+		vmove all
+	}
+}

srcpkgs/conky/template

@@ -1,7 +1,7 @@
 # Template file for 'conky'
 pkgname=conky
 version=1.9.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ibm --enable-curl --enable-rss --enable-weather-xoap
  --enable-imlib2 --disable-lua --enable-wlan"
@@ -17,6 +17,8 @@ checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
 
 conky_package() {
 	conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
+	provides="conky-${version}"
+	conflicts="conky>=0"
 	pkg_install() {
 		vmove all
 	}