Attachment 48620 Details for Bug 74397 – mono-1.0.4.diff

[patch] mono-1.0.4.diff

mono-1.0.4.diff (text/plain), 10.39 KB, created by Tom McLaughlin on 2004-11-26 04:20:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom McLaughlin

Created: 2004-11-26 04:20:18 UTC

Size: 10.39 KB

patch

obsolete

>diff -Nur mono.orig/Makefile mono/Makefile
>--- mono.orig/Makefile	Sat Aug 28 21:20:25 2004
>+++ mono/Makefile	Sun Nov 14 02:47:10 2004
>@@ -2,29 +2,29 @@
> # Date created:        22 July 2002
> # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
> #
>-# $FreeBSD: ports/lang/mono/Makefile,v 1.34 2004/08/29 01:20:25 pav Exp $
>+# $FreeBSD$
> #
> 
> PORTNAME=	mono
>-PORTVERSION=	1.0
>-PORTREVISION=	1
>+PORTVERSION=	1.0.4
> CATEGORIES=	lang
>-MASTER_SITES=	http://mono.ximian.com/archive/${PORTVERSION}/
>+MASTER_SITES=	http://www.go-mono.com/archive/${PORTVERSION}/
> 
> MAINTAINER=	coop9211@uidaho.edu
> COMMENT=	An open source implementation of .NET Development Framework
> 
> USE_REINPLACE=	yes
> USE_BISON=	yes
>-USE_GNOME=	gnomehack glib20 pkgconfig
>+USE_GNOME=	gnomehack glib20
> USE_GMAKE=	yes
>-GNU_CONFIGURE=	yes
>+LIBTOOLFILES=	configure libgc/configure
>+USE_LIBTOOL_VER=15
> INSTALLS_SHLIB=	yes
> CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 		PTHREAD_LIBS="${PTHREAD_LIBS}"
> CONFIGURE_ARGS=	--program-transform-name=\'\' \
> 		--with-gc=included \
>-		--with-nptl=no
>+		--with-tls=pthread
> 
> MAN1=		cert2spc.1 certmgr.1 chktrust.1 cilc.1 disco.1 gacutil.1 \
> 		genxs.1 ilasm.1 makecert.1 mcs.1 mint.1 mono.1 \
>@@ -38,8 +38,12 @@
> 
> .if ${OSVERSION} < 500000
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-signbit
>-.elif ${OSVERSION} < 502113
>-IGNORE=	"Does not work on 5.X before 502113"
>+.elif ${OSVERSION} < 503000
>+IGNORE=	"Does not work on 5.X before 503000"
> .endif
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
>+		${WRKSRC}/mono/metadata/assembly.c
> 
> .include <bsd.port.post.mk>
>diff -Nur mono.orig/distinfo mono/distinfo
>--- mono.orig/distinfo	Wed Jul 14 12:40:17 2004
>+++ mono/distinfo	Wed Nov  3 00:22:32 2004
>@@ -1,2 +1,2 @@
>-MD5 (mono-1.0.tar.gz) = 23a5787818837893073e2ae56d4ef3ac
>-SIZE (mono-1.0.tar.gz) = 18218284
>+MD5 (mono-1.0.4.tar.gz) = 272d26525bfa121ee19713051d5b3a01
>+SIZE (mono-1.0.4.tar.gz) = 18452996
>diff -Nur mono.orig/files/patch-configure mono/files/patch-configure
>--- mono.orig/files/patch-configure	Sat Aug 28 21:20:26 2004
>+++ mono/files/patch-configure	Sun Sep 12 05:40:18 2004
>@@ -1,21 +1,6 @@
>---- 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"
>--		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 @@
>+--- 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
>diff -Nur mono.orig/files/patch-libgc_Makefile.in mono/files/patch-libgc_Makefile.in
>--- mono.orig/files/patch-libgc_Makefile.in	Sat Jun 12 18:08:56 2004
>+++ mono/files/patch-libgc_Makefile.in	Wed Nov  3 00:22:32 2004
>@@ -1,11 +1,11 @@
>---- libgc/Makefile.in.orig	Sat Jun 12 15:40:48 2004
>-+++ libgc/Makefile.in	Sat Jun 12 15:41:15 2004
>-@@ -120,7 +120,7 @@
>- 
>+--- 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 @@
>+ 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
>diff -Nur mono.orig/files/patch-libgc_configure mono/files/patch-libgc_configure
>--- mono.orig/files/patch-libgc_configure	Wed Jul 14 12:40:17 2004
>+++ mono/files/patch-libgc_configure	Wed Dec 31 19:00:00 1969
>@@ -1,13 +0,0 @@
>---- 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 -Nur mono.orig/files/patch-libgc_dyn_load.c mono/files/patch-libgc_dyn_load.c
>--- mono.orig/files/patch-libgc_dyn_load.c	Sat Jun 12 18:10:50 2004
>+++ mono/files/patch-libgc_dyn_load.c	Sun Sep 12 05:40:18 2004
>@@ -1,24 +1,24 @@
>---- libgc/dyn_load.c.orig	Tue May 18 14:42:19 2004
>-+++ libgc/dyn_load.c	Sat Jun 12 15:23:33 2004
>-@@ -91,6 +91,13 @@
>+--- libgc/dyn_load.c.orig	Sat Jul 17 11:31:47 2004
>++++ libgc/dyn_load.c	Sun Sep 12 04:09:10 2004
>+@@ -96,6 +96,13 @@
>  /* Newer versions of GNU/Linux define this macro.  We
>   * define it similarly for any ELF systems that don't.  */
>  #  ifndef ElfW
>-+#ifdef __FreeBSD__
>++#ifdef FREEBSD
> +#if __ELF_WORD_SIZE == 32
> +#define ElfW(type) Elf32_##type
> +#else
> +#define ElfW(type) Elf64_##type
> +#endif
> +#else
>- #    ifdef __NetBSD__
>+ #    ifdef NETBSD
>  #      if ELFSIZE == 32
>  #        define ElfW(type) Elf32_##type
>-@@ -104,6 +111,7 @@
>- #        define ElfW(type) Elf64_##type
>+@@ -110,6 +117,7 @@
>  #      endif
>  #    endif
>-+#endif
>  #  endif
>++#endif
>  
>  #if defined(SUNOS5DL) && !defined(USE_PROC_FOR_LIBRARIES)
>+ 
>diff -Nur mono.orig/files/patch-libgc_ltmain.sh mono/files/patch-libgc_ltmain.sh
>--- mono.orig/files/patch-libgc_ltmain.sh	Sat Jun 12 18:08:56 2004
>+++ mono/files/patch-libgc_ltmain.sh	Wed Dec 31 19:00:00 1969
>@@ -1,42 +0,0 @@
>---- libgc/ltmain.sh.orig	Mon Mar 31 09:34:30 2003
>-+++ libgc/ltmain.sh	Sat Jun 12 15:23:56 2004
>-@@ -1060,8 +1060,16 @@
>- 	continue
>- 	;;
>- 
>-+      -pthread)
>-+      compile_command="$compile_command -pthread"
>-+      finalize_command="$finalize_command -pthread"
>-+      compiler_flags="$compiler_flags -pthread"
>-+      continue
>-+      ;;
>-+
>-       -module)
>- 	module=yes
>-+	build_old_libs=no
>- 	continue
>- 	;;
>- 
>-@@ -2444,6 +2452,9 @@
>- 	  *-*-openbsd*)
>- 	    # Do not include libc due to us having libc/libc_r.
>- 	    ;;
>-+	  *-*-freebsd*)
>-+	    # FreeBSD doesn't need this...
>-+	    ;;
>- 	  *)
>- 	    # Add libc to deplibs on all other systems if necessary.
>- 	    if test $build_libtool_need_lc = "yes"; then
>-@@ -4210,10 +4221,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $instname $destdir/$name"
>- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>diff -Nur mono.orig/files/patch-ltmain.sh mono/files/patch-ltmain.sh
>--- mono.orig/files/patch-ltmain.sh	Sat Jun 12 18:08:56 2004
>+++ mono/files/patch-ltmain.sh	Wed Dec 31 19:00:00 1969
>@@ -1,51 +0,0 @@
>---- ltmain.sh.orig	Thu May 22 16:42:22 2003
>-+++ ltmain.sh	Tue May 27 12:12:52 2003
>-@@ -1072,7 +1072,7 @@
>- 	  esac
>- 	 elif test "X$arg" = "X-lc_r"; then
>- 	  case $host in
>--	 *-*-openbsd* | *-*-freebsd*)
>-+	 *-*-openbsd* | *-*-freebsd4*)
>- 	    # Do not include libc_r directly, use -pthread flag.
>- 	    continue
>- 	    ;;
>-@@ -1082,8 +1082,16 @@
>- 	continue
>- 	;;
>- 
>-+      -pthread)
>-+      compile_command="$compile_command -pthread"
>-+      finalize_command="$finalize_command -pthread"
>-+      compiler_flags="$compiler_flags -pthread"
>-+      continue
>-+      ;;
>-+
>-       -module)
>- 	module=yes
>-+	build_old_libs=no
>- 	continue
>- 	;;
>- 
>-@@ -2498,6 +2506,9 @@
>- 	  *-*-openbsd* | *-*-freebsd*)
>- 	    # Do not include libc due to us having libc/libc_r.
>- 	    ;;
>-+	  *-*-freebsd*)
>-+	    # FreeBSD doesn't need this...
>-+	    ;;
>- 	  *)
>- 	    # Add libc to deplibs on all other systems if necessary.
>- 	    if test $build_libtool_need_lc = "yes"; then
>-@@ -4325,10 +4336,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $instname $destdir/$name"
>- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>diff -Nur mono.orig/files/patch-mono_Makefile.in mono/files/patch-mono_Makefile.in
>--- mono.orig/files/patch-mono_Makefile.in	Tue Mar  2 02:14:20 2004
>+++ mono/files/patch-mono_Makefile.in	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- mono/Makefile.in.bak	Mon Feb  2 17:02:39 2004
>-+++ mono/Makefile.in	Tue Mar  2 01:48:16 2004
>-@@ -123,7 +123,7 @@
>- @PLATFORM_WIN32_TRUE@	arch monograph interpreter mini tests benchmark profiler
>- 
>- @PLATFORM_WIN32_FALSE@SUBDIRS = utils io-layer monoburg os metadata cil dis \
>--@PLATFORM_WIN32_FALSE@	arch monograph interpreter mini tests benchmark handles profiler
>-+@PLATFORM_WIN32_FALSE@	arch monograph interpreter mini benchmark handles profiler
>- 
>- subdir = mono
>- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>diff -Nur mono.orig/pkg-descr mono/pkg-descr
>--- mono.orig/pkg-descr	Mon Jul 22 09:41:43 2002
>+++ mono/pkg-descr	Wed Sep 22 01:58:34 2004
>@@ -1,3 +1,3 @@
>-An open source implementation of .NET Development Framework
>+An open source implementation of .NET Development Framework.
> 
>-WWW: http://www.go-mono.com/
>+WWW: http://www.mono-project.com/
>diff -Nur mono.orig/pkg-plist mono/pkg-plist
>--- mono.orig/pkg-plist	Wed Jul 14 12:40:17 2004
>+++ mono/pkg-plist	Sat Oct 30 18:09:45 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.1641.20878__7c307b91aa13d208/IBM.Data.DB2.dll
>+lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__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.1641.20878__7c307b91aa13d208
>+@dirrm lib/mono/gac/IBM.Data.DB2/1.0.1677.31401__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

Actions: View | Diff

Attachments on bug 74397: 48620