From da8c4de812fd6fc2545d68309fd05ab6d14c3969 Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 27 Aug 2011 19:12:45 +0000
Subject: [PATCH] [packages] ditg: update to 2.8.0-rc1, remove obsolete patch

SVN-Revision: 28091
---
 net/ditg/Makefile                 | 40 +++++++++++++------------------
 net/ditg/patches/001-no_stropts.h | 11 ---------
 2 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 net/ditg/patches/001-no_stropts.h

diff --git a/net/ditg/Makefile b/net/ditg/Makefile
index bed7b96681..2d75ba0782 100644
--- a/net/ditg/Makefile
+++ b/net/ditg/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,27 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ditg
-PKG_VERSION:=2.7.0
-PKG_RELEASE:=Beta2
+PKG_VERSION:=2.8.0-rc1
+PKG_RELEASE:=1
 
-PKG_SOURCE:=D-ITG-${PKG_VERSION}-${PKG_RELEASE}.zip
-PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice/
-PKG_MD5SUM:=6cf5f1a16283cff8297521ec4093df7f
+PKG_SOURCE:=D-ITG-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice
+PKG_MD5SUM:=ed8efdda540f467ef4d688ed4184b11d
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-${PKG_VERSION}-${PKG_RELEASE}
+PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/ditg/Default
+define Package/ditg
   TITLE:=D-ITG (Distributed Internet Traffic Generator)
   SECTION:=net
   CATEGORY:=Network
   URL:=http://www.grid.unina.it/software/ITG/
   MAINTAINER:=Giovanni Di Stasi <giovanni.distasi@unina.it>
-  DEPENDS:= +libpcap +libstdcpp
+  DEPENDS:=+libpthread +uclibcxx
 endef
 
-define Package/ditg/Default/description
+define Package/ditg/description
   D-ITG (Distributed Internet Traffic Generator) is a platform capable
   to produce traffic at packet level accurately replicating appropriate
   stochastic processes for both IDT (Inter Departure Time) and PS
@@ -39,24 +39,16 @@ define Package/ditg/Default/description
   when compared to other traffic generators.
 endef
 
-define Package/ditg
-  $(call Package/ditg/Default)
-endef
+MAKE_PATH := src
 
-# uncomment for arm targets
-#EXTRA_FLAGS=" arm=on "
+TARGET_CXX = $(STAGING_DIR)/host/bin/g++-uc
 
-define Build/Compile
-	$(MAKE) \
-		CXX="$(TARGET_CXX)" \
-		CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-		-C $(PKG_BUILD_DIR)/src $(EXTRA_CFLAGS)
-endef
+MAKE_FLAGS += \
+	CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DMULTIPORT -DARM"
 
 define Package/ditg/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/{ITGSend,ITGRecv,ITGLog,ITGDec}  \
-		       $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/ITG{Send,Recv,Log,Dec} $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,ditg))
diff --git a/net/ditg/patches/001-no_stropts.h b/net/ditg/patches/001-no_stropts.h
deleted file mode 100644
index 442f83a213..0000000000
--- a/net/ditg/patches/001-no_stropts.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- D-ITG-2.7.0-Beta2/src/common/serial.cpp	2009-05-24 10:48:18.000000000 +0200
-+++ D-ITG-2.7.0-Beta2.new/src/common/serial.cpp	2010-03-21 17:22:54.000000000 +0100
-@@ -84,7 +84,7 @@
- #include <unistd.h>
- #include <termios.h>
- #if !defined(BSD) && !defined(ARM)
--#include <stropts.h>
-+//#include <stropts.h>
- #endif
- #include <fcntl.h>
- #include <stdio.h>
-- 
2.30.2