aboutsummaryrefslogtreecommitdiff
path: root/emulators/dynamips
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2006-11-14 04:22:00 +0000
committerMax Khon <fjoe@FreeBSD.org>2006-11-14 04:22:00 +0000
commitedd3566211bdb6546cd9d40c760e7aa31e8f10b9 (patch)
treeb7980311a6c8e4b76372ec13340291c6f290b9b4 /emulators/dynamips
parent83a38e9ea5a95153b834392e2f2c30db951b4ee8 (diff)
downloadports-edd3566211bdb6546cd9d40c760e7aa31e8f10b9.tar.gz
ports-edd3566211bdb6546cd9d40c760e7aa31e8f10b9.zip
Notes
Diffstat (limited to 'emulators/dynamips')
-rw-r--r--emulators/dynamips/Makefile17
-rw-r--r--emulators/dynamips/files/patch-gen_eth.c16
-rw-r--r--emulators/dynamips/pkg-descr2
3 files changed, 11 insertions, 24 deletions
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 6c95a1316dc1..41d9d073fd9f 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -7,12 +7,12 @@
PORTNAME= dynamips
PORTVERSION= 0.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://www.ipflow.utc.fr/dynamips/
MAINTAINER= fjoe@FreeBSD.org
-COMMENT= Cisco 7200 Simulator
+COMMENT= Cisco 3600/7200 Simulator
LIB_DEPENDS= elf.0:${PORTSDIR}/devel/libelf
@@ -37,16 +37,19 @@ do-install:
.include <bsd.port.pre.mk>
-.if ${ARCH} == "i386" #|| ${ARCH} == "amd64"
-DYNAMIPS_ARCH= "${ARCH}"
+.if ${ARCH} == "i386"
+DYNAMIPS_ARCH= "x86"
+.elif ${ARCH} == "amd64"
+DYNAMIPS_ARCH= "nojit" # JIT does not work on amd64 for some reason
.else
DYNAMIPS_ARCH= "nojit"
.endif
-.if ${OSVERSION} < 600029
+.if ${OSVERSION} < 602100 || ${OSVERSION} < 700021
#
-# Requires libpcap 0.9+
-MAKE_ENV+= HAS_PCAP=0
+# Requires libpcap 0.9.4
+LIB_DEPENDS+= pcap.2:${PORTSDIR}/net/libpcap
+BUILD_DEPENDS+= libpcap>=0.9.4:${PORTSDIR}/net/libpcap
.endif
.if ${OSVERSION} >= 700013
diff --git a/emulators/dynamips/files/patch-gen_eth.c b/emulators/dynamips/files/patch-gen_eth.c
deleted file mode 100644
index f27a0f8f709c..000000000000
--- a/emulators/dynamips/files/patch-gen_eth.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- gen_eth.c.orig Thu Sep 14 17:59:13 2006
-+++ gen_eth.c Tue Nov 14 00:28:18 2006
-@@ -25,6 +25,13 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <pthread.h>
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+
-+#if __FreeBSD_version < 602100 || __FreeBSD_version < 700021
-+#define PCAP_D_IN D_IN
-+#endif
-+#endif
-
- #ifdef CYGWIN
- /* Needed for pcap_open() flags */
diff --git a/emulators/dynamips/pkg-descr b/emulators/dynamips/pkg-descr
index f4f8a8d23601..6a3bb92dfde1 100644
--- a/emulators/dynamips/pkg-descr
+++ b/emulators/dynamips/pkg-descr
@@ -1,3 +1,3 @@
-Cisco 7200 simulator.
+Cisco 3600/7200 simulator.
WWW: http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator