update to libgdiplus-0.5 (part of mono beta1)

Sadly, there's no real news file avaiable. So, I guess it's the usual
bug-fixes and optimizations.

5 files changed, 43 insertions, 19 deletions

diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 1ead9d299c5..fcf85c3e95e 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/04/04 16:54:42 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/11 17:37:48 recht Exp $
 #
 
-DISTNAME=	libgdiplus-0.2
+DISTNAME=	libgdiplus-0.5
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.go-mono.com/archive/
+MASTER_SITES=	http://www.go-mono.com/archive/beta1/
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.go-mono.com/archive/
@@ -19,6 +19,9 @@ GNU_CONFIGURE=		yes
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 0902731cd77..09d01e35196 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/04/04 16:54:42 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/05/11 17:37:48 recht Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -11,11 +11,14 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
 BUILDLINK_PACKAGES+=	libgdiplus
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=0.2
+BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=0.5
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .endif	# LIBGDIPLUS_BUILDLINK3_MK
 
 .include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
 
diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo
index 734a9a29b30..4f2ef84c8e2 100644
--- a/graphics/libgdiplus/distinfo
+++ b/graphics/libgdiplus/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/04/27 14:29:00 adam Exp $
+$NetBSD: distinfo,v 1.4 2004/05/11 17:37:48 recht Exp $
 
-SHA1 (libgdiplus-0.2.tar.gz) = f024963da29e742d8efb96ed65163a6a6189a82d
-Size (libgdiplus-0.2.tar.gz) = 226254 bytes
-SHA1 (patch-aa) = 8bcf32e54952e4da2e2ff4317dff496a8dc8c958
+SHA1 (libgdiplus-0.5.tar.gz) = 65c96314bd5989d018667f130b58e6126efbae33
+Size (libgdiplus-0.5.tar.gz) = 286361 bytes
+SHA1 (patch-aa) = 9e1416427846f1341fb136759a58956ce591c67a
+SHA1 (patch-ab) = 53376dad81edd615c9eb7b27e993361d1b520f78
diff --git a/graphics/libgdiplus/patches/patch-aa b/graphics/libgdiplus/patches/patch-aa
index db45d3a877f..34a27e25faa 100644
--- a/graphics/libgdiplus/patches/patch-aa
+++ b/graphics/libgdiplus/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2004/04/27 14:29:00 adam Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/11 17:37:48 recht Exp $
 
---- src/Makefile.in.orig	2004-04-27 16:24:05.000000000 +0000
-+++ src/Makefile.in
-@@ -120,7 +120,7 @@ libgdiplus_la_SOURCES = \
+--- src/jpegcodec.c.orig	2004-05-11 18:20:03.000000000 +0200
++++ src/jpegcodec.c
+@@ -20,6 +20,9 @@
+ #ifdef HAVE_LIBJPEG
  
- libgdiplus_la_LIBADD = $(GDIPLUS_LIBS)
+ #include <setjmp.h>
++
++/* pkgsrc */
++#undef HAVE_STDLIB_H
+ #include <jpeglib.h>
  
--INCLUDES = $(GDIPLUS_CFLAGS) -ansi -Werror
-+INCLUDES = $(GDIPLUS_CFLAGS) -ansi
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
+ /* Codecinfo related data*/
diff --git a/graphics/libgdiplus/patches/patch-ab b/graphics/libgdiplus/patches/patch-ab
new file mode 100644
index 00000000000..4de4fd726fb
--- /dev/null
+++ b/graphics/libgdiplus/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2004/05/11 17:37:48 recht Exp $
+
+--- src/tiffcodec.c.orig	2004-05-11 18:19:51.000000000 +0200
++++ src/tiffcodec.c
+@@ -14,7 +14,10 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <byteswap.h>
++
++/* pkgsrc */
++/* #include <byteswap.h> */
++
+ #include "tiffcodec.h"
+ 
+ #ifdef HAVE_LIBTIFF