From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 5 May 2012 17:04:55 +0000 (+0000)
Subject: [packages] pmacct: update to 0.14.0 (#11364, thanks deus), remove leading whitespace... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=6c9948e2e2c1b39c118ab02c175a5f5295fbb22e;hp=1c9986584e0d80ef0486cf7e533435f0e89d1422

[packages] pmacct: update to 0.14.0 (#11364, thanks deus), remove leading whitespace causing missing conffiles, use PKG_INSTALL


SVN-Revision: 31611
---

diff --git a/admin/pmacct/Makefile b/admin/pmacct/Makefile
index 638fa637d2..deb4138321 100644
--- 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
@@ -113,13 +115,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 +137,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
diff --git a/admin/pmacct/patches/001-honor_cflags.patch b/admin/pmacct/patches/001-honor_cflags.patch
deleted file mode 100644
index 14d17110d2..0000000000
--- a/admin/pmacct/patches/001-honor_cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1083,7 +1083,7 @@ fi
-
-
- if test "x$ac_cv_prog_gcc" = xyes ; then
--  CFLAGS="-O2"
-+  CFLAGS="-O2 ${CFLAGS}"
-   case "$host_os" in
-     IRIX*)
-       CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}"
-@@ -1097,7 +1097,7 @@ else
-       LDFLAGS="-n32 -L/usr/lib32 -L/usr/freeware/lib32 ${LDFLAGS}"
-       ;;
-     OSF*)
--      CFLAGS="-O -assume noaligned_objects"
-+      CFLAGS="-O -assume noaligned_objects ${CFLAGS}"
-       ;;
-   esac
- fi