add libtool fixes, cleanup

[openwrt/svn-archive/archive.git] / utils / collectd / Makefile

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 71d0ce6a53c6d0513919c924d552156d84cd4a9e..1d530b1df116bb3694bcfe800ee21a39a9630752 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -8,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
-PKG_VERSION:=3.5.1
-PKG_RELEASE:=1
-PKG_MD5SUM:=46a4b81e46d3bb58faab1d603649d737
+PKG_VERSION:=3.11.5
+PKG_RELEASE:=2
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://verplant.org/collectd/files
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_MD5SUM:=7a3e47ccaed2eb1d03f91c82a1406e8d
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -24,50 +24,65 @@ include $(INCLUDE_DIR)/package.mk
 define Package/collectd
   SECTION:=utils
   CATEGORY:=Utilities
+  DEPENDS=+libgcc
   TITLE:=Lightweight system statistics collection daemon
-  DESCRIPTION:=Lightweight system statistics collection daemon
+  DESCRIPTION:=\
+       collectd is a small daemon which collects system information periodically \\\
+       and provides mechanismns to store the values in a variety of ways.
   URL:=http://verplant.org/collectd/
 endef
 
-define Build/Compile
-       $(call Build/Configure/Default,--enable-shared \
-               --disable-static \
-               --disable-debug \
-               --enable-cpu \
-               --enable-load \
-               --enable-memory \
-               --enable-ping \
-               --enable-traffic \
-               --disable-cpufreq \
-               --disable-disk \
-               --disable-hddtemp \
-               --disable-nfs \
-               --disable-processes \
-               --disable-sensors \
-               --disable-serial \
-               --disable-swap \
-               --disable-tape \
-               --disable-users \
-       )
+define Package/collectd/conffiles 
+/etc/collectd.conf 
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-endef
+CONFIGURE_ARGS += \
+       --disable-debug \
+       --enable-daemon \
+       --enable-getifaddrs \
+       --disable-apache \
+       --disable-apcups \
+       --disable-apple_sensors \
+       --disable-battery \
+       --enable-cpu \
+       --disable-cpufreq \
+       --enable-disk \
+       --enable-df \
+       --disable-dns \
+       --disable-email \
+       --disable-quota \
+       --disable-hddtemp \
+       --enable-load \
+       --disable-mbmon \
+       --enable-memory \
+       --disable-multimeter \
+       --disable-mysql \
+       --disable-nfs \
+       --disable-ntpd \
+       --enable-ping \
+       --enable-processes \
+       --disable-sensors \
+       --enable-serial \
+       --disable-swap \
+       --disable-tape \
+       --enable-traffic \
+       --disable-users \
+       --disable-vserver \
+       --enable-wireless
+
+MAKE_FLAGS += \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install
 
 define Package/collectd/install
-       install -d -m0755 $(1)/etc/init.d
-       install -d -m0755 $(1)/usr/sbin
-       install -d -m0755 $(1)/usr/lib/collectd
-       install -d -m0755 $(1)/var/lib/collectd
-       install -d -m0755 $(1)/var/run
-       install -m0755 ./files/collectd.init $(1)/etc/init.d/collectd
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(1)/usr/lib/collectd/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/lib/collectd
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(1)/usr/lib/collectd/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) ./files/collectd.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/collectd.init $(1)/etc/init.d/collectd
 endef
 
 $(eval $(call BuildPackage,collectd))