diff options
Diffstat (limited to 'package/pmacct')
| -rw-r--r-- | package/pmacct/Makefile | 11 | ||||
| -rw-r--r-- | package/pmacct/patches/patch-configure | 41 |
2 files changed, 6 insertions, 46 deletions
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index bfba469b8..1368c276c 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pmacct -PKG_VERSION:= 0.12.5 +PKG_VERSION:= 1.7.8 PKG_RELEASE:= 1 -PKG_HASH:= 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8 +PKG_HASH:= 4df50a3c6c7bdace3345bbf3bd4f6fa7a6722ec1fb45dfd266ad956b327da98a PKG_DESCR:= ip accounting tools PKG_SECTION:= net/acct -PKG_DEPENDS:= libpcap -PKG_BUILDDEP:= libpcap +PKG_DEPENDS:= libpcap libcdada +PKG_BUILDDEP:= libpcap libcdada PKG_URL:= http://www.pmacct.net/ PKG_SITES:= http://www.pmacct.net/ @@ -26,7 +26,8 @@ $(eval $(call PKG_template,SFACCTD,sfacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-pcap-includes="$(STAGING_TARGET_DIR)/usr/include" \ - --with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib" + --with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib" \ + --without-external-deps sfacctd-install: ${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin diff --git a/package/pmacct/patches/patch-configure b/package/pmacct/patches/patch-configure deleted file mode 100644 index 0c7310ba6..000000000 --- a/package/pmacct/patches/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- pmacct-0.12.5.orig/configure 2010-12-28 17:26:21.000000000 +0100 -+++ pmacct-0.12.5/configure 2011-01-21 21:15:15.478658080 +0100 -@@ -1006,7 +1006,6 @@ fi - - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" --CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 - echo "configure:1012: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then -@@ -1022,22 +1021,6 @@ rm -f conftest* - - fi - --echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS="$ac_save_CFLAGS" --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi - - host_os=`uname` - host_cpu=`uname -m` -@@ -1083,7 +1066,6 @@ fi - - - if test "x$ac_cv_prog_gcc" = xyes ; then -- CFLAGS="-O2" - case "$host_os" in - IRIX*) - CFLAGS="-mabi=n32 -fno-builtins ${CFLAGS}" |