4 files changed, 11 insertions, 46 deletions
diff --git a/graphics/ImageMagick/files/patch-coders_palm.c b/graphics/ImageMagick/files/patch-coders_palm.c
deleted file mode 100644
index a5cd0c32f710..000000000000
--- a/graphics/ImageMagick/files/patch-coders_palm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- coders/palm.c	2014-12-25 19:05:34.000000000 +0100
-+++ coders/palm.c	2014-12-31 09:38:35.499493971 +0100
-@@ -510,7 +510,7 @@
-       {
-         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
-         if (bits_per_pixel != 16)
--          SetMagickPixelPacket(image,image->colormap+index,
-+          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
-             (const IndexPacket *) NULL,&transpix);
-         (void) TransparentPaintImage(image,&transpix,(Quantum)
-           TransparentOpacity,MagickFalse);
diff --git a/graphics/ImageMagick/files/patch-coders_rle.c b/graphics/ImageMagick/files/patch-coders_rle.c
deleted file mode 100644
index 184ddb77c96f..000000000000
--- a/graphics/ImageMagick/files/patch-coders_rle.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- coders/rle.c.orig	2015-01-01 22:58:53.775440763 +0100
-+++ coders/rle.c	2015-01-01 23:00:50.825507571 +0100
-@@ -456,7 +456,7 @@
-             if (IsValidColormapIndex(image,*p & mask,&index,exception) ==
-                 MagickFalse)
-               break;
--            *p=colormap[index];
-+            *p=colormap[(ssize_t)index];
-             p++;
-           }
-         else
-@@ -467,7 +467,7 @@
-                 if (IsValidColormapIndex(image,(size_t) (x*map_length+
-                     (*p & mask)),&index,exception) == MagickFalse)
-                   break;
--                *p=colormap[index];
-+                *p=colormap[(ssize_t)index];
-                 p++;
-               }
-         if ((i < (ssize_t) number_pixels) || (x < (ssize_t) number_planes))
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
new file mode 100644
index 000000000000..cbd21aa8d1bd
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2015-01-16 22:45:09.000000000 +0100
++++ configure	2015-01-17 22:55:31.590059586 +0100
+@@ -33096,7 +33096,7 @@
+ 
+ 
+ if test "x$SHAREARCH_DIRNAME" = "x"; then
+-  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
++  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/graphics/ImageMagick/files/patch-magick_distribute-cache.c b/graphics/ImageMagick/files/patch-magick_distribute-cache.c
deleted file mode 100644
index 6a83cbd576fa..000000000000
--- a/graphics/ImageMagick/files/patch-magick_distribute-cache.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: magick/distribute-cache.c
-===================================================================
---- magick/distribute-cache.c	(revision 17523)
-+++ magick/distribute-cache.c	(working copy)
-@@ -92,6 +92,10 @@
- #define SOCKET_TYPE SOCKET
- #define MAGICKCORE_HAVE_DISTRIBUTE_CACHE
- #else
-+#define CLOSE_SOCKET(socket) 
-+#define HANDLER_RETURN_TYPE  void *
-+#define HANDLER_RETURN_VALUE  (void *) NULL
-+#define SOCKET_TYPE  int
- #undef send
- #undef recv
- #define send(file,buffer,length,flags)  0