Update to 5.5.7-10. [1]

o Removed two (now obsolate) libtool version patches
  as ImageMagick now uses internal version system for
  them starting from 0:0:0 (5.5.8 will become 0:1:0),
  also MAJOR_VERSION/MINOR_VERSION/MICRO_VERSION
  variables removed from the source.
o Removed two other patches as now they are already
  embedded to the source.
o Updated plist to reflect separate Q8/Q16 folder
  installations based on selection while installing.
  Also Makefile modifed to reflect this.

PR:		ports/55274 [1]
Submitted by:	Erdener Gonenc <ergonenc@artemis.efes.net> [1]
Pointed out by:	Rob Lahaye <lahaye@snu.ac.kr>

6 files changed, 3 insertions, 54 deletions

diff --git a/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in b/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in
deleted file mode 100644
index 85b5d37c0d93..000000000000
--- a/graphics/ImageMagick/files/patch-Magick++::lib::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- Magick++/lib/Makefile.in.orig	Mon Feb 24 15:03:18 2003
-+++ Magick++/lib/Makefile.in	Mon Feb 24 15:07:51 2003
-@@ -331,8 +331,7 @@
- 
- # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs.
- libMagick___la_LDFLAGS = \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)-Q$(QuantumDepth) \
--	-version-info 0:0:0
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):0
- 
- 
- libMagick___la_LIBADD = ../../magick/libMagick.la
diff --git a/graphics/ImageMagick/files/patch-coders::jp2.c b/graphics/ImageMagick/files/patch-coders::jp2.c
index fb428a197371..c0891457f989 100644
--- a/graphics/ImageMagick/files/patch-coders::jp2.c
+++ b/graphics/ImageMagick/files/patch-coders::jp2.c
@@ -1,8 +1,7 @@
 --- coders/jp2.c.orig	Sat Oct 12 23:41:32 2002
 +++ coders/jp2.c	Wed Jan 22 21:11:31 2003
-@@ -498,6 +498,15 @@
- }
- 
+@@ -639,5 +639,14 @@
+ 
  #if defined(HasJP2)
 +
 +#ifndef JAS_IMAGE_CM_GRAY
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
index c96390c296d5..ab93c04e6ebf 100644
--- a/graphics/ImageMagick/files/patch-configure
+++ b/graphics/ImageMagick/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Sun Jun 23 12:18:35 2002
 +++ configure	Sun Jun 23 12:23:23 2002
-@@ -14689,6 +14689,7 @@
+@@ -22001,6 +22001,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/graphics/ImageMagick/files/patch-magick::Makefile.in b/graphics/ImageMagick/files/patch-magick::Makefile.in
deleted file mode 100644
index 1260420ab38f..000000000000
--- a/graphics/ImageMagick/files/patch-magick::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- magick/Makefile.in.orig	Mon Feb 24 15:12:11 2003
-+++ magick/Makefile.in	Mon Feb 24 15:12:46 2003
-@@ -353,8 +353,7 @@
- ALLMANPAGES = Magick-config.1
- 
- libMagick_la_LDFLAGS = -no-undefined \
--	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)-Q$(QuantumDepth) \
--	-version-info 0:0:0
-+	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):0
- 
- 
- #AM_CFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
diff --git a/graphics/ImageMagick/files/patch-mi b/graphics/ImageMagick/files/patch-mi
deleted file mode 100644
index 6cc6540e31c1..000000000000
--- a/graphics/ImageMagick/files/patch-mi
+++ /dev/null
@@ -1,7 +0,0 @@
---- magick/xwindow.h	Thu Sep  5 15:50:03 2002
-+++ magick/xwindow.h	Wed Oct 16 11:08:11 2002
-@@ -43,4 +43,2 @@
- #if defined(HasSharedMemory)
--#include <sys/ipc.h>
--#include <sys/shm.h>
- #include <X11/extensions/XShm.h>
diff --git a/graphics/ImageMagick/files/patch-xwindow.c b/graphics/ImageMagick/files/patch-xwindow.c
deleted file mode 100644
index 782a0a09b9cc..000000000000
--- a/graphics/ImageMagick/files/patch-xwindow.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- magick/xwindow.c.old	Sun Nov 24 15:07:53 2002
-+++ magick/xwindow.c	Sun Nov 24 15:08:16 2002
-@@ -57,6 +57,16 @@
- #include "log.h"
- #include "utility.h"
- #include "version.h"
-+#if defined(HasSharedMemory)
-+#include <machine/param.h>
-+
-+#if __FreeBSD__ >= 5
-+typedef unsigned short ushort;	/* needed for sys/ipc.h at the moment */
-+#endif
-+#include <sys/types.h>
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#endif
- #include "xwindow.h"
- #if defined(HasX11)
-