Update to 1.0.5.

Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Project by:	BSD# - http://forge.novell.com/modules/xfmod/project/?bsd-sharp
Approved by:	maintainer timeout (still no contact for months)

6 files changed, 75 insertions, 23 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index b0299c231309..2d02b14a0060 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -2,11 +2,12 @@
 # Date created:        22 July 2002
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
+# $Id: Makefile,v 1.16 2004/12/10 07:09:02 tmclau02 Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	mono
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.go-mono.com/archive/${PORTVERSION}/
 
@@ -34,6 +35,8 @@ MAN5=		mono-config.5
 
 ONLY_FOR_ARCHS=	i386
 
+MAKE_ENV=MONO_SHARED_DIR=${WRKDIR}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 7bf582cc59e9..91097d715ba6 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,2 +1,2 @@
-MD5 (mono-1.0.4.tar.gz) = 272d26525bfa121ee19713051d5b3a01
-SIZE (mono-1.0.4.tar.gz) = 18452996
+MD5 (mono-1.0.5.tar.gz) = 09c9b5e7a128e7607e79d4d35bf76f68
+SIZE (mono-1.0.5.tar.gz) = 18477749
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index f38ee4a42997..5577b9bfea9c 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -1,13 +1,37 @@
---- configure.orig	Wed Aug  4 17:42:34 2004
-+++ configure	Sun Aug 29 02:39:35 2004
-@@ -14148,8 +14148,8 @@
- ACCESS_UNALIGNED="yes"
- 
- JIT_SUPPORTED=no
--LIBC="libc.so.6"
--INTL="libc.so.6"
-+LIBC="libc.so"
-+INTL="libintl.so"
- 
- jit_wanted=false
- case "$host" in
+--- configure.orig	Sun Dec  5 22:51:07 2004
++++ configure	Sun Dec  5 22:55:18 2004
+@@ -2180,6 +2180,34 @@
+ 		with_nptl=no
+ 		with_tls=pthread
+ 		;;
++	*-*-*freebsd6*)
++		platform_win32=no
++		if test "x$PTHREAD_CFLAGS" = "x"; then
++		    	CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
++			libmono_cflags=
++		else
++		    CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
++		    libmono_cflags="$PTHREAD_CFLAGS"
++		fi
++		if test "x$PTHREAD_LIBS" = "x"; then
++		    	LDFLAGS="$LDFLAGS -pthread"
++			libmono_ldflags="-pthread"
++		else
++		    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
++			libmono_ldflags="$PTHREAD_LIBS"
++		fi
++		need_link_unlink=yes
++		cat >>confdefs.h <<\_ACEOF
++#define PTHREAD_POINTER_ID 1
++_ACEOF
++		libdl=
++		libgc_threads=pthreads
++# TLS is only partially implemented on -CURRENT (compiler support
++# but NOT library support)
++#
++		with_nptl=no
++		with_tls=pthread
++		;;
+ 	*-*-*openbsd*)
+ 		platform_win32=no
+ 		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
diff --git a/lang/mono/files/patch-libgc_Makefile.in b/lang/mono/files/patch-libgc_Makefile.in
index b1c4ea9f27bf..85bc6454aaf9 100644
--- a/lang/mono/files/patch-libgc_Makefile.in
+++ b/lang/mono/files/patch-libgc_Makefile.in
@@ -1,11 +1,11 @@
---- libgc/Makefile.in.orig	Tue Nov  2 21:37:01 2004
-+++ libgc/Makefile.in	Tue Nov  2 21:39:34 2004
-@@ -278,7 +278,7 @@
+--- libgc/Makefile.in.orig	Fri Dec 10 00:09:11 2004
++++ libgc/Makefile.in	Fri Dec 10 00:10:16 2004
+@@ -256,7 +256,7 @@
  target_alias = @target_alias@
  target_all = @target_all@
  AUTOMAKE_OPTIONS = foreign
 -SUBDIRS = include doc
 +SUBDIRS = include
+ noinst_LTLIBRARIES = libmonogc.la
  
- #
- # libtool is not capable of creating shared/static versions of a convenience
+ # files used by makefiles other than Makefile.am
diff --git a/lang/mono/files/patch-libgc_configure b/lang/mono/files/patch-libgc_configure
new file mode 100644
index 000000000000..ada035c7623e
--- /dev/null
+++ b/lang/mono/files/patch-libgc_configure
@@ -0,0 +1,25 @@
+--- libgc/configure.orig	Fri Dec 10 01:42:46 2004
++++ libgc/configure	Fri Dec 10 01:43:11 2004
+@@ -3962,6 +3962,22 @@
+ 		THREADLIBS="$PTHREAD_LIBS"
+ 	fi
+       	;;
++     *-*-freebsd6*)
++	{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
++echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
++	cat >>confdefs.h <<\_ACEOF
++#define GC_FREEBSD_THREADS 1
++_ACEOF
++
++	if test "x$PTHREAD_CFLAGS" != "x"; then
++		INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
++	fi
++	if test "x$PTHREAD_LIBS" = "x"; then
++		THREADLIBS=-lpthread
++	else
++		THREADLIBS="$PTHREAD_LIBS"
++	fi
++      	;;
+      *-*-solaris*)
+ 	cat >>confdefs.h <<\_ACEOF
+ #define GC_SOLARIS_THREADS 1
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index e65dfdc63943..6c0e303ae067 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -189,7 +189,7 @@ lib/mono/gac/I18N.Other/1.0.5000.0__0738eb9f132ed756/I18N.Other.dll
 lib/mono/gac/I18N.Rare/1.0.5000.0__0738eb9f132ed756/I18N.Rare.dll
 lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756/I18N.West.dll
 lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756/I18N.dll
-lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/IBM.Data.DB2/1.0.1802.30985__7c307b91aa13d208/IBM.Data.DB2.dll
 lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll
 lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll
 lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
@@ -319,7 +319,7 @@ share/mono/cil/cil-opcodes.xml
 @dirrm lib/mono/gac/Microsoft.VisualBasic
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib/0.6.0.0__1b03e6acf1164f73
 @dirrm lib/mono/gac/ICSharpCode.SharpZipLib
-@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1802.30985__7c307b91aa13d208
 @dirrm lib/mono/gac/IBM.Data.DB2
 @dirrm lib/mono/gac/I18N/1.0.5000.0__0738eb9f132ed756
 @dirrm lib/mono/gac/I18N.West/1.0.5000.0__0738eb9f132ed756