poco: moved to github

[packages.git] / admin / pmacct / Makefile

diff --git a/admin/pmacct/Makefile b/admin/pmacct/Makefile
index 638fa63..4299a82 100644 (file)
--- a/admin/pmacct/Makefile
+++ b/admin/pmacct/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pmacct
-PKG_VERSION:=0.12.5
-PKG_RELEASE:=3
+PKG_VERSION:=0.14.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pmacct.net/
-PKG_MD5SUM:=3d10f9301a17f034a0f221490a99a5d0
+PKG_MD5SUM:=4588531f0e8033fe82ad7fb22d1bbdb7
 
 PKG_BUILD_DEPENDS:=libpcap
 
@@ -22,6 +22,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 PKG_CONFIG_DEPENDS:= \
        CONFIG_IPV6 \
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pmacct/Default
@@ -29,6 +31,7 @@ define Package/pmacct/Default
   CATEGORY:=Administration
   SUBMENU:=Pmacct suite
   URL:=http://www.pmacct.net/
+  DEPENDS=+libpcap
 endef
 
 define Package/pmacct-client
@@ -44,13 +47,11 @@ endef
 
 define Package/pmacctd/Default
   $(call Package/pmacct/Default)
-  DEPENDS+= +libpcap
   TITLE:=IP pcap-based accounting daemon
 endef
 
 define Package/sfacctd/Default
   $(call Package/pmacct/Default)
-  DEPENDS+= +libpcap
   TITLE:=sFlow accounting daemon
 endef
 
@@ -113,13 +114,6 @@ ifeq ($(BUILD_VARIANT),sqlite)
 endif
 
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-
 define Package/pmacct-client/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/
@@ -142,8 +136,8 @@ define BuildPackage/Template
   endef
 
   define Package/$(2)$(3)/conffiles
-    /etc/default/$(2)
-    /etc/$(2).conf
+/etc/default/$(2)
+/etc/$(2).conf
   endef
 
   define Package/$(2)$(3)/install
@@ -178,7 +172,7 @@ $(eval $(call BuildPackage/Template,pgsql,pmacctd,-pgsql,with PostgreSQL support
 $(eval $(call BuildPackage/Template,pgsql,sfacctd,-pgsql,with PostgreSQL support,+libpq))
 $(eval $(call BuildPackage/Template,pgsql,uacctd,-pgsql,with PostgreSQL support,+libpq))
 
-$(eval $(call BuildPackage/Template,sqlite,nfacctd,-sqlite,with SQLite support,+libsqlite3))
-$(eval $(call BuildPackage/Template,sqlite,pmacctd,-sqlite,with SQLite support,+libsqlite3))
-$(eval $(call BuildPackage/Template,sqlite,sfacctd,-sqlite,with SQLite support,+libsqlite3))
-$(eval $(call BuildPackage/Template,sqlite,uacctd,-sqlite,with SQLite support,+libsqlite3))
+$(eval $(call BuildPackage/Template,sqlite,nfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib))
+$(eval $(call BuildPackage/Template,sqlite,pmacctd,-sqlite,with SQLite support,+libsqlite3 +zlib))
+$(eval $(call BuildPackage/Template,sqlite,sfacctd,-sqlite,with SQLite support,+libsqlite3 +zlib))
+$(eval $(call BuildPackage/Template,sqlite,uacctd,-sqlite,with SQLite support,+libsqlite3 +zlib))