X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Frrdtool;h=5d7c8943dd4ea07795c6eeab2aeac9226e185c13;hb=b07b1bef22eae7038e7d0fcba0bfd53813f85258;hp=4aade20e3ebe17d79ad18e5d39b3e3e7e5901561;hpb=e17aebd7cc0c5c0594796890b02e1a4851265a1d;p=ipfire-2.x.git

diff --git a/lfs/rrdtool b/lfs/rrdtool
index 4aade20e3e..5d7c8943dd 100644
--- a/lfs/rrdtool
+++ b/lfs/rrdtool
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  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        = 1.2.15
+VER        = 1.6.0
 
 THISAPP    = rrdtool-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bde8b12c202bc4e27fb9a9588a0aaddf
+$(DL_FILE)_MD5 = 4ff52cc44b935b02d2742e6875094da5
 
 install : $(TARGET)
 
@@ -70,13 +70,16 @@ $(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) && ./configure --prefix=/usr/share/$(THISAPP) \
-	    --exec-prefix=/usr --mandir=/usr/share/man --enable-perl-site-install \
-	    --enable-local-libpng --enable-local-zlib --with-pic --enable-latin2 \
-	    --disable-python --disable-tcl
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--disable-rrdcgi \
+		--enable-perl \
+		--enable-perl-site-install \
+		--disable-tcl \
+		--disable-ruby \
+		--disable-python
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && make site-perl-install
 	-mkdir -p /srv/web/ipfire/html/graphs/
 	chmod 777 /srv/web/ipfire/html/graphs/
 	-mkdir -p /var/log/rrd/