bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31611 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-05-05 17:04:55 +00:00
parent f290b4fa51
commit 09d2442166
2 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
admin/pmacct/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pmacct PKG_NAME:=pmacct
PKG_VERSION:=0.12.5 PKG_VERSION:=0.14.0
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.pmacct.net/ PKG_SOURCE_URL:=http://www.pmacct.net/
PKG_MD5SUM:=3d10f9301a17f034a0f221490a99a5d0 PKG_MD5SUM:=4588531f0e8033fe82ad7fb22d1bbdb7
PKG_BUILD_DEPENDS:=libpcap PKG_BUILD_DEPENDS:=libpcap
@ -22,6 +22,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_IPV6 \ CONFIG_IPV6 \
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/pmacct/Default define Package/pmacct/Default
@ -113,13 +115,6 @@ ifeq ($(BUILD_VARIANT),sqlite)
endif endif
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/pmacct-client/install define Package/pmacct-client/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/
@ -142,8 +137,8 @@ define BuildPackage/Template
endef endef
define Package/$(2)$(3)/conffiles define Package/$(2)$(3)/conffiles
/etc/default/$(2) /etc/default/$(2)
/etc/$(2).conf /etc/$(2).conf
endef endef
define Package/$(2)$(3)/install define Package/$(2)$(3)/install

20
admin/pmacct/patches/001-honor_cflags.patch
View File

@ -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