poco: moved to github

[packages.git] / utils / rrdtool / Makefile

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index 475f9a4..74f063a 100644 (file)
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -1,34 +1,38 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.23
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.30
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=dafa161bc9c61e57636a6085c87c1fe8
+PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
 
-PKG_BUILD_DEPENDS:=python libnotimpl
-PKG_FIXUP = libtool
+PKG_BUILD_DEPENDS:=python
+
+PKG_CONFIG_DEPENDS:= \
+       CONFIG_PACKAGE_python-rrd \
+       CONFIG_PACKAGE_rrdcgi \
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifneq ($(MAKECMDGOALS),download)
-  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
-endif
+$(call include_mk, python-package.mk)
 
 define Package/rrdtool/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Round Robin Database (RRD)
+  URL:=http://oss.oetiker.ch/rrdtool/
 endef
 
 define Package/librrd
@@ -36,7 +40,7 @@ $(call Package/rrdtool/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= management library (v1.2.x)
-  DEPENDS+= +libart +libfreetype +libpng +zlib
+  DEPENDS+= +libart +libfreetype +libpng +zlib +libpthread
 endef
 
 define Package/rrdcgi
@@ -57,7 +61,7 @@ $(call Package/rrdtool/Default)
   SECTION:=lang
   CATEGORY:=Languages
   TITLE+= python bindings (v1.2.x)
-  DEPENDS+= python-core +librrd
+  DEPENDS+= +python-mini +librrd
 endef
 
 CONFIGURE_ARGS += \
@@ -73,7 +77,6 @@ CONFIGURE_ARGS += \
        --with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
 
 CONFIGURE_VARS += \
-       LIBS="-lnotimpl" \
        rd_cv_ieee_works=yes \
        rd_cv_null_realloc=nope \
        ac_cv_func_mmap_fixed_mapped=yes \
@@ -94,15 +97,15 @@ else
 endif
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+       $(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
+       $(call Build/Compile/Default)
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.{a,so*} $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
+       $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/
 endef
 
 define Package/librrd/install
@@ -134,5 +137,5 @@ $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
 $(eval $(call BuildPackage,rrdtool))
 
-$(eval $(call PyPackage,python-rrd))
-$(eval $(call BuildPackage,python-rrd))
+#$(eval $(call PyPackage,python-rrd))
+#$(eval $(call BuildPackage,python-rrd))