From bd7fa3bd9284d279a2c6ee77d0f54e9f519a7fdb Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 6 Sep 2009 07:24:55 +0000
Subject: [PATCH] Update to libgdiplus-2.4.2. Add missing USE_LIBTOOL. Make
 sure we don't use bundled cairo and pixman.

ok jolan@ ok jasper@
---
 x11/libgdiplus/Makefile                | 21 ++++++++++++---------
 x11/libgdiplus/distinfo                | 10 +++++-----
 x11/libgdiplus/patches/patch-configure | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 x11/libgdiplus/patches/patch-configure

diff --git a/x11/libgdiplus/Makefile b/x11/libgdiplus/Makefile
index e482096432a..c111bfa9182 100644
--- a/x11/libgdiplus/Makefile
+++ b/x11/libgdiplus/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2009/08/11 08:42:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2009/09/06 07:24:55 ajacoutot Exp $
 
 COMMENT=	GDI+ comptible API
 
-DISTNAME=	libgdiplus-2.0
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	libgdiplus-2.4.2
 
 CATEGORIES=	x11 devel
 
-SHARED_LIBS +=	gdiplus	0.0	# .0.0
+SHARED_LIBS +=	gdiplus	1.0	# .0.0
 
 HOMEPAGE=	http://www.mono-project.com/Libgdiplus
 
@@ -19,14 +18,17 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-WANTLIB=	X11 Xau Xdmcp Xrender cairo expat fontconfig freetype \
-		glib-2.0 glitz gmodule-2.0 gobject-2.0 jpeg m pixman-1 \
-		png z pthread-stubs xcb
+WANTLIB += X11 Xau Xdmcp Xrender cairo expat fontconfig freetype
+WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 jpeg m pcre
+WANTLIB += pixman-1 png pthread-stubs xcb z
 
 MASTER_SITES=	ftp://ftp.novell.com/pub/mono/sources/libgdiplus/
 EXTRACT_SUFX=	.tar.bz2
 
 MODULES=	devel/gettext
+
+USE_LIBTOOL=	Yes
+
 LIB_DEPENDS=	pango-1.0.>=1600.0,pangocairo-1.0.>=1600.0,pangoft2-1.0.>=1600.0::devel/pango \
 		tiff.>=38::graphics/tiff \
 		exif.>=12::graphics/libexif \
@@ -34,8 +36,9 @@ LIB_DEPENDS=	pango-1.0.>=1600.0,pangocairo-1.0.>=1600.0,pangoft2-1.0.>=1600.0::d
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include \
+		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libpng"
-CONFIGURE_ARGS=	--with-cairo=system --with-pango
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--with-pango
 
 .include <bsd.port.mk>
diff --git a/x11/libgdiplus/distinfo b/x11/libgdiplus/distinfo
index 5afb2e5a07f..0d154735beb 100644
--- a/x11/libgdiplus/distinfo
+++ b/x11/libgdiplus/distinfo
@@ -1,5 +1,5 @@
-MD5 (libgdiplus-2.0.tar.bz2) = 3HMvstmWtUQFwnZFy4ZC2Q==
-RMD160 (libgdiplus-2.0.tar.bz2) = UnnbfMO+RcsKOnm8ELSBcqZUlEU=
-SHA1 (libgdiplus-2.0.tar.bz2) = P0/ByygIky6UaqK7BJSU/Yf9ql0=
-SHA256 (libgdiplus-2.0.tar.bz2) = CjCNw6jRqR8DZQLtRbjevDxvg42Gz24VQwxpaatKM7E=
-SIZE (libgdiplus-2.0.tar.bz2) = 1971529
+MD5 (libgdiplus-2.4.2.tar.bz2) = cDIQlQvOLtCpgk+Jf3dJJQ==
+RMD160 (libgdiplus-2.4.2.tar.bz2) = EU/2JjqC15xyszLe/aw7bsbFBDI=
+SHA1 (libgdiplus-2.4.2.tar.bz2) = 2mGF+Ckb31Ts3e/c6v9tLSfDxhQ=
+SHA256 (libgdiplus-2.4.2.tar.bz2) = UTXjq9UfKoNs1gZeLe3jsHP5PtlDbz4gGhTzAZqnF7Y=
+SIZE (libgdiplus-2.4.2.tar.bz2) = 1975307
diff --git a/x11/libgdiplus/patches/patch-configure b/x11/libgdiplus/patches/patch-configure
new file mode 100644
index 00000000000..69365037948
--- /dev/null
+++ b/x11/libgdiplus/patches/patch-configure
@@ -0,0 +1,15 @@
+$OpenBSD: patch-configure,v 1.1 2009/09/06 07:24:55 ajacoutot Exp $
+--- configure.orig	Thu Aug 27 22:25:09 2009
++++ configure	Thu Aug 27 22:26:27 2009
+@@ -20571,9 +20571,9 @@ _ACEOF
+ 	fi
+ fi
+ 
+-subdirs="$subdirs pixman cairo"
++subdirs="$subdirs"
+ 
+-CAIRO_DIR="pixman cairo"
++CAIRO_DIR=""
+ GDIPLUS_LIBS="$GDIPLUS_LIBS $CAIRO_LIBS $PANGO_LIBS"
+ GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS $CAIRO_CFLAGS $PANGO_CFLAGS"
+