Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Sep 2021 09:55:29 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2ab38bd2ae48 - main - lang/mtasc: normalize patches to make adding new ones easier.
Message-ID:  <202109110955.18B9tTGT023870@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2ab38bd2ae48f0e166805f2c0e3b6f0260f5b81f

commit 2ab38bd2ae48f0e166805f2c0e3b6f0260f5b81f
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-09-11 09:53:12 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-09-11 09:53:13 +0000

    lang/mtasc: normalize patches to make adding new ones easier.
---
 .../{patch-extc_extc_stubs.c => patch-extc_extc__stubs.c}    |  6 +++---
 lang/mtasc/files/{patch-basepath => patch-mtasc_main.ml}     |  8 ++++----
 lang/mtasc/files/patch-mtasc_parser.ml                       | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lang/mtasc/files/patch-extc_extc_stubs.c b/lang/mtasc/files/patch-extc_extc__stubs.c
similarity index 86%
rename from lang/mtasc/files/patch-extc_extc_stubs.c
rename to lang/mtasc/files/patch-extc_extc__stubs.c
index f9411fe39ada..27f665ff2696 100644
--- a/lang/mtasc/files/patch-extc_extc_stubs.c
+++ b/lang/mtasc/files/patch-extc_extc__stubs.c
@@ -1,5 +1,5 @@
---- extc/extc_stubs.c.orig	2007-03-05 14:09:37.000000000 +0300
-+++ extc/extc_stubs.c	2009-04-11 12:57:23.000000000 +0400
+--- extc/extc_stubs.c.orig	2007-03-05 11:09:37 UTC
++++ extc/extc_stubs.c
 @@ -32,6 +32,11 @@
  #	include <sys/syslimits.h>
  #	include <mach-o/dyld.h>
@@ -12,7 +12,7 @@
  
  #define zval(z)		((z_streamp)(z))
  
-@@ -125,7 +130,26 @@
+@@ -125,7 +130,26 @@ CAMLprim value zlib_inflate_end(value zv) {
  }
  
  CAMLprim value executable_path(value u) {
diff --git a/lang/mtasc/files/patch-basepath b/lang/mtasc/files/patch-mtasc_main.ml
similarity index 88%
rename from lang/mtasc/files/patch-basepath
rename to lang/mtasc/files/patch-mtasc_main.ml
index 012583a41249..b9f81f6e2278 100644
--- a/lang/mtasc/files/patch-basepath
+++ b/lang/mtasc/files/patch-mtasc_main.ml
@@ -1,6 +1,6 @@
---- mtasc/main.ml.orig	2008-08-31 15:14:17.000000000 +0400
-+++ mtasc/main.ml	2009-04-11 12:38:50.000000000 +0400
-@@ -112,8 +112,8 @@
+--- mtasc/main.ml.orig	2008-08-31 11:14:17 UTC
++++ mtasc/main.ml
+@@ -112,8 +112,8 @@ let report ?(do_exit=true) (msg,p) etype printer =
  	if do_exit then exit 1
  ;;
  try	
@@ -11,7 +11,7 @@
  	let files = ref [] in
  	let time = Sys.time() in
  	Plugin.class_path := [base_path;"";"/"];
-@@ -132,8 +132,8 @@
+@@ -132,8 +132,8 @@ try	
  		),": use precompiled mx package");
  	] @ !Plugin.options in
  	Arg.parse args_spec (fun file -> files := file :: !files) usage;
diff --git a/lang/mtasc/files/patch-mtasc_parser.ml b/lang/mtasc/files/patch-mtasc_parser.ml
index 2c504486ec20..649870d96dd6 100644
--- a/lang/mtasc/files/patch-mtasc_parser.ml
+++ b/lang/mtasc/files/patch-mtasc_parser.ml
@@ -1,6 +1,6 @@
---- mtasc/parser.ml.orig	2009-04-11 12:35:07.000000000 +0400
-+++ mtasc/parser.ml	2009-04-11 12:37:16.000000000 +0400
-@@ -166,8 +166,8 @@
+--- mtasc/parser.ml.orig	2007-02-04 13:56:04 UTC
++++ mtasc/parser.ml
+@@ -166,8 +166,8 @@ and parse_expr = parser
  	| [< '(Kwd For,p); '(POpen,_); c = parse_expr_opt; e = parse_for p c >] -> e
  	| [< '(Kwd If,p); cond = parse_eval; e = parse_expr_opt; e2 , p2 = parse_else (pos e) >] -> EIf (cond,wrap_var e,e2), punion p p2
  	| [< '(Kwd Return,p); v , p2 = parse_eval_option p; >] -> EReturn v , punion p p2
@@ -11,7 +11,7 @@
  	| [< '(Kwd While,p1); v = parse_eval; e = parse_expr_opt >] -> EWhile (v,wrap_var e,NormalWhile) , punion p1 (pos e)
  	| [< '(Kwd Do,p1); e = parse_expr; '(Kwd While,_); v = parse_eval; >] -> EWhile (v,wrap_var e,DoWhile) , punion p1 (pos v)
  	| [< '(Kwd Switch,p1); v = parse_eval; '(BrOpen,_); el, p2 = parse_switch false >] -> ESwitch (v,el) , punion p1 p2
-@@ -278,7 +278,7 @@
+@@ -278,7 +278,7 @@ and parse_else p = parser
  
  and parse_expr_opt = parser
  	| [< e = parse_expr >] -> e
@@ -20,7 +20,7 @@
  
  and parse_for p c = parser
  	| [< '(Kwd In,_); v = parse_eval; '(PClose,p2); e = parse_expr_opt >] -> EForIn(c,v,wrap_var e) , punion p p2
-@@ -324,7 +324,7 @@
+@@ -324,7 +324,7 @@ and parse_switch_clause = parser
  and parse_block callb sp = parser
  	| [< e = callb; el,p = parse_block callb sp >] -> e :: el , p
  	| [< '(Next,_); el = parse_block callb sp >] -> el
@@ -29,7 +29,7 @@
  	| [< '(Eof,_) >] -> error Unclosed_parenthesis sp
  
  and parse_expr_list p = parser
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ and parse_class_path2 name = parser
  
  and parse_import = parser
  	| [< '(Const (Ident name),_); p = parse_import2 name >] -> p



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