Update ming to 0.4.5.

0.4.5 - 2013-06-08

	* Fix a build problem with perl module and Perl 5.13.10 (Debian package patch 07)
	* Fix an issue with a shared lib version of the perl module (Debian package patch 05)
	* Fix a runtime warnign in the PHP module (Issue #6)
	* Fix build probem with PHP 5.4 (Issue #9, Debian Bug #662620)
	* Took in some build warning fixes found by openSUSE
	* Add support for giflib 4.2.0+ (bugzilla #119)
	* Fix build with SunStudio compiler (bugzilla #103, #118)
	* Include test file missing in 0.4.4 (Oops)
	* Ensure perl tests use uninstalled package
	* Allow running testsuite with interpreters in custom paths
	* Improve detection of TCL files
	* Fix testsuite runs on systems w/out GNU vasprintf
	* Fix run of ActionScriptTests with BSD make
	* Fix short allocation parsing empty glyph record

7 files changed, 9 insertions, 78 deletions

diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index 80c336582ae..87ea37a7b4a 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/06/04 22:16:49 tron Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/14 09:00:19 obache Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	obache@NetBSD.org
diff --git a/multimedia/ming/Makefile.common b/multimedia/ming/Makefile.common
index 2f088a900f6..310672c7aa0 100644
--- a/multimedia/ming/Makefile.common
+++ b/multimedia/ming/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.6 2013/04/06 13:01:26 rodent Exp $
+# $NetBSD: Makefile.common,v 1.7 2013/06/14 09:00:19 obache Exp $
 #
 # used by multimedia/php-ming/Makefile
 # used by multimedia/py-ming/Makefile
 
-MING_VERSION=	0.4.4
+MING_VERSION=	0.4.5
 DISTNAME=	ming-${MING_VERSION}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ming/}
 
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
index ad1a46f8a42..7f648f734a3 100644
--- a/multimedia/ming/distinfo
+++ b/multimedia/ming/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2012/06/23 03:26:23 obache Exp $
+$NetBSD: distinfo,v 1.11 2013/06/14 09:00:19 obache Exp $
 
-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 (ming-0.4.5.tar.gz) = 97c201040729917bf7c62da9616a87f4a920f473
+RMD160 (ming-0.4.5.tar.gz) = 9ef9cf769a03c6e356dca299c85e06a2cdd6a155
+Size (ming-0.4.5.tar.gz) = 15029578 bytes
 SHA1 (patch-ae) = 614e322330d2d2ab1e0ef1beadf1395014ecd880
 SHA1 (patch-php__ext_ming.c) = 36cf34f63b6ccafd48b4035073c0a3d1d984f7b4
 SHA1 (patch-test_actionscript_ActionScriptTest.c) = 730ef68fb3e7714da2783d396809b8f8ca5e1bf7
diff --git a/multimedia/ming/patches/patch-php__ext_ming.c b/multimedia/ming/patches/patch-php__ext_ming.c
deleted file mode 100644
index 62379a6da85..00000000000
--- a/multimedia/ming/patches/patch-php__ext_ming.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-php__ext_ming.c,v 1.1 2012/06/23 03:26:23 obache Exp $
-
-* fixes build with PHP-5.4
- https://github.com/libming/libming/issues/9
-
---- php_ext/ming.c.orig	2011-10-26 06:33:18.000000000 +0000
-+++ php_ext/ming.c
-@@ -87,10 +87,17 @@ static SWFCXform getCXform(zval *id TSRM
- static SWFMatrix getMatrix(zval *id TSRMLS_DC);
- #endif
- 
-+#if PHP_API_VERSION < 20100412
- #define PHP_MING_FILE_CHK(file) \
- 	if ((PG(safe_mode) && !php_checkuid((file), NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) {	\
- 		RETURN_FALSE;	\
--	}	\
-+	}
-+#else
-+#define PHP_MING_FILE_CHK(file) \
-+	if (php_check_open_basedir((file) TSRMLS_CC)) {	\
-+		RETURN_FALSE;	\
-+	}
-+#endif
- 
- /* {{{ proto void ming_setcubicthreshold (int threshold)
-    Set cubic threshold (?) */
diff --git a/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c b/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c
deleted file mode 100644
index f5a59779183..00000000000
--- a/multimedia/ming/patches/patch-test_actionscript_ActionScriptTest.c
+++ /dev/null
@@ -1,40 +0,0 @@
-$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,
diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile
index ff976fd5acf..cfc8d608ec6 100644
--- a/multimedia/php-ming/Makefile
+++ b/multimedia/php-ming/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2013/06/04 22:16:49 tron Exp $
+# $NetBSD: Makefile,v 1.23 2013/06/14 09:00:19 obache Exp $
 
 .include "../../multimedia/ming/Makefile.common"
-PKGREVISION=		3
 PECL_VERSION=		${MING_VERSION}
 MODNAME=		ming
 CATEGORIES+=		multimedia
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index 60f04caac83..6bbc4d793ac 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/06/04 22:16:50 tron Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/14 09:00:19 obache Exp $
 #
 
 .include "../../multimedia/ming/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		3
 CATEGORIES=		multimedia
 
 MAINTAINER=		obache@NetBSD.org