X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcacti;h=ef06eade18f7fae423415cf43969bde9eb87ea91;hb=a408c745d77ed569da9066ca2c95cda587f327e7;hp=45d226abc38b86d920461e864704b064b8194169;hpb=de57f399915f89a3aadf97c440a370211983c71f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/cacti b/lfs/cacti
index 45d226abc3..ef06eade18 100644
--- a/lfs/cacti
+++ b/lfs/cacti
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.8.7e
+VER        = 0.8.7g
 
 THISAPP    = cacti-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cacti
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "netsnmpd mysql"
 
@@ -44,7 +44,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7563a58a57d2c6cc0da28cc341a30969
+$(DL_FILE)_MD5 = 268421cb1a58d3444f7ecbddb4c4b016
+
 
 install : $(TARGET)
 
@@ -78,21 +79,20 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	@rm -rf /usr/share/cacti
-	mkdir /usr/share/cacti
+	@rm -rf /var/cacti /usr/share/cacti
+	mkdir -pv /var/cacti /usr/share/cacti
+
 	cd $(DIR_APP) && mv -vf * /usr/share/cacti
 	cp -vf $(DIR_SRC)/config/cacti/cacti.conf /etc/httpd/conf/vhosts.d/
 	install -v -m 755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/cacti \
 	                 /var/ipfire/backup/addons/includes/cacti
-	if [ ! -x "/var/cacti" ]; then mkdir /var/cacti;fi
-	if [ ! -x "/var/cacti/rra" ]; then mkdir /var/cacti/rra; fi
-	if [ ! -x "/var/cacti/log" ]; then mkdir /var/cacti/log; fi
-	mv -vf /usr/share/cacti/log/* /var/cacti/log/
-	mv -vf /usr/share/cacti/rra/* /var/cacti/rra
+
+	mv -vf /usr/share/cacti/log /var/cacti
+	mv -vf /usr/share/cacti/rra /var/cacti
 	ln -s /var/cacti/log /usr/share/cacti/log
 	ln -s /var/cacti/rra /usr/share/cacti/rra
+
 	chown -R nobody:nobody /var/cacti/rra /var/cacti/log
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-