From 23bdd69ff2f306281b3b1d44a5b75ce6c511ad0a Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Fri, 5 Feb 2010 20:10:42 +0000
Subject: Update dynamips to 0.2.8-RC2 (from 2007)

0.2.8-RC2
* mainly a bug fix release
0.2.8-RC1
* hypervisor control protocol has been modified
* Support of the Cisco 1700 platforms, with WIC-1T, WIC-2T and
  WIC-1ENET cards
* Support of WIC-1T and WIC-2T for the 2600, 2691, 3725 and 3745.
* Support of NM-NAM and NM-CIDS interfaces.
* Plugin system
* Bug fixes.
---
 emulators/dynamips/Makefile         |  5 +++--
 emulators/dynamips/distinfo         | 10 +++++-----
 emulators/dynamips/patches/patch-aa | 38 ++++++++++++++-----------------------
 3 files changed, 22 insertions(+), 31 deletions(-)

(limited to 'emulators')

diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index e42252fc2b3..e3169ccebc6 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/06/30 00:07:14 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/05 20:10:42 markd Exp $
 
-DISTNAME=	dynamips-0.2.7
+DISTNAME=	dynamips-0.2.8-RC2
+PKGNAME=	${DISTNAME:S/-RC/rc/}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ipflow.utc.fr/dynamips/
 
diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo
index 0f6c3c1eb23..3fe86206a94 100644
--- a/emulators/dynamips/distinfo
+++ b/emulators/dynamips/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/06/03 13:53:49 kefren Exp $
+$NetBSD: distinfo,v 1.3 2010/02/05 20:10:42 markd Exp $
 
-SHA1 (dynamips-0.2.7.tar.gz) = 6f65a2e92f5d27aca9d8608369cb20c9539a8121
-RMD160 (dynamips-0.2.7.tar.gz) = 1c84f762c65dc2e83e84ee7b046793c71252c7b1
-Size (dynamips-0.2.7.tar.gz) = 522620 bytes
-SHA1 (patch-aa) = baf9b6d251f36d2a95994860e00fef872d5f497f
+SHA1 (dynamips-0.2.8-RC2.tar.gz) = 349270690996a1e260b3eceb51ea90f94c25a59e
+RMD160 (dynamips-0.2.8-RC2.tar.gz) = 0447a4c0cf516bd2b63259881c7625e26d0d838f
+Size (dynamips-0.2.8-RC2.tar.gz) = 578935 bytes
+SHA1 (patch-aa) = 6a0a7a0ce822e69bc77b7957ca0d5a5ba497fadd
diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa
index 63b4e759359..2e6f2e980df 100644
--- a/emulators/dynamips/patches/patch-aa
+++ b/emulators/dynamips/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2008/06/03 13:53:49 kefren Exp $
---- Makefile.orig	2007-05-26 12:52:33 +0300
-+++ Makefile	2008-06-02 18:40:41 +0300
+$NetBSD: patch-aa,v 1.3 2010/02/05 20:10:42 markd Exp $
+
+--- Makefile.orig	2007-10-14 08:43:07.000000000 +0000
++++ Makefile
 @@ -3,7 +3,19 @@
  
  # Replace x86 by amd64 for a build on x86_64.
@@ -22,35 +23,24 @@ $NetBSD: patch-aa,v 1.2 2008/06/03 13:53:49 kefren Exp $
  
  # Change this to 0 if your system doesn't support RFC 2553 extensions
  HAS_RFC2553?=1
-@@ -40,8 +52,8 @@ CFLAGS+=-g -Wall -O3 -fomit-frame-pointe
- 	-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
- 	-DHAS_RFC2553=$(HAS_RFC2553)
- 
--PCAP_LIB=/usr/local/lib/libpcap.a
--#PCAP_LIB=-lpcap
-+#PCAP_LIB=/usr/local/lib/libpcap.a
-+PCAP_LIB=-lpcap
- 
- ifeq ($(shell uname), FreeBSD)
-    PTHREAD_LIBS?=-pthread
-@@ -49,6 +61,16 @@ ifeq ($(shell uname), FreeBSD)
-          -D_FILE_OFFSET_BITS=64
-    LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
+@@ -54,6 +66,16 @@ ifeq ($(shell uname), FreeBSD)
+ 	$(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64
+    LIBS=-L$(LOCALBASE)/lib -L. -ldl -lelf $(PTHREAD_LIBS) $(LDFLAGS)
  else
 +ifeq ($(shell uname -s), NetBSD)
-+	PTHREAD_LIBS?=-pthread
-+	CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS}
-+	LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib
++   PTHREAD_LIBS?=-pthread
++   CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS}
++   LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib
 +else
 +ifeq ($(shell uname -s), DragonFly)
-+	PTHREAD_LIBS?=-pthread
-+	CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS}
-+	LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib
++   PTHREAD_LIBS?=-pthread
++   CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS}
++   LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} -R${LOCALBASE}/lib
 +else
  ifeq ($(shell uname), Linux)
     PTHREAD_LIBS?=-lpthread
  #   PCAP_LIB=-lpcap
-@@ -80,6 +102,8 @@ endif
+@@ -85,6 +107,8 @@ endif
  endif
  endif
  endif
-- 
cgit v1.2.3