- Update to 210

PR:		178158
Submitted by:	Ports Fury

6 files changed, 61 insertions, 3 deletions

diff --git a/devel/jwasm/Makefile b/devel/jwasm/Makefile
index ccd09be52c9d..896994389ec8 100644
--- a/devel/jwasm/Makefile
+++ b/devel/jwasm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jwasm
-PORTVERSION=	209
+PORTVERSION=	210
 CATEGORIES=	devel
 MASTER_SITES=	http://www.japheth.de/Download/JWasm/
 DISTNAME=	JWasm${PORTVERSION}s
diff --git a/devel/jwasm/distinfo b/devel/jwasm/distinfo
index df870364f55e..9ed071a2772c 100644
--- a/devel/jwasm/distinfo
+++ b/devel/jwasm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JWasm209s.zip) = 94eaffdb9a6ae5c78340d05f4407518b32e42e6bb924dd9b8308de90eba1d619
-SIZE (JWasm209s.zip) = 880165
+SHA256 (JWasm210s.zip) = 8d9a5ac95fa07a8e935423f3d1e44127c79d873e380f04d1ce8e1a65ca7daafd
+SIZE (JWasm210s.zip) = 939008
diff --git a/devel/jwasm/files/patch-H__expreval.h b/devel/jwasm/files/patch-H__expreval.h
new file mode 100644
index 000000000000..74791bd3e698
--- /dev/null
+++ b/devel/jwasm/files/patch-H__expreval.h
@@ -0,0 +1,10 @@
+--- H/expreval.h.orig
++++ H/expreval.h
+@@ -130,6 +130,7 @@
+     EXPF_IN_SQBR   = 8   /* private flag, used inside expreval.c only */
+ };
+ 
++extern void         EmitConstError( const struct expr * );
+ extern ret_code     EvalOperand( int *, struct asm_tok[], int, struct expr *, uint_8 );
+ extern void         ExprEvalInit( void );
+ 
diff --git a/devel/jwasm/files/patch-H__parser.h b/devel/jwasm/files/patch-H__parser.h
new file mode 100644
index 000000000000..ada5d3a12643
--- /dev/null
+++ b/devel/jwasm/files/patch-H__parser.h
@@ -0,0 +1,10 @@
+--- H/parser.h.orig
++++ H/parser.h
+@@ -302,7 +302,6 @@
+ extern ret_code   MemtypeFromSize( int, enum memtype * );
+ extern int        SizeFromRegister( int );
+ extern ret_code   GetLangType( int *, struct asm_tok[], enum lang_type * );
+-extern void       EmitConstError( const struct expr * );
+ 
+ extern void       sym_add_table( struct symbol_queue *, struct dsym * );
+ extern void       sym_remove_table( struct symbol_queue *, struct dsym * );
diff --git a/devel/jwasm/files/patch-exprval.c b/devel/jwasm/files/patch-exprval.c
new file mode 100644
index 000000000000..ee8999d2c44a
--- /dev/null
+++ b/devel/jwasm/files/patch-exprval.c
@@ -0,0 +1,19 @@
+--- expreval.c.orig
++++ expreval.c
+@@ -79,6 +79,16 @@
+     LS_FAR32  = 0xFF06,
+ };
+ 
++void EmitConstError( const struct expr *opnd )
++/********************************************/
++{
++    if ( opnd->hlvalue != 0 )
++        EmitErr( CONSTANT_VALUE_TOO_LARGE_EX, opnd->hlvalue, opnd->value64 );
++    else
++        EmitErr( CONSTANT_VALUE_TOO_LARGE, opnd->value64 );
++    return;
++}
++
+ static const uint_16 tbaseptr[] = { T_BP, T_EBP
+ #if AMD64_SUPPORT
+ , T_RBP
diff --git a/devel/jwasm/files/patch-parser.c b/devel/jwasm/files/patch-parser.c
new file mode 100644
index 000000000000..c24257cf6808
--- /dev/null
+++ b/devel/jwasm/files/patch-parser.c
@@ -0,0 +1,19 @@
+--- parser.c.orig
++++ parser.c
+@@ -787,16 +787,6 @@
+     return( NOT_ERROR );
+ }
+ 
+-void EmitConstError( const struct expr *opnd )
+-/********************************************/
+-{
+-    if ( opnd->hlvalue != 0 )
+-        EmitErr( CONSTANT_VALUE_TOO_LARGE_EX, opnd->hlvalue, opnd->value64 );
+-    else
+-        EmitErr( CONSTANT_VALUE_TOO_LARGE, opnd->value64 );
+-    return;
+-}
+-
+ /* get an immediate operand without a fixup.
+  * output:
+  * - ERROR: error