From 62f04d41ed07754ca741da490a6242af62dc5223 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 28 Oct 2006 13:30:56 +0000
Subject: [PATCH] fix opt flags in cross-compile patch, remove volatile dirs
 (in /var) from the package, Makefile cleanup

SVN-Revision: 5319
---
 net/iptraf/Makefile                       | 20 +++++++++-----------
 net/iptraf/patches/01-cross_compile.patch |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/net/iptraf/Makefile b/net/iptraf/Makefile
index 02c31ee18c..78124375f4 100644
--- 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 c12719d25a..574367beda 100644
--- 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
-- 
2.30.2