Actually use the results of some configure tests for stdint.h and

inttypes.h.  Fixes builds on SunOS-5.9.

4 files changed, 80 insertions, 5 deletions

diff --git a/graphics/librsvg/distinfo b/graphics/librsvg/distinfo
index e747c912cd1..d495a3bb87f 100644
--- a/graphics/librsvg/distinfo
+++ b/graphics/librsvg/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2007/09/20 21:36:57 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/10/03 20:42:49 dmcmahill Exp $
 
 SHA1 (librsvg-2.18.2.tar.bz2) = 9e3017817708025737e53b60fe3bfa813e670e02
 RMD160 (librsvg-2.18.2.tar.bz2) = df154e6a3c74a406a5d6435a82611b3d204f147f
 Size (librsvg-2.18.2.tar.bz2) = 461122 bytes
-SHA1 (patch-ab) = f1cbfcccd0a7d17801d2f5b60645c39e885d7c37
+SHA1 (patch-aa) = c0c1ed7bb4efe2099a5a1b85bcd59a03ba48854a
+SHA1 (patch-ab) = ddc98a217624bd493092ed2718152c5552be4db6
+SHA1 (patch-ac) = 3f6863d3cc36d0ff69d493c914e69d7632fb03b4
diff --git a/graphics/librsvg/patches/patch-aa b/graphics/librsvg/patches/patch-aa
new file mode 100644
index 00000000000..a6b448df4cb
--- /dev/null
+++ b/graphics/librsvg/patches/patch-aa
@@ -0,0 +1,38 @@
+$NetBSD: patch-aa,v 1.5 2007/10/03 20:42:49 dmcmahill Exp $
+
+--- tests/pdiff/pdiff.c.orig	2007-04-23 18:45:34.000000000 -0400
++++ tests/pdiff/pdiff.c
+@@ -16,11 +16,32 @@
+ 
+ #define _GNU_SOURCE
+ 
++#include "config.h"
++
+ #include "lpyramid.h"
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++#  include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#  include <inttypes.h>
++#elif defined(HAVE_SYS_INT_TYPES_H)
++#  include <sys/int_types.h>
++#elif defined(_MSC_VER)
++   typedef __int8 int8_t;
++   typedef unsigned __int8 uint8_t;
++   typedef __int16 int16_t;
++   typedef unsigned __int16 uint16_t;
++   typedef __int32 int32_t;
++   typedef unsigned __int32 uint32_t;
++   typedef __int64 int64_t;
++   typedef unsigned __int64 uint64_t;
++#else
++#  error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
++#endif
++
+ #include "pdiff.h"
+ 
+ #ifndef M_PI
diff --git a/graphics/librsvg/patches/patch-ab b/graphics/librsvg/patches/patch-ab
index 6d049241942..eb7c2fb28c2 100644
--- a/graphics/librsvg/patches/patch-ab
+++ b/graphics/librsvg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/09/20 21:36:57 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2007/10/03 20:42:50 dmcmahill Exp $
 
---- gdk-pixbuf-loader/Makefile.in.orig	2006-04-01 16:31:29.000000000 +0000
+--- gdk-pixbuf-loader/Makefile.in.orig	2007-08-29 15:11:19.000000000 -0400
 +++ gdk-pixbuf-loader/Makefile.in
-@@ -545,10 +545,6 @@ uninstall-am: uninstall-info-am uninstal
+@@ -544,10 +544,6 @@ uninstall-am: uninstall-info-am uninstal
  
  
  install-data-hook: 
diff --git a/graphics/librsvg/patches/patch-ac b/graphics/librsvg/patches/patch-ac
new file mode 100644
index 00000000000..32e87e89c92
--- /dev/null
+++ b/graphics/librsvg/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.4 2007/10/03 20:42:50 dmcmahill Exp $
+
+--- tests/pdiff/perceptualdiff.c.orig	2007-04-23 18:45:34.000000000 -0400
++++ tests/pdiff/perceptualdiff.c
+@@ -16,8 +16,29 @@
+   if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
++#include "config.h"
++
+ #include <stdio.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++#  include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#  include <inttypes.h>
++#elif defined(HAVE_SYS_INT_TYPES_H)
++#  include <sys/int_types.h>
++#elif defined(_MSC_VER)
++   typedef __int8 int8_t;
++   typedef unsigned __int8 uint8_t;
++   typedef __int16 int16_t;
++   typedef unsigned __int16 uint16_t;
++   typedef __int32 int32_t;
++   typedef unsigned __int32 uint32_t;
++   typedef __int64 int64_t;
++   typedef unsigned __int64 uint64_t;
++#else
++#  error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
++#endif
++
+ #include <string.h>
+ #include <math.h>
+ #include "lpyramid.h"