Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Sep 2017 11:43:13 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r450356 - in head/emulators/dynamips-community: . files
Message-ID:  <201709221143.v8MBhDhL017181@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Fri Sep 22 11:43:13 2017
New Revision: 450356
URL: https://svnweb.freebsd.org/changeset/ports/450356

Log:
  emulators/dynamips-community: Update version 0.2.16=>0.2.17
  
  - Add OPTION DOCS
  - Fix build with NOJIT [1]
  
  PR:		222047 [1]
  Reported by:	openss.services@gmail.com [1]

Added:
  head/emulators/dynamips-community/files/patch-common_dynamips.c   (contents, props changed)
Deleted:
  head/emulators/dynamips-community/files/patch-CMakeLists.txt
  head/emulators/dynamips-community/files/patch-common_net__io.c
Modified:
  head/emulators/dynamips-community/Makefile
  head/emulators/dynamips-community/distinfo

Modified: head/emulators/dynamips-community/Makefile
==============================================================================
--- head/emulators/dynamips-community/Makefile	Fri Sep 22 11:11:02 2017	(r450355)
+++ head/emulators/dynamips-community/Makefile	Fri Sep 22 11:43:13 2017	(r450356)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dynamips
-PORTVERSION=	0.2.16
+PORTVERSION=	0.2.17
 DISTVERSIONPREFIX=	v
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-community
@@ -24,12 +24,13 @@ CONFLICTS=	dynamips-[0-9]* dynamips-devel-[0-9]*
 USES=		cmake
 USE_GITHUB=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 MAKE_JOBS_UNSAFE=	yes
 
 GH_ACCOUNT=	GNS3
 
-MAKE_ENV=	DYNAMIPS_CODE=${DYNAMIPS_CODE} \
-		DYNAMIPS_ARCH=${DYNAMIPS_ARCH}
+CMAKE_ARGS+=	-DDYNAMIPS_CODE=${DYNAMIPS_CODE} -DDYNAMIPS_ARCH=${DYNAMIPS_ARCH}
 
 .include <bsd.port.pre.mk>
 
@@ -52,6 +53,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/nvram_export.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/hypervisor_mode.7 ${STAGEDIR}${MANPREFIX}/man/man7
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in README.md README.hypervisor RELEASE-NOTES ChangeLog MAINTAINERS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}

Modified: head/emulators/dynamips-community/distinfo
==============================================================================
--- head/emulators/dynamips-community/distinfo	Fri Sep 22 11:11:02 2017	(r450355)
+++ head/emulators/dynamips-community/distinfo	Fri Sep 22 11:43:13 2017	(r450356)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493198102
-SHA256 (GNS3-dynamips-v0.2.16_GH0.tar.gz) = 0fcf18d701898a77cb589bd9bad16dde436ac1ccb87516fefe07d09de1a196c0
-SIZE (GNS3-dynamips-v0.2.16_GH0.tar.gz) = 832173
+TIMESTAMP = 1506060982
+SHA256 (GNS3-dynamips-v0.2.17_GH0.tar.gz) = d524ef32b78dd7384775920604912d3b4b212ded338cc4df930b0086df1e81ed
+SIZE (GNS3-dynamips-v0.2.17_GH0.tar.gz) = 832721

Added: head/emulators/dynamips-community/files/patch-common_dynamips.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/dynamips-community/files/patch-common_dynamips.c	Fri Sep 22 11:43:13 2017	(r450356)
@@ -0,0 +1,32 @@
+--- common/dynamips.c.orig	2017-07-24 11:37:51 UTC
++++ common/dynamips.c
+@@ -190,7 +190,7 @@ static void show_usage(vm_instance_t *vm,int argc,char
+           "2691, 3725, 3745, 2600 or 1700) "
+           "(default: 7200)\n\n"
+           "  -l <log_file>      : Set logging file (default is %s)\n"
+-          "  -j                 : Disable the JIT compiler, very slow\n"
++/*          "  -j                 : Disable the JIT compiler, very slow\n" */
+           "  --idle-pc <pc>     : Set the idle PC (default: disabled)\n"
+           "  --timer-itv <val>  : Timer IRQ interval check (default: %u)\n"
+           "\n"
+@@ -394,7 +394,7 @@ static vm_instance_t *cli_create_instance(char *name,c
+ static int parse_std_cmd_line(int argc,char *argv[])
+ {
+    char *options_list =
+-      "r:o:n:c:m:l:C:i:jt:p:s:k:T:U:A:B:a:f:E:b:S:R:M:eXP:N:G:g:L:I:";
++      "r:o:n:c:m:l:C:i:t:p:s:k:T:U:A:B:a:f:E:b:S:R:M:eXP:N:G:g:L:I:";
+    vm_platform_t *platform;
+    vm_instance_t *vm = NULL;
+    int instance_id;
+@@ -563,11 +563,6 @@ static int parse_std_cmd_line(int argc,char *argv[])
+             }
+ 
+             printf("Using a clock divisor of %d.\n",vm->clock_divisor);
+-            break;
+-
+-         /* Disable JIT */
+-         case 'j':
+-            vm->jit_use = FALSE;
+             break;
+ 
+          /* VM debug level */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709221143.v8MBhDhL017181>