add rrdtool1 (v1.0.x) and enable it by default,

disable rrdtool (v1.2.x),
change Maintainer in control files,
tweak Makefiles


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1881 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 23 insertions, 27 deletions

diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
index 058fe4e713..f464af23e4 100644
--- a/package/rrdtool/Config.in
+++ b/package/rrdtool/Config.in
@@ -1,18 +1,17 @@
-menu "rrdtool - Round Robin Database (RRD) management tools and library"
-
 config BR2_COMPILE_RRDTOOL
 	bool
 	default no
-	depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_RRDCGI || BR2_PACKAGE_RRDTOOL
+	depends BR2_PACKAGE_LIBRRD
 
 config BR2_PACKAGE_LIBRRD
-	tristate "librrd - Round Robin Database (RRD) management library"
-#	default m if CONFIG_DEVEL
+	tristate "librrd - Round Robin Database (RRD) management library (v1.2.x)"
 	default n
+	depends !BR2_COMPILE_RRDTOOL1
 	select BR2_COMPILE_RRDTOOL
 	select BR2_PACKAGE_LIBART
 	select BR2_PACKAGE_LIBFREETYPE
 	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_ZLIB
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -28,12 +27,10 @@ config BR2_PACKAGE_LIBRRD
 	  
 
 config BR2_PACKAGE_RRDCGI
-	tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool"
-#	default m if CONFIG_DEVEL
+	tristate "rrdcgi - Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
 	default n
-	select BR2_COMPILE_RRDTOOL
+	depends BR2_PACKAGE_LIBRRD
 	select BR2_PACKAGE_CGILIB
-	select BR2_PACKAGE_LIBRRD
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -50,11 +47,9 @@ config BR2_PACKAGE_RRDCGI
 	  
 
 config BR2_PACKAGE_RRDTOOL
-	tristate "rrdtool - Round Robin Database (RRD) management tools"
-#	default m if CONFIG_DEVEL
+	tristate "rrdtool - Round Robin Database (RRD) management tools (v1.2.x)"
 	default n
-	select BR2_COMPILE_RRDTOOL
-	select BR2_PACKAGE_LIBRRD
+	depends BR2_PACKAGE_LIBRRD
 	help
 	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
 	  display time-series data (i.e. network bandwidth, machine-room temperature,
@@ -69,5 +64,3 @@ config BR2_PACKAGE_RRDTOOL
 	  This package contains command line tools used to manage RRDs.
 	  
 
-endmenu
-
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 2b97a530e7..4daedd960f 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -22,11 +22,11 @@ $(eval $(call PKG_template,RRDTOOL,rrdtool,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)
 
 $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		$(TARGET_CONFIGURE_OPTS) \
 		rd_cv_ieee_works=yes \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
@@ -49,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 			--enable-shared=yes \
 			--enable-static=yes \
 			--disable-rpath \
+			--with-gnu-ld \
 			--enable-rrdcgi \
 			--disable-mmap \
 			--disable-perl \
@@ -69,20 +70,20 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_RRDTOOL):
 	install -d -m0755 $(IDIR_RRDTOOL)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/rrdtool
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/rrdupdate
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/
 	$(RSTRIP) $(IDIR_RRDTOOL)
 	$(IPKG_BUILD) $(IDIR_RRDTOOL) $(PACKAGE_DIR)
 
 $(IPKG_RRDCGI):
 	install -d -m0755 $(IDIR_RRDCGI)/usr/bin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/rrdcgi
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/
 	$(RSTRIP) $(IDIR_RRDCGI)
 	$(IPKG_BUILD) $(IDIR_RRDCGI) $(PACKAGE_DIR)
 
 $(IPKG_LIBRRD):
 	install -d -m0755 $(IDIR_LIBRRD)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/
 	install -d -m0755 $(IDIR_LIBRRD)/usr/share/rrdtool/fonts
 	cp -fpR $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
 		$(IDIR_LIBRRD)/usr/share/rrdtool/fonts/
@@ -93,7 +94,8 @@ $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/librrd.so
@@ -101,7 +103,8 @@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so
 uninstall-dev:
 	rm -rf \
 		$(STAGING_DIR)/usr/include/rrd.h \
-		$(STAGING_DIR)/usr/lib/librrd.{a,so*} \
+		$(STAGING_DIR)/usr/lib/librrd.a \
+		$(STAGING_DIR)/usr/lib/librrd.so* \
 
 compile: install-dev
 clean: uninstall-dev
diff --git a/package/rrdtool/ipkg/librrd.control b/package/rrdtool/ipkg/librrd.control
index 6ee92811f6..7585836534 100644
--- a/package/rrdtool/ipkg/librrd.control
+++ b/package/rrdtool/ipkg/librrd.control
@@ -1,7 +1,7 @@
 Package: librrd
 Priority: optional
 Section: libs
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
 Depends: libart, libfreetype, libpng, zlib
 Description: Round Robin Database (RRD) management library. 
diff --git a/package/rrdtool/ipkg/rrdcgi.control b/package/rrdtool/ipkg/rrdcgi.control
index b73f4808a0..d5079fcd0d 100644
--- a/package/rrdtool/ipkg/rrdcgi.control
+++ b/package/rrdtool/ipkg/rrdcgi.control
@@ -1,7 +1,7 @@
 Package: rrdcgi
 Priority: optional
 Section: web
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
 Depends: cgilib, librrd
 Description: Round Robin Database (RRD) CGI graphing tool. 
diff --git a/package/rrdtool/ipkg/rrdtool.control b/package/rrdtool/ipkg/rrdtool.control
index 6b4d8e8b57..5da8e7a0e7 100644
--- a/package/rrdtool/ipkg/rrdtool.control
+++ b/package/rrdtool/ipkg/rrdtool.control
@@ -1,7 +1,7 @@
 Package: rrdtool
 Priority: optional
 Section: admin
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
 Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdtool/
 Depends: librrd
 Description: Round Robin Database (RRD) management tools.