version bump (bug #122643) thanks to Brenden and Philip. removed old versions too

(Portage version: 2.1_pre4-r1)

10 files changed, 290 insertions, 166 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index c4b585408f2f..138ef450f028 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.18 2006/01/06 20:31:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.19 2006/02/18 22:50:36 dragonheart Exp $
+
+*conky-1.4.0 (18 Feb 2006)
+
+  18 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/portmon-mpd.patch, -conky-1.3.1.ebuild, -conky-1.3.3.ebuild,
+  -conky-1.3.4-r1.ebuild, +conky-1.4.0.ebuild:
+  version bump (bug #122643) thanks to Brenden and Philip. removed old
+  versions too
 
   06 Jan 2006; Markus Rothe <corsair@gentoo.org> conky-1.3.5.ebuild:
   Added ~ppc64
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index be633607ac72..07e463a45f87 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,33 @@
-MD5 9b5dc52454c96bac31235b2b81c06a09 ChangeLog 3284
-MD5 7cf736bd0931fa89a032b455112ce1de conky-1.3.1.ebuild 1916
-MD5 fe8b738545f4869bfcbfac38df47ee52 conky-1.3.3.ebuild 1851
-MD5 910eeed20139a5579848512bc6b0530f conky-1.3.4-r1.ebuild 2374
+MD5 8f9ab43d7286278e8939cdaf4dc7c4c8 ChangeLog 3569
+RMD160 d16a5816f86089452996b6bbfa3531e97c5bb044 ChangeLog 3569
+SHA256 74e43eb4c69a0038b05d99c328aabab9288d6e7befe63ae39dc0b3ea0e19a6ac ChangeLog 3569
 MD5 daec6353bf84e62c4edd4d82d00cd350 conky-1.3.4-r2.ebuild 2662
+RMD160 cb44f4d794c053ce408b57c4efadb8ada3239204 conky-1.3.4-r2.ebuild 2662
+SHA256 a5f19b74b6edcbf2b1e307239add9960b8e2b3e01f8f32e1da90e2cc79ab1736 conky-1.3.4-r2.ebuild 2662
 MD5 1fb8ed3829e3a05007be9048e75b8922 conky-1.3.5.ebuild 2310
+RMD160 7bd68a407b99eed8b4ce160f39d7759531d8a39e conky-1.3.5.ebuild 2310
+SHA256 839179ccea8039d7c97a7a07e391159ad4cbc4ab8b69555f8422045d5acee160 conky-1.3.5.ebuild 2310
+MD5 a83f5eea1374903e5780f5b0aa972ece conky-1.4.0.ebuild 2722
+RMD160 288319558dbbbce37af4aa7558c34c7023458d54 conky-1.4.0.ebuild 2722
+SHA256 f4acc281bd1d6db9c3aaf740f30f78720bebbe42663f8f11cd350a1786af1148 conky-1.4.0.ebuild 2722
 MD5 d9296cc5c3fc007026e784f5825b153e files/conky-1.3.4-arraybounds.patch 1560
+RMD160 dcb1c9b195a03e19b2e477dbc149228930588b52 files/conky-1.3.4-arraybounds.patch 1560
+SHA256 4d1eb88c938305b680e4880a8b0f34264b72d4083ce660ef8afdaead8a752710 files/conky-1.3.4-arraybounds.patch 1560
 MD5 3f930afeab86d38688b8c7fe8a610bc7 files/conky-1.3.4-miscbug.patch 2591
-MD5 31acfc146c31ba015fb9b8643deb2d57 files/digest-conky-1.3.1 64
-MD5 6e51a33ec07b6f71db430f1839fd7902 files/digest-conky-1.3.3 64
-MD5 c5c1fb804afb4bd1255b602c8894a317 files/digest-conky-1.3.4-r1 64
+RMD160 dd4495070c8c5acc6ba60328536325b126e8ef92 files/conky-1.3.4-miscbug.patch 2591
+SHA256 5ebd3da731900f6db25c6cc1a3dbbb71d33e458b9f4d9b3fb1771bb7abdc218b files/conky-1.3.4-miscbug.patch 2591
 MD5 c5c1fb804afb4bd1255b602c8894a317 files/digest-conky-1.3.4-r2 64
+RMD160 9f59088f6ea3f519eb67f2ae7e798fb72e7366e6 files/digest-conky-1.3.4-r2 64
+SHA256 c2ba6df2c3b68c39c7ba6ab81d23388e515bf9c9095bd0e6ed9df03c36625312 files/digest-conky-1.3.4-r2 64
 MD5 2441f16c8370649ea372b69c895f0bd1 files/digest-conky-1.3.5 64
+RMD160 b2cabf5d33d7915ced97e820f8b87a9d23887c90 files/digest-conky-1.3.5 64
+SHA256 4b2c1d690aafb4a33771921f6425cdb31ca0fd8bb57a839b7ce6bda1d2aeb7c3 files/digest-conky-1.3.5 64
+MD5 dd1c99f09b0ec583eadca05832f8c5ea files/digest-conky-1.4.0 238
+RMD160 4743c690e8a6d5923fd3a83d25c1f021549978cb files/digest-conky-1.4.0 238
+SHA256 61e0266fd2231aa366ed5009e12d8667da17bc789f026bf0dd082af02853261f files/digest-conky-1.4.0 238
+MD5 be24830cd00cf502f6cc31cdafb0fe59 files/portmon-mpd.patch 7494
+RMD160 59b6c00771894b982758fd4d83a39ebfaace2a1d files/portmon-mpd.patch 7494
+SHA256 cd2dbfb405c08c66cd1efa3ff260bb1243e832b8a9da391423ea3cd5287fb641 files/portmon-mpd.patch 7494
 MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
+RMD160 b40ff9a4903b330dcef016836e32f78709f10d0a metadata.xml 588
+SHA256 6cf91473c528b64d87041a3088f4930e270349ebdebd3c6dca06dc4943370b5a metadata.xml 588
diff --git a/app-admin/conky/conky-1.3.1.ebuild b/app-admin/conky/conky-1.3.1.ebuild
deleted file mode 100644
index bd8e1da31ed5..000000000000
--- a/app-admin/conky/conky-1.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.1.ebuild,v 1.2 2005/11/28 07:03:32 dragonheart Exp $
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype X"
-
-RDEPEND="
-	virtual/libc
-	X? (
-		virtual/x11
-		truetype? ( >=media-libs/freetype-2 )
-	)"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/automake-1.9
-	>=sys-devel/autoconf-2.59
-	sys-devel/libtool
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gcc"
-
-
-src_compile() {
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime
-	--enable-mpd --enable-mldonkey"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable X x11)  || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
-	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	einfo
-	einfo "For more info on Conky's new features,"
-	einfo "please look at the README and ChangeLog:"
-	einfo "/usr/share/doc/${PF}/README.gz"
-	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-	einfo "There are also pretty html docs available"
-	einfo "on Conky's site or in /usr/share/doc/${PF}"
-	einfo
-	einfo "Comment out temperature info lines if you have no kernel"
-	einfo "support for it."
-	einfo
-	ewarn "Conky doesn't work with window managers that"
-	ewarn "take control over root window such as Gnome's nautilus."
-	ewarn
-	ewarn "Please note that METAR support has been removed since 1.2"
-	ewarn
-}
diff --git a/app-admin/conky/conky-1.3.3.ebuild b/app-admin/conky/conky-1.3.3.ebuild
deleted file mode 100644
index 0a3ed85209ed..000000000000
--- a/app-admin/conky/conky-1.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.3.ebuild,v 1.2 2005/11/28 07:03:32 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype X"
-
-RDEPEND="
-	virtual/libc
-	X? (
-		virtual/x11
-		truetype? ( >=media-libs/freetype-2 )
-	)"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/automake-1.9
-	>=sys-devel/autoconf-2.59
-	sys-devel/libtool
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gcc"
-
-
-src_compile() {
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime
-	--enable-mpd --enable-mldonkey"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable X x11)  || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
-	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	einfo
-	einfo "For more info on Conky's new features,"
-	einfo "please look at the README and ChangeLog:"
-	einfo "/usr/share/doc/${PF}/README.gz"
-	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-	einfo "There are also pretty html docs available"
-	einfo "on Conky's site or in /usr/share/doc/${PF}"
-	einfo
-	einfo "Comment out temperature info lines if you have no kernel"
-	einfo "support for it."
-	einfo
-	ewarn "Conky doesn't work with window managers that"
-	ewarn "take control over root window such as Gnome's nautilus."
-}
diff --git a/app-admin/conky/conky-1.3.4-r1.ebuild b/app-admin/conky/conky-1.4.0.ebuild
index eea991fb05c0..21a4a01b868a 100644
--- a/app-admin/conky/conky-1.3.4-r1.ebuild
+++ b/app-admin/conky/conky-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.4-r1.ebuild,v 1.2 2005/11/28 07:03:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0.ebuild,v 1.1 2006/02/18 22:50:36 dragonheart Exp $
 
 inherit eutils
 
@@ -10,30 +10,50 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype X ipv6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious"
 
 DEPEND_COMMON="
 	virtual/libc
 	X? (
-		virtual/x11
+		|| ( ( x11-libs/libICE
+				x11-libs/libXext
+				x11-libs/libX11
+				x11-libs/libSM
+				x11-libs/libXrender
+				x11-libs/libXft
+				)
+				virtual/x11
+		)
 		truetype? ( >=media-libs/freetype-2 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+		)
+		audacious? ( media-sound/audacious )
+		infopipe? ( || ( media-plugins/bmp-infopipe media-plugins/xmms-infopipe ) )
+		xmms? ( media-sound/xmms )
 	)"
 
+		#bmp? ( media-sound/beep-media-player )
 RDEPEND="${DEPEND_COMMON}"
-#	seti? ( sci-astronomy/setiathome )"
 
 DEPEND="
 	${DEPEND_COMMON}
-	sys-devel/libtool
+	X? (
+		|| ( ( x11-libs/libXt
+				x11-proto/xextproto
+				x11-proto/xproto
+				)
+				virtual/x11
+		)
+	)
 	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gcc"
+	sys-apps/sed"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-miscbug.patch
+	epatch ${FILESDIR}/portmon-mpd.patch || die "epatch failed"
 }
 
 src_compile() {
@@ -44,19 +64,23 @@ src_compile() {
 		ewarn "using the ipv6 USE flag with Conky disables the port"
 		ewarn "monitor."
 		ewarn
-		sleep 5
+		epause
 	else
 		mymake="MPD_NO_IPV6=noipv6"
 	fi
 	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime
-	--enable-mpd --enable-mldonkey"
+	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
+		--enable-mpd --enable-mldonkey"
 	econf \
 		${myconf} \
 		$(use_enable truetype xft) \
 		$(use_enable X x11) \
+		$(use_enable bmpx) \
+		$(use_enable bmp) \
+		$(use_enable xmms) \
+		$(use_enable audacious) \
+		$(use_enable infopipe) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
-#		$(use_enable seti)
 	emake ${mymake} || die "compile failed"
 }
 
@@ -78,13 +102,7 @@ pkg_postinst() {
 	einfo "There are also pretty html docs available"
 	einfo "on Conky's site or in /usr/share/doc/${PF}"
 	einfo
-	einfo "Comment out temperature info lines if you have no kernel"
-	einfo "support for it."
-	einfo
 	einfo "Check out app-vim/conky-syntax for conkyrc"
 	einfo "syntax highlighting in Vim"
 	einfo
-	ewarn "Conky doesn't work with window managers that"
-	ewarn "take control over root window such as Gnome's nautilus."
-	ewarn
 }
diff --git a/app-admin/conky/files/digest-conky-1.3.1 b/app-admin/conky/files/digest-conky-1.3.1
deleted file mode 100644
index ae7b28a2c3c6..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1dda4829734050293e07b1f0228b1a42 conky-1.3.1.tar.bz2 316741
diff --git a/app-admin/conky/files/digest-conky-1.3.3 b/app-admin/conky/files/digest-conky-1.3.3
deleted file mode 100644
index d818d002c617..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c200d13b31b0c441d0e8ad38161b35e conky-1.3.3.tar.bz2 317987
diff --git a/app-admin/conky/files/digest-conky-1.3.4-r1 b/app-admin/conky/files/digest-conky-1.3.4-r1
deleted file mode 100644
index 3d1c4064a29c..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91f7d4ce29a6bc2d785f13224ea4aaac conky-1.3.4.tar.bz2 332871
diff --git a/app-admin/conky/files/digest-conky-1.4.0 b/app-admin/conky/files/digest-conky-1.4.0
new file mode 100644
index 000000000000..daf49f2cff1c
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.4.0
@@ -0,0 +1,3 @@
+MD5 532e7b8a0d4be31eb8cd29c5dbf92eb5 conky-1.4.0.tar.bz2 361968
+RMD160 dceee3ae83fb1aa34473b61bc1a1287bef38d14c conky-1.4.0.tar.bz2 361968
+SHA256 75480c7cfe1741d7c881e6309e11573b1ce22f9242d35e12f0b3a9d593c6960e conky-1.4.0.tar.bz2 361968
diff --git a/app-admin/conky/files/portmon-mpd.patch b/app-admin/conky/files/portmon-mpd.patch
new file mode 100644
index 000000000000..1f757a7f893b
--- /dev/null
+++ b/app-admin/conky/files/portmon-mpd.patch
@@ -0,0 +1,214 @@
+--- src/libtcp-portmon.c.old	2005-12-05 22:27:16.000000000 -0500
++++ src/libtcp-portmon.c	2006-02-13 00:22:25.000000000 -0500
+@@ -3,7 +3,7 @@
+  *
+  * Copyright (C) 2005  Philip Kovacs kovacsp3@comcast.net
+  * 
+- * $Id: portmon-mpd.patch,v 1.1 2006/02/18 22:50:36 dragonheart Exp $
++ * $Id: portmon-mpd.patch,v 1.1 2006/02/18 22:50:36 dragonheart Exp $
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -231,8 +231,8 @@
+    p_monitor1 = (tcp_port_monitor_t *)p_data1;
+    p_monitor2 = (tcp_port_monitor_t *)p_data2;
+ 
+-   return (p_monitor1->port_range_begin == p_monitor1->port_range_begin &&
+-	   p_monitor2->port_range_end == p_monitor2->port_range_end);
++   return (p_monitor1->port_range_begin == p_monitor2->port_range_begin &&
++	   p_monitor1->port_range_end == p_monitor2->port_range_end);
+ }
+ 
+ /* ---------------------------------------------------------------------------
+--- src/mpd.c.old	2006-02-12 23:11:15.000000000 -0500
++++ src/mpd.c	2006-02-14 13:23:14.000000000 -0500
+@@ -42,22 +42,14 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
+ 		strncpy(current_info->mpd.status, "MPD not responding",	TEXT_BUFFER_SIZE - 1);
+ 		current_info->mpd.bitrate = 0;
+ 		current_info->mpd.progress = 0;
+@@ -97,22 +89,14 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
+ 		strncpy(current_info->mpd.status, "MPD not responding", TEXT_BUFFER_SIZE - 1);
+ 		current_info->mpd.bitrate = 0;
+ 		current_info->mpd.progress = 0;
+@@ -158,23 +142,15 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.status, "Unknown",
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
++		strncpy(current_info->mpd.status, "Stopped",
+ 			TEXT_BUFFER_SIZE - 1);
+ 	}
+ 	if (status->state == MPD_STATUS_STATE_PAUSE) {
+@@ -211,24 +187,15 @@
+ 			current_info->mpd.name = malloc(TEXT_BUFFER_SIZE);
+ 		if (current_info->mpd.file == NULL)
+ 			current_info->mpd.file = malloc(TEXT_BUFFER_SIZE);
+-		strncpy(current_info->mpd.name, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.file, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.artist, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.album, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.title, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.random, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.repeat, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.track, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
+-		strncpy(current_info->mpd.status, "Unknown",
+-			TEXT_BUFFER_SIZE - 1);
++		*current_info->mpd.name=0;
++		*current_info->mpd.file=0;
++		*current_info->mpd.artist=0;
++		*current_info->mpd.album=0;
++		*current_info->mpd.title=0;
++		*current_info->mpd.random=0;
++		*current_info->mpd.repeat=0;
++		*current_info->mpd.track=0;
++		*current_info->mpd.status=0;
+ 	}
+ 	if (status->state == MPD_STATUS_STATE_PLAY ||
+ 	    status->state == MPD_STATUS_STATE_PAUSE) {
+@@ -248,14 +215,14 @@
+ 		} else if (status->random == 1) {
+ 			strcpy(current_info->mpd.random, "On");
+ 		} else {
+-			strcpy(current_info->mpd.random, "Unknown");
++			*current_info->mpd.random=0;
+ 		}
+ 		if (status->repeat == 0) {
+ 			strcpy(current_info->mpd.repeat, "Off");
+ 		} else if (status->repeat == 1) {
+ 			strcpy(current_info->mpd.repeat, "On");
+ 		} else {
+-			strcpy(current_info->mpd.repeat, "Unknown");
++			*current_info->mpd.repeat=0;
+ 		}
+ 	}
+ 
+@@ -292,37 +259,37 @@
+ 			strncpy(current_info->mpd.artist, song->artist,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.artist, "Unknown");
++			*current_info->mpd.artist=0;
+ 		}
+ 		if (song->album) {
+ 			strncpy(current_info->mpd.album, song->album,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.album, "Unknown");
++			*current_info->mpd.album=0;
+ 		}
+ 		if (song->title) {
+ 			strncpy(current_info->mpd.title, song->title,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.title, "Unknown");
++			*current_info->mpd.title=0;
+ 		}
+ 		if (song->track) {
+ 			strncpy(current_info->mpd.track, song->track,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.track, "Unknown");
++			*current_info->mpd.track=0;
+ 		}
+ 		if (song->name) {
+ 			strncpy(current_info->mpd.name, song->name,
+ 				TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.name, "Unknown");
++			*current_info->mpd.name=0;
+ 		}
+ 		if (song->file) {
+ 			strncpy(current_info->mpd.file,
+ 				song->file, TEXT_BUFFER_SIZE - 1);
+ 		} else {
+-			strcpy(current_info->mpd.file, "Unknown");
++			*current_info->mpd.file=0;
+ 		}
+ 		if (entity != NULL) {
+ 			mpd_freeInfoEntity(entity);