From 1838aa2870cf0f876fc724231f31428f0d8b8bd0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 9 Jul 2010 20:05:43 +0200
Subject: update and fix packages which got activated to autogenerated package
 configuration menu.

---
 package/pmacct/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'package/pmacct')

diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index cb92cbe8f..0b9c6c1ae 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pmacct
-PKG_VERSION:=		0.11.6
+PKG_VERSION:=		0.12.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e0f3bcba9a73b7a70bbf5a303cd22f77
+PKG_MD5SUM:=		1c656ea9ca13455c54e8efb9f8299b3d
 PKG_DESCR:=		IP accounting daemons
 PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libpcap
@@ -20,7 +20,7 @@ endif
 ifneq ($(ADK_COMPILE_PMACCT_SQLITE),)
 PKG_BUILDDEP+=		sqlite
 endif
-PKG_URL:=		http://www.pmacct.net
+PKG_URL:=		http://www.pmacct.net/
 PKG_SITES:=		http://www.pmacct.net/
 
 include $(TOPDIR)/mk/package.mk
@@ -30,16 +30,18 @@ $(eval $(call PKG_template,PMACCTD,pmacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 $(eval $(call PKG_template,SFACCTD,sfacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		--with-pcap-includes="$(STAGING_DIR)/usr/include" \
+CONFIGURE_ARGS+=	--with-pcap-includes="$(STAGING_DIR)/usr/include" \
 			--with-pcap-libs="$(STAGING_DIR)/usr/lib"
 
 post-install:
 	${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/sfacctd $(IDIR_SFACCTD)/usr/sbin/
-	${INSTALL_DIR} $(IDIR_NFACCTD)/usr/sbin
+	${INSTALL_DIR} $(IDIR_NFACCTD)/usr/sbin $(IDIR_NFACCTD)/etc
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/nfacctd $(IDIR_NFACCTD)/usr/sbin/
-	${INSTALL_DIR} $(IDIR_PMACCTD)/usr/sbin
+	${INSTALL_DATA} ./files/nfacctd.conf $(IDIR_NFACCTD)/etc
+	${INSTALL_DIR} $(IDIR_PMACCTD)/usr/sbin $(IDIR_PMACCTD)/etc
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/pmacctd $(IDIR_PMACCTD)/usr/sbin/
+	${INSTALL_DATA} ./files/pmacctd.conf $(IDIR_PMACCTD)/etc
 	${INSTALL_DIR} $(IDIR_PMACCT_CLIENT)/usr/bin
 	${INSTALL_BIN} $(WRKINST)/usr/bin/pmacct $(IDIR_PMACCT_CLIENT)/usr/bin/
 
-- 
cgit v1.2.3