Attachment 82075 Details for Bug 117457 – dynamips-devel-0.2.8.r2.patch

[patch] dynamips-devel-0.2.8.r2.patch

dynamips-devel-0.2.8.r2.patch (text/plain), 3.34 KB, created by Pavel Volkov on 2007-10-24 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2007-10-24 18:10:01 UTC

Size: 3.34 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/Makefile /usr/ports/emulators/dynamips-devel/Makefile
>--- /usr/ports/emulators/dynamips-devel.orig/Makefile	2007-10-24 12:37:17.000000000 +0400
>+++ /usr/ports/emulators/dynamips-devel/Makefile	2007-10-24 20:31:43.000000000 +0400
>@@ -6,13 +6,13 @@
> #
> 
> PORTNAME=	dynamips
>-DISTVERSION=	0.2.8-RC1
>+DISTVERSION=	0.2.8-RC2
> CATEGORIES=	emulators
> MASTER_SITES=	http://www.ipflow.utc.fr/dynamips/
> PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	pol@opk.ru
>-COMMENT=	Cisco 3600/7200 Simulator
>+COMMENT=	Cisco 1700/2600/3600/3700/7200 Simulator
> 
> LIB_DEPENDS=	elf.0:${PORTSDIR}/devel/libelf
> 
>@@ -46,8 +46,13 @@
> DYNAMIPS_ARCH=	"nojit"
> .endif
> 
>-.if ${OSVERSION} < 602100 || ${OSVERSION} < 700021
>-LIB_DEPENDS+=	libpcap>=0.9.4:${PORTSDIR}/net/libpcap
>+# It required libpcap version 0.9.4 or is higher.
>+.if ${OSVERSION} < 602100 || (${OSVERSION} >= 700000 && ${OSVERSION} < 700021)
>+LIB_DEPENDS+=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
>+MAKE_ENV+=	PCAP_LIB=${LOCALBASE}/lib/libpcap.a
>+#.warning Do not overlook, make libpcap with LIBPCAP_OVERWRITE_BASE parameter, for use with shared library.
>+#LIB_DEPENDS+=	pcap.$0.9.$?[2-9]:${PORTSDIR}/net/libpcap
>+#MAKE_ENV+=	PCAP_LIB=-lpcap.2
> .endif
> 
> .if ${OSVERSION} >= 700013
>diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/distinfo /usr/ports/emulators/dynamips-devel/distinfo
>--- /usr/ports/emulators/dynamips-devel.orig/distinfo	2007-10-24 12:37:17.000000000 +0400
>+++ /usr/ports/emulators/dynamips-devel/distinfo	2007-10-24 12:38:04.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (dynamips-0.2.8-RC1.tar.gz) = 39d08f2d20cdd78ef05c50ae86c4b522
>-SHA256 (dynamips-0.2.8-RC1.tar.gz) = 266cd3fe12f643f8c6aaf59ec8b99b20d6fb53ed8032c1984477065ca97ee994
>-SIZE (dynamips-0.2.8-RC1.tar.gz) = 569599
>+MD5 (dynamips-0.2.8-RC2.tar.gz) = 8d12d28684d164fe3312a3fe43c84d2e
>+SHA256 (dynamips-0.2.8-RC2.tar.gz) = a8b377ce631119e285c401fdb7cb4d0bcc600a15508bdffcf337546957e252de
>+SIZE (dynamips-0.2.8-RC2.tar.gz) = 578935
>diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/files/patch-Makefile /usr/ports/emulators/dynamips-devel/files/patch-Makefile
>--- /usr/ports/emulators/dynamips-devel.orig/files/patch-Makefile	2007-10-24 12:37:17.000000000 +0400
>+++ /usr/ports/emulators/dynamips-devel/files/patch-Makefile	2007-10-24 19:50:28.000000000 +0400
>@@ -1,6 +1,14 @@
>---- Makefile.orig	Thu Sep 13 19:55:14 2007
>-+++ Makefile	Thu Sep 13 19:55:30 2007
>-@@ -52,7 +52,7 @@
>+--- Makefile.orig	2007-10-14 12:43:07.000000000 +0400
>++++ Makefile	2007-10-24 19:48:14.000000000 +0400
>+@@ -45,14 +45,14 @@
>+ 	-DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN)
>+ 
>+ #PCAP_LIB=/usr/local/lib/libpcap.a
>+-PCAP_LIB=-lpcap
>++PCAP_LIB?=-lpcap
>+ 
>+ ifeq ($(shell uname), FreeBSD)
>+    PTHREAD_LIBS?=-pthread
>     LOCALBASE?=/usr/local
>     CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf \
>  	$(PTHREAD_CFLAGS) -D_FILE_OFFSET_BITS=64
>diff -ruN --exclude=CVS /usr/ports/emulators/dynamips-devel.orig/pkg-descr /usr/ports/emulators/dynamips-devel/pkg-descr
>--- /usr/ports/emulators/dynamips-devel.orig/pkg-descr	2007-10-24 12:37:17.000000000 +0400
>+++ /usr/ports/emulators/dynamips-devel/pkg-descr	2007-10-24 20:31:57.000000000 +0400
>@@ -1,4 +1,4 @@
>-Cisco 3600/7200 simulator.
>+Cisco 1700/2600/3600/3700/7200 simulator.
> 
> WWW:	http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator
> 	http://www.ipflow.utc.fr/blog/

Actions: View | Diff

Attachments on bug 117457: 82075