Update ming to 0.4.4.

0.4.4 - 2011-10-26

	* Generally improve swftoscript and decompiler
	* Change makefdb to name output files by font ID, to play nicer
	  with swftoscript.
	* Add support for 'class A extends B' syntax in actioncompiler
	* Fix bug in 'makeswf' failing to catch some compile errors
	  (bugzilla #94) and being too silent in swf embedding errors
	* Fix bug in action compiler dealing with class methods (bugzilla #94)
	* Add support for libpng > 1.4 (bugzilla #96)
	* Add font kernings support (bugzilla #95)
	* Add button characters export capabilities
	* Add support for 'swfAction <code>' syntax in asm blocks

7 files changed, 49 insertions, 69 deletions

diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index 8a1098616f2..9b38c89bf18 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/11/01 06:02:13 sbd Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/12 06:36:39 obache Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	obache@NetBSD.org
@@ -27,7 +26,7 @@ PKGCONFIG_OVERRIDE+=	src/libming.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
+.if defined(PKGSRC_RUN_TEST) && !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 # Test require perl
 USE_TOOLS+=	perl
 TEST_TARGET=	check
diff --git a/multimedia/ming/Makefile.common b/multimedia/ming/Makefile.common
index 287e8f96e09..1e936624fed 100644
--- a/multimedia/ming/Makefile.common
+++ b/multimedia/ming/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.3 2010/04/09 01:33:43 obache Exp $
+# $NetBSD: Makefile.common,v 1.4 2012/05/12 06:36:39 obache Exp $
 #
 # used by multimedia/py-ming/Makefile
 
-DISTNAME=	ming-0.4.3
+DISTNAME=	ming-0.4.4
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ming/}
 
 DISTINFO_FILE=	${.CURDIR}/../../multimedia/ming/distinfo
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
index 551471268a4..4f9fd026c12 100644
--- a/multimedia/ming/distinfo
+++ b/multimedia/ming/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/02/15 05:37:29 obache Exp $
+$NetBSD: distinfo,v 1.9 2012/05/12 06:36:39 obache Exp $
 
-SHA1 (ming-0.4.3.tar.gz) = bbdef489b5446f3bc4060d6b808287b0f7f03f37
-RMD160 (ming-0.4.3.tar.gz) = a11501d0b49dde332c68c1ff11612fa8ab05cc66
-Size (ming-0.4.3.tar.gz) = 14920165 bytes
+SHA1 (ming-0.4.4.tar.gz) = 125a9ba6fffeaf230deefb5a9e73d496a640e539
+RMD160 (ming-0.4.4.tar.gz) = b2c7530aef4feca90d698b39b746ff5cb5da7af7
+Size (ming-0.4.4.tar.gz) = 14816668 bytes
 SHA1 (patch-ae) = 614e322330d2d2ab1e0ef1beadf1395014ecd880
-SHA1 (patch-ai) = 838baf040f24e53139d9ade21f586b1e18f60da8
-SHA1 (patch-aj) = ce8e48f24d3f8bef4993d65be14a8eab749cc4be
-SHA1 (patch-ak) = ec8f6ccf7a43f28cb1d9255b49c7b6368ddeebc3
+SHA1 (patch-test_actionscript_ActionScriptTest.c) = 730ef68fb3e7714da2783d396809b8f8ca5e1bf7
diff --git a/multimedia/ming/patches/patch-ai b/multimedia/ming/patches/patch-ai
deleted file mode 100644
index 488e89c7c71..00000000000
--- a/multimedia/ming/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2011/02/15 05:37:29 obache Exp $
-
-* portability fix.
-  http://bugs.libming.org/show_bug.cgi?id=110
-
---- configure.orig	2010-02-06 21:53:28.000000000 +0000
-+++ configure
-@@ -4636,7 +4636,7 @@ echo $ECHO_N "checking for Python librar
- 		py_version=`$PYTHON -c "from distutils.sysconfig import *; \
- 			from string import join; \
- 			print join(get_config_vars('VERSION'))"`
--		if test "$py_version" == "None"; then
-+		if test "$py_version" = "None"; then
- 			if test -n "$PYTHON_VERSION"; then
- 				py_version=$PYTHON_VERSION
- 			else
diff --git a/multimedia/ming/patches/patch-aj b/multimedia/ming/patches/patch-aj
deleted file mode 100644
index 4d986f2b256..00000000000
--- a/multimedia/ming/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2011/02/15 05:37:29 obache Exp $
-
-* Use API instead of direct access, for png>=1.5.
-  http://bugs.libming.org/show_bug.cgi?id=109
-
---- src/blocks/pngdbl.c.orig	2008-12-22 13:33:58.000000000 +0000
-+++ src/blocks/pngdbl.c
-@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE 
- }
- 
- static int pngReadFunc(png_structp png, unsigned char *buf, int len)
--{	SWFInput input = (SWFInput) png->io_ptr;
-+{	SWFInput input = (SWFInput) png_get_io_ptr(png);
- 	return SWFInput_read(input, buf, len);
- }
- 
-@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, 
- 		return 0;
- 	}
- 
--	if(setjmp(png_ptr->jmpbuf))
-+	if(setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-     	return 0;
diff --git a/multimedia/ming/patches/patch-ak b/multimedia/ming/patches/patch-ak
deleted file mode 100644
index 6495377ff63..00000000000
--- a/multimedia/ming/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2011/02/15 05:37:29 obache Exp $
-
-* Use API instead of direct access, for png>=1.5.
-  http://bugs.libming.org/show_bug.cgi?id=109
-
---- util/png2dbl.c.orig	2008-12-22 13:33:59.000000000 +0000
-+++ util/png2dbl.c
-@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp)
-     error("Couldn't create end_info\n");
-   }
- 
--  if(setjmp(png_ptr->jmpbuf))
-+  if(setjmp(png_jmpbuf(png_ptr)))
-   {
-     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-     fclose(fp);
diff --git a/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c b/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c
new file mode 100644
index 00000000000..f5a59779183
--- /dev/null
+++ b/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-test_actionscript_ActionScriptTest.c,v 1.1 2012/05/12 06:36:40 obache Exp $
+
+* Allow tabs in addition to spaces in the macro listing testcases.
+  https://github.com/libming/libming/commit/d2e12f8
+
+--- test/actionscript/ActionScriptTest.c.orig	2011-10-26 06:33:18.000000000 +0000
++++ test/actionscript/ActionScriptTest.c
+@@ -30,6 +30,7 @@
+ 
+ #include <libming.h>
+ #include <run_test.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+@@ -81,19 +82,18 @@ do_tests()
+ 	char vstr[2];
+ 	const char *from, *to, *end;
+ 	char *ptr;
+-	int version;
++	size_t len = strlen(all_tests);
+ 
+ 	from = all_tests;
+-	end = from+strlen(all_tests);
++	end = from+len;
+ 	do
+ 	{
+-		while (*from && *from == ' ') ++from;
++		while (*from && isspace(*from)) ++from;
+ 		if ( ! *from ) break;
+ 
+-		to=strchr(from, ' ');
+-		if ( ! to ) to = end;
++		to = from + strcspn(from, " \t");
+ 
+-		size_t len = to-from;
++		len = to-from;
+ 		if ( len+1 >= PATH_MAX )
+ 		{
+ 			fprintf(stderr,