X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Frrdcollect%2FMakefile;h=b1867b75b2bd395f495c572c4f5b7a4197b4c082;hp=2f65588d57dcf330ff06cb74308159f7542eef9d;hb=535ac87b0b5c6c3770d9cac4cc64c33bca8b6c82;hpb=a7c6375c4879204704cfc0f5339f1b5026639503

diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile
index 2f65588d57..b1867b75b2 100644
--- a/utils/rrdcollect/Makefile
+++ b/utils/rrdcollect/Makefile
@@ -1,56 +1,59 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 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:=rrdcollect
-PKG_VERSION:=0.2.3
-PKG_RELEASE:=3
+PKG_VERSION:=0.2.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rrdcollect
-PKG_MD5SUM:=5e4305c612bc3cccbaf802c275c81a11
-PKG_CAT:=zcat
+PKG_MD5SUM:=fd7ac95195e3e5cbab0677629505d9be
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rrdcollect/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DESCRIPTION:=\
-	RRDcollect is a daemon which polls ceratin files in /proc/ \\\
-	directory, gathering data and storing it inside RRDtool's \\\
-	database files.  Being written in C should be both fast \\\
-	and resources-friendly.  Supports both scanf(3)-style \\\
-	pattern matches and perl compatible regular expressions.
   URL:=http://rrdcollect.sourceforge.net/
 endef
 
+define Package/rrdcollect/Default/description
+ RRDcollect is a daemon which polls ceratin files in /proc/ 
+ directory, gathering data and storing it inside RRDtool's 
+ database files. Being written in C should be both fast 
+ and resources-friendly. Supports both scanf(3)-style 
+ pattern matches and perl compatible regular expressions.	
+endef
+
 define Package/rrdcollect
-  $(call Package/rrdcollect/Default)
-  DEPENDS:=+librrd
+$(call Package/rrdcollect/Default)
+  DEPENDS:=+librrd1
   TITLE:=Round-Robin Database (RRD) collecting daemon
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the RRD collecting daemon.
   MENU:=1
 endef
 
+define Package/rrdcollect/description
+$(call Package/rrdcollect/Default/description)
+ This package contains the RRD collecting daemon.
+endef
+
 define Package/rrdcollect-example
-  $(call Package/rrdcollect/Default)
+$(call Package/rrdcollect/Default)
   DEPENDS:=rrdcollect
   TITLE:=Example setup for RRD collecting daemon above
-  DESCRIPTION+=\\\
-	\\\
-	This package contains examples for the RRD collecting daemon.
+endef
+
+define Package/rrdcollect-example/description
+$(call Package/rrdcollect/Default/description)
+ This package contains examples for the RRD collecting daemon.
 endef
 
 define Package/rrdcollect-example/conffiles
@@ -58,34 +61,25 @@ define Package/rrdcollect-example/conffiles
 /etc/rrdcollect.conf
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--disable-static \
-		--disable-rpath \
-		--enable-exec \
-		--without-rrdtool \
-		--with-librrd \
-		--without-libpcre \
-		--without-libpcap \
-		, \
-		CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
-		LIBS="-lz -lfreetype -lpng -lart_lgpl_2" \
-	)
-endef
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--disable-static \
+	--disable-rpath \
+	--enable-exec \
+	--without-rrdtool \
+	--with-librrd="$(STAGING_DIR)/usr/lib/rrdtool-1.0" \
+	--without-libpcre \
+	--without-libpcap \
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+CONFIGURE_VARS+= \
+	CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
 
-define Package/rrdcollect/install	
+define Package/rrdcollect/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(1)/usr/sbin/
 endef
 
-define Package/rrdcollect-example/install	
+define Package/rrdcollect-example/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DATA) ./files/rrd.conf $(1)/etc/
 	$(INSTALL_DATA) ./files/rrdcollect.conf $(1)/etc/