Date: Thu, 8 Jul 2004 00:06:39 -0700 From: "John Merryweather Cooper" <johnmary@adelphia.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: steve@digitalnothing.com Subject: ports/68804: [MAINTAINER-UPDATE] Update lang/mono to 1.0 (release version) Message-ID: <1089270399.0@68-169-191-150.losaca.adelphia.net> Resent-Message-ID: <200407080710.i687ATa1085466@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68804
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] Update lang/mono to 1.0 (release version)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 08 07:10:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #1: Wed Jun 30 13:09:09 PDT 2004
root@borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/ATHLON
>Description:
The long-clamored-for lang/mono 1.0 is here. I've changed the method of patching in the right threading model in a manner that should be more robust--particularly for -STABLE. But given the alpha nature of the GC, stability problems can be expected.
>How-To-Repeat:
N/A
>Fix:
--- update-mono-1.0 begins here ---
# NOTE: Not tested on -STABLE (tested on -CURRENT).
# This thing is going to be as good as it's GC, which right now
# is alpha at best.
# The patching method should be more robust for -STABLE and the
# correct PTHREAD_CFLAGS and PTHREAD_LIBS should be selected for
# either -CURRENT or -STABLE.
#
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
touch 'files/patch-libgc_configure'
chmod 0644 'files/patch-libgc_configure'
touch 'files/patch-libgc_threadlibs.c'
chmod 0644 'files/patch-libgc_threadlibs.c'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####
#### Patch data follows ####
diff -u '/usr/ports/lang/mono/Makefile' '/usr/ports/local/mono/Makefile'
Index: ./Makefile
--- ./Makefile Sun Jun 27 06:03:45 2004
+++ ./Makefile Wed Jul 7 23:08:40 2004
@@ -2,13 +2,13 @@
# Date created: 22 July 2002
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
-# $FreeBSD: ports/lang/mono/Makefile,v 1.31 2004/06/27 13:03:45 pav Exp $
+# $FreeBSD$
#
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_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
@@ -38,11 +40,5 @@
.elif ${OSVERSION} < 502113
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 -u '/usr/ports/lang/mono/distinfo' '/usr/ports/local/mono/distinfo'
Index: ./distinfo
--- ./distinfo Tue Jun 29 19:01:10 2004
+++ ./distinfo Wed Jul 7 22:17:04 2004
@@ -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 -u '/usr/ports/lang/mono/files/patch-configure' '/usr/ports/local/mono/files/patch-configure'
Index: ./files/patch-configure
--- ./files/patch-configure Tue Jun 29 19:01:10 2004
+++ ./files/patch-configure Wed Jul 7 22:36:12 2004
@@ -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 -u /dev/null '/usr/ports/local/mono/files/patch-libgc_configure'
Index: ./files/patch-libgc_configure
--- ./files/patch-libgc_configure Wed Dec 31 16:00:00 1969
+++ ./files/patch-libgc_configure Wed Jul 7 22:44:18 2004
@@ -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 -u /dev/null '/usr/ports/local/mono/files/patch-libgc_threadlibs.c'
Index: ./files/patch-libgc_threadlibs.c
--- ./files/patch-libgc_threadlibs.c Wed Dec 31 16:00:00 1969
+++ ./files/patch-libgc_threadlibs.c Wed Jul 7 23:06:05 2004
@@ -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 -u '/usr/ports/lang/mono/pkg-plist' '/usr/ports/local/mono/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist Tue Jun 29 19:01:10 2004
+++ ./pkg-plist Wed Jul 7 23:43:17 2004
@@ -189,7 +189,7 @@
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 @@
@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
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Wed Jul 7 23:55:29 2004
# Generated by : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 1382 1089266920 0100644
# p 'distinfo' 93 1089263824 0100644
# p 'files/patch-configure' 637 1089264972 0100644
# c 'files/patch-libgc_configure' 0 1089265458 0100644
# c 'files/patch-libgc_threadlibs.c' 0 1089266765 0100644
# p 'pkg-plist' 14426 1089268997 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Wed Jul 7 23:55:29 2004] ####
#### Checksum: 202 7651 52049 ####
--- update-mono-1.0 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1089270399.0>