From 0e25b474707e33038061a40bfaf71b40345474a3 Mon Sep 17 00:00:00 2001 From: fjoe Date: Tue, 7 Nov 2006 15:01:41 +0000 Subject: Update to 0.2.5. --- emulators/dynamips-devel/Makefile | 2 +- emulators/dynamips-devel/distinfo | 6 +++--- emulators/dynamips-devel/files/patch-Makefile | 21 ++++++++++++--------- emulators/dynamips-devel/files/patch-gen_eth.c | 11 +++++++++++ emulators/dynamips/Makefile | 2 +- emulators/dynamips/distinfo | 6 +++--- emulators/dynamips/files/patch-Makefile | 21 ++++++++++++--------- emulators/dynamips/files/patch-gen_eth.c | 11 +++++++++++ 8 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 emulators/dynamips-devel/files/patch-gen_eth.c create mode 100644 emulators/dynamips/files/patch-gen_eth.c (limited to 'emulators') diff --git a/emulators/dynamips-devel/Makefile b/emulators/dynamips-devel/Makefile index a06d8e811052..b7930ea7bac5 100644 --- a/emulators/dynamips-devel/Makefile +++ b/emulators/dynamips-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dynamips -PORTVERSION= 0.2.4 +PORTVERSION= 0.2.5 CATEGORIES= emulators MASTER_SITES= http://www.ipflow.utc.fr/dynamips/ diff --git a/emulators/dynamips-devel/distinfo b/emulators/dynamips-devel/distinfo index 4a69aaf7c8e1..39e9c46d415e 100644 --- a/emulators/dynamips-devel/distinfo +++ b/emulators/dynamips-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (dynamips-0.2.4.tar.gz) = 7b5ba42bbb466cb057bba1bc855476a9 -SHA256 (dynamips-0.2.4.tar.gz) = c29154224d87bd5e73cb89a0c4ab96e64a67328fdbd15bfa36afafe0240e6c1d -SIZE (dynamips-0.2.4.tar.gz) = 193988 +MD5 (dynamips-0.2.5.tar.gz) = b87ef442f7537373ccbe69c3f6dca301 +SHA256 (dynamips-0.2.5.tar.gz) = eab3f45b0e040be5748523a4ae0f2fae28ee9dd3068b56663459c7e84451de75 +SIZE (dynamips-0.2.5.tar.gz) = 312130 diff --git a/emulators/dynamips-devel/files/patch-Makefile b/emulators/dynamips-devel/files/patch-Makefile index 42cbc60faef4..088a8e3cced2 100644 --- a/emulators/dynamips-devel/files/patch-Makefile +++ b/emulators/dynamips-devel/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 14 23:54:17 2006 -+++ Makefile Wed Mar 8 22:54:11 2006 +--- Makefile.orig Thu Sep 14 17:59:13 2006 ++++ Makefile Wed Oct 18 22:38:24 2006 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -8,16 +8,19 @@ +HAS_POSIX_MEMALIGN?=0 + # Current dynamips release - VERSION=0.2.4 - -@@ -25,14 +28,15 @@ - CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ + VERSION=0.2.5 + VERSION_DEV=$(VERSION)-$(shell date +%Y%m%d-%H) +@@ -30,15 +33,16 @@ + -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) ++ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) - PCAP_LIB=-lpcap +-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 @@ -28,4 +31,4 @@ + LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) else ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include + CFLAGS+=-I/usr/local/include -mdynamic-no-pic diff --git a/emulators/dynamips-devel/files/patch-gen_eth.c b/emulators/dynamips-devel/files/patch-gen_eth.c new file mode 100644 index 000000000000..20f469d03d59 --- /dev/null +++ b/emulators/dynamips-devel/files/patch-gen_eth.c @@ -0,0 +1,11 @@ +--- gen_eth.c.orig Wed Oct 18 22:39:46 2006 ++++ gen_eth.c Wed Oct 18 22:39:55 2006 +@@ -46,7 +46,7 @@ + goto pcap_error; + + /* Accept only incoming packets */ +- pcap_setdirection(p,PCAP_D_IN); ++ pcap_setdirection(p,D_IN); + #else + p = pcap_open(device,2048, + PCAP_OPENFLAG_PROMISCUOUS | diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile index a06d8e811052..b7930ea7bac5 100644 --- a/emulators/dynamips/Makefile +++ b/emulators/dynamips/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dynamips -PORTVERSION= 0.2.4 +PORTVERSION= 0.2.5 CATEGORIES= emulators MASTER_SITES= http://www.ipflow.utc.fr/dynamips/ diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo index 4a69aaf7c8e1..39e9c46d415e 100644 --- a/emulators/dynamips/distinfo +++ b/emulators/dynamips/distinfo @@ -1,3 +1,3 @@ -MD5 (dynamips-0.2.4.tar.gz) = 7b5ba42bbb466cb057bba1bc855476a9 -SHA256 (dynamips-0.2.4.tar.gz) = c29154224d87bd5e73cb89a0c4ab96e64a67328fdbd15bfa36afafe0240e6c1d -SIZE (dynamips-0.2.4.tar.gz) = 193988 +MD5 (dynamips-0.2.5.tar.gz) = b87ef442f7537373ccbe69c3f6dca301 +SHA256 (dynamips-0.2.5.tar.gz) = eab3f45b0e040be5748523a4ae0f2fae28ee9dd3068b56663459c7e84451de75 +SIZE (dynamips-0.2.5.tar.gz) = 312130 diff --git a/emulators/dynamips/files/patch-Makefile b/emulators/dynamips/files/patch-Makefile index 42cbc60faef4..088a8e3cced2 100644 --- a/emulators/dynamips/files/patch-Makefile +++ b/emulators/dynamips/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Feb 14 23:54:17 2006 -+++ Makefile Wed Mar 8 22:54:11 2006 +--- Makefile.orig Thu Sep 14 17:59:13 2006 ++++ Makefile Wed Oct 18 22:38:24 2006 @@ -12,6 +12,9 @@ # (WinPcap is used for Cygwin) HAS_PCAP?=1 @@ -8,16 +8,19 @@ +HAS_POSIX_MEMALIGN?=0 + # Current dynamips release - VERSION=0.2.4 - -@@ -25,14 +28,15 @@ - CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ + VERSION=0.2.5 + VERSION_DEV=$(VERSION)-$(shell date +%Y%m%d-%H) +@@ -30,15 +33,16 @@ + -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \ -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -DHAS_RFC2553=$(HAS_RFC2553) -+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) ++ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN) - PCAP_LIB=-lpcap +-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 @@ -28,4 +31,4 @@ + LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) else ifeq ($(shell uname -s), Darwin) - CFLAGS+=-I/usr/local/include + CFLAGS+=-I/usr/local/include -mdynamic-no-pic diff --git a/emulators/dynamips/files/patch-gen_eth.c b/emulators/dynamips/files/patch-gen_eth.c new file mode 100644 index 000000000000..20f469d03d59 --- /dev/null +++ b/emulators/dynamips/files/patch-gen_eth.c @@ -0,0 +1,11 @@ +--- gen_eth.c.orig Wed Oct 18 22:39:46 2006 ++++ gen_eth.c Wed Oct 18 22:39:55 2006 +@@ -46,7 +46,7 @@ + goto pcap_error; + + /* Accept only incoming packets */ +- pcap_setdirection(p,PCAP_D_IN); ++ pcap_setdirection(p,D_IN); + #else + p = pcap_open(device,2048, + PCAP_OPENFLAG_PROMISCUOUS | -- cgit