diff options
| -rw-r--r-- | emulators/dynamips/Makefile | 28 | ||||
| -rw-r--r-- | emulators/dynamips/PLIST | 12 | ||||
| -rw-r--r-- | emulators/dynamips/distinfo | 12 | ||||
| -rw-r--r-- | emulators/dynamips/patches/patch-aa | 76 | ||||
| -rw-r--r-- | emulators/dynamips/patches/patch-utils.h | 31 |
5 files changed, 26 insertions, 133 deletions
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile index 87513ce9b0c..0ef1edc6489 100644 --- a/emulators/dynamips/Makefile +++ b/emulators/dynamips/Makefile @@ -1,37 +1,29 @@ -# $NetBSD: Makefile,v 1.9 2015/03/12 16:48:40 tnn Exp $ +# $NetBSD: Makefile,v 1.10 2015/12/12 20:20:04 markd Exp $ -DISTNAME= dynamips-0.2.8-RC2 -PKGNAME= ${DISTNAME:S/-RC/rc/} -PKGREVISION= 1 +PKGNAME= dynamips-0.2.15 +DISTNAME= ${PKGNAME:S/dynamips-/v/} CATEGORIES= emulators -MASTER_SITES= http://www.ipflow.utc.fr/dynamips/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=GNS3/dynamips/archive/} +DIST_SUBDIR= dynamips MAINTAINER= kefren@NetBSD.org -HOMEPAGE= http://www.ipflow.utc.fr/index.php/Cisco_7200_Simulator +HOMEPAGE= https://github.com/GNS3/dynamips COMMENT= Cisco 3600 and 7200 MIPS emulator LICENSE= gnu-gpl-v2 -MAKE_JOBS_SAFE= no - USE_TOOLS+= gmake +USE_CMAKE= yes -NO_CONFIGURE= yes - -BUILD_TARGET= # empty +WRKSRC= ${WRKDIR}/${PKGNAME} SUBST_CLASSES+= libelf SUBST_STAGE.libelf= post-patch -SUBST_FILES.libelf= dynamips.h rom2c.c +SUBST_FILES.libelf= common/dynamips.h common/rom2c.c SUBST_SED.libelf= -e 's,<libelf.h>,<libelf/libelf.h>,' SUBST_MESSAGE.libelf= Fix libelf header file path -INSTALLATION_DIRS= bin - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dynamips ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/nvram_export ${DESTDIR}${PREFIX}/bin - .include "../../devel/libelf/buildlink3.mk" +.include "../../devel/libuuid/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/emulators/dynamips/PLIST b/emulators/dynamips/PLIST index 8dde6c48b28..c8411a852e3 100644 --- a/emulators/dynamips/PLIST +++ b/emulators/dynamips/PLIST @@ -1,3 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/14 11:00:13 kefren Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/12/12 20:20:04 markd Exp $ bin/dynamips bin/nvram_export +man/man1/dynamips.1 +man/man1/nvram_export.1 +man/man7/hypervisor_mode.7 +share/doc/dynamips/ChangeLog +share/doc/dynamips/COPYING +share/doc/dynamips/MAINTAINERS +share/doc/dynamips/README +share/doc/dynamips/README.hypervisor +share/doc/dynamips/RELEASE-NOTES +share/doc/dynamips/TODO diff --git a/emulators/dynamips/distinfo b/emulators/dynamips/distinfo index a85e0685615..72e09ef22ee 100644 --- a/emulators/dynamips/distinfo +++ b/emulators/dynamips/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 20:30:57 agc Exp $ +$NetBSD: distinfo,v 1.9 2015/12/12 20:20:04 markd Exp $ -SHA1 (dynamips-0.2.8-RC2.tar.gz) = 349270690996a1e260b3eceb51ea90f94c25a59e -RMD160 (dynamips-0.2.8-RC2.tar.gz) = 0447a4c0cf516bd2b63259881c7625e26d0d838f -SHA512 (dynamips-0.2.8-RC2.tar.gz) = 288a87f988f08009fcccb6cfff4af84db8f90160021340add5e8491becefcbd74fe52ebe77d9a6c1262493f0d9341e3a34c5a80e8cfa713b9e6fb885dff7c5ff -Size (dynamips-0.2.8-RC2.tar.gz) = 578935 bytes -SHA1 (patch-aa) = 9dce75ed9d39e6faaf3b8af7a52fa094073d6f56 -SHA1 (patch-utils.h) = 10662fe161ba9d87615abfc6a8e1cb5bf19df3e5 +SHA1 (dynamips/v0.2.15.tar.gz) = 890c9357c668c91b7fd39a96f017b4e5e6ca580e +RMD160 (dynamips/v0.2.15.tar.gz) = d9ffabf0ec38790d0f8a6b7b38e35e36f5c99c70 +SHA512 (dynamips/v0.2.15.tar.gz) = c46248c2803168676c2011e6b3ff4e68a90681c56fd655243d5aad652c8257701c37fdd770842e24830a95a748622e7a78d680e5564296856d06ef8daa215251 +Size (dynamips/v0.2.15.tar.gz) = 839493 bytes diff --git a/emulators/dynamips/patches/patch-aa b/emulators/dynamips/patches/patch-aa deleted file mode 100644 index 869e3c8b91c..00000000000 --- a/emulators/dynamips/patches/patch-aa +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2014/02/24 12:30:59 wiedi 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. - # Use "nojit" for architectures that are not x86 or x86_64. --DYNAMIPS_ARCH?=x86 -+ifeq ($(shell uname -m), i386) -+ DYNAMIPS_ARCH?=x86 -+else -+ifeq ($(shell uname -m), i686) -+ DYNAMIPS_ARCH?=x86 -+else -+ifeq ($(shell uname -m), amd64) -+ DYNAMIPS_ARCH?=amd64 -+else -+ DYNAMIPS_ARCH?=nojit -+endif -+endif -+endif - - # Change this to 0 if your system doesn't support RFC 2553 extensions - HAS_RFC2553?=1 -@@ -54,11 +66,21 @@ 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} ${COMPILER_RPATH_FLAG}${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} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -+else - ifeq ($(shell uname), Linux) - PTHREAD_LIBS?=-lpthread - # PCAP_LIB=-lpcap - CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS) -- LIBS=-L/usr/lib -L. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS) -+ LIBS=-L${LOCALBASE}/lib -L. -ldl -lelf $(PTHREAD_LIBS) ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib - DESTDIR=/usr - else - ifeq ($(shell uname -s), Darwin) -@@ -66,11 +88,11 @@ ifeq ($(shell uname -s), Darwin) - LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread - else - ifeq ($(shell uname -s), SunOS) -- CFLAGS+=-I/usr/local/include -DINADDR_NONE=0xFFFFFFFF \ -- -I /opt/csw/include -DSUNOS -- LIBS=-L/usr/local/lib -L. -ldl -lelf -lpthread -L/opt/csw/lib \ -- -lsocket -lnsl -lresolv -- PCAP_LIB=/opt/csw/lib/libpcap.a -+ PTHREAD_LIBS?=-pthread -+ CFLAGS+=-I${LOCALBASE}/include -I${LOCALBASE}/include/libelf ${PTHREAD_CFLAGS} \ -+ -DINADDR_NONE=0xFFFFFFFF -DSUNOS -+ LIBS=-L${LOCALBASE}/lib -lelf ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} \ -+ ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lsocket -lnsl -lresolv - else - ifeq ($(shell uname -o), Cygwin) - CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf -DCYGWIN \ -@@ -79,7 +101,9 @@ ifeq ($(shell uname -o), Cygwin) - PCAP_LIB=-lpacket -lwpcap - else - CFLAGS+=-I/usr/include/libelf -D_FILE_OFFSET_BITS=64 -- LIBS=-L. -ldl /usr/lib/libelf.a -lpthread -+ LIBS=-L. -ldl -lelf -lpthread -+endif -+endif - endif - endif - endif diff --git a/emulators/dynamips/patches/patch-utils.h b/emulators/dynamips/patches/patch-utils.h deleted file mode 100644 index d3ccc6edc26..00000000000 --- a/emulators/dynamips/patches/patch-utils.h +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-utils.h,v 1.1 2015/02/19 14:18:23 joerg Exp $ - ---- utils.h.orig 2015-02-10 10:34:29.000000000 +0000 -+++ utils.h -@@ -54,6 +54,12 @@ - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN - #elif defined(__ia64__) - #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN -+#elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__) -+# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -+# define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN -+# else -+# define ARCH_BYTE_ORDER ARCH_BIG_ENDIAN -+# endif - #endif - - #ifndef ARCH_BYTE_ORDER -@@ -80,8 +86,13 @@ - #endif - - /* Useful attributes for functions */ -+#ifdef __arm__ -+#define asmlinkage -+#define fastcall -+#else - #define asmlinkage __attribute__((regparm(0))) - #define fastcall __attribute__((regparm(3))) -+#endif - - #if __GNUC__ > 2 - #define forced_inline inline __attribute__((always_inline)) |