- Update to 1.0

PR:		ports/68804
Submitted by:	John Merryweather Cooper <johnmary@adelphia.net> (maintainer)

6 files changed, 53 insertions, 19 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index f2c2e0ab77f7..d0af0be9e117 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	mono
-PORTVERSION=	0.97
+PORTVERSION=	1.0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.go-mono.com/archive/rc/
+MASTER_SITES=	http://mono2.ximian.com/archive/${PORTVERSION}/
 
 MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	An open source implementation of .NET Development Framework
@@ -19,6 +19,8 @@ USE_GNOME=	gnomehack glib20 pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-transform-name=\'\' \
 		--with-gc=included \
 		--with-nptl=no
@@ -39,10 +41,4 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-signbit
 IGNORE=	"Does not work on 5.X before 502113"
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -type f -name configure | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|-pthread|${PTHREAD_LIBS}|g' \
-		-e 's|-D_REENTRANT|${PTHREAD_CFLAGS}|g'
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/libgc/threadlibs.c
-
 .include <bsd.port.post.mk>
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 461cc91b7bee..3e3b6f9850c4 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,2 +1,2 @@
-MD5 (mono-0.97.tar.gz) = e0a1cff236eb92a61da04b5df26a242d
-SIZE (mono-0.97.tar.gz) = 18213505
+MD5 (mono-1.0.tar.gz) = 23a5787818837893073e2ae56d4ef3ac
+SIZE (mono-1.0.tar.gz) = 18218284
diff --git a/lang/mono/files/patch-configure b/lang/mono/files/patch-configure
index 4b353afe41ce..5cc371af7064 100644
--- a/lang/mono/files/patch-configure
+++ b/lang/mono/files/patch-configure
@@ -1,16 +1,20 @@
---- configure.orig	Fri Jun 25 19:28:48 2004
-+++ configure	Fri Jun 25 19:35:06 2004
-@@ -2020,8 +2020,8 @@
+--- configure.orig	Wed Jul  7 22:19:06 2004
++++ configure	Wed Jul  7 22:35:38 2004
+@@ -2020,10 +2020,10 @@
  		;;
  	*-*-*freebsd*|*-*-*openbsd*)
  		platform_win32=no
 -		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
 -		libmono_cflags="-D_THREAD_SAFE"
-+		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_REENTRANT -DGC_FREEBSD_THREADS"
-+		libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
- 		LDFLAGS="$LDFLAGS -pthread"
- 		libmono_ldflags="-pthread"
+-		LDFLAGS="$LDFLAGS -pthread"
+-		libmono_ldflags="-pthread"
++		CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
++		libmono_cflags="$PTHREAD_CFLAGS"
++		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
++		libmono_ldflags="$PTHREAD_LIBS"
  		need_link_unlink=yes
+ 		cat >>confdefs.h <<\_ACEOF
+ #define PTHREAD_POINTER_ID 1
 @@ -14003,8 +14003,8 @@
  ACCESS_UNALIGNED="yes"
  
diff --git a/lang/mono/files/patch-libgc_configure b/lang/mono/files/patch-libgc_configure
new file mode 100644
index 000000000000..e97793bfd125
--- /dev/null
+++ b/lang/mono/files/patch-libgc_configure
@@ -0,0 +1,13 @@
+--- libgc/configure.bak	Tue Jun 29 06:29:58 2004
++++ libgc/configure	Wed Jul  7 22:43:28 2004
+@@ -3686,8 +3686,8 @@
+ #define GC_FREEBSD_THREADS 1
+ _ACEOF
+ 
+-	INCLUDES="$INCLUDES -pthread"
+-	THREADLIBS=-pthread
++	INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
++	THREADLIBS="$PTHREAD_LIBS"
+       	;;
+      *-*-solaris*)
+ 	cat >>confdefs.h <<\_ACEOF
diff --git a/lang/mono/files/patch-libgc_threadlibs.c b/lang/mono/files/patch-libgc_threadlibs.c
new file mode 100644
index 000000000000..7516550cc377
--- /dev/null
+++ b/lang/mono/files/patch-libgc_threadlibs.c
@@ -0,0 +1,21 @@
+--- libgc/threadlibs.c.orig	Wed Jul  7 22:57:48 2004
++++ libgc/threadlibs.c	Wed Jul  7 23:05:12 2004
+@@ -1,5 +1,6 @@
+ # include "private/gcconfig.h"
+ # include <stdio.h>
++# include <sys/param.h>
+ 
+ int main()
+ {
+@@ -12,7 +13,11 @@
+ #   if defined(GC_LINUX_THREADS) || defined(GC_IRIX_THREADS) \
+ 	|| defined(GC_FREEBSD_THREADS) || defined(GC_SOLARIS_PTHREADS) \
+ 	|| defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)
++#       if (__FREEBSD_version >= 500000)
+         printf("-lpthread\n");
++#       else
++	printf("-pthread\n");
++#       endif
+ #   endif
+ #   if defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS)
+ 	printf("-lpthread -lrt\n");
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 988e2feab75d..c648772641b4 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.1636.35700__7c307b91aa13d208/IBM.Data.DB2.dll
+lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__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.1636.35700__7c307b91aa13d208
+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1641.20878__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