update to libgdiplus-1.1.11 to sync with latest mono update

changes include update to cairo and the usual bug-fixes

5 files changed, 11 insertions, 80 deletions

diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index d6af09c3f69..78585e653e9 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/04 00:08:27 recht Exp $
 #
 
-DISTNAME=	libgdiplus-1.1.8
+DISTNAME=	libgdiplus-1.1.11
 CATEGORIES=	graphics
 MASTER_SITES=	http://go-mono.com/sources/libgdiplus-1.1/
 
@@ -13,11 +13,8 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		autoconf gmake pkg-config
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libgdiplus.pc.in
+PKGCONFIG_OVERRIDE+=	cairo/cairo.pc.in
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-glitz
-
-pre-configure:
-	cd ${WRKSRC}; autoheader; autoconf
 
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
@@ -28,7 +25,7 @@ BUILDLINK_TRANSFORM+=		rm:-Werror
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-#.include "../../graphics/glitz/buildlink3.mk"
+.include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 853ceef7b31..7707d91b102 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/07/31 19:23:00 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/01/04 00:08:27 recht Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -11,13 +11,14 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
 BUILDLINK_PACKAGES+=	libgdiplus
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=1.1.8
+BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=1.1.11
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .endif	# LIBGDIPLUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo
index 006cd416b26..3b486fa3eaa 100644
--- a/graphics/libgdiplus/distinfo
+++ b/graphics/libgdiplus/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/08/04 16:11:28 rillig Exp $
+$NetBSD: distinfo,v 1.13 2006/01/04 00:08:27 recht Exp $
 
-SHA1 (libgdiplus-1.1.8.tar.gz) = b606e7320713578e6e827aee567cda6ddab98c0d
-RMD160 (libgdiplus-1.1.8.tar.gz) = ff5bd2a8213a0f256c6f3d5bef4b0347fb972b51
-Size (libgdiplus-1.1.8.tar.gz) = 1353269 bytes
+SHA1 (libgdiplus-1.1.11.tar.gz) = 979d2ad9281a4498e38481614b5f8e4bff5bbcfb
+RMD160 (libgdiplus-1.1.11.tar.gz) = 45e892aaf4736070a84c71f08e274c0dd89cffb8
+Size (libgdiplus-1.1.11.tar.gz) = 1255643 bytes
 SHA1 (patch-aa) = 7f63e4367b5faef0bd18e1cffee2e56e11dc88b9
-SHA1 (patch-ac) = d3f1e99c8a50f211ab6202ad812e9e4d847ccdab
-SHA1 (patch-ad) = f7b4d2530fa21bb8a971eb8e8e144e89b2debf91
diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac
deleted file mode 100644
index 095cf6bd1d9..00000000000
--- a/graphics/libgdiplus/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/07/31 19:23:00 recht Exp $
-
---- configure.in.orig	2005-06-10 18:12:34.000000000 +0200
-+++ configure.in
-@@ -8,11 +8,12 @@ AM_PROG_LIBTOOL
- 
- AC_C_BIGENDIAN
- 
-+AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- if test "x$PKG_CONFIG" = "xno"; then
- 	AC_MSG_ERROR([You need to install pkg-config])
- fi
--if pkg-config --atleast-version 2.2.3 glib-2.0; then
-+if $PKG_CONFIG --atleast-version 2.2.3 glib-2.0; then
- 	echo GLIB 2.0 installation OK
- else
- 	AC_MSG_ERROR("Did not find Glib >= 2.2.3");
-@@ -31,18 +32,18 @@ then
- 	CAIRO_CFLAGS='-I$(top_builddir)/libpixman/src -I$(top_srcdir)/libpixman/src -I$(top_builddir)/cairo/src -I$(top_srcdir)/cairo/src'
- 	AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
- else
--	if pkg-config --exact-version 0.3.0 cairo; then
-+	if $PKG_CONFIG --exact-version 0.3.0 cairo; then
- 		echo Cairo installation OK
- 	else
- 		AC_MSG_ERROR("Did not find Cairo == 0.3.0");
- 	fi
- 
--	CAIRO_LIBS="`pkg-config --libs cairo`"
--	CAIRO_CFLAGS="`pkg-config --cflags cairo`"
-+	CAIRO_LIBS="`$PKG_CONFIG --libs cairo`"
-+	CAIRO_CFLAGS="`$PKG_CONFIG --cflags cairo`"
- fi
- 
--GDIPLUS_LIBS="$CAIRO_LIBS `pkg-config --libs glib-2.0 ` `freetype-config --libs`"
--GDIPLUS_CFLAGS="$CAIRO_CFLAGS `pkg-config --cflags glib-2.0 ` `freetype-config --cflags`"
-+GDIPLUS_LIBS="$CAIRO_LIBS `$PKG_CONFIG --libs glib-2.0 ` `freetype-config --libs`"
-+GDIPLUS_CFLAGS="$CAIRO_CFLAGS `$PKG_CONFIG --cflags glib-2.0 ` `freetype-config --cflags`"
- 
- AC_CHECK_HEADERS(byteswap.h)
- 
diff --git a/graphics/libgdiplus/patches/patch-ad b/graphics/libgdiplus/patches/patch-ad
deleted file mode 100644
index 57d6baa759b..00000000000
--- a/graphics/libgdiplus/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/04 16:11:28 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/bitmap.c.orig	Mon Jun 13 21:17:10 2005
-+++ src/bitmap.c	Thu Aug  4 18:05:51 2005
-@@ -284,6 +284,7 @@ GdipCreateBitmapFromScan0 (int width, in
- 		int bytes_needed = header_size + palette_entries * sizeof(ARGB);
- 
- 		int i;
-+		const unsigned int *default_palette;
- 
- 		result->image.palette = malloc (bytes_needed);
- 
-@@ -292,8 +293,6 @@ GdipCreateBitmapFromScan0 (int width, in
- 
- 		result->image.palette->Flags = 0;
- 		result->image.palette->Count = palette_entries;
--
--		const unsigned int *default_palette;
- 
- 		switch (format)
- 		{