Update from 1.1.7 to 1.1.10. FPX-support is now in (and no longer an

OPTION). Add support for running bundled self-tests after building.
Do not run the self-tests by default, in order to be able to secure
portmgr's approval, but advise the user to do so before installing.
The self-tests will be turned on, when port-freeze is over.

Approved by:	portmgr	(pav)

3 files changed, 32 insertions, 34 deletions

diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
index 695f093c89fc..072c2e820395 100644
--- a/graphics/GraphicsMagick/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick/files/patch-Makefile.in
@@ -19,22 +19,22 @@
 @@ -1479,5 +1479,5 @@
  install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
  	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
  	 if test -f $$p; then \
 @@ -1825,5 +1825,5 @@
  install-pkgDATA: $(pkg_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
  	@list='$(pkg_DATA)'; for p in $$list; do \
  	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 @@ -1842,5 +1842,5 @@
  install-pkgdataDATA: $(pkgdata_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
-+	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
++	test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
  	@list='$(pkgdata_DATA)'; for p in $$list; do \
  	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 --- filters/Makefile.in        Fri Mar 18 19:36:17 2005
@@ -42,15 +42,15 @@
 @@ -522,5 +522,5 @@
  install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)"  -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
  	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
 @@ -592,5 +592,5 @@
  install-pkgDATA: $(pkg_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
  	@list='$(pkg_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 --- magick/Makefile.in	Fri Mar 18 19:36:18 2005
@@ -65,8 +65,8 @@
 @@ -930,5 +930,5 @@
  install-pkgDATA: $(pkg_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkgdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
-+	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(mkdir_p) "$(DESTDIR)$(pkgdir)"
+-	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
++	test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
  	@list='$(pkg_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 --- Magick++/lib/Makefile.in	Fri Mar 18 19:36:13 2005
diff --git a/graphics/GraphicsMagick/files/patch-coders-png.c b/graphics/GraphicsMagick/files/patch-coders-png.c
deleted file mode 100644
index 7a3b687f08cf..000000000000
--- a/graphics/GraphicsMagick/files/patch-coders-png.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- coders/png.c	2004/11/11 03:10:42	1.369.2.3
-+++ coders/png.c	2006/08/18 04:03:02	1.369.2.4
-@@ -1709,7 +1709,7 @@ static Image *ReadOnePNGImage(MngInfo *m
- #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
- && (PNG_LIBPNG_VER >= 10200)
-   /* Disable thread-unsafe features of pnggccrd */
--  if (png_access_version() >= 10200)
-+  if (png_access_version_number() >= 10200)
-   {
-     png_uint_32 mmx_disable_mask=0;
-     png_uint_32 asm_flags;
-@@ -1718,8 +1718,8 @@ static Image *ReadOnePNGImage(MngInfo *m
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
--    asm_flags=png_get_asm_flags(png_ptr);
--    png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
-+    asm_flags=png_get_asm_flags(ping);
-+    png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask);
-   }
- #endif
- 
diff --git a/graphics/GraphicsMagick/files/patch-newfpx b/graphics/GraphicsMagick/files/patch-newfpx
new file mode 100644
index 000000000000..6aa24bf3dacc
--- /dev/null
+++ b/graphics/GraphicsMagick/files/patch-newfpx
@@ -0,0 +1,20 @@
+--- coders/fpx.c	2004-04-14 18:45:28.000000000 -0400
++++ coders/fpx.c	2007-11-01 23:30:18.000000000 -0500
+@@ -182,13 +182,13 @@
+   unsigned int
+     status,
+-    subimage;
+-
+-  unsigned long
++    subimage,
+     height,
+-    memory_limit,
+     tile_width,
+     tile_height,
+     width;
+ 
++  size_t
++    memory_limit;
++
+   /*
+     Open image.