update to 1.0

changes:
- bugfixes

4 files changed, 90 insertions, 16 deletions

diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index a061d3467fe..289d1150afe 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2004/06/26 20:19:42 recht Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/03 23:03:21 recht Exp $
 #
 
-DISTNAME=	libgdiplus-0.10
+DISTNAME=	libgdiplus-1.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.go-mono.com/archive/rc/
+MASTER_SITES=	http://mono2.ximian.com/archive/1.0/
 
 MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://www.go-mono.com/archive/
+HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Implementation of the GDI+ API
 
 USE_X11=		yes
@@ -19,8 +19,8 @@ GNU_CONFIGURE=		yes
 
 # XXX gdip_win32.c uses pthread, but
 # configure doesn't check for it...
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LDFLAGS}
+#CFLAGS+=	${PTHREAD_CFLAGS}
+#LDFLAGS+=	${PTHREAD_LDFLAGS}
 
 pre-configure:
 	cd ${WRKSRC};			\
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 1fbcbeec0e8..c3229b10234 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/06/26 20:19:42 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/07/03 23:03:22 recht Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgdiplus}
 BUILDLINK_PACKAGES+=	libgdiplus
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=0.10
+BUILDLINK_DEPENDS.libgdiplus+=	libgdiplus>=1.0
 BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .endif	# LIBGDIPLUS_BUILDLINK3_MK
 
diff --git a/graphics/libgdiplus/distinfo b/graphics/libgdiplus/distinfo
index ad54cb91e57..bd0674dad08 100644
--- a/graphics/libgdiplus/distinfo
+++ b/graphics/libgdiplus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/06/26 20:19:42 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/07/03 23:03:22 recht Exp $
 
-SHA1 (libgdiplus-0.10.tar.gz) = 5fa20d0e60c3f7607be6af3084c2b0a5583c7743
-Size (libgdiplus-0.10.tar.gz) = 327050 bytes
-SHA1 (patch-ac) = d223c7eba94470d6441d9fd19e9d5436027e3c59
+SHA1 (libgdiplus-1.0.tar.gz) = 18e65a4d8aec195b78aa9f509f82ad8e8b09faba
+Size (libgdiplus-1.0.tar.gz) = 327197 bytes
+SHA1 (patch-ac) = 189a32aa425926c04982ac2f8375ab8fd541b713
diff --git a/graphics/libgdiplus/patches/patch-ac b/graphics/libgdiplus/patches/patch-ac
index 3aa5693ee1c..70174d8ff14 100644
--- a/graphics/libgdiplus/patches/patch-ac
+++ b/graphics/libgdiplus/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2004/06/26 20:19:42 recht Exp $
+$NetBSD: patch-ac,v 1.2 2004/07/03 23:03:22 recht Exp $
 
---- configure.in.orig	2004-06-26 19:11:38.000000000 +0200
-+++ configure.in	2004-06-26 19:13:36.000000000 +0200
-@@ -6,24 +6,25 @@
+--- configure.in.orig	2004-07-04 00:21:40.000000000 +0200
++++ configure.in	2004-07-04 00:21:46.000000000 +0200
+@@ -6,26 +6,99 @@
  AM_MAINTAINER_MODE
  AM_PROG_LIBTOOL
  
@@ -31,4 +31,78 @@ $NetBSD: patch-ac,v 1.1 2004/06/26 20:19:42 recht Exp $
 +GDIPLUS_CFLAGS="`$PKG_CONFIG --cflags cairo glib-2.0 ` `$FREETYPE_CONFIG --cflags`"
  AC_CHECK_HEADERS(byteswap.h)
  
++AC_MSG_CHECKING([host threading settings])
++case "$host" in
++	*-*-mingw*|*-*-cygwin*)
++		AC_DEFINE_UNQUOTED(CYGWIN,1,[Win32])
++		AC_CHECK_LIB(intl, gettext)
++		;;
++
++	*-*-*netbsd*)
++		AC_DEFINE_UNQUOTED(BSDOS,1,[NetBSD])
++		;;
++
++	*-*-*freebsd*)
++		AC_DEFINE_UNQUOTED(BSDOS,1,[FreeBSD])
++		CFLAGS="-D_THREAD_SAFE $CFLAGS"
++		;;
++
++	*-*-*openbsd*)
++		AC_DEFINE_UNQUOTED(BSDOS,1,[OpenBSD])
++		CFLAGS="$CFLAGS"
++		LIBS="$LIBS"
++		;;
++
++	*-*-linux*)
++		AC_DEFINE_UNQUOTED(LINUX,1,[Linux])
++		AC_CHECK_LIB(pthread, pthread_create)
++		;;
++
++	*-*-solaris*)
++		AC_DEFINE_UNQUOTED(SOLARIS,1,[Solaris])
++		AC_DEFINE_UNQUOTED(_REENTRANT,1,[For libc reentrancy])
++		CFLAGS="-pthreads $CFLAGS"
++		;;
++
++	*-*-darwin*)
++		AC_DEFINE_UNQUOTED(OSX,1,[OS X])
++		CFLAGS="-no-cpp-precomp $CFLAGS"
++		LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
++		;;
++
++	*)
++		AC_MSG_RESULT(Unrecognized host $host)
++		AC_DEFINE_UNQUOTED(OTHEROS,1,[Unknown])
++		;;
++esac
++
++# Apparently for BSD special handling needs to happen
++# See http://archives/neohapsis.com/archives/openbsd/2001-11/2142.html
++# by Miod Vallat <miod@online.fr>
++AC_CACHE_CHECK(
++  [if compiler recognizes -pthread],
++   myapp_cv_gcc_pthread,
++   ac_save_CFLAGS=$CFLAGS
++   CFLAGS="$CFLAGS -pthread"
++   AC_LANG_SAVE
++   AC_LANG_C
++   AC_TRY_LINK([#include <pthread.h>],
++               [void *p = pthread_create;],
++                myapp_cv_gcc_pthread=yes,
++                myapp_cv_gcc_pthread=no)
++   AC_LANG_RESTORE
++   CFLAGS=$ac_save_CFLAGS
++)
++if test $myapp_cv_gcc_pthread = yes
++then
++   myapp_threads=""
++   CFLAGS="$CFLAGS -pthread"
++else
++   AC_CHECK_LIB(pthread,pthread_create,myapp_threads=-lpthread,
++                [AC_CHECK_LIB(c_r,pthread_create,myapp_threads=-lc_r)])
++fi
++
++
  # sigsetjmp is a macro on some platforms, so can't use AC_CHECK_FUNCS
+ AC_MSG_CHECKING(for sigsetjmp)
+ AC_TRY_LINK([#include <setjmp.h>], [