From 54b07019a0ab741cd898c63717d157b8d097ec5c Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 17 May 2011 21:35:39 +0200
Subject: [PATCH] mpfire: updated config/install.sh for new mpd.

---
 config/mpfire/mpd.conf     | 1 -
 lfs/mpfire                 | 4 ++--
 src/paks/mpfire/install.sh | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
index 10da064c30..d66481ecfd 100644
--- a/config/mpfire/mpd.conf
+++ b/config/mpfire/mpd.conf
@@ -7,7 +7,6 @@ port "6600"
 music_directory "/var/mp3"
 playlist_directory "/var/ipfire/mpfire"
 log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error.log"
 pid_file "/var/run/mpd.pid"
 ##########################################################
 
diff --git a/lfs/mpfire b/lfs/mpfire
index 5a8b85feda..facb1798cc 100644
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -30,7 +30,7 @@ THISAPP    = mpfire-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "mpd mpc"
 
diff --git a/src/paks/mpfire/install.sh b/src/paks/mpfire/install.sh
index e09fca4254..f8f833de96 100644
--- a/src/paks/mpfire/install.sh
+++ b/src/paks/mpfire/install.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -28,7 +28,9 @@ ln -svf  /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
 ln -svf  /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
 ln -svf  /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
 chmod 755 /srv/web/ipfire/html/images/mpfire
-touch /var/log/mpd.error.log
 touch /var/log/mpd.log
 restore_backup ${NAME}
+# comment removed option from config
+sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf
+#
 /etc/init.d/mpd start
-- 
2.39.2