diff options
-rw-r--r-- | lang/mono/Makefile | 12 | ||||
-rw-r--r-- | lang/mono/PLIST | 53 | ||||
-rw-r--r-- | lang/mono/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/mono/distinfo | 22 | ||||
-rw-r--r-- | lang/mono/patches/patch-aa | 34 | ||||
-rw-r--r-- | lang/mono/patches/patch-ac | 10 | ||||
-rw-r--r-- | lang/mono/patches/patch-ad | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-ar | 10 | ||||
-rw-r--r-- | lang/mono/patches/patch-cf | 14 | ||||
-rw-r--r-- | lang/mono/patches/patch-cg | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-ch | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-ci | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-cj | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-ck | 12 | ||||
-rw-r--r-- | lang/mono/patches/patch-cl | 70 | ||||
-rw-r--r-- | lang/mono/patches/patch-cm | 21 |
16 files changed, 69 insertions, 253 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 3ed21b75637..2a1fcfe15aa 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.71 2008/09/01 09:28:54 kefren Exp $ +# $NetBSD: Makefile,v 1.72 2008/10/07 13:22:32 kefren Exp $ DISTNAME= mono-${MONO_VERSION} -PKGREVISION= 4 CATEGORIES= lang -MASTER_SITES= http://go-mono.com/sources/mono/ +MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kefren@NetBSD.org @@ -16,7 +15,7 @@ BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser CONFLICTS= pnet-[0-9]* -MONO_VERSION= 1.9.1 +MONO_VERSION= 2.0 ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} USE_TOOLS+= bison gmake gtar perl:run pkg-config bash:run @@ -42,9 +41,11 @@ UNLIMIT_RESOURCES+= memorysize PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in PKGCONFIG_OVERRIDE+= data/cecil.pc.in PKGCONFIG_OVERRIDE+= data/dotnet.pc.in +PKGCONFIG_OVERRIDE+= data/dotnet35.pc.in PKGCONFIG_OVERRIDE+= data/mint.pc.in PKGCONFIG_OVERRIDE+= data/mono-cairo.pc.in PKGCONFIG_OVERRIDE+= data/mono.pc.in +PKGCONFIG_OVERRIDE+= data/smcs.pc.in PKGCONFIG_OVERRIDE+= scripts/mono-nunit.pc.in REPLACE_PERL+= mcs/errors/do-tests.pl @@ -59,11 +60,12 @@ REPLACE_PERL+= mono/tests/stress-runner.pl REPLACE_BASH+= mono/arch/arm/dpiops.sh REPLACE_BASH+= mono/arch/arm/fpaops.sh REPLACE_BASH+= mono/arch/arm/vfpops.sh +REPLACE_BASH+= mono/tests/make_imt_test.sh REPLACE_BASH+= scripts/mono-find-provides.in REPLACE_BASH+= scripts/mono-find-requires.in REPLACE_BASH+= scripts/mono-test-install REPLACE_BASH+= web/mono-build-w32.sh -REPLACE_BASH+= mcs/class/Mono.Mozilla/build-csproj2k5 +REPLACE_BASH+= mcs/class/Mono.WebBrowser/build-csproj2k5 REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj2k5 REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/gtk/compile.sh diff --git a/lang/mono/PLIST b/lang/mono/PLIST index 2c821722aeb..7a020dada43 100644 --- a/lang/mono/PLIST +++ b/lang/mono/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.25 2008/08/10 16:19:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.26 2008/10/07 13:22:32 kefren Exp $ bin/al +bin/al1 bin/al2 bin/caspol bin/cert2spc @@ -10,24 +11,30 @@ bin/disco bin/dtd2rng bin/dtd2xsd bin/gacutil +bin/gacutil2 bin/genxs +bin/genxs1 +bin/genxs2 bin/gmcs bin/httpcfg bin/ilasm +bin/ilasm1 bin/ilasm2 bin/installvst bin/jay bin/macpack bin/makecert -bin/mbas bin/mconfig bin/mcs +bin/mcs1 bin/mjs bin/mkbundle +bin/mkbundle1 bin/mkbundle2 bin/mono bin/mono-api-diff bin/mono-api-info +bin/mono-api-info1 bin/mono-api-info2 bin/mono-find-provides bin/mono-find-requires @@ -40,6 +47,7 @@ bin/monodis bin/monograph bin/monolinker bin/monop +bin/monop1 bin/monop2 bin/mozroots bin/nunit-console @@ -48,6 +56,7 @@ bin/pedump bin/permview bin/prj2make bin/resgen +bin/resgen1 bin/resgen2 bin/secutil bin/setreg @@ -58,9 +67,11 @@ bin/sn bin/soapsuds bin/sqlsharp bin/wsdl +bin/wsdl1 bin/wsdl2 bin/xbuild bin/xsd +bin/xsd2 include/mono-1.0/mono/cil/opcode.def include/mono-1.0/mono/interpreter/embed.h include/mono-1.0/mono/io-layer/access.h @@ -75,6 +86,7 @@ include/mono-1.0/mono/io-layer/io-layer.h include/mono-1.0/mono/io-layer/io-portability.h include/mono-1.0/mono/io-layer/io.h include/mono-1.0/mono/io-layer/macros.h +include/mono-1.0/mono/io-layer/messages.h include/mono-1.0/mono/io-layer/mono-mutex.h include/mono-1.0/mono/io-layer/mutexes.h include/mono-1.0/mono/io-layer/processes.h @@ -160,10 +172,10 @@ lib/mono/1.0/Mono.Data.TdsClient.dll lib/mono/1.0/Mono.Data.dll lib/mono/1.0/Mono.GetOptions.dll lib/mono/1.0/Mono.Http.dll -lib/mono/1.0/Mono.Mozilla.dll lib/mono/1.0/Mono.Posix.dll lib/mono/1.0/Mono.Security.Win32.dll lib/mono/1.0/Mono.Security.dll +lib/mono/1.0/Mono.WebBrowser.dll lib/mono/1.0/Novell.Directory.Ldap.dll lib/mono/1.0/Npgsql.dll lib/mono/1.0/OpenSystem.C.dll @@ -290,6 +302,7 @@ lib/mono/2.0/I18N.Other.dll lib/mono/2.0/I18N.Rare.dll lib/mono/2.0/I18N.West.dll lib/mono/2.0/I18N.dll +lib/mono/2.0/IBM.Data.DB2.dll lib/mono/2.0/ICSharpCode.SharpZipLib.dll lib/mono/2.0/MSBuild/Microsoft.Build.CommonTypes.xsd lib/mono/2.0/MSBuild/Microsoft.Build.Core.xsd @@ -316,11 +329,11 @@ lib/mono/2.0/Mono.Data.TdsClient.dll lib/mono/2.0/Mono.Data.dll lib/mono/2.0/Mono.GetOptions.dll lib/mono/2.0/Mono.Http.dll -lib/mono/2.0/Mono.Mozilla.dll lib/mono/2.0/Mono.Posix.dll lib/mono/2.0/Mono.Security.Win32.dll lib/mono/2.0/Mono.Security.dll lib/mono/2.0/Mono.Web.dll +lib/mono/2.0/Mono.WebBrowser.dll lib/mono/2.0/Novell.Directory.Ldap.dll lib/mono/2.0/Npgsql.dll lib/mono/2.0/OpenSystem.C.dll @@ -328,6 +341,8 @@ lib/mono/2.0/PEAPI.dll lib/mono/2.0/System.Configuration.Install.dll lib/mono/2.0/System.Configuration.dll lib/mono/2.0/System.Core.dll +lib/mono/2.0/System.Data.DataSetExtensions.dll +lib/mono/2.0/System.Data.Linq.dll lib/mono/2.0/System.Data.OracleClient.dll lib/mono/2.0/System.Data.dll lib/mono/2.0/System.Design.dll @@ -347,11 +362,14 @@ lib/mono/2.0/System.Web.Extensions.dll lib/mono/2.0/System.Web.Services.dll lib/mono/2.0/System.Web.dll lib/mono/2.0/System.Windows.Forms.dll +lib/mono/2.0/System.Xml.Linq.dll lib/mono/2.0/System.Xml.dll lib/mono/2.0/System.dll lib/mono/2.0/al.exe lib/mono/2.0/al.exe.mdb lib/mono/2.0/cscompmgd.dll +lib/mono/2.0/gacutil.exe +lib/mono/2.0/gacutil.exe.mdb lib/mono/2.0/gmcs.exe lib/mono/2.0/gmcs.exe.config lib/mono/2.0/gmcs.exe.mdb @@ -388,9 +406,10 @@ lib/mono/2.0/wsdl.exe.mdb lib/mono/2.0/xbuild.exe lib/mono/2.0/xbuild.exe.mdb lib/mono/2.0/xbuild.rsp +lib/mono/2.0/xsd.exe +lib/mono/2.0/xsd.exe.mdb lib/mono/3.5/System.Web.Extensions.Design.dll lib/mono/3.5/System.Web.Extensions.dll -lib/mono/3.5/System.Xml.Linq.dll lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a/Accessibility.dll @@ -511,8 +530,6 @@ lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756/Mono.Http.dll.mdb lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756/Mono.Http.dll.mdb -lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756/Mono.Mozilla.dll -lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756/Mono.Mozilla.dll.mdb lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756/Mono.Posix.dll.mdb lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756/Mono.Posix.dll @@ -527,6 +544,8 @@ lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756/Mono.Security.dll.mdb lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll.mdb +lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756/Mono.WebBrowser.dll +lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756/Mono.WebBrowser.dll.mdb lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756/Novell.Directory.Ldap.dll.mdb lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll @@ -551,6 +570,10 @@ lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll.mdb lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089/System.Core.dll lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089/System.Core.dll.mdb +lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089/System.Data.DataSetExtensions.dll +lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089/System.Data.DataSetExtensions.dll.mdb +lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089/System.Data.Linq.dll +lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089/System.Data.Linq.dll.mdb lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll @@ -607,8 +630,12 @@ lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.d lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll.mdb lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll.mdb +lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.Design.dll +lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.Design.dll.mdb lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb +lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll +lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35/System.Web.Extensions.dll.mdb lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a/System.Web.Services.dll.mdb lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll @@ -649,9 +676,11 @@ lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77/nunit.util.dll.mdb lib/pkgconfig/cecil.pc lib/pkgconfig/dotnet.pc +lib/pkgconfig/dotnet35.pc lib/pkgconfig/mono-cairo.pc lib/pkgconfig/mono-nunit.pc lib/pkgconfig/mono.pc +lib/pkgconfig/smcs.pc man/man1/al.1 man/man1/cert2spc.1 man/man1/certmgr.1 @@ -782,7 +811,9 @@ share/mono-1.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/System.Web.Services/2.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.Web.Services/1.0.5000.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.Web.Services +@dirrm lib/mono/gac/System.Web.Extensions/3.5.0.0__31bf3856ad364e35 @dirrm lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35 +@dirrm lib/mono/gac/System.Web.Extensions.Design/3.5.0.0__31bf3856ad364e35 @dirrm lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35 @dirrm lib/mono/gac/System.Web.Extensions.Design @dirrm lib/mono/gac/System.Web.Extensions @@ -827,6 +858,10 @@ share/mono-1.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089 @dirrm lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089 @dirrm lib/mono/gac/System.Data.OracleClient +@dirrm lib/mono/gac/System.Data.Linq/3.5.0.0__b77a5c561934e089 +@dirrm lib/mono/gac/System.Data.Linq +@dirrm lib/mono/gac/System.Data.DataSetExtensions/3.5.0.0__b77a5c561934e089 +@dirrm lib/mono/gac/System.Data.DataSetExtensions @dirrm lib/mono/gac/System.Data @dirrm lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089 @dirrm lib/mono/gac/System.Core @@ -848,6 +883,8 @@ share/mono-1.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/Novell.Directory.Ldap/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Novell.Directory.Ldap/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Novell.Directory.Ldap +@dirrm lib/mono/gac/Mono.WebBrowser/0.5.0.0__0738eb9f132ed756 +@dirrm lib/mono/gac/Mono.WebBrowser @dirrm lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Web @dirrm lib/mono/gac/Mono.Security/2.0.0.0__0738eb9f132ed756 @@ -859,8 +896,6 @@ share/mono-1.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/Mono.Posix/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Posix/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Posix -@dirrm lib/mono/gac/Mono.Mozilla/0.2.0.0__0738eb9f132ed756 -@dirrm lib/mono/gac/Mono.Mozilla @dirrm lib/mono/gac/Mono.Http/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Http/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Http diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index 2aaf2a4aebd..5332202f78b 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2008/05/30 11:01:15 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2008/10/07 13:22:33 kefren Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= mono BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono .if ${MONO_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.mono+= mono>=1.9 +BUILDLINK_API_DEPENDS.mono+= mono>=2.0 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} .endif # MONO_BUILDLINK3_MK diff --git a/lang/mono/distinfo b/lang/mono/distinfo index f5b79f30697..2499fa36ff0 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,19 +1,17 @@ -$NetBSD: distinfo,v 1.37 2008/09/01 09:28:54 kefren Exp $ +$NetBSD: distinfo,v 1.38 2008/10/07 13:22:33 kefren Exp $ -SHA1 (mono-1.9.1.tar.bz2) = a6229bb625dcdbcc992aef3f8049bf1b27205db7 -RMD160 (mono-1.9.1.tar.bz2) = 32659841ef5de912b8064f7b1f0452304ffd35d0 -Size (mono-1.9.1.tar.bz2) = 18429855 bytes -SHA1 (patch-aa) = 5d9fb5f3a468f415337565021497fa1005716502 +SHA1 (mono-2.0.tar.bz2) = 761c653750367331732f76cc7fb3a7d4480bff80 +RMD160 (mono-2.0.tar.bz2) = a80be8a222bcffd402ecc727c87d20c30b750031 +Size (mono-2.0.tar.bz2) = 19368811 bytes SHA1 (patch-ab) = 28217e3c8bbbde2e26d33bf32297e99971e3d436 -SHA1 (patch-ac) = 4ca577c2a03a6bc71b198e6dfa87cc6b2b9ad60a -SHA1 (patch-ad) = c03630b88d2614eb3bc37dfc0dc4cd0b0bbe5e63 +SHA1 (patch-ac) = f88e1a034063a7f14e73d2e314e362d950c65e05 SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1 SHA1 (patch-af) = abe2bc406e8f58c00f4d1226bda3c5fb9d4ea36f SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc SHA1 (patch-aq) = 2279dc6b46eded6f5a67b04e79779c1c7117fbc5 -SHA1 (patch-ar) = a82fa37f2580cd412ac0774bca27c8bd4ec5b6f3 +SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642 @@ -27,11 +25,3 @@ SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69 SHA1 (patch-cc) = ee2b28f90034d17330910af2f6c47524a3d6d557 SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 -SHA1 (patch-cf) = 5f896a60fe1056c34237c38fb25f6dea3b5939e5 -SHA1 (patch-cg) = eb28f024bae68028fd3d047794974d04b9a59783 -SHA1 (patch-ch) = ac6f50457ac38d922394b47d6e8bd2595991fcaa -SHA1 (patch-ci) = 3f2a817ac3bfab939d62c1053790e0c3d4a8c961 -SHA1 (patch-cj) = 0cd0f67ba1443ee1f9c55ed930208304c1dae0be -SHA1 (patch-ck) = 31979c8d8136e3530590dd4f1118189fbbcdad68 -SHA1 (patch-cl) = 7678d74b5ee3c1d179b83d070f8e3855c2eb3c9a -SHA1 (patch-cm) = 304168de1dc9e16b87264cb14af0c00a55b87f0e diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa deleted file mode 100644 index 6e381e4ff1c..00000000000 --- a/lang/mono/patches/patch-aa +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-aa,v 1.14 2008/04/19 18:42:10 kefren Exp $ ---- mcs/tools/tuner/Makefile.orig 2007-11-09 00:08:31.000000000 +0200 -+++ mcs/tools/tuner/Makefile 2008-03-18 20:17:17.000000000 +0200 -@@ -57,7 +57,7 @@ - run-test-local run-test-ondotnet-local: - - TUNER_FLAGS = -d $(WORKING_DIR) -o $(OUTPUT_DIR) \ -- -l none \ -+# -l none \ - -c link \ - -a smcs \ - -b true \ -@@ -78,15 +78,19 @@ - - TUNER_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/mono/2.1 - --end-install: check-install-dir inst-mscorlib.dll inst-smcs.exe gac-System gac-System.Xml.Core gac-System.Core -+end-install: check-install-dir inst-mscorlib.dll inst-tuned-smcs.exe gac-System gac-System.Xml.Core gac-System.Core - - check-install-dir: - [ -d $(TUNER_INSTALL_DIR) ] || mkdir $(TUNER_INSTALL_DIR) - --inst-%: -+inst-tuned-%: - $(INSTALL_LIB) $(OUTPUT_DIR)/$* $(TUNER_INSTALL_DIR)/$* - test ! -f $(OUTPUT_DIR)/$*.mdb || $(INSTALL_LIB) $(OUTPUT_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb - -+inst-%: -+ $(INSTALL_LIB) $(WORKING_DIR)/$* $(TUNER_INSTALL_DIR)/$* -+ test ! -f $(WORKING_DIR)/$*.mdb || $(INSTALL_LIB) $(WORKING_DIR)/$*.mdb $(TUNER_INSTALL_DIR)/$*.mdb -+ - gac-%: - $(GACUTIL) /i $(OUTPUT_DIR)/$*.dll /f /root $(DESTDIR)$(mono_libdir) /package 2.1 - diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac index 75f5dc209e0..971085db0d1 100644 --- a/lang/mono/patches/patch-ac +++ b/lang/mono/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.14 2008/02/13 14:16:43 kefren Exp $ ---- data/Makefile.in.orig 2008-02-05 13:36:24.000000000 +0200 -+++ data/Makefile.in 2008-02-05 13:36:42.000000000 +0200 -@@ -232,7 +232,7 @@ +$NetBSD: patch-ac,v 1.15 2008/10/07 13:22:33 kefren Exp $ +--- data/Makefile.in.orig 2008-10-02 00:07:19.000000000 +0300 ++++ data/Makefile.in 2008-10-06 16:48:02.000000000 +0300 +@@ -244,7 +244,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = net_1_1 net_2_0 @@ -9,4 +9,4 @@ $NetBSD: patch-ac,v 1.14 2008/02/13 14:16:43 kefren Exp $ +monodir = $(datadir)/examples/mono EXTRA_DIST = \ config.in \ - browscap.ini mono.supp README \ + browscap.ini mono.supp mono.d README \ diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad deleted file mode 100644 index 97b179a25b5..00000000000 --- a/lang/mono/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.14 2008/04/25 11:23:26 kefren Exp $ ---- mcs/mcs/anonymous.cs.orig 2008-04-25 13:42:00.000000000 +0300 -+++ mcs/mcs/anonymous.cs 2008-04-25 13:42:44.000000000 +0300 -@@ -1150,7 +1150,7 @@ - - public virtual bool HasExplicitParameters { - get { -- return true; -+ return Parameters != null; - } - } - diff --git a/lang/mono/patches/patch-ar b/lang/mono/patches/patch-ar index 4814c6aa5d6..198a0ae293d 100644 --- a/lang/mono/patches/patch-ar +++ b/lang/mono/patches/patch-ar @@ -1,10 +1,10 @@ -$NetBSD: patch-ar,v 1.3 2008/04/19 18:42:10 kefren Exp $ ---- data/net_2_0/Makefile.in.orig 2008-03-11 01:37:54.000000000 +0200 -+++ data/net_2_0/Makefile.in 2008-03-18 15:38:00.000000000 +0200 -@@ -217,7 +217,7 @@ - target_vendor = @target_vendor@ +$NetBSD: patch-ar,v 1.4 2008/10/07 13:22:33 kefren Exp $ +--- data/net_2_0/Makefile.in.orig 2008-10-02 00:07:20.000000000 +0300 ++++ data/net_2_0/Makefile.in 2008-10-06 16:55:41.000000000 +0300 +@@ -238,7 +238,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + SUBDIRS = Browsers -monodir = $(sysconfdir)/mono/2.0 +monodir = $(datadir)/examples/mono/2.0 EXTRA_DIST = machine.config \ diff --git a/lang/mono/patches/patch-cf b/lang/mono/patches/patch-cf deleted file mode 100644 index 18576f56bb9..00000000000 --- a/lang/mono/patches/patch-cf +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog.orig 2008-02-06 22:38:44.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog 2008-08-09 22:23:02.000000000 +0300 -@@ -1,3 +1,10 @@ -+2008-07-25 Dean Brettle <dean@brettle.com> -+ -+ * HtmlControl.cs (PreProcessRelativeReference), -+ HtmlForm.cs (RenderAttributes), HtmlInputButton (RenderAttributes), -+ HtmlInputRadioButton (RenderAttributes), HtmlSelect (RenderChildren): -+ Encode attributes that could contain HTML special chars. -+ - 2008-02-06 Marek Habersack <mhabersack@novell.com> - - * HtmlMeta.cs: render XHTML compliant tag if not in the Legacy diff --git a/lang/mono/patches/patch-cg b/lang/mono/patches/patch-cg deleted file mode 100644 index d33b28927e8..00000000000 --- a/lang/mono/patches/patch-cg +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs.orig 2007-11-09 00:10:32.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs 2008-08-09 22:23:02.000000000 +0300 -@@ -90,7 +90,7 @@ - catch (Exception) { - throw new HttpException(attribName + " property had malformed url"); - } -- writer.WriteAttribute(attribName, attr); -+ writer.WriteAttribute(attribName, attr, true); - Attributes.Remove(attribName); - } - } diff --git a/lang/mono/patches/patch-ch b/lang/mono/patches/patch-ch deleted file mode 100644 index b7be4e73fee..00000000000 --- a/lang/mono/patches/patch-ch +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs.orig 2008-01-30 00:04:11.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs 2008-08-09 22:23:02.000000000 +0300 -@@ -276,7 +276,7 @@ - w.WriteAttribute ("name", Name); - - w.WriteAttribute ("method", Method); -- w.WriteAttribute ("action", action); -+ w.WriteAttribute ("action", action, true); - - /* - * This is a hack that guarantees the ID is set properly for HtmlControl to diff --git a/lang/mono/patches/patch-ci b/lang/mono/patches/patch-ci deleted file mode 100644 index 6470de3091d..00000000000 --- a/lang/mono/patches/patch-ci +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs.orig 2007-11-09 00:10:32.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs 2008-08-09 22:23:02.000000000 +0300 -@@ -302,7 +302,7 @@ - - if (oc != null) { - writer.WriteAttribute ("language", "javascript"); -- writer.WriteAttribute ("onclick", oc); -+ writer.WriteAttribute ("onclick", oc, true); - } - } - #endif diff --git a/lang/mono/patches/patch-cj b/lang/mono/patches/patch-cj deleted file mode 100644 index ab1c7c11ea9..00000000000 --- a/lang/mono/patches/patch-cj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cj,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs.orig 2007-11-09 00:10:32.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs 2008-08-09 22:23:02.000000000 +0300 -@@ -126,7 +126,7 @@ - if (Page != null) - Page.ClientScript.RegisterForEventValidation (this.UniqueID, Value); - #endif -- writer.WriteAttribute ("value", Value); -+ writer.WriteAttribute ("value", Value, true); - Attributes.Remove ("value"); - base.RenderAttributes (writer); - } diff --git a/lang/mono/patches/patch-ck b/lang/mono/patches/patch-ck deleted file mode 100644 index 69cc454ef21..00000000000 --- a/lang/mono/patches/patch-ck +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ck,v 1.1 2008/08/09 19:57:51 kefren Exp $ ---- mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs.orig 2008-01-30 00:04:11.000000000 +0200 -+++ mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs 2008-08-09 22:23:02.000000000 +0300 -@@ -693,7 +693,7 @@ - } - } - -- w.WriteAttribute ("value", item.Value); -+ w.WriteAttribute ("value", item.Value, true); - w.Write (HtmlTextWriter.TagRightChar); - - w.Write (item.Text); diff --git a/lang/mono/patches/patch-cl b/lang/mono/patches/patch-cl deleted file mode 100644 index 9add244aa5c..00000000000 --- a/lang/mono/patches/patch-cl +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-cl,v 1.1 2008/09/01 09:28:54 kefren Exp $ ---- mcs/class/System.Web/System.Web/HttpResponseHeader.cs 2008/08/21 16:19:17 111275 -+++ mcs/class/System.Web/System.Web/HttpResponseHeader.cs 2008/08/21 16:51:54 111276 -@@ -30,17 +30,65 @@ - - using System.Collections; - using System.Text; -+using System.Web.Configuration; - - namespace System.Web { - - internal abstract class BaseResponseHeader { -- public string Value; -+ string headerValue; -+ -+ public string Value { -+ get { return headerValue; } -+ set { headerValue = EncodeHeader (value); } -+ } - -+ static bool headerCheckingEnabled; -+ -+ static BaseResponseHeader () { -+#if NET_2_0 -+ HttpRuntimeSection section = WebConfigurationManager.GetSection ("system.web/httpRuntime") as HttpRuntimeSection; -+#else -+ HttpRuntimeConfig section = HttpContext.GetAppConfig ("system.web/httpRuntime") as HttpRuntimeConfig; -+#endif -+ headerCheckingEnabled = section == null || section.EnableHeaderChecking; -+ } -+ -+ - internal BaseResponseHeader (string val) - { - Value = val; - } - -+ string EncodeHeader (string value) -+ { -+ if (value == null || value.Length == 0) -+ return value; -+ -+ if (headerCheckingEnabled) { -+ StringBuilder ret = new StringBuilder (); -+ int len = value.Length; -+ -+ for (int i = 0; i < len; i++) { -+ switch (value [i]) { -+ case '\r': -+ ret.Append ("%0d"); -+ break; -+ -+ case '\n': -+ ret.Append ("%0a"); -+ break; -+ -+ default: -+ ret.Append (value [i]); -+ break; -+ } -+ } -+ -+ return ret.ToString (); -+ } else -+ return value; -+ } -+ - internal abstract void SendContent (HttpWorkerRequest wr); - } - diff --git a/lang/mono/patches/patch-cm b/lang/mono/patches/patch-cm deleted file mode 100644 index 32e0ec20cc9..00000000000 --- a/lang/mono/patches/patch-cm +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-cm,v 1.1 2008/09/01 09:28:54 kefren Exp $ ---- mcs/class/System.Web/System.Web.Configuration/HttpRuntimeConfig.cs 2008/08/21 16:19:17 111275 -+++ mcs/class/System.Web/System.Web.Configuration/HttpRuntimeConfig.cs 2008/08/21 16:51:54 111276 -@@ -55,7 +55,8 @@ - public int IdleTimeout = 20; // minutes - public bool Enable = true; - public string VersionHeader; -- -+ public bool EnableHeaderChecking = true; -+ - /* Only the config. handler should create instances of this. Use GetInstance (context) */ - public HttpRuntimeConfig (object p) - { -@@ -92,6 +93,7 @@ - RequireRootSaveAsPath = parent.RequireRootSaveAsPath; - IdleTimeout = parent.IdleTimeout; - Enable = parent.Enable; -+ EnableHeaderChecking = parent.EnableHeaderChecking; - } - } - } |