X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flcdproc;h=855cb16a400a8231baf9f5e12712a79f2cd21f8a;hp=0e329ba5bdfd69f161047f82288941c12fbb71f5;hb=39d43c5b99720c31e4423e3668ea77679954c184;hpb=77ebcf4e8ba8f949deb29c3ae716c524ec0dc8d9

diff --git a/lfs/lcdproc b/lfs/lcdproc
index 0e329ba5bd..855cb16a40 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.6
+VER        = 0.5.7
 
 THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcdproc
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = 
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
+$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
 
 install : $(TARGET)
 
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
@@ -92,6 +91,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--enable-seamless-hbars
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	-mkdir -pv /etc/lcdproc
+	cp -vf $(DIR_SRC)/config/lcdproc/{LCDd,lcdproc}.conf /etc/lcdproc
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,lcdproc)
+
+	ln -sf ../init.d/lcdproc /etc/rc.d/rc3.d/S60lcdproc
+	ln -sf ../init.d/lcdproc /etc/rc.d/rc0.d/K40lcdproc
+	ln -sf ../init.d/lcdproc /etc/rc.d/rc6.d/K40lcdproc
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcdproc \
 		/var/ipfire/backup/addons/includes/lcdproc
 	@rm -rf $(DIR_APP)