Switch a 'long' to int32_t to work correctly on BE-LP64 platforms.

Mark NOT_FOR_PLATFORM = NetBSD-*-sparc64 as c++ still broken

10 files changed, 151 insertions, 132 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 47c00a49efd..1526dab13b8 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2001/10/24 22:10:58 jlam Exp $
+# $NetBSD: Makefile,v 1.81 2002/02/10 12:50:59 abs Exp $
 
 DISTNAME=		ImageMagick-5.3.9
 CATEGORIES=		graphics
@@ -20,6 +20,9 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+# c++ broken as of 'gcc version 2.95.3 20010315 (release) (NetBSD nb1)'
+NOT_FOR_PLATFORM=	NetBSD-*-sparc64
+
 .include "../../mk/bsd.prefs.mk"
 
 # Avoid compiler bug on "arm32"
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index bbffe20e384..cbb1036486a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2001/11/27 01:26:49 lukem Exp $
+$NetBSD: distinfo,v 1.7 2002/02/10 12:50:59 abs Exp $
 
 SHA1 (ImageMagick-5.3.9.tar.bz2) = 554f0168cce4e7597366e70b835cf0b07435a4f9
 Size (ImageMagick-5.3.9.tar.bz2) = 2772757 bytes
-SHA1 (patch-aa) = 9023c09c60e58d7976cf56c08aeb202bedc341f3
-SHA1 (patch-ab) = 23197141943645250ed336040045cccd13d09b7e
-SHA1 (patch-ac) = d96ef6ca8dc12861bdb63cf5ab6e7b3358705fde
-SHA1 (patch-ad) = 83e78c89ff45d814c1b509dfc71e37a96aa5d6e7
-SHA1 (patch-ae) = 3b71f2ab7cb02aa547c6f50cbef775d06c011af2
-SHA1 (patch-af) = c7b55329cc0e60fb36a97961b71131e070633992
-SHA1 (patch-ag) = 36a23040a01ecdf457ea2b62ea7fe05491abd3b8
+SHA1 (patch-aa) = 45bbecaeb54524a0e5996a4e84f38935a88a57d8
+SHA1 (patch-ab) = 49c9354cf0e351cb3f20bf69a76263e6c97e8227
+SHA1 (patch-ac) = 415172bacc3266473d4f16699f7f4e366fd83acd
+SHA1 (patch-ad) = d9716acb824b6692f3dd25e06d3a71a37547dfb8
+SHA1 (patch-ae) = 52f87aafbc587312db604b2df9b931146e632aa7
+SHA1 (patch-af) = d0ca4f9afcaa5361a5b727199def122a5718a932
+SHA1 (patch-ag) = 78537a5e2a79233e9c971ffec6d85dbe667b2203
+SHA1 (patch-ah) = 26f8068a0c34b09e5c9966c0905bc14492da6868
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 659698a1937..42e185e5137 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.16 2001/09/17 15:17:32 tron Exp $
+$NetBSD: patch-aa,v 1.17 2002/02/10 12:51:00 abs Exp $
 
---- magick/magick.c.orig	Mon Sep 17 01:36:12 2001
-+++ magick/magick.c	Mon Sep 17 16:39:26 2001
-@@ -421,6 +421,7 @@
- #endif
-   SetClientName(filename);
-   (void) setlocale(LC_ALL,"");
-+  (void) setlocale(LC_CTYPE,"C");
-   (void) setlocale(LC_NUMERIC,"C");
- }
- 
+--- coders/fits.c.orig	Sun Feb 10 10:31:38 2002
++++ coders/fits.c
+@@ -183,7 +183,9 @@
+     y;
+ 
+   long
+-    count,
++    count;
++
++  int32_t
+     quantum;
+ 
+   register IndexPacket
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 12598943c44..bcd7474fb08 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,13 +1,14 @@
-$NetBSD: patch-ab,v 1.11 2001/09/17 15:17:32 tron Exp $
+$NetBSD: patch-ab,v 1.12 2002/02/10 12:51:00 abs Exp $
 
---- magick/magick.h.orig	Wed Aug 15 04:20:26 2001
-+++ magick/magick.h	Mon Sep 17 16:39:59 2001
-@@ -11,8 +11,6 @@
- /*
-   System include declarations.
- */
--#define _XOPEN_SOURCE  500
--#define _POSIX_C_SOURCE  199506L
+--- configure.in.orig	Wed Sep 12 17:39:19 2001
++++ configure.in
+@@ -423,9 +423,6 @@
+ eval "eval MAN_DIR=$mandir"
+ 
+ 
+-LDFLAGS="$LDFLAGS -L$LIB_DIR"
+-CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
+-
+ # Extend includedir to include magick subdirectory offset
+ includedir="$includedir/magick"
  
- #define _MAGICK_CONFIG_H
- #if !defined(vms) && !defined(macintosh)
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
index 86606b126e5..51071d1c2a3 100644
--- a/graphics/ImageMagick/patches/patch-ac
+++ b/graphics/ImageMagick/patches/patch-ac
@@ -1,12 +1,14 @@
-$NetBSD: patch-ac,v 1.7 2001/09/17 15:17:32 tron Exp $
+$NetBSD: patch-ac,v 1.8 2002/02/10 12:51:00 abs Exp $
 
---- magick/xwindow.c.orig	Sun Sep  9 04:04:32 2001
-+++ magick/xwindow.c	Mon Sep 17 16:40:54 2001
-@@ -2424,6 +2424,7 @@
-   annotate_info->previous=(XAnnotateInfo *) NULL;
-   annotate_info->next=(XAnnotateInfo *) NULL;
-   (void) setlocale(LC_ALL,"");
-+  (void) setlocale(LC_CTYPE,"C");
-   (void) setlocale(LC_NUMERIC,"C");
-   XSupportsLocale();
-   XSetLocaleModifiers("");
+--- configure.orig	Wed Sep 12 17:39:17 2001
++++ configure
+@@ -4128,9 +4128,6 @@
+ eval "eval INFO_DIR=$infodir"
+ eval "eval MAN_DIR=$mandir"
+ 
+-LDFLAGS="$LDFLAGS -L$LIB_DIR"
+-CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
+-
+ # Extend includedir to include magick subdirectory offset
+ includedir="$includedir/magick"
+ 
diff --git a/graphics/ImageMagick/patches/patch-ad b/graphics/ImageMagick/patches/patch-ad
index 5114556ef20..15b79f31b6e 100644
--- a/graphics/ImageMagick/patches/patch-ad
+++ b/graphics/ImageMagick/patches/patch-ad
@@ -1,14 +1,12 @@
-$NetBSD: patch-ad,v 1.4 2001/07/02 16:48:32 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2002/02/10 12:51:00 abs Exp $
 
---- configure.orig	Sat Jan 27 12:09:13 2001
-+++ configure
-@@ -4079,9 +4079,6 @@
- eval "eval INFO_DIR=$infodir"
- eval "eval MAN_DIR=$mandir"
- 
--LDFLAGS="$LDFLAGS -L$LIB_DIR"
--CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--
- # Extend includedir to include magick subdirectory offset
- includedir="$includedir/magick"
- 
+--- magick/delegate.c.orig	Fri Aug 24 21:26:43 2001
++++ magick/delegate.c
+@@ -267,7 +267,6 @@
+   assert(image_info->signature == MagickSignature);
+   assert(image != (Image *) NULL);
+   assert(image->signature == MagickSignature);
+-  assert(decode!= (char *) NULL);
+   delegate_info=GetDelegateInfo(decode,encode,&image->exception);
+   if (delegate_info == (DelegateInfo *) NULL)
+     {
diff --git a/graphics/ImageMagick/patches/patch-ae b/graphics/ImageMagick/patches/patch-ae
index 8c6bfb670b9..ecbaafc95a7 100644
--- a/graphics/ImageMagick/patches/patch-ae
+++ b/graphics/ImageMagick/patches/patch-ae
@@ -1,14 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2001/07/02 16:48:32 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2002/02/10 12:51:00 abs Exp $
 
---- configure.in.orig	Sat Jan 27 12:09:13 2001
-+++ configure.in
-@@ -408,9 +408,6 @@
- eval "eval MAN_DIR=$mandir"
- 
- 
--LDFLAGS="$LDFLAGS -L$LIB_DIR"
--CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--
- # Extend includedir to include magick subdirectory offset
- includedir="$includedir/magick"
- 
+--- magick/magick.c.orig	Sun Sep 16 23:36:12 2001
++++ magick/magick.c
+@@ -421,6 +421,7 @@
+ #endif
+   SetClientName(filename);
+   (void) setlocale(LC_ALL,"");
++  (void) setlocale(LC_CTYPE,"C");
+   (void) setlocale(LC_NUMERIC,"C");
+ }
+ 
diff --git a/graphics/ImageMagick/patches/patch-af b/graphics/ImageMagick/patches/patch-af
index e35afc5e5c0..0f058ff7297 100644
--- a/graphics/ImageMagick/patches/patch-af
+++ b/graphics/ImageMagick/patches/patch-af
@@ -1,12 +1,13 @@
-$NetBSD: patch-af,v 1.1 2001/11/24 01:42:01 lukem Exp $
+$NetBSD: patch-af,v 1.2 2002/02/10 12:51:00 abs Exp $
 
---- magick/delegate.c.orig	Sat Aug 25 07:26:43 2001
-+++ magick/delegate.c
-@@ -267,7 +267,6 @@
-   assert(image_info->signature == MagickSignature);
-   assert(image != (Image *) NULL);
-   assert(image->signature == MagickSignature);
--  assert(decode!= (char *) NULL);
-   delegate_info=GetDelegateInfo(decode,encode,&image->exception);
-   if (delegate_info == (DelegateInfo *) NULL)
-     {
+--- magick/magick.h.orig	Wed Aug 15 02:20:26 2001
++++ magick/magick.h
+@@ -11,8 +11,6 @@
+ /*
+   System include declarations.
+ */
+-#define _XOPEN_SOURCE  500
+-#define _POSIX_C_SOURCE  199506L
+ 
+ #define _MAGICK_CONFIG_H
+ #if !defined(vms) && !defined(macintosh)
diff --git a/graphics/ImageMagick/patches/patch-ag b/graphics/ImageMagick/patches/patch-ag
index 6b5c143f62f..47b75656c62 100644
--- a/graphics/ImageMagick/patches/patch-ag
+++ b/graphics/ImageMagick/patches/patch-ag
@@ -1,54 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2001/11/27 01:26:49 lukem Exp $
+$NetBSD: patch-ag,v 1.2 2002/02/10 12:51:00 abs Exp $
 
---- utilities/mogrify.c.orig	Sat Sep  8 02:03:51 2001
-+++ utilities/mogrify.c
-@@ -1651,11 +1651,12 @@
-               (void) strcpy(p,format);
-             else
-               {
--                FormatString(image_info->filename,"%.1024s:%.1024s",format,
--                  image->filename);
--                (void) strcpy(image->filename,image_info->filename);
-+                FormatString(filename, "%.1024s:%.1024s",format,
-+                  image_info->filename);
-+                (void) strcpy(image->filename,filename);
-               }
--          }
-+          } else 
-+            (void) strcpy(image->filename,image_info->filename);
-         /*
-           Transmogrify image as defined by the image processing options.
-         */
-@@ -1669,19 +1670,6 @@
-         */
-         if (format != (char *) NULL)
-           AppendImageFormat(format,image->filename);
--        else
--          if (LocaleCompare(image_info->filename,"-") != 0)
--            {
--              (void) strcpy(filename,image->filename);
--              AppendImageFormat("mgk",image->filename);
--              if (IsAccessible(image->filename))
--                {
--                  (void) strcat(image->filename,"~");
--                  if (IsAccessible(image->filename))
--                    MagickError(FileOpenError,"Unable to create temporary file",
--                      filename);
--                }
--            }
-         for (p=image; p != (Image *) NULL; p=p->next)
-         {
-           (void) strcpy(p->filename,image->filename);
-@@ -1700,12 +1688,6 @@
-           scene--;
-         if (image_info->verbose)
-           DescribeImage(image,stderr,False);
--        if ((format == (char *) NULL) && (status != False))
--          if (LocaleCompare(image_info->filename,"-") != 0)
--            {
--              (void) remove(filename);
--              (void) rename(image->filename,filename);
--            }
-         DestroyImage(image);
-       }
-   }
+--- magick/xwindow.c.orig	Sun Sep  9 02:04:32 2001
++++ magick/xwindow.c
+@@ -2424,6 +2424,7 @@
+   annotate_info->previous=(XAnnotateInfo *) NULL;
+   annotate_info->next=(XAnnotateInfo *) NULL;
+   (void) setlocale(LC_ALL,"");
++  (void) setlocale(LC_CTYPE,"C");
+   (void) setlocale(LC_NUMERIC,"C");
+   XSupportsLocale();
+   XSetLocaleModifiers("");
diff --git a/graphics/ImageMagick/patches/patch-ah b/graphics/ImageMagick/patches/patch-ah
new file mode 100644
index 00000000000..f6ed65e7347
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ah
@@ -0,0 +1,54 @@
+$NetBSD: patch-ah,v 1.1 2002/02/10 12:51:00 abs Exp $
+
+--- utilities/mogrify.c.orig	Fri Sep  7 16:03:51 2001
++++ utilities/mogrify.c
+@@ -1651,11 +1651,12 @@
+               (void) strcpy(p,format);
+             else
+               {
+-                FormatString(image_info->filename,"%.1024s:%.1024s",format,
+-                  image->filename);
+-                (void) strcpy(image->filename,image_info->filename);
++                FormatString(filename, "%.1024s:%.1024s",format,
++                  image_info->filename);
++                (void) strcpy(image->filename,filename);
+               }
+-          }
++          } else 
++            (void) strcpy(image->filename,image_info->filename);
+         /*
+           Transmogrify image as defined by the image processing options.
+         */
+@@ -1669,19 +1670,6 @@
+         */
+         if (format != (char *) NULL)
+           AppendImageFormat(format,image->filename);
+-        else
+-          if (LocaleCompare(image_info->filename,"-") != 0)
+-            {
+-              (void) strcpy(filename,image->filename);
+-              AppendImageFormat("mgk",image->filename);
+-              if (IsAccessible(image->filename))
+-                {
+-                  (void) strcat(image->filename,"~");
+-                  if (IsAccessible(image->filename))
+-                    MagickError(FileOpenError,"Unable to create temporary file",
+-                      filename);
+-                }
+-            }
+         for (p=image; p != (Image *) NULL; p=p->next)
+         {
+           (void) strcpy(p->filename,image->filename);
+@@ -1700,12 +1688,6 @@
+           scene--;
+         if (image_info->verbose)
+           DescribeImage(image,stderr,False);
+-        if ((format == (char *) NULL) && (status != False))
+-          if (LocaleCompare(image_info->filename,"-") != 0)
+-            {
+-              (void) remove(filename);
+-              (void) rename(image->filename,filename);
+-            }
+         DestroyImage(image);
+       }
+   }