[packages] vnstat: readd download and symlink functionality

[openwrt/svn-archive/archive.git] / net / vnstat / Makefile

diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 86e5414164f2408ce332fa032af2635de3804016..86d6fc5900bd67436f20908a43c48fdc98608849 100644 (file)
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -1,41 +1,112 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 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:=vnstat
-PKG_VERSION:=1.4
-PKG_RELEASE:=1
-PKG_MD5SUM:=9184f79b5e60499bc059f670032291e5
+PKG_VERSION:=1.10
+PKG_RELEASE:=3
 
-PKG_SOURCE_URL:=http://humdi.net/vnstat
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://humdi.net/vnstat
+PKG_MD5SUM:=95421d968689130590348ceb80ff74a8
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=libgd
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/vnstat
+define Package/vnstat/Default
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=Console-based network traffic monitor
-  DESCRIPTION:=vnStat is a network traffic monitor for Linux that keeps a log of daily\\\
-  network traffic for the selected interface(s). vnStat isn't a packet\\\
-  sniffer. The traffic information is analyzed from the /proc -filesystem,\\\
-  so vnStat can be used without root permissions.\\\
   URL:=http://humdi.net/vnstat/
 endef
 
-define Package/vnstat/install  
-       install -d -m0755 $(1)/usr/bin
-       $(CP) $(PKG_BUILD_DIR)/src/vnstat $(1)/usr/bin/
+define Package/vnstat
+$(call Package/vnstat/Default)
+  TITLE:=Console-based network traffic monitor
+endef
+
+define Package/vnstat/description
+       vnStat is a network traffic monitor for Linux that keeps a log of daily
+       network traffic for the selected interface(s). vnStat isn't a packet
+       sniffer. The traffic information is analyzed from the /proc -filesystem,
+       so vnStat can be used without root permissions.
+endef
+
+define Package/vnstati
+$(call Package/vnstat/Default)
+  DEPENDS+=vnstat +libgd
+  TITLE:=PNG image output support for vnStat
+endef
+
+define Package/vnstati/description
+       The purpose of vnstati is to provide image output support for statistics
+       collected using vnstat(1). However, the image file format is limited to
+       png. All basic outputs of vnStat are supported excluding live traffic
+       features. The image can be outputted either to a file or to standard
+       output.
+endef
+
+define Package/vnstat/conffiles
+/etc/vnstat.conf
+/etc/config/vnstat
+endef
+
+define Build/Compile/vnstat
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS)"
+endef
+
+define Build/Compile/vnstati
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+               LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \
+               all
+endef
+
+define Build/Compile
+$(call Build/Compile/vnstat)
+$(call Build/Compile/vnstati)
+endef
+
+define Package/vnstat/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vnstat $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vnstatd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vnstat.conf $(1)/etc/
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) ./files/vnstat-uci.conf $(1)/etc/config/vnstat
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/vnstat.init $(1)/etc/init.d/vnstat
+endef
+
+define Package/vnstati/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vnstati $(1)/usr/bin/
+endef
+
+define Package/vnstat/postinst
+#!/bin/sh
+local wan="$$(uci -P/var/state get network.wan.ifname)"
+if [ -n "$$wan" ]; then
+       uci -q batch <<-EOF >/dev/null
+               add_list vnstat.@vnstat[-1].interface=$$wan
+               commit vnstat
+       EOF
+fi
+exit 0
 endef
 
 $(eval $(call BuildPackage,vnstat))
+$(eval $(call BuildPackage,vnstati))