Upgrade to 1.51.

PR:		ports/67447
Submitted by:	Marton Kenyeres <junkmail@konvergencia.hu>

4 files changed, 37 insertions, 116 deletions

diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index d5cfa304766c..c7e70dd29e02 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	flasm
-PORTVERSION=	1.41
-PORTREVISION=	1
+PORTVERSION=	1.51
 CATEGORIES=	graphics
-#MASTER_SITES=	http://www.nowrap.de/
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kuriyama
-DISTNAME=	flasm141src
+MASTER_SITES=	http://www.nowrap.de/download/
+DISTNAME=	flasm15src
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Command line assembler/disassembler of flash actionscript bytecode
diff --git a/graphics/flasm/distinfo b/graphics/flasm/distinfo
index 420654885def..406aa7f8b2c4 100644
--- a/graphics/flasm/distinfo
+++ b/graphics/flasm/distinfo
@@ -1,2 +1,2 @@
-MD5 (flasm141src.zip) = b0d11f50e10172b358192035a0792656
-SIZE (flasm141src.zip) = 70746
+MD5 (flasm15src.zip) = 9fcbc67d17cd53008fdfe98fbee764ae
+SIZE (flasm15src.zip) = 104330
diff --git a/graphics/flasm/files/patch-assembler.y b/graphics/flasm/files/patch-assembler.y
deleted file mode 100644
index fbff08d781cb..000000000000
--- a/graphics/flasm/files/patch-assembler.y
+++ /dev/null
@@ -1,72 +0,0 @@
---- assembler.y.orig	Sat Oct 26 01:11:50 2002
-+++ assembler.y	Mon Dec  2 12:00:50 2002
-@@ -254,22 +254,22 @@
- %token SWFACTION
- %token HEXDATA
- 
--%token '(', ')', ',', ':', '"',	'.'
-+%token '(' ')' ',' ':' '"' '.'
- 
- %type <str> funcname_opt
- %type <str> mcname_opt
--%type <len> statements,	statement, statements_opt
--%type <len> function, function_args
--%type <len> push_list, push_item
-+%type <len> statements statement statements_opt
-+%type <len> function function_args
-+%type <len> push_list push_item
- %type <len> with
--%type <len> settarget, settargetexpression, ifframeloaded, ifframeloadedexpression
--%type <len> actionblocks, actionblock, actionblocks_opt
--%type <len> buttoneventblocks, buttoneventblock, buttoneventblocks_opt
--%type <len> mceventblocks, mceventblock, mceventblocks_opt
--%type <len> mcblocks, mcblock, mcblocks_opt
--%type <len> frame, definebutton, definemc, placemc, initmc
--%type <len> buttonevent, buttonevents, mcevent, mcevents, key, property
--%type <len> opcode,hex_list, hexdata_opt
-+%type <len> settarget settargetexpression ifframeloaded ifframeloadedexpression
-+%type <len> actionblocks actionblock actionblocks_opt
-+%type <len> buttoneventblocks buttoneventblock buttoneventblocks_opt
-+%type <len> mceventblocks mceventblock mceventblocks_opt
-+%type <len> mcblocks mcblock mcblocks_opt
-+%type <len> frame definebutton definemc placemc initmc
-+%type <len> buttonevent buttonevents mcevent mcevents key property
-+%type <len> opcode hex_list hexdata_opt
- %type <num> urlmethod
- 
- %%
-@@ -447,7 +447,7 @@
- 	;
- 
- mcevent
--	: /* empty */			{ yyerror("Missing mc event condition")	}
-+	: /* empty */			{ yyerror("Missing mc event condition");	}
- 	| MCLOAD			{ $$ = 0x01;   }
- 	| MCENTERFRAME			{ $$ = 0x02;   }
- 	| MCUNLOAD			{ $$ = 0x04;   }
-@@ -551,16 +551,10 @@
- 	: SETTARGET STRING		{ $$ = writeByte(SWFACTION_SETTARGET);
- 					  $$ +=	writeShort(strlen($2)+1);
- 					  $$ +=	writeString($2); }
--	  statements_opt END		{ $$ = $4 + writeByte(SWFACTION_SETTARGET);
--					  $$ +=	$<len>3	+ writeShort(1);
--					  $$ +=	writeByte(0); }
- 	;
- 
- settargetexpression
- 	: SETTARGETEXPR			{ $$ = writeByte(SWFACTION_SETTARGETEXPRESSION); }
--	  statements_opt END		{ $$ = $3 + writeByte(SWFACTION_SETTARGET);
--					  $$ +=	$<len>2	+ writeShort(1);
--					  $$ +=	writeByte(0); }
- 	;
- 
- ifframeloadedexpression
-@@ -849,7 +843,7 @@
- 
- 	| GOTOFRAME INTEGER		{ $$ = writeByte(SWFACTION_GOTOFRAME);
- 					  $$ +=	writeShort(2);
--					  $$ +=	writeShort(atoi($2)) }
-+					  $$ +=	writeShort(atoi($2)); }
- 
- 	| GETURL STRING	STRING		{ $$ = writeByte(SWFACTION_GETURL);
- 					  $$ +=	writeShort(strlen($2)+strlen($3)+2);
diff --git a/graphics/flasm/files/patch-unflasm.c b/graphics/flasm/files/patch-unflasm.c
index 2a0f75ba0f1e..36b1c12751f6 100644
--- a/graphics/flasm/files/patch-unflasm.c
+++ b/graphics/flasm/files/patch-unflasm.c
@@ -1,38 +1,34 @@
---- unflasm.c.orig	Thu Nov 22 05:59:32 2001
-+++ unflasm.c	Tue Jan 22 10:28:58 2002
-@@ -485,15 +485,7 @@
-       println("setVariable");
-       break;
-     case SWFACTION_SETTARGETEXPRESSION:
--      if (targetIndent==1)
--      {
--        --indent;
--        println("end");
--        targetIndent = 0;
--      }
-       println("setTargetExpr");
--      ++indent;
--      targetIndent = 1;
-       break;
-     case SWFACTION_STRINGCONCAT:
-       println("concat");
-@@ -1008,18 +1000,7 @@
+--- unflasm.c.orig	Tue Jun  1 23:05:40 2004
++++ unflasm.c	Tue Jun  1 23:07:05 2004
+@@ -991,29 +991,11 @@
+ 			}
  
-     case SWFACTION_SETTARGET:
-     {
--      if (targetIndent==1)
--      {
--        --indent;
--        println("end");
--        targetIndent = 0;
--      }
--      if (strlen(p)>0)
--      {
--        println("setTarget '%s'", p);
--        ++indent;
--        targetIndent = 1;
--      }
-+      println("setTarget '%s'", p);
-       break;
-     }
+ 		case SWFACTION_SETTARGET:
+-			{
+-				if (targetIndent == 1) {
+-					--indent;
+-					print("end\n");
+-					targetIndent = 0;
+-				}
+-				if (strlen((char *) p) > 0) {
+-					print("setTarget '%s'\n", p);
+-					++indent;
+-					targetIndent = 1;
+-				}
+-				break;
+-			}
++			print("setTarget '%s'\n", p);
++			break;
  
+ 		case SWFACTION_SETTARGETEXPRESSION:
+-			if (targetIndent == 1) {
+-				--indent;
+-				print("end\n");
+-				targetIndent = 0;
+-			}
+ 			print("setTargetExpr\n");
+-			++indent;
+-			targetIndent = 1;
+ 			break;
+ 
+ 		case SWFACTION_GOTOLABEL: