- Update to 1.1.7

PR:		ports/106025
Submitted by:	Nick Muerdter <spam@nickm.org>

12 files changed, 12 insertions, 300 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 9de49a7b6454..6dd5af54fc34 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 691779a9d1b9..e95e45e200a3 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (GraphicsMagick-1.1.6.tar.bz2) = ee85aef3cde13432a3f2e5604b758f9c
-SHA256 (GraphicsMagick-1.1.6.tar.bz2) = 9469109d952c47f4b02ccfe43b99ca092c3d57dc987a1689bcc57fa7e34afda7
-SIZE (GraphicsMagick-1.1.6.tar.bz2) = 4959704
+MD5 (GraphicsMagick-1.1.7.tar.bz2) = f75d830ca623bf10385b3ad62c48437a
+SHA256 (GraphicsMagick-1.1.7.tar.bz2) = 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc
+SIZE (GraphicsMagick-1.1.7.tar.bz2) = 4957394
diff --git a/graphics/GraphicsMagick/files/patch-freebsd b/graphics/GraphicsMagick/files/patch-freebsd
deleted file mode 100644
index 4f5c664fbbd5..000000000000
--- a/graphics/GraphicsMagick/files/patch-freebsd
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: magick/command.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/command.c,v
-retrieving revision 1.147.2.8
-retrieving revision 1.147.2.9
-diff -u -r1.147.2.8 -r1.147.2.9
---- magick/command.c   28 Apr 2005 22:57:28 -0000      1.147.2.8
-+++ magick/command.c   16 Jul 2005 01:42:22 -0000      1.147.2.9
-@@ -6525,7 +6525,7 @@
-     } 
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
- 
-Index: magick/image.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/image.c,v
-retrieving revision 1.1207.2.5
-retrieving revision 1.1207.2.6
-diff -u -r1.1207.2.5 -r1.1207.2.6
---- magick/image.c     1 May 2005 18:43:29 -0000       1.1207.2.5
-+++ magick/image.c     16 Jul 2005 01:42:23 -0000      1.1207.2.6
-@@ -2527,7 +2527,7 @@
-   }
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
-   XDestroyResourceInfo(&resource_info);
-Index: magick/nt_base.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/nt_base.c,v
-retrieving revision 1.35.2.6
-retrieving revision 1.35.2.7
-diff -u -r1.35.2.6 -r1.35.2.7
---- magick/nt_base.c   20 Mar 2005 01:39:13 -0000      1.35.2.6
-+++ magick/nt_base.c   19 Jun 2005 00:13:29 -0000      1.35.2.7
-@@ -2027,8 +2027,8 @@
-     }
-   entry->firsttime=FALSE;
-   (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
--    MaxTextExtent-1);
--  entry->file_info.d_name[MaxTextExtent-1]='\0';
-+    sizeof(entry->file_info.d_name)-1);
-+  entry->file_info.d_name[sizeof(entry->file_info.d_name)-1]='\0';
-   entry->file_info.d_namlen=strlen(entry->file_info.d_name);
-   return(&entry->file_info);
- }
-Index: magick/version.h
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/version.h,v
-retrieving revision 1.142.2.43
-retrieving revision 1.142.2.46
-diff -u -r1.142.2.43 -r1.142.2.46
---- magick/version.h   1 May 2005 20:09:53 -0000       1.142.2.43
-+++ magick/version.h   16 Jul 2005 01:42:24 -0000      1.142.2.46
-@@ -38,7 +38,7 @@
- #define MagickLibVersion  0x010006
- #define MagickLibVersionText  "1.1.6"
- #define MagickLibVersionNumber 1,0,6
--#define MagickChangeDate   "20050501"
-+#define MagickChangeDate   "20050715"
- #define MagickReleaseDate  "2005-05-01"
- 
- 
diff --git a/graphics/GraphicsMagick/files/patch-warnings b/graphics/GraphicsMagick/files/patch-warnings
deleted file mode 100644
index f317adbf1116..000000000000
--- a/graphics/GraphicsMagick/files/patch-warnings
+++ /dev/null
@@ -1,25 +0,0 @@
---- magick/blob.c      Wed Apr 14 18:45:16 2004
-+++ magick/blob.c      Sun Jul 24 12:30:20 2005
-@@ -2364,5 +2364,5 @@
-                   (void) rewind(image->blob->file);
-                   (void) LogMagickEvent(BlobEvent,GetMagickModule(),
--                     "  read %d magic header bytes", count);
-+                     "  read %td magic header bytes", count);
- #if defined(HasZLIB)
-                   if ((magick[0] == 0x1F) && (magick[1] == 0x8B) &&
---- coders/ept.c       Wed Apr 14 18:45:28 2004
-+++ coders/ept.c       Sun Jul 24 13:33:39 2005
-@@ -584,5 +584,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing EPS section at offset %lld",TellBlob(image));
-+          "Writing EPS section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(ps_file); c != EOF; c=fgetc(ps_file))
-         (void) WriteBlobByte(image,c);
-@@ -590,5 +590,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing TIFF section at offset %lld",TellBlob(image));
-+          "Writing TIFF section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(tiff_file); c != EOF; c=fgetc(tiff_file))
-         (void) WriteBlobByte(image,c);
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 9de49a7b6454..6dd5af54fc34 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick12/distinfo b/graphics/GraphicsMagick12/distinfo
index 691779a9d1b9..e95e45e200a3 100644
--- a/graphics/GraphicsMagick12/distinfo
+++ b/graphics/GraphicsMagick12/distinfo
@@ -1,3 +1,3 @@
-MD5 (GraphicsMagick-1.1.6.tar.bz2) = ee85aef3cde13432a3f2e5604b758f9c
-SHA256 (GraphicsMagick-1.1.6.tar.bz2) = 9469109d952c47f4b02ccfe43b99ca092c3d57dc987a1689bcc57fa7e34afda7
-SIZE (GraphicsMagick-1.1.6.tar.bz2) = 4959704
+MD5 (GraphicsMagick-1.1.7.tar.bz2) = f75d830ca623bf10385b3ad62c48437a
+SHA256 (GraphicsMagick-1.1.7.tar.bz2) = 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc
+SIZE (GraphicsMagick-1.1.7.tar.bz2) = 4957394
diff --git a/graphics/GraphicsMagick12/files/patch-freebsd b/graphics/GraphicsMagick12/files/patch-freebsd
deleted file mode 100644
index 4f5c664fbbd5..000000000000
--- a/graphics/GraphicsMagick12/files/patch-freebsd
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: magick/command.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/command.c,v
-retrieving revision 1.147.2.8
-retrieving revision 1.147.2.9
-diff -u -r1.147.2.8 -r1.147.2.9
---- magick/command.c   28 Apr 2005 22:57:28 -0000      1.147.2.8
-+++ magick/command.c   16 Jul 2005 01:42:22 -0000      1.147.2.9
-@@ -6525,7 +6525,7 @@
-     } 
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
- 
-Index: magick/image.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/image.c,v
-retrieving revision 1.1207.2.5
-retrieving revision 1.1207.2.6
-diff -u -r1.1207.2.5 -r1.1207.2.6
---- magick/image.c     1 May 2005 18:43:29 -0000       1.1207.2.5
-+++ magick/image.c     16 Jul 2005 01:42:23 -0000      1.1207.2.6
-@@ -2527,7 +2527,7 @@
-   }
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
-   XDestroyResourceInfo(&resource_info);
-Index: magick/nt_base.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/nt_base.c,v
-retrieving revision 1.35.2.6
-retrieving revision 1.35.2.7
-diff -u -r1.35.2.6 -r1.35.2.7
---- magick/nt_base.c   20 Mar 2005 01:39:13 -0000      1.35.2.6
-+++ magick/nt_base.c   19 Jun 2005 00:13:29 -0000      1.35.2.7
-@@ -2027,8 +2027,8 @@
-     }
-   entry->firsttime=FALSE;
-   (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
--    MaxTextExtent-1);
--  entry->file_info.d_name[MaxTextExtent-1]='\0';
-+    sizeof(entry->file_info.d_name)-1);
-+  entry->file_info.d_name[sizeof(entry->file_info.d_name)-1]='\0';
-   entry->file_info.d_namlen=strlen(entry->file_info.d_name);
-   return(&entry->file_info);
- }
-Index: magick/version.h
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/version.h,v
-retrieving revision 1.142.2.43
-retrieving revision 1.142.2.46
-diff -u -r1.142.2.43 -r1.142.2.46
---- magick/version.h   1 May 2005 20:09:53 -0000       1.142.2.43
-+++ magick/version.h   16 Jul 2005 01:42:24 -0000      1.142.2.46
-@@ -38,7 +38,7 @@
- #define MagickLibVersion  0x010006
- #define MagickLibVersionText  "1.1.6"
- #define MagickLibVersionNumber 1,0,6
--#define MagickChangeDate   "20050501"
-+#define MagickChangeDate   "20050715"
- #define MagickReleaseDate  "2005-05-01"
- 
- 
diff --git a/graphics/GraphicsMagick12/files/patch-warnings b/graphics/GraphicsMagick12/files/patch-warnings
deleted file mode 100644
index f317adbf1116..000000000000
--- a/graphics/GraphicsMagick12/files/patch-warnings
+++ /dev/null
@@ -1,25 +0,0 @@
---- magick/blob.c      Wed Apr 14 18:45:16 2004
-+++ magick/blob.c      Sun Jul 24 12:30:20 2005
-@@ -2364,5 +2364,5 @@
-                   (void) rewind(image->blob->file);
-                   (void) LogMagickEvent(BlobEvent,GetMagickModule(),
--                     "  read %d magic header bytes", count);
-+                     "  read %td magic header bytes", count);
- #if defined(HasZLIB)
-                   if ((magick[0] == 0x1F) && (magick[1] == 0x8B) &&
---- coders/ept.c       Wed Apr 14 18:45:28 2004
-+++ coders/ept.c       Sun Jul 24 13:33:39 2005
-@@ -584,5 +584,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing EPS section at offset %lld",TellBlob(image));
-+          "Writing EPS section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(ps_file); c != EOF; c=fgetc(ps_file))
-         (void) WriteBlobByte(image,c);
-@@ -590,5 +590,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing TIFF section at offset %lld",TellBlob(image));
-+          "Writing TIFF section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(tiff_file); c != EOF; c=fgetc(tiff_file))
-         (void) WriteBlobByte(image,c);
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 9de49a7b6454..6dd5af54fc34 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
diff --git a/graphics/GraphicsMagick13/distinfo b/graphics/GraphicsMagick13/distinfo
index 691779a9d1b9..e95e45e200a3 100644
--- a/graphics/GraphicsMagick13/distinfo
+++ b/graphics/GraphicsMagick13/distinfo
@@ -1,3 +1,3 @@
-MD5 (GraphicsMagick-1.1.6.tar.bz2) = ee85aef3cde13432a3f2e5604b758f9c
-SHA256 (GraphicsMagick-1.1.6.tar.bz2) = 9469109d952c47f4b02ccfe43b99ca092c3d57dc987a1689bcc57fa7e34afda7
-SIZE (GraphicsMagick-1.1.6.tar.bz2) = 4959704
+MD5 (GraphicsMagick-1.1.7.tar.bz2) = f75d830ca623bf10385b3ad62c48437a
+SHA256 (GraphicsMagick-1.1.7.tar.bz2) = 95f85e8bb84cc7ad05e84988f4cd93432ab2d4b300827fef34d1ada5e69196cc
+SIZE (GraphicsMagick-1.1.7.tar.bz2) = 4957394
diff --git a/graphics/GraphicsMagick13/files/patch-freebsd b/graphics/GraphicsMagick13/files/patch-freebsd
deleted file mode 100644
index 4f5c664fbbd5..000000000000
--- a/graphics/GraphicsMagick13/files/patch-freebsd
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: magick/command.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/command.c,v
-retrieving revision 1.147.2.8
-retrieving revision 1.147.2.9
-diff -u -r1.147.2.8 -r1.147.2.9
---- magick/command.c   28 Apr 2005 22:57:28 -0000      1.147.2.8
-+++ magick/command.c   16 Jul 2005 01:42:22 -0000      1.147.2.9
-@@ -6525,7 +6525,7 @@
-     } 
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
- 
-Index: magick/image.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/image.c,v
-retrieving revision 1.1207.2.5
-retrieving revision 1.1207.2.6
-diff -u -r1.1207.2.5 -r1.1207.2.6
---- magick/image.c     1 May 2005 18:43:29 -0000       1.1207.2.5
-+++ magick/image.c     16 Jul 2005 01:42:23 -0000      1.1207.2.6
-@@ -2527,7 +2527,7 @@
-   }
-   if (resource_database != (XrmDatabase) NULL)
-     {
--      XrmDestroyDatabase(resource_database);
-+      /* XrmDestroyDatabase(resource_database); */
-       resource_database=(XrmDatabase) NULL;
-     }
-   XDestroyResourceInfo(&resource_info);
-Index: magick/nt_base.c
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/nt_base.c,v
-retrieving revision 1.35.2.6
-retrieving revision 1.35.2.7
-diff -u -r1.35.2.6 -r1.35.2.7
---- magick/nt_base.c   20 Mar 2005 01:39:13 -0000      1.35.2.6
-+++ magick/nt_base.c   19 Jun 2005 00:13:29 -0000      1.35.2.7
-@@ -2027,8 +2027,8 @@
-     }
-   entry->firsttime=FALSE;
-   (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
--    MaxTextExtent-1);
--  entry->file_info.d_name[MaxTextExtent-1]='\0';
-+    sizeof(entry->file_info.d_name)-1);
-+  entry->file_info.d_name[sizeof(entry->file_info.d_name)-1]='\0';
-   entry->file_info.d_namlen=strlen(entry->file_info.d_name);
-   return(&entry->file_info);
- }
-Index: magick/version.h
-===================================================================
-RCS file: /GraphicsMagick/GraphicsMagick/magick/version.h,v
-retrieving revision 1.142.2.43
-retrieving revision 1.142.2.46
-diff -u -r1.142.2.43 -r1.142.2.46
---- magick/version.h   1 May 2005 20:09:53 -0000       1.142.2.43
-+++ magick/version.h   16 Jul 2005 01:42:24 -0000      1.142.2.46
-@@ -38,7 +38,7 @@
- #define MagickLibVersion  0x010006
- #define MagickLibVersionText  "1.1.6"
- #define MagickLibVersionNumber 1,0,6
--#define MagickChangeDate   "20050501"
-+#define MagickChangeDate   "20050715"
- #define MagickReleaseDate  "2005-05-01"
- 
- 
diff --git a/graphics/GraphicsMagick13/files/patch-warnings b/graphics/GraphicsMagick13/files/patch-warnings
deleted file mode 100644
index f317adbf1116..000000000000
--- a/graphics/GraphicsMagick13/files/patch-warnings
+++ /dev/null
@@ -1,25 +0,0 @@
---- magick/blob.c      Wed Apr 14 18:45:16 2004
-+++ magick/blob.c      Sun Jul 24 12:30:20 2005
-@@ -2364,5 +2364,5 @@
-                   (void) rewind(image->blob->file);
-                   (void) LogMagickEvent(BlobEvent,GetMagickModule(),
--                     "  read %d magic header bytes", count);
-+                     "  read %td magic header bytes", count);
- #if defined(HasZLIB)
-                   if ((magick[0] == 0x1F) && (magick[1] == 0x8B) &&
---- coders/ept.c       Wed Apr 14 18:45:28 2004
-+++ coders/ept.c       Sun Jul 24 13:33:39 2005
-@@ -584,5 +584,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing EPS section at offset %lld",TellBlob(image));
-+          "Writing EPS section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(ps_file); c != EOF; c=fgetc(ps_file))
-         (void) WriteBlobByte(image,c);
-@@ -590,5 +590,5 @@
-       if (logging)
-         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
--          "Writing TIFF section at offset %lld",TellBlob(image));
-+          "Writing TIFF section at offset %lld", (long long)TellBlob(image));
-       for (c=fgetc(tiff_file); c != EOF; c=fgetc(tiff_file))
-         (void) WriteBlobByte(image,c);