From 653152122efe26199fd239c5c9df103d20b4396d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 27 Sep 2013 13:04:30 +0200
Subject: update rrdtool

---
 package/rrdtool/Makefile | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'package/rrdtool/Makefile')

diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index a047f032c..840633559 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -4,25 +4,29 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rrdtool
-PKG_VERSION:=		1.2.30
+PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		19b24f7184a8dbf7b48c1bbb565ad9fb
-PKG_DESCR:=		Round Robin Database (RRD) management library and tools
+PKG_MD5SUM:=		dbe59386db97fd2f2216729facd74ca8
+PKG_DESCR:=		Round Robin Database (RRD) management library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libart libfreetype libpng zlib
+PKG_DEPENDS+=		glib cairo pango
 PKG_BUILDDEP:=		libxml2 cgilib freetype libart libpng
+PKG_BUILDDEP+=		glib cairo pango
 PKG_URL:=		http://oss.oetiker.ch/
 PKG_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
 
 PKG_SUBPKGS:=		LIBRRD RRDCGI RRDTOOL
-PKG_SECTION_RRDCGI:=	misc
-PKG_SECTION_RRDTOOL:=	misc
+PKGSC_RRDCGI:=		misc
+PKGSD_RRDCGI:=		RRD CGI
+PKGSC_RRDTOOL:=		misc
+PKGSD_RRDTOOL:=		RRD tool
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL}))
 
 CONFIGURE_ENV+=		rd_cv_ieee_works=yes
 CONFIGURE_ARGS+=	--enable-rrdcgi \
@@ -30,21 +34,22 @@ CONFIGURE_ARGS+=	--enable-rrdcgi \
 			--disable-perl \
 			--disable-ruby \
 			--disable-tcl \
-			--disable-python \
-			--without-x \
-			--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+			--disable-python
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/freetype2
+TARGET_LDFLAGS+=	-lglib-2.0
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-install:
+rrdtool-install:
 	${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rrdtool ${WRKINST}/usr/bin/rrdupdate \
 	               ${IDIR_RRDTOOL}/usr/bin/
+
+rrdcgi-install:
 	${INSTALL_DIR} ${IDIR_RRDCGI}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rrdcgi ${IDIR_RRDCGI}/usr/bin/
+
+librrd-install:
 	${INSTALL_DIR} ${IDIR_LIBRRD}/usr/lib
-	${CP} ${WRKINST}/usr/lib/librrd.so.* ${IDIR_LIBRRD}/usr/lib/
-	${INSTALL_DIR} ${IDIR_LIBRRD}/usr/share/rrdtool/fonts
-	${CP} ${WRKBUILD}/src/DejaVuSansMono-Roman.ttf \
-		${IDIR_LIBRRD}/usr/share/rrdtool/fonts/
+	${CP} ${WRKINST}/usr/lib/librrd*.so* ${IDIR_LIBRRD}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3