fix opt flags in cross-compile patch, remove volatile dirs (in /var) from the package...

SVN-Revision: 5319

diff --git a/net/iptraf/Makefile b/net/iptraf/Makefile
index 02c31ee18c287a8484aa74084af351a91c175bbc..78124375f460ca734d2ea4b5cea2f1d16558510a 100644 (file)
--- a/net/iptraf/Makefile
+++ b/net/iptraf/Makefile
@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,15 +11,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iptraf
 PKG_VERSION:=3.0.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=377371c28ee3c21a76f7024920649ea8
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://iptraf.seul.org/pub/iptraf/ \
        ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=377371c28ee3c21a76f7024920649ea8
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,14 +27,14 @@ define Package/iptraf
   CATEGORY:=Network
   DEPENDS:=+libncurses
   TITLE:=A console-based network monitoring program
-  DESCRIPTION:=IPTraf is a console-based network statistics utility for Linux. It gathers\\\
-a variety of figures such as TCP connection packet and byte counts,\\\
-interface statistics and activity indicators, TCP/UDP traffic breakdowns,\\\
-and LAN station packet and byte counts.\\\
+  DESCRIPTION:=\
+       IPTraf is a console-based network statistics utility for Linux. It gathers \\\
+       a variety of figures such as TCP connection packet and byte counts, \\\
+       interface statistics and activity indicators, TCP/UDP traffic breakdowns, \\\
+       and LAN station packet and byte counts.
   URL:=http://iptraf.seul.org/
 endef
 
-
 define Build/Compile   
        $(MAKE) -C $(PKG_BUILD_DIR)/src \
                $(TARGET_CONFIGURE_OPTS) \
@@ -49,9 +49,7 @@ define Build/Compile
 endef
 
 define Package/iptraf/install  
-       install -d -m0755 $(1)/usr/bin \
-                         $(1)/var/run/iptraf \
-                         $(1)/var/lib/iptraf
+       install -d -m0755 $(1)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/src/iptraf $(1)/usr/bin/
 endef
 

diff --git a/net/iptraf/patches/01-cross_compile.patch b/net/iptraf/patches/01-cross_compile.patch
index c12719d25a885a5aae6e473655c8d808013125f3..574367bedad89451fb0a87d8847b7865471765a5 100644 (file)
--- a/net/iptraf/patches/01-cross_compile.patch
+++ b/net/iptraf/patches/01-cross_compile.patch
@@ -18,7 +18,7 @@ diff -urN iptraf-3.0.0/support/Makefile iptraf-3.0.0.new/support/Makefile
  
  %.o: %.c *.h
 -      gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
-+      $(CC) -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
++      $(CC) $(CFLAGS) -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
  
  clean:
        rm -rf *.o *~ libtextbox.a libtextbox.so