From 5e89e8eb685c58fd619a02993ce473474731c4d0 Mon Sep 17 00:00:00 2001 From: kefren Date: Wed, 13 Feb 2008 14:16:43 +0000 Subject: Update to mono 1.2.6 --- lang/mono/MESSAGE | 2 +- lang/mono/Makefile | 66 +++++----- lang/mono/Makefile.version | 3 + lang/mono/PLIST | 301 +++++++++++++++++++++++++++++++-------------- lang/mono/buildlink3.mk | 9 +- lang/mono/distinfo | 43 ++++--- lang/mono/patches/patch-ab | 24 ++-- lang/mono/patches/patch-ac | 19 ++- lang/mono/patches/patch-af | 19 ++- lang/mono/patches/patch-ah | 13 -- lang/mono/patches/patch-ai | 13 -- lang/mono/patches/patch-aj | 174 -------------------------- lang/mono/patches/patch-ak | 66 +--------- lang/mono/patches/patch-al | 13 -- lang/mono/patches/patch-am | 13 -- lang/mono/patches/patch-an | 56 --------- lang/mono/patches/patch-ao | 15 --- lang/mono/patches/patch-aq | 13 +- lang/mono/patches/patch-ar | 17 ++- lang/mono/patches/patch-ba | 11 +- lang/mono/patches/patch-bd | 11 +- lang/mono/patches/patch-bf | 19 ++- lang/mono/patches/patch-bg | 12 ++ lang/mono/patches/patch-bh | 12 ++ lang/mono/patches/patch-bi | 37 ++++++ lang/mono/patches/patch-ca | 9 +- lang/mono/patches/patch-cb | 9 +- lang/mono/patches/patch-cc | 12 ++ lang/mono/patches/patch-cd | 12 ++ lang/mono/patches/patch-ce | 32 +++++ 30 files changed, 465 insertions(+), 590 deletions(-) create mode 100644 lang/mono/Makefile.version delete mode 100644 lang/mono/patches/patch-ah delete mode 100644 lang/mono/patches/patch-ai delete mode 100644 lang/mono/patches/patch-aj delete mode 100644 lang/mono/patches/patch-al delete mode 100644 lang/mono/patches/patch-am delete mode 100644 lang/mono/patches/patch-an delete mode 100644 lang/mono/patches/patch-ao create mode 100644 lang/mono/patches/patch-bg create mode 100644 lang/mono/patches/patch-bh create mode 100644 lang/mono/patches/patch-bi create mode 100644 lang/mono/patches/patch-cc create mode 100644 lang/mono/patches/patch-cd create mode 100644 lang/mono/patches/patch-ce diff --git a/lang/mono/MESSAGE b/lang/mono/MESSAGE index 5cc65bf6831..0be95bba8d4 100644 --- a/lang/mono/MESSAGE +++ b/lang/mono/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2005/03/27 10:25:51 recht Exp $ +$NetBSD: MESSAGE,v 1.4 2008/02/13 14:16:43 kefren Exp $ If you intent to use the System.Drawing or Windows.Forms then you have to install graphics/libgdiplus as well. diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 56d22841d69..22ca4c013cb 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.59 2007/11/05 11:28:50 drochner Exp $ +# $NetBSD: Makefile,v 1.60 2008/02/13 14:16:43 kefren Exp $ -DISTNAME= mono-1.1.13.8.1 -PKGREVISION= 3 +DISTNAME= mono-${MONO_VERSION} CATEGORIES= lang -MASTER_SITES= http://go-mono.com/sources/mono-1.1/ +MASTER_SITES= http://go-mono.com/sources/mono/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= recht@NetBSD.org +MAINTAINER= kefren@NetBSD.org HOMEPAGE= http://www.mono-project.com/ COMMENT= Open source implementation of the .NET Development Framework @@ -13,16 +13,16 @@ BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser CONFLICTS= pnet-[0-9]* +.include "../../lang/mono/Makefile.version" + # XXX please test NOT_FOR_PLATFORM= NetBSD-1.[0-5]*-* NOT_FOR_PLATFORM+= NetBSD-1.6-* NetBSD-1.6.*-* NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-* -# LP64 problems -NOT_FOR_PLATFORM+= *-*-alpha *-*-sparc64 *-*-x86_64 - USE_TOOLS+= bison gmake gtar perl:run pkg-config bash:run USE_LIBTOOL= yes +USE_LANGUAGES+= c c++ EXTRACT_USING= gtar GNU_CONFIGURE= yes @@ -37,51 +37,57 @@ UNLIMIT_RESOURCES= datasize UNLIMIT_RESOURCES+= stacksize UNLIMIT_RESOURCES+= memorysize -PKGCONFIG_OVERRIDE+= dotnet.pc.in -PKGCONFIG_OVERRIDE+= mint.pc.in -PKGCONFIG_OVERRIDE+= mono-cairo.pc.in +PKGCONFIG_OVERRIDE+= data/cecil.pc.in +PKGCONFIG_OVERRIDE+= data/dotnet.pc.in +PKGCONFIG_OVERRIDE+= data/mint.pc.in +PKGCONFIG_OVERRIDE+= data/mono-cairo.pc.in PKGCONFIG_OVERRIDE+= mono-uninstalled.pc.in -PKGCONFIG_OVERRIDE+= mono.pc.in +PKGCONFIG_OVERRIDE+= data/mono.pc.in PKGCONFIG_OVERRIDE+= scripts/mono-nunit.pc.in -REPLACE_PERL+= mcs/class/Microsoft.VisualBasic/fixup/fixup.pl REPLACE_PERL+= mcs/errors/do-tests.pl REPLACE_PERL+= mcs/tools/scan-tests.pl +REPLACE_PERL+= msvc/create-windef.pl REPLACE_PERL+= mono/benchmark/test-driver REPLACE_PERL+= mono/cil/make-opcodes-def.pl REPLACE_PERL+= mono/metadata/make-bundle.pl +REPLACE_PERL+= mono/mini/genmdesc.pl REPLACE_PERL+= mono/tests/stress-runner.pl REPLACE_BASH+= scripts/mono-find-provides.in REPLACE_BASH+= scripts/mono-find-requires.in +REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj +REPLACE_BASH+= mcs/class/Managed.Windows.Forms/build-csproj2k5 EGDIR= ${PREFIX}/share/examples/mono -PKG_SYSCONFSUBDIR= mono -CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config -CONF_FILES+= ${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/browscap.ini +CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config +CONF_FILES+= ${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/mono/browscap.ini CONF_FILES+= ${EGDIR}/1.0/DefaultWsdlHelpGenerator.aspx \ - ${PKG_SYSCONFDIR}/1.0/DefaultWsdlHelpGenerator.aspx -CONF_FILES+= ${EGDIR}/1.0/machine.config ${PKG_SYSCONFDIR}/1.0/machine.config + ${PKG_SYSCONFDIR}/mono/1.0/DefaultWsdlHelpGenerator.aspx +CONF_FILES+= ${EGDIR}/1.0/machine.config \ + ${PKG_SYSCONFDIR}/mono/1.0/machine.config CONF_FILES+= ${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \ - ${PKG_SYSCONFDIR}/2.0/DefaultWsdlHelpGenerator.aspx -CONF_FILES+= ${EGDIR}/2.0/machine.config ${PKG_SYSCONFDIR}/2.0/machine.confi + ${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx +CONF_FILES+= ${EGDIR}/2.0/machine.config \ + ${PKG_SYSCONFDIR}/mono/2.0/machine.confi TEST_TARGET= check -post-patch: substpcprefix -# replace relative prefix in pkgconfig files -substpcprefix: -.for f in ${PKGCONFIG_OVERRIDE} - (cd ${WRKSRC}; \ - ${SED} 's|$${pcfiledir}/../..|@prefix@|g' <${f} >${f}.tmp; \ - ${MV} ${f}.tmp ${f} \ - ) -.endfor +SUBST_CLASSES+= fix-prefix +SUBST_STAGE.fix-prefix= post-patch +SUBST_MESSAGE.fix-prefix= Fixing relative prefix +SUBST_FILES.fix-prefix= ${PKGCONFIG_OVERRIDE} +SUBST_SED.fix-prefix= -e 's,$${pcfiledir}/../..,\@prefix\@,g' + +SUBST_CLASSES+= fix-mcs +SUBST_STAGE.fix-mcs= post-patch +SUBST_MESSAGE.fix-mcs= Fixing mcs default prefix +SUBST_FILES.fix-mcs= mcs/build/config-default.make +SUBST_SED.fix-mcs= -e 's,/usr/local,${PREFIX},g' .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/lang/mono/Makefile.version b/lang/mono/Makefile.version new file mode 100644 index 00000000000..671863bbeb9 --- /dev/null +++ b/lang/mono/Makefile.version @@ -0,0 +1,3 @@ +# $NetBSD: Makefile.version,v 1.1 2008/02/13 14:16:43 kefren Exp $ + +MONO_VERSION= 1.2.6 diff --git a/lang/mono/PLIST b/lang/mono/PLIST index 70ef8bd5b54..34ee87dc256 100644 --- a/lang/mono/PLIST +++ b/lang/mono/PLIST @@ -1,43 +1,59 @@ -@comment $NetBSD: PLIST,v 1.21 2006/08/03 18:15:07 drochner Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/02/13 14:16:43 kefren Exp $ bin/al +bin/al2 bin/caspol bin/cert2spc bin/certmgr bin/chktrust bin/cilc bin/disco +bin/dtd2rng bin/dtd2xsd bin/gacutil bin/genxs bin/gmcs +bin/httpcfg bin/ilasm bin/ilasm2 +bin/installvst bin/jay bin/macpack bin/makecert bin/mbas +bin/mconfig bin/mcs bin/mjs bin/mkbundle +bin/mkbundle2 bin/mono +bin/mono-api-diff +bin/mono-api-info +bin/mono-api-info2 bin/mono-find-provides bin/mono-find-requires bin/mono-service +bin/mono-service2 bin/mono-shlib-cop -bin/monodiet +bin/mono-test-install +bin/mono-xmltool bin/monodis bin/monograph +bin/monolinker bin/monop bin/monop2 bin/mozroots bin/nunit-console +bin/nunit-console2 bin/pedump bin/permview bin/prj2make bin/resgen +bin/resgen2 bin/secutil bin/setreg +bin/sgen bin/signcode +bin/smcs bin/sn bin/soapsuds bin/sqlsharp @@ -45,65 +61,72 @@ bin/wsdl bin/wsdl2 bin/xbuild bin/xsd -include/mono/cil/opcode.def -include/mono/interpreter/embed.h -include/mono/io-layer/access.h -include/mono/io-layer/atomic.h -include/mono/io-layer/collection.h -include/mono/io-layer/context.h -include/mono/io-layer/critical-sections.h -include/mono/io-layer/error.h -include/mono/io-layer/events.h -include/mono/io-layer/handles.h -include/mono/io-layer/io-layer.h -include/mono/io-layer/io.h -include/mono/io-layer/macros.h -include/mono/io-layer/mono-mutex.h -include/mono/io-layer/mutexes.h -include/mono/io-layer/processes.h -include/mono/io-layer/security.h -include/mono/io-layer/semaphores.h -include/mono/io-layer/sockets.h -include/mono/io-layer/status.h -include/mono/io-layer/system.h -include/mono/io-layer/threads.h -include/mono/io-layer/timefuncs.h -include/mono/io-layer/types.h -include/mono/io-layer/uglify.h -include/mono/io-layer/versioninfo.h -include/mono/io-layer/wait.h -include/mono/io-layer/wapi.h -include/mono/jit/jit.h -include/mono/metadata/appdomain.h -include/mono/metadata/assembly.h -include/mono/metadata/blob.h -include/mono/metadata/class.h -include/mono/metadata/debug-helpers.h -include/mono/metadata/debug-mono-symfile.h -include/mono/metadata/environment.h -include/mono/metadata/exception.h -include/mono/metadata/image.h -include/mono/metadata/loader.h -include/mono/metadata/mempool.h -include/mono/metadata/metadata.h -include/mono/metadata/mono-debug.h -include/mono/metadata/mono-gc.h -include/mono/metadata/object.h -include/mono/metadata/opcodes.h -include/mono/metadata/profiler.h -include/mono/metadata/reflection.h -include/mono/metadata/row-indexes.h -include/mono/metadata/threads.h -include/mono/metadata/tokentype.h -include/mono/metadata/verify.h -include/mono/utils/mono-codeman.h -include/mono/utils/mono-digest.h -include/mono/utils/mono-hash.h -include/mono/utils/mono-logger.h -include/mono/utils/mono-math.h -include/mono/utils/mono-poll.h -include/mono/utils/mono-uri.h -include/mono/utils/monobitset.h +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 +include/mono-1.0/mono/io-layer/atomic.h +include/mono-1.0/mono/io-layer/collection.h +include/mono-1.0/mono/io-layer/context.h +include/mono-1.0/mono/io-layer/critical-sections.h +include/mono-1.0/mono/io-layer/error.h +include/mono-1.0/mono/io-layer/events.h +include/mono-1.0/mono/io-layer/handles.h +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/mono-mutex.h +include/mono-1.0/mono/io-layer/mutexes.h +include/mono-1.0/mono/io-layer/processes.h +include/mono-1.0/mono/io-layer/security.h +include/mono-1.0/mono/io-layer/semaphores.h +include/mono-1.0/mono/io-layer/sockets.h +include/mono-1.0/mono/io-layer/status.h +include/mono-1.0/mono/io-layer/system.h +include/mono-1.0/mono/io-layer/threads.h +include/mono-1.0/mono/io-layer/timefuncs.h +include/mono-1.0/mono/io-layer/types.h +include/mono-1.0/mono/io-layer/uglify.h +include/mono-1.0/mono/io-layer/versioninfo.h +include/mono-1.0/mono/io-layer/wait.h +include/mono-1.0/mono/io-layer/wapi.h +include/mono-1.0/mono/jit/jit.h +include/mono-1.0/mono/metadata/appdomain.h +include/mono-1.0/mono/metadata/assembly.h +include/mono-1.0/mono/metadata/attrdefs.h +include/mono-1.0/mono/metadata/blob.h +include/mono-1.0/mono/metadata/class.h +include/mono-1.0/mono/metadata/debug-helpers.h +include/mono-1.0/mono/metadata/debug-mono-symfile.h +include/mono-1.0/mono/metadata/environment.h +include/mono-1.0/mono/metadata/exception.h +include/mono-1.0/mono/metadata/image.h +include/mono-1.0/mono/metadata/loader.h +include/mono-1.0/mono/metadata/mempool.h +include/mono-1.0/mono/metadata/metadata.h +include/mono-1.0/mono/metadata/mono-config.h +include/mono-1.0/mono/metadata/mono-debug.h +include/mono-1.0/mono/metadata/mono-gc.h +include/mono-1.0/mono/metadata/object.h +include/mono-1.0/mono/metadata/opcodes.h +include/mono-1.0/mono/metadata/profiler.h +include/mono-1.0/mono/metadata/reflection.h +include/mono-1.0/mono/metadata/row-indexes.h +include/mono-1.0/mono/metadata/threads.h +include/mono-1.0/mono/metadata/tokentype.h +include/mono-1.0/mono/metadata/verify.h +include/mono-1.0/mono/utils/mono-codeman.h +include/mono-1.0/mono/utils/mono-counters.h +include/mono-1.0/mono/utils/mono-digest.h +include/mono-1.0/mono/utils/mono-hash.h +include/mono-1.0/mono/utils/mono-logger.h +include/mono-1.0/mono/utils/mono-math.h +include/mono-1.0/mono/utils/mono-membar.h +include/mono-1.0/mono/utils/mono-path.h +include/mono-1.0/mono/utils/mono-poll.h +include/mono-1.0/mono/utils/mono-stdlib.h +include/mono-1.0/mono/utils/mono-uri.h +include/mono-1.0/mono/utils/monobitset.h lib/libMonoPosixHelper.la lib/libMonoSupportW.la lib/libikvm-native.la @@ -114,6 +137,7 @@ lib/mono/1.0/Accessibility.dll lib/mono/1.0/ByteFX.Data.dll lib/mono/1.0/Commons.Xml.Relaxng.dll lib/mono/1.0/CorCompare.exe +lib/mono/1.0/CustomMarshalers.dll lib/mono/1.0/FirebirdSql.Data.Firebird.dll lib/mono/1.0/I18N.CJK.dll lib/mono/1.0/I18N.MidEast.dll @@ -124,11 +148,11 @@ lib/mono/1.0/I18N.dll lib/mono/1.0/IBM.Data.DB2.dll lib/mono/1.0/ICSharpCode.SharpZipLib.dll lib/mono/1.0/Microsoft.JScript.dll -lib/mono/1.0/Microsoft.VisualBasic.dll lib/mono/1.0/Microsoft.VisualC.dll lib/mono/1.0/Microsoft.Vsa.dll lib/mono/1.0/Mono.Cairo.dll lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll +lib/mono/1.0/Mono.Data.Sqlite.dll lib/mono/1.0/Mono.Data.SqliteClient.dll lib/mono/1.0/Mono.Data.SybaseClient.dll lib/mono/1.0/Mono.Data.Tds.dll @@ -136,11 +160,13 @@ 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/Novell.Directory.Ldap.dll lib/mono/1.0/Npgsql.dll +lib/mono/1.0/OpenSystem.C.dll lib/mono/1.0/PEAPI.dll lib/mono/1.0/System.Configuration.Install.dll lib/mono/1.0/System.Data.OracleClient.dll @@ -176,8 +202,12 @@ lib/mono/1.0/chktrust.exe.mdb lib/mono/1.0/cilc.exe lib/mono/1.0/cilc.exe.mdb lib/mono/1.0/cscompmgd.dll +lib/mono/1.0/culevel.exe +lib/mono/1.0/culevel.exe.mdb lib/mono/1.0/disco.exe lib/mono/1.0/disco.exe.mdb +lib/mono/1.0/dtd2rng.exe +lib/mono/1.0/dtd2rng.exe.mdb lib/mono/1.0/dtd2xsd.exe lib/mono/1.0/dtd2xsd.exe.mdb lib/mono/1.0/gacutil.exe @@ -188,12 +218,12 @@ lib/mono/1.0/ictool.exe lib/mono/1.0/ictool.exe.mdb lib/mono/1.0/ilasm.exe lib/mono/1.0/ilasm.exe.mdb +lib/mono/1.0/installvst.exe +lib/mono/1.0/installvst.exe.mdb lib/mono/1.0/macpack.exe lib/mono/1.0/macpack.exe.mdb lib/mono/1.0/makecert.exe lib/mono/1.0/makecert.exe.mdb -lib/mono/1.0/mbas.exe -lib/mono/1.0/mbas.exe.mdb lib/mono/1.0/mcs.exe lib/mono/1.0/mcs.exe.config lib/mono/1.0/mcs.exe.mdb @@ -208,6 +238,10 @@ lib/mono/1.0/mono-service.exe.mdb lib/mono/1.0/mono-shlib-cop.exe lib/mono/1.0/mono-shlib-cop.exe.config lib/mono/1.0/mono-shlib-cop.exe.mdb +lib/mono/1.0/mono-xmltool.exe +lib/mono/1.0/mono-xmltool.exe.mdb +lib/mono/1.0/monolinker.exe +lib/mono/1.0/monolinker.exe.mdb lib/mono/1.0/monop.exe lib/mono/1.0/monop.exe.mdb lib/mono/1.0/mozroots.exe @@ -219,6 +253,7 @@ lib/mono/1.0/nunit-console.exe.config lib/mono/1.0/nunit-console.exe.mdb lib/mono/1.0/nunit.core.dll lib/mono/1.0/nunit.framework.dll +lib/mono/1.0/nunit.mocks.dll lib/mono/1.0/nunit.util.dll lib/mono/1.0/permview.exe lib/mono/1.0/permview.exe.mdb @@ -238,6 +273,7 @@ lib/mono/1.0/soapsuds.exe lib/mono/1.0/soapsuds.exe.mdb lib/mono/1.0/sqlsharp.exe lib/mono/1.0/sqlsharp.exe.mdb +lib/mono/1.0/transform.exe lib/mono/1.0/wsdl.exe lib/mono/1.0/wsdl.exe.mdb lib/mono/1.0/xsd.exe @@ -245,6 +281,7 @@ lib/mono/1.0/xsd.exe.mdb lib/mono/2.0/Accessibility.dll lib/mono/2.0/ByteFX.Data.dll lib/mono/2.0/Commons.Xml.Relaxng.dll +lib/mono/2.0/CustomMarshalers.dll lib/mono/2.0/I18N.CJK.dll lib/mono/2.0/I18N.MidEast.dll lib/mono/2.0/I18N.Other.dll @@ -252,17 +289,24 @@ lib/mono/2.0/I18N.Rare.dll lib/mono/2.0/I18N.West.dll lib/mono/2.0/I18N.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 lib/mono/2.0/Microsoft.Build.Engine.dll lib/mono/2.0/Microsoft.Build.Framework.dll lib/mono/2.0/Microsoft.Build.Tasks.dll lib/mono/2.0/Microsoft.Build.Utilities.dll +lib/mono/2.0/Microsoft.Build.xsd +lib/mono/2.0/Microsoft.CSharp.targets +lib/mono/2.0/Microsoft.Common.targets +lib/mono/2.0/Microsoft.Common.tasks lib/mono/2.0/Microsoft.JScript.dll -lib/mono/2.0/Microsoft.VisualBasic.dll +lib/mono/2.0/Microsoft.VisualBasic.targets lib/mono/2.0/Microsoft.VisualC.dll lib/mono/2.0/Microsoft.Vsa.dll lib/mono/2.0/Mono.C5.dll lib/mono/2.0/Mono.Cairo.dll lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll +lib/mono/2.0/Mono.Data.Sqlite.dll lib/mono/2.0/Mono.Data.SqliteClient.dll lib/mono/2.0/Mono.Data.SybaseClient.dll lib/mono/2.0/Mono.Data.Tds.dll @@ -270,14 +314,17 @@ 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/Novell.Directory.Ldap.dll lib/mono/2.0/Npgsql.dll +lib/mono/2.0/OpenSystem.C.dll 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.OracleClient.dll lib/mono/2.0/System.Data.dll lib/mono/2.0/System.Design.dll @@ -291,18 +338,31 @@ lib/mono/2.0/System.Runtime.Remoting.dll lib/mono/2.0/System.Runtime.Serialization.Formatters.Soap.dll lib/mono/2.0/System.Security.dll lib/mono/2.0/System.ServiceProcess.dll +lib/mono/2.0/System.Transactions.dll +lib/mono/2.0/System.Web.Extensions.Design.dll +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.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/gmcs.exe lib/mono/2.0/gmcs.exe.config lib/mono/2.0/gmcs.exe.mdb +lib/mono/2.0/httpcfg.exe +lib/mono/2.0/httpcfg.exe.mdb lib/mono/2.0/ilasm.exe lib/mono/2.0/ilasm.exe.mdb +lib/mono/2.0/mconfig.exe +lib/mono/2.0/mconfig.exe.mdb +lib/mono/2.0/mkbundle.exe +lib/mono/2.0/mkbundle.exe.mdb lib/mono/2.0/mono-api-info.exe +lib/mono/2.0/mono-service.exe +lib/mono/2.0/mono-service.exe.mdb lib/mono/2.0/monop.exe lib/mono/2.0/monop.exe.mdb lib/mono/2.0/mscorlib.dll @@ -310,10 +370,15 @@ lib/mono/2.0/mscorlib.dll.mdb lib/mono/2.0/nunit-console.exe lib/mono/2.0/nunit-console.exe.config lib/mono/2.0/nunit-console.exe.mdb +lib/mono/2.0/resgen.exe +lib/mono/2.0/resgen.exe.mdb +lib/mono/2.0/sgen.exe +lib/mono/2.0/sgen.exe.mdb lib/mono/2.0/wsdl.exe 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/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 @@ -328,6 +393,10 @@ lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxn lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756/Commons.Xml.Relaxng.dll.mdb +lib/mono/gac/CustomMarshalers/1.0.5000.0__b03f5f7f11d50a3a/CustomMarshalers.dll +lib/mono/gac/CustomMarshalers/1.0.5000.0__b03f5f7f11d50a3a/CustomMarshalers.dll.mdb +lib/mono/gac/CustomMarshalers/2.0.0.0__b03f5f7f11d50a3a/CustomMarshalers.dll +lib/mono/gac/CustomMarshalers/2.0.0.0__b03f5f7f11d50a3a/CustomMarshalers.dll.mdb lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4/FirebirdSql.Data.Firebird.dll.mdb lib/mono/gac/I18N.CJK/1.0.5000.0__0738eb9f132ed756/I18N.CJK.dll @@ -376,8 +445,6 @@ lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dl lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a/Microsoft.JScript.dll.mdb -lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll -lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualBasic.dll lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll.mdb lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll @@ -392,10 +459,18 @@ lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756/Mono.Cairo.dll.mdb lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756/Mono.Cairo.dll.mdb +lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll +lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756/Mono.Cecil.Mdb.dll.mdb +lib/mono/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll +lib/mono/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll.mdb lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb +lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll +lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756/Mono.Data.Sqlite.dll.mdb +lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll +lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll.mdb lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll.mdb lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756/Mono.Data.SqliteClient.dll @@ -424,6 +499,8 @@ 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.1.0.0__0738eb9f132ed756/Mono.Mozilla.dll +lib/mono/gac/Mono.Mozilla/0.1.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 @@ -444,6 +521,10 @@ lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7/Npgsql.dll.mdb lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7/Npgsql.dll lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7/Npgsql.dll.mdb +lib/mono/gac/OpenSystem.C/1.0.5000.0__b77a5c561934e089/OpenSystem.C.dll +lib/mono/gac/OpenSystem.C/1.0.5000.0__b77a5c561934e089/OpenSystem.C.dll.mdb +lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089/OpenSystem.C.dll +lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089/OpenSystem.C.dll.mdb lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756/PEAPI.dll.mdb lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll @@ -454,6 +535,8 @@ lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Confi lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll.mdb lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll 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.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 @@ -506,6 +589,12 @@ lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServicePr lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a/System.ServiceProcess.dll.mdb +lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089/System.Transactions.dll +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/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.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 @@ -530,19 +619,20 @@ lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb +lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756/mono-service.exe +lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756/mono-service.exe.mdb +lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756/mono-service.exe +lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756/mono-service.exe.mdb lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77/nunit.core.dll.mdb lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77/nunit.framework.dll.mdb +lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll +lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77/nunit.mocks.dll.mdb 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/mono/xbuild/Microsoft.Build.Commontypes.xsd -lib/mono/xbuild/Microsoft.Build.Core.xsd -lib/mono/xbuild/Microsoft.Build.xsd -lib/mono/xbuild/Microsoft.Common.tasks -lib/mono/xbuild/xbuild.rsp +lib/pkgconfig/cecil.pc lib/pkgconfig/dotnet.pc -lib/pkgconfig/mint.pc lib/pkgconfig/mono-cairo.pc lib/pkgconfig/mono-nunit.pc lib/pkgconfig/mono.pc @@ -555,30 +645,37 @@ man/man1/disco.1 man/man1/dtd2xsd.1 man/man1/gacutil.1 man/man1/genxs.1 +man/man1/httpcfg.1 man/man1/ilasm.1 man/man1/jay.1 man/man1/macpack.1 man/man1/makecert.1 +man/man1/mconfig.1 man/man1/mcs.1 man/man1/mint.1 man/man1/mkbundle.1 man/man1/mono-service.1 man/man1/mono-shlib-cop.1 +man/man1/mono-xmltool.1 man/man1/mono.1 man/man1/monoburg.1 man/man1/monodis.1 +man/man1/monolinker.1 man/man1/monop.1 man/man1/monostyle.1 man/man1/mozroots.1 man/man1/oldmono.1 man/man1/permview.1 man/man1/prj2make.1 +man/man1/resgen.1 man/man1/secutil.1 man/man1/setreg.1 +man/man1/sgen.1 man/man1/signcode.1 man/man1/sn.1 man/man1/soapsuds.1 man/man1/sqlsharp.1 +man/man1/vbnc.1 man/man1/wsdl.1 man/man1/xsd.1 man/man5/mono-config.5 @@ -586,6 +683,7 @@ share/examples/mono/1.0/DefaultWsdlHelpGenerator.aspx share/examples/mono/1.0/machine.config share/examples/mono/2.0/DefaultWsdlHelpGenerator.aspx share/examples/mono/2.0/machine.config +share/examples/mono/2.0/web.config share/examples/mono/browscap.ini share/examples/mono/config share/jay/ACKNOWLEDGEMENTS @@ -627,23 +725,26 @@ share/libgc-mono/leak.html share/libgc-mono/scale.html share/libgc-mono/simple_example.html share/libgc-mono/tree.html -share/mono/cil/cil-opcodes.xml -@dirrm share/mono/cil -@dirrm share/mono +share/mono-1.0/mono/cil/cil-opcodes.xml +@dirrm share/mono-1.0/mono/cil +@dirrm share/mono-1.0/mono +@dirrm share/mono-1.0 @dirrm share/libgc-mono @dirrm share/jay @dirrm share/examples/mono/2.0 @dirrm share/examples/mono/1.0 @dirrm share/examples/mono -@exec ${MKDIR} %D/lib/mono/xbuild/MSBuild -@dirrm lib/mono/xbuild/MSBuild -@dirrm lib/mono/xbuild @dirrm lib/mono/gac/nunit.util/2.2.0.0__96d09a1eb7f44a77 @dirrm lib/mono/gac/nunit.util +@dirrm lib/mono/gac/nunit.mocks/2.2.8.0__96d09a1eb7f44a77 +@dirrm lib/mono/gac/nunit.mocks @dirrm lib/mono/gac/nunit.framework/2.2.0.0__96d09a1eb7f44a77 @dirrm lib/mono/gac/nunit.framework @dirrm lib/mono/gac/nunit.core/2.2.0.0__96d09a1eb7f44a77 @dirrm lib/mono/gac/nunit.core +@dirrm lib/mono/gac/mono-service/2.0.0.0__0738eb9f132ed756 +@dirrm lib/mono/gac/mono-service/1.0.5000.0__0738eb9f132ed756 +@dirrm lib/mono/gac/mono-service @dirrm lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/cscompmgd @@ -660,7 +761,13 @@ share/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/1.0.61025.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 @dirrm lib/mono/gac/System.Web +@dirrm lib/mono/gac/System.Transactions/2.0.0.0__b77a5c561934e089 +@dirrm lib/mono/gac/System.Transactions @dirrm lib/mono/gac/System.ServiceProcess/2.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.ServiceProcess/1.0.5000.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.ServiceProcess @@ -700,6 +807,8 @@ share/mono/cil/cil-opcodes.xml @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 +@dirrm lib/mono/gac/System.Core/3.5.0.0__b77a5c561934e089 +@dirrm lib/mono/gac/System.Core @dirrm lib/mono/gac/System.Configuration/2.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.Configuration.Install/2.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/System.Configuration.Install/1.0.5000.0__b03f5f7f11d50a3a @@ -709,6 +818,9 @@ share/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/PEAPI/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/PEAPI +@dirrm lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089 +@dirrm lib/mono/gac/OpenSystem.C/1.0.5000.0__b77a5c561934e089 +@dirrm lib/mono/gac/OpenSystem.C @dirrm lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7 @dirrm lib/mono/gac/Npgsql/1.0.5000.0__5d8b90d52f46fda7 @dirrm lib/mono/gac/Npgsql @@ -724,6 +836,8 @@ share/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.1.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 @@ -744,10 +858,17 @@ share/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/Mono.Data.SqliteClient/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Data.SqliteClient/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Data.SqliteClient +@dirrm lib/mono/gac/Mono.Data.Sqlite/2.0.0.0__0738eb9f132ed756 +@dirrm lib/mono/gac/Mono.Data.Sqlite/1.0.5000.0__0738eb9f132ed756 +@dirrm lib/mono/gac/Mono.Data.Sqlite @dirrm lib/mono/gac/Mono.Data @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.CompilerServices.SymbolWriter +@dirrm lib/mono/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756 +@dirrm lib/mono/gac/Mono.Cecil.Mdb/0.2.0.0__0738eb9f132ed756 +@dirrm lib/mono/gac/Mono.Cecil.Mdb +@dirrm lib/mono/gac/Mono.Cecil @dirrm lib/mono/gac/Mono.Cairo/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Cairo/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Mono.Cairo @@ -759,9 +880,6 @@ share/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/Microsoft.VisualC/8.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/Microsoft.VisualC/7.0.5000.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/Microsoft.VisualC -@dirrm lib/mono/gac/Microsoft.VisualBasic/8.0.0.0__b03f5f7f11d50a3a -@dirrm lib/mono/gac/Microsoft.VisualBasic/7.0.5000.0__b03f5f7f11d50a3a -@dirrm lib/mono/gac/Microsoft.VisualBasic @dirrm lib/mono/gac/Microsoft.JScript/8.0.0.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/Microsoft.JScript/7.0.5000.0__b03f5f7f11d50a3a @dirrm lib/mono/gac/Microsoft.JScript @@ -800,6 +918,9 @@ share/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/I18N @dirrm lib/mono/gac/FirebirdSql.Data.Firebird/1.7.1.0__0706f5520aae4ff4 @dirrm lib/mono/gac/FirebirdSql.Data.Firebird +@dirrm lib/mono/gac/CustomMarshalers/2.0.0.0__b03f5f7f11d50a3a +@dirrm lib/mono/gac/CustomMarshalers/1.0.5000.0__b03f5f7f11d50a3a +@dirrm lib/mono/gac/CustomMarshalers @dirrm lib/mono/gac/Commons.Xml.Relaxng/2.0.0.0__0738eb9f132ed756 @dirrm lib/mono/gac/Commons.Xml.Relaxng/1.0.5000.0__0738eb9f132ed756 @dirrm lib/mono/gac/Commons.Xml.Relaxng @@ -812,13 +933,15 @@ share/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac @dirrm lib/mono/compat-2.0 @dirrm lib/mono/compat-1.0 +@dirrm lib/mono/2.0/MSBuild @dirrm lib/mono/2.0 @dirrm lib/mono/1.0 @dirrm lib/mono -@dirrm include/mono/utils -@dirrm include/mono/metadata -@dirrm include/mono/jit -@dirrm include/mono/io-layer -@dirrm include/mono/interpreter -@dirrm include/mono/cil -@dirrm include/mono +@dirrm include/mono-1.0/mono/utils +@dirrm include/mono-1.0/mono/metadata +@dirrm include/mono-1.0/mono/jit +@dirrm include/mono-1.0/mono/io-layer +@dirrm include/mono-1.0/mono/interpreter +@dirrm include/mono-1.0/mono/cil +@dirrm include/mono-1.0/mono +@dirrm include/mono-1.0 diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index 9a755bc1772..0f14c5340ca 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.23 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2008/02/13 14:16:43 kefren Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MONO_BUILDLINK3_MK:= ${MONO_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= mono .endif @@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmono} BUILDLINK_PACKAGES+= mono BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mono -.if !empty(MONO_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.mono+= mono>=1.1.12.1 -BUILDLINK_ABI_DEPENDS.mono?= mono>=1.1.12.1nb2 +.if ${MONO_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.mono+= mono>=1.2.6 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono .endif # MONO_BUILDLINK3_MK diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 3c4cd962411..af20b640cda 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,28 +1,27 @@ -$NetBSD: distinfo,v 1.31 2007/11/05 11:28:50 drochner Exp $ +$NetBSD: distinfo,v 1.32 2008/02/13 14:16:43 kefren Exp $ -SHA1 (mono-1.1.13.8.1.tar.gz) = f2cb79844073694859b1fb92eb770e3705239a3d -RMD160 (mono-1.1.13.8.1.tar.gz) = a100a96b19300b253c12a2ad70caf65721418209 -Size (mono-1.1.13.8.1.tar.gz) = 17758715 bytes -SHA1 (patch-ab) = 00c29acc144c76ed7aa739d031288f0fc48c8786 -SHA1 (patch-ac) = 57139cd9312461db0665bd9f1cfa716f4f6ba6ef +SHA1 (mono-1.2.6.tar.bz2) = f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae +RMD160 (mono-1.2.6.tar.bz2) = c6536b008cb73845943956c9ab365589a28c013c +Size (mono-1.2.6.tar.bz2) = 18163130 bytes +SHA1 (patch-ab) = 28217e3c8bbbde2e26d33bf32297e99971e3d436 +SHA1 (patch-ac) = 4ca577c2a03a6bc71b198e6dfa87cc6b2b9ad60a SHA1 (patch-ae) = f0654c3103e3d69c44158456f481e5a357350cb1 -SHA1 (patch-af) = b74d8401e9e0213a7c4418b9d989365af2f3ae30 +SHA1 (patch-af) = f53ba21803ddb82a5a78f773351d83cd83bd1e05 SHA1 (patch-ag) = 93775d9350fac57f58f20a7f5a512b8f4a3bd1ca -SHA1 (patch-ah) = 6f05a2a7460ea243fa9d294dc8bde4db6dbed55b -SHA1 (patch-ai) = ef4aedc6f6e200704b3754be7277e8d3a047624c -SHA1 (patch-aj) = 14131eb3ee9e827955091412cce59b62da0a6832 -SHA1 (patch-ak) = f053c9f38fecde2ff3f81d8d3668330a333496a2 -SHA1 (patch-al) = 96e7125b2e9046784e3cf1b1c094de26d55d073e -SHA1 (patch-am) = 07b004da1bf0cda00b79f731fd46b440cdff01ba -SHA1 (patch-an) = 9ebaf8024e1a5b9581e5fdf20899331308074db4 -SHA1 (patch-ao) = aa16cc813f443832488e63d9df5e17e9a1483f05 +SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df SHA1 (patch-ap) = db62ab3c1adc9f8a0b6051c4cbb76aef61a5c7dc -SHA1 (patch-aq) = 7c43ded1ac6371df4d31a063032dd3a46d69d4a9 -SHA1 (patch-ar) = 83fed158f52b9717298c0594bc0bbef8edc7e509 -SHA1 (patch-ba) = 1aee2cf3dce0d2d378941b6cbff5600640c4d564 +SHA1 (patch-aq) = 2279dc6b46eded6f5a67b04e79779c1c7117fbc5 +SHA1 (patch-ar) = 67de5bad8bfbba35707bcfc79c9e1b75b59b3031 +SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 -SHA1 (patch-bd) = a52007ae22f8b23d20abf4a56e5b9d57ccd1fbbe +SHA1 (patch-bd) = cf15b750dbd93ebf0e0e5165b8a10aabbf4f1642 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332 -SHA1 (patch-bf) = cbe6c7a401a183eccc73ffb45120486c1cbc75b8 -SHA1 (patch-ca) = 46c16c507f0b1f127561f03d95711c91b6b26820 -SHA1 (patch-cb) = c99543e4a5d2c968871d51780500731e31d4ea36 +SHA1 (patch-bf) = e945b13fbffc1239a4c459a2c6be543e67e883f9 +SHA1 (patch-bg) = 92168eba23d1cf17a1424e318e21b0d845c52c5a +SHA1 (patch-bh) = a42432fd8ed92e2213fbcd24bf29c2b6d4cbd8ba +SHA1 (patch-bi) = 91786c858b459cd6b5a0dc683b5bdefc412973c1 +SHA1 (patch-ca) = f5c54525d70b185f9fcb28f82034c4e995395c0b +SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69 +SHA1 (patch-cc) = ee2b28f90034d17330910af2f6c47524a3d6d557 +SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6 +SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0 diff --git a/lang/mono/patches/patch-ab b/lang/mono/patches/patch-ab index f9aace238d2..fa8f63433dd 100644 --- a/lang/mono/patches/patch-ab +++ b/lang/mono/patches/patch-ab @@ -1,24 +1,14 @@ -$NetBSD: patch-ab,v 1.13 2006/08/03 18:15:08 drochner Exp $ - ---- configure.orig 2006-05-11 00:39:07.000000000 +0200 -+++ configure -@@ -2233,14 +2233,16 @@ _ACEOF - ;; - *-*-*netbsd*) - platform_win32=no -- CPPFLAGS="$CPPFLAGS -D_REENTRANT" -+ CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE" - libmono_cflags="-D_REENTRANT" - LDFLAGS="$LDFLAGS -pthread" +$NetBSD: patch-ab,v 1.14 2008/02/13 14:16:43 kefren Exp $ +--- configure.orig 2008-02-05 14:21:50.000000000 +0200 ++++ configure 2008-02-05 14:24:06.000000000 +0200 +@@ -2890,8 +2890,9 @@ CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes -- libdl= -- libgc_threads=no +- libdl="-ldl" + libdl="-ldl /libexec/ld.elf_so" -+ libgc_threads=pthreads + libgc_threads=pthreads + with_tls=__thread -+ with_sigaltstack=no + with_sigaltstack=no ;; # these flags will work for all versions of -STABLE - # diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac index a1f592a9c8b..75f5dc209e0 100644 --- a/lang/mono/patches/patch-ac +++ b/lang/mono/patches/patch-ac @@ -1,13 +1,12 @@ -$NetBSD: patch-ac,v 1.13 2006/01/03 08:03:53 recht Exp $ - ---- data/Makefile.in.orig 2005-12-22 18:35:08.000000000 +0100 -+++ data/Makefile.in -@@ -271,7 +271,7 @@ target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ +$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 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = net_1_1 net_2_0 -monodir = $(sysconfdir)/mono +monodir = $(datadir)/examples/mono - EXTRA_DIST = config.in \ - browscap.ini - + EXTRA_DIST = \ + config.in \ + browscap.ini mono.supp README \ diff --git a/lang/mono/patches/patch-af b/lang/mono/patches/patch-af index 1142e286d79..9cf0f225cf1 100644 --- a/lang/mono/patches/patch-af +++ b/lang/mono/patches/patch-af @@ -1,13 +1,12 @@ -$NetBSD: patch-af,v 1.8 2006/01/03 08:03:53 recht Exp $ - ---- mono/metadata/Makefile.in.orig 2005-12-22 18:35:15.000000000 +0100 -+++ mono/metadata/Makefile.in -@@ -68,7 +68,7 @@ am__objects_1 = reflection.lo object.lo - am_libmonoruntime_static_la_OBJECTS = $(am__objects_1) - libmonoruntime_static_la_OBJECTS = \ - $(am_libmonoruntime_static_la_OBJECTS) +$NetBSD: patch-af,v 1.9 2008/02/13 14:16:43 kefren Exp $ +--- mono/metadata/Makefile.in.orig 2008-02-05 13:38:26.000000000 +0200 ++++ mono/metadata/Makefile.in 2008-02-05 13:38:34.000000000 +0200 +@@ -65,7 +65,7 @@ + libmonoruntime_static_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmonoruntime_static_la_LDFLAGS) $(LDFLAGS) -o $@ -libmonoruntime_la_LIBADD = +libmonoruntime_la_LIBADD = $(ICU_LIBS) am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \ - decimal.lo boehm-gc.lo null-gc.lo gc.lo marshal.lo monitor.lo \ - threads.lo threadpool.lo file-io.lo socket-io.lo exception.lo \ + decimal.lo boehm-gc.lo null-gc.lo sgen-gc.lo gc.lo marshal.lo \ + mono-mlist.lo monitor.lo threads.lo threadpool.lo file-io.lo \ diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah deleted file mode 100644 index 60b92204095..00000000000 --- a/lang/mono/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.6 2005/07/31 15:26:58 recht Exp $ - ---- libgc/include/gc_config_macros.h.orig 2004-05-18 20:43:26.000000000 +0200 -+++ libgc/include/gc_config_macros.h -@@ -56,7 +56,7 @@ - defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \ - defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \ - defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \ -- defined(GC_AIX_THREADS) || \ -+ defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \ - (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) - # define GC_PTHREADS - # endif diff --git a/lang/mono/patches/patch-ai b/lang/mono/patches/patch-ai deleted file mode 100644 index 16fdc5de6de..00000000000 --- a/lang/mono/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.5 2005/07/31 15:26:58 recht Exp $ - ---- libgc/include/private/gc_priv.h.orig 2005-02-07 18:00:32.000000000 +0100 -+++ libgc/include/private/gc_priv.h -@@ -1936,7 +1936,7 @@ void GC_err_puts GC_PROTO((GC_CONST char - /* in Linux glibc, but it's not exported.) Thus we continue to use */ - /* the same hard-coded signals we've always used. */ - # if !defined(SIG_SUSPEND) --# if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS) -+# if defined(GC_LINUX_THREADS) || defined(GC_DGUX386_THREADS) || defined(GC_NETBSD_THREADS) - # if defined(SPARC) && !defined(SIGPWR) - /* SPARC/Linux doesn't properly define SIGPWR in . - * It is aliased to SIGLOST in asm/signal.h, though. */ diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj deleted file mode 100644 index f6e3db0a3af..00000000000 --- a/lang/mono/patches/patch-aj +++ /dev/null @@ -1,174 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2006/01/03 08:03:53 recht Exp $ - ---- libgc/pthread_stop_world.c.orig 2005-07-05 20:42:42.000000000 +0200 -+++ libgc/pthread_stop_world.c -@@ -99,6 +99,7 @@ word GC_stop_count; /* Incremented at th - # endif - #endif - -+#if !defined(GC_NETBSD_THREADS) - sem_t GC_suspend_ack_sem; - - static void _GC_suspend_handler(int sig) -@@ -208,6 +209,7 @@ static void _GC_restart_handler(int sig) - GC_printf1("In GC_restart_handler for 0x%lx\n", pthread_self()); - #endif - } -+#endif /* !GC_NETBSD_THREADS */ - - # ifdef IA64 - # define IF_IA64(x) x -@@ -283,12 +285,14 @@ static void pthread_push_all_stacks() - ABORT("Collecting from unknown thread."); - } - -+#if !defined(GC_NETBSD_THREADS) - void GC_restart_handler(int sig) - { - int old_errno = errno; - _GC_restart_handler (sig); - errno = old_errno; - } -+#endif - - /* We hold allocation lock. Should do exactly the right thing if the */ - /* world is stopped. Should not fail if it isn't. */ -@@ -297,6 +301,28 @@ void GC_push_all_stacks() - gc_thread_vtable->push_all_stacks(); - } - -+#if defined(GC_NETBSD_THREADS) -+/* -+ * Get the stack start address for the specified address. -+ */ -+int -+np_stackinfo(pthread_t p, void **addr) -+{ -+ pthread_attr_t attr; -+ int ret = -1; -+ -+ if (pthread_attr_init(&attr)) -+ return -1; -+ -+ if (!pthread_attr_get_np(p, &attr)) -+ if (!pthread_attr_getstackaddr(&attr, addr)) -+ ret = 0; -+ -+ pthread_attr_destroy(&attr); -+ return ret; -+} -+#endif -+ - /* There seems to be a very rare thread stopping problem. To help us */ - /* debug that, we save the ids of the stopping thread. */ - pthread_t GC_stopping_thread; -@@ -322,6 +348,7 @@ int GC_suspend_all() - if (p -> stop_info.last_stop_count == GC_stop_count) continue; - if (p -> thread_blocked) /* Will wait */ continue; - n_live_threads++; -+#if !defined(GC_NETBSD_THREADS) - #if DEBUG_THREADS - GC_printf1("Sending suspend signal to 0x%lx\n", p -> id); - #endif -@@ -337,6 +364,23 @@ int GC_suspend_all() - default: - ABORT("pthread_kill failed"); - } -+#else -+ #if DEBUG_THREADS -+ GC_printf1("Suspending 0x%lx ...\n", p -> id); -+ #endif -+ -+ if(pthread_suspend_np(p -> id) != 0) -+ GC_printf1("Could not susend thread... 0x%lx\n", p -> id); -+ -+ /* Right now, this is not enough. Retreiving the stack base address is not the correct */ -+ /* info to give to the GC, but since there is no way to get the current stack pointer */ -+ /* for the suspended thread, base pointer will have to be enough. Mono seems to be */ -+ /* happy with it so... */ -+ if(np_stackinfo(p -> id, &(p -> stop_info.stack_ptr)) != 0) -+ GC_err_printf1("Could not get thread stack address... 0x%lx\n", p -> id); -+ -+ n_live_threads--; -+#endif /* !GC_NETBSD_THREADS */ - } - } - } -@@ -356,6 +400,7 @@ static void pthread_stop_world() - - n_live_threads = GC_suspend_all(); - -+#if !defined(GC_NETBSD_THREADS) - if (GC_retry_signals) { - unsigned long wait_usecs = 0; /* Total wait since retry. */ - # define WAIT_UNIT 3000 -@@ -393,6 +438,8 @@ static void pthread_stop_world() - } - } - } -+#endif /* !GC_NETBSD_THREADS */ -+ - #if DEBUG_THREADS - GC_printf1("World stopped from 0x%lx\n", pthread_self()); - #endif -@@ -439,6 +486,7 @@ static void pthread_start_world() - if (p -> flags & FINISHED) continue; - if (p -> thread_blocked) continue; - n_live_threads++; -+#if !defined(GC_NETBSD_THREADS) - #if DEBUG_THREADS - GC_printf1("Sending restart signal to 0x%lx\n", p -> id); - #endif -@@ -454,10 +502,18 @@ static void pthread_start_world() - default: - ABORT("pthread_kill failed"); - } -+#else -+ #if DEBUG_THREADS -+ GC_printf1("Resuming Thread 0x%lx\n", p -> id); -+ #endif -+ pthread_resume_np(p -> id); -+ n_live_threads--; -+#endif /* !GC_NETBSD_THREADS */ - } - } - } - -+#if !defined(GC_NETBSD_THREADS) - #if DEBUG_THREADS - GC_printf0 ("All threads signaled"); - #endif -@@ -470,6 +526,7 @@ static void pthread_start_world() - } - } - } -+#endif /* !GC_NETBSD_THREADS */ - - #if DEBUG_THREADS - GC_printf0("World started\n"); -@@ -482,6 +539,8 @@ void GC_start_world() - } - - static void pthread_stop_init() { -+ -+#if !defined(GC_NETBSD_THREADS) - struct sigaction act; - - if (sem_init(&GC_suspend_ack_sem, 0, 0) != 0) -@@ -522,6 +581,16 @@ static void pthread_stop_init() { - GC_printf0("Will retry suspend signal if necessary.\n"); - } - # endif -+#else -+ struct sigaction act; -+ -+ act.sa_flags = SA_RESTART; -+ if (sigfillset(&act.sa_mask) != 0) { -+ ABORT("sigfillset() failed"); -+ } -+ GC_remove_allowed_signals(&act.sa_mask); -+ -+#endif /* !GC_NETBSD_THREADS */ - } - - /* We hold the allocation lock. */ diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak index b09c15eafe3..29ac59e41ff 100644 --- a/lang/mono/patches/patch-ak +++ b/lang/mono/patches/patch-ak @@ -1,38 +1,7 @@ -$NetBSD: patch-ak,v 1.7 2006/01/03 08:03:53 recht Exp $ - ---- libgc/pthread_support.c.orig 2005-12-07 06:42:46.000000000 +0100 -+++ libgc/pthread_support.c -@@ -68,7 +68,7 @@ - # endif - - # if (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \ -- defined(GC_DARWIN_THREADS)) && !defined(USE_PTHREAD_SPECIFIC) -+ defined(GC_DARWIN_THREADS) || defined(GC_NETBSD_THREADS)) && !defined(USE_PTHREAD_SPECIFIC) - # define USE_PTHREAD_SPECIFIC - # endif - -@@ -120,7 +120,10 @@ - # include - #endif /* GC_DARWIN_THREADS */ - -- -+#if defined(GC_NETBSD_THREADS) -+# include -+# include -+#endif - - #if defined(GC_DGUX386_THREADS) - # include -@@ -978,7 +981,7 @@ void GC_thr_init() - # if defined(GC_FREEBSD_THREADS) - GC_nprocs = 1; - # endif --# if defined(GC_DARWIN_THREADS) -+# if defined(GC_DARWIN_THREADS) || defined(GC_NETBSD_THREADS) - int ncpus = 1; - size_t len = sizeof(ncpus); - sysctl((int[2]) {CTL_HW, HW_NCPU}, 2, &ncpus, &len, NULL, 0); -@@ -1115,8 +1118,24 @@ void GC_end_blocking(void) { +$NetBSD: patch-ak,v 1.8 2008/02/13 14:16:43 kefren Exp $ +--- libgc/pthread_support.c.orig 2007-11-09 00:07:02.000000000 +0200 ++++ libgc/pthread_support.c 2008-02-05 14:01:40.000000000 +0200 +@@ -1160,6 +1160,22 @@ void GC_end_blocking(void) { #define __d10_sleep sleep #endif /* GC_DGUX386_THREADS */ @@ -40,7 +9,7 @@ $NetBSD: patch-ak,v 1.7 2006/01/03 08:03:53 recht Exp $ +#undef usleep +#undef sleep + -+/* A wrapper for the standard C nanosleep function */ ++/* A wrapper for the standard C nanosleep function */ +int WRAP_FUNC(nanosleep) (const struct timespec *rqtp, struct timespec *rmtp) +{ + int result; @@ -53,28 +22,5 @@ $NetBSD: patch-ak,v 1.7 2006/01/03 08:03:53 recht Exp $ +} + /* A wrapper for the standard C sleep function */ --int WRAP_FUNC(sleep) (unsigned int seconds) -+unsigned int WRAP_FUNC(sleep) (unsigned int seconds) + int WRAP_FUNC(sleep) (unsigned int seconds) { - int result; - -@@ -1126,6 +1145,19 @@ int WRAP_FUNC(sleep) (unsigned int secon - return result; - } - -+/* A wrapper for the standard C usleep function */ -+int WRAP_FUNC(usleep) (useconds_t microseconds) -+{ -+ int result; -+ -+ GC_start_blocking(); -+ result = REAL_FUNC(usleep)(microseconds); -+ GC_end_blocking(); -+ -+ return result; -+} -+ -+ - struct start_info { - void *(*start_routine)(void *); - void *arg; diff --git a/lang/mono/patches/patch-al b/lang/mono/patches/patch-al deleted file mode 100644 index 0c062b4f156..00000000000 --- a/lang/mono/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2005/07/31 15:26:58 recht Exp $ - ---- libgc/specific.c.orig 2003-03-31 16:33:32.000000000 +0200 -+++ libgc/specific.c -@@ -11,7 +11,7 @@ - * modified is included with the above copyright notice. - */ - --#if defined(GC_LINUX_THREADS) -+#if defined(GC_LINUX_THREADS) || defined(GC_NETBSD_THREADS) - - #include "private/gc_priv.h" /* For GC_compare_and_exchange, GC_memory_barrier */ - #include "private/specific.h" diff --git a/lang/mono/patches/patch-am b/lang/mono/patches/patch-am deleted file mode 100644 index 7bfc2cbb3af..00000000000 --- a/lang/mono/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.2 2006/01/03 08:03:53 recht Exp $ - ---- mono/io-layer/collection.c.orig 2005-10-19 13:24:08.000000000 +0200 -+++ mono/io-layer/collection.c -@@ -60,7 +60,7 @@ void _wapi_collection_init (void) - g_assert (ret == 0); - - #ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__NetBSD__) - ret = pthread_attr_setstacksize (&attr, 65536); - #else - ret = pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN); diff --git a/lang/mono/patches/patch-an b/lang/mono/patches/patch-an deleted file mode 100644 index eb306f05fba..00000000000 --- a/lang/mono/patches/patch-an +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-an,v 1.2 2006/01/03 08:03:53 recht Exp $ - ---- mono/mini/exceptions-x86.c.orig 2005-09-15 13:21:13.000000000 +0200 -+++ mono/mini/exceptions-x86.c -@@ -688,7 +688,17 @@ mono_arch_sigctx_to_monoctx (void *sigct - mctx->esi = ctx->uc_mcontext.mc_esi; - mctx->edi = ctx->uc_mcontext.mc_edi; - mctx->eip = ctx->uc_mcontext.mc_eip; --#else -+#elif defined(__NetBSD__) -+ mctx->eax = ctx->uc_mcontext.__gregs[_REG_EAX]; -+ mctx->ebx = ctx->uc_mcontext.__gregs[_REG_EBX]; -+ mctx->ecx = ctx->uc_mcontext.__gregs[_REG_ECX]; -+ mctx->edx = ctx->uc_mcontext.__gregs[_REG_EDX]; -+ mctx->ebp = ctx->uc_mcontext.__gregs[_REG_EBP]; -+ mctx->esp = ctx->uc_mcontext.__gregs[_REG_ESP]; -+ mctx->esi = ctx->uc_mcontext.__gregs[_REG_ESI]; -+ mctx->edi = ctx->uc_mcontext.__gregs[_REG_EDI]; -+ mctx->eip = ctx->uc_mcontext.__gregs[_REG_EIP]; -+#else - mctx->eax = ctx->uc_mcontext.gregs [REG_EAX]; - mctx->ebx = ctx->uc_mcontext.gregs [REG_EBX]; - mctx->ecx = ctx->uc_mcontext.gregs [REG_ECX]; -@@ -725,12 +735,21 @@ mono_arch_monoctx_to_sigctx (MonoContext - ctx->uc_mcontext.mc_ebx = mctx->ebx; - ctx->uc_mcontext.mc_ecx = mctx->ecx; - ctx->uc_mcontext.mc_edx = mctx->edx; -- ctx->uc_mcontext.mc_ebp = mctx->ebp; -+ ctx->uc_mcontext.mc_ebp = mctx->ebp; - ctx->uc_mcontext.mc_esp = mctx->esp; - ctx->uc_mcontext.mc_esi = mctx->esi; - ctx->uc_mcontext.mc_edi = mctx->edi; - ctx->uc_mcontext.mc_eip = mctx->eip; -- -+#elif defined(__NetBSD__) -+ ctx->uc_mcontext.__gregs[_REG_EAX] = mctx->eax; -+ ctx->uc_mcontext.__gregs[_REG_EBX] = mctx->ebx; -+ ctx->uc_mcontext.__gregs[_REG_ECX] = mctx->ecx; -+ ctx->uc_mcontext.__gregs[_REG_EDX] = mctx->edx; -+ ctx->uc_mcontext.__gregs[_REG_EBP] = mctx->ebp; -+ ctx->uc_mcontext.__gregs[_REG_ESP] = mctx->esp; -+ ctx->uc_mcontext.__gregs[_REG_ESI] = mctx->esi; -+ ctx->uc_mcontext.__gregs[_REG_EDI] = mctx->edi; -+ ctx->uc_mcontext.__gregs[_REG_EIP] = mctx->eip; - #else - ctx->uc_mcontext.gregs [REG_EAX] = mctx->eax; - ctx->uc_mcontext.gregs [REG_EBX] = mctx->ebx; -@@ -764,6 +783,8 @@ mono_arch_ip_from_context (void *sigctx) - ucontext_t *ctx = (ucontext_t*)sigctx; - #if defined(__FreeBSD__) - return (gpointer)ctx->uc_mcontext.mc_eip; -+#elif defined(__NetBSD__) -+ return (gpointer)ctx->uc_mcontext.__gregs[_REG_EIP]; - #else - return (gpointer)ctx->uc_mcontext.gregs [REG_EIP]; - #endif diff --git a/lang/mono/patches/patch-ao b/lang/mono/patches/patch-ao deleted file mode 100644 index b153395fb25..00000000000 --- a/lang/mono/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.2 2006/08/03 18:15:08 drochner Exp $ - ---- mono/mini/mini-x86.h.orig 2006-05-11 00:32:02.000000000 +0200 -+++ mono/mini/mini-x86.h -@@ -63,6 +63,10 @@ LONG CALLBACK seh_handler(EXCEPTION_POIN - # endif - # endif /* BSDs */ - -+#else -+#ifdef __NetBSD__ -+#define MONO_ARCH_USE_SIGACTION -+#endif - #endif /* HAVE_WORKING_SIGALTSTACK */ - #endif /* !PLATFORM_WIN32 */ - diff --git a/lang/mono/patches/patch-aq b/lang/mono/patches/patch-aq index 35303ec92ba..6232a0f5314 100644 --- a/lang/mono/patches/patch-aq +++ b/lang/mono/patches/patch-aq @@ -1,11 +1,10 @@ -$NetBSD: patch-aq,v 1.1 2006/08/03 18:15:08 drochner Exp $ - ---- data/net_1_1/Makefile.in.orig 2006-07-27 13:29:45.000000000 +0200 -+++ data/net_1_1/Makefile.in -@@ -263,7 +263,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ +$NetBSD: patch-aq,v 1.2 2008/02/13 14:16:43 kefren Exp $ +--- data/net_1_1/Makefile.in.orig 2008-02-05 14:07:38.000000000 +0200 ++++ data/net_1_1/Makefile.in 2008-02-05 14:07:52.000000000 +0200 +@@ -214,7 +214,7 @@ target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -monodir = $(sysconfdir)/mono/1.0 +monodir = $(datadir)/examples/mono/1.0 EXTRA_DIST = machine.config \ diff --git a/lang/mono/patches/patch-ar b/lang/mono/patches/patch-ar index a6bb60a4fe8..55c3c1508ac 100644 --- a/lang/mono/patches/patch-ar +++ b/lang/mono/patches/patch-ar @@ -1,13 +1,12 @@ -$NetBSD: patch-ar,v 1.1 2006/08/03 18:15:08 drochner Exp $ - ---- data/net_2_0/Makefile.in.orig 2006-07-27 13:31:19.000000000 +0200 -+++ data/net_2_0/Makefile.in -@@ -263,7 +263,7 @@ target_alias = @target_alias@ - target_cpu = @target_cpu@ - target_os = @target_os@ +$NetBSD: patch-ar,v 1.2 2008/02/13 14:16:43 kefren Exp $ +--- data/net_2_0/Makefile.in.orig 2008-02-05 14:09:06.000000000 +0200 ++++ data/net_2_0/Makefile.in 2008-02-05 14:09:24.000000000 +0200 +@@ -214,7 +214,7 @@ target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -monodir = $(sysconfdir)/mono/2.0 +monodir = $(datadir)/examples/mono/2.0 EXTRA_DIST = machine.config \ - DefaultWsdlHelpGenerator.aspx - + web.config \ + DefaultWsdlHelpGenerator.aspx diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba index b35dafeb00e..adb3abfa655 100644 --- a/lang/mono/patches/patch-ba +++ b/lang/mono/patches/patch-ba @@ -1,9 +1,8 @@ -$NetBSD: patch-ba,v 1.6 2006/01/03 08:03:53 recht Exp $ - ---- mono/cil/Makefile.in.orig 2005-12-22 18:35:13.000000000 +0100 -+++ mono/cil/Makefile.in -@@ -466,7 +466,7 @@ uninstall-am: uninstall-defDATA uninstal - uninstall-info-am uninstall-xmlDATA +$NetBSD: patch-ba,v 1.7 2008/02/13 14:16:43 kefren Exp $ +--- mono/cil/Makefile.in.orig 2008-02-05 14:11:27.000000000 +0200 ++++ mono/cil/Makefile.in 2008-02-05 14:11:40.000000000 +0200 +@@ -427,7 +427,7 @@ + uninstall-xmlDATA opcode.def: make-opcodes-def.pl cil-opcodes.xml - perl $(srcdir)/make-opcodes-def.pl $(srcdir)/cil-opcodes.xml $@.tmp diff --git a/lang/mono/patches/patch-bd b/lang/mono/patches/patch-bd index ad1f5dde7b8..77f28433219 100644 --- a/lang/mono/patches/patch-bd +++ b/lang/mono/patches/patch-bd @@ -1,12 +1,11 @@ -$NetBSD: patch-bd,v 1.1 2007/01/04 02:38:14 rillig Exp $ - ---- mcs/build/config-default.make.orig 2006-04-11 00:22:08.000000000 +0200 -+++ mcs/build/config-default.make 2007-01-04 01:11:48.000000000 +0100 -@@ -17,6 +17,7 @@ LIBRARY_FLAGS = /noconfig +$NetBSD: patch-bd,v 1.2 2008/02/13 14:16:43 kefren Exp $ +--- mcs/build/config-default.make.orig 2008-02-05 14:12:44.000000000 +0200 ++++ mcs/build/config-default.make 2008-02-05 14:13:00.000000000 +0200 +@@ -17,6 +17,7 @@ CFLAGS = -g -O2 prefix = /usr/local exec_prefix = $(prefix) +mandir = $(prefix)/man mono_libdir = $(exec_prefix)/lib + sysconfdir = $(prefix)/etc #RUNTIME = mono - RUNTIME = false diff --git a/lang/mono/patches/patch-bf b/lang/mono/patches/patch-bf index 0c7d7124879..76f48a33c13 100644 --- a/lang/mono/patches/patch-bf +++ b/lang/mono/patches/patch-bf @@ -1,8 +1,7 @@ -$NetBSD: patch-bf,v 1.1 2007/08/13 16:41:34 taca Exp $ - ---- support/map.c.orig 2006-04-11 07:21:37.000000000 +0900 -+++ support/map.c -@@ -4672,15 +4672,23 @@ int Mono_Posix_ToMountFlags (guint64 x, +$NetBSD: patch-bf,v 1.2 2008/02/13 14:16:43 kefren Exp $ +--- support/map.c.orig 2008-02-05 14:14:43.000000000 +0200 ++++ support/map.c 2008-02-05 14:16:06.000000000 +0200 +@@ -3011,13 +3011,21 @@ int Mono_Posix_ToMountFlags (guint64 x, int Mono_Posix_FromMremapFlags (guint64 x, guint64 *r) { @@ -11,18 +10,16 @@ $NetBSD: patch-bf,v 1.1 2007/08/13 16:41:34 taca Exp $ +#else *r = 0; +#endif - if (x == 0) - return 0; if ((x & Mono_Posix_MremapFlags_MREMAP_MAYMOVE) == Mono_Posix_MremapFlags_MREMAP_MAYMOVE) +#ifdef __NetBSD__ -+ *r &= ~MAP_FIXED; ++ *r &= ~MAP_FIXED; +#else #ifdef MREMAP_MAYMOVE *r |= MREMAP_MAYMOVE; #else /* def MREMAP_MAYMOVE */ {errno = EINVAL; return -1;} #endif /* ndef MREMAP_MAYMOVE */ -+#endif /* NetBSD */ ++#endif /* __NetBSD__ */ + if (x == 0) + return 0; return 0; - } - diff --git a/lang/mono/patches/patch-bg b/lang/mono/patches/patch-bg new file mode 100644 index 00000000000..125dab2a638 --- /dev/null +++ b/lang/mono/patches/patch-bg @@ -0,0 +1,12 @@ +$NetBSD: patch-bg,v 1.1 2008/02/13 14:16:43 kefren Exp $ +--- mono/metadata/socket-io.c.orig 2008-02-07 08:37:02.000000000 +0200 ++++ mono/metadata/socket-io.c 2008-02-07 08:37:17.000000000 +0200 +@@ -2751,7 +2751,7 @@ + struct sockaddr_in6 saddr6; + struct addrinfo *info = NULL, hints; + gint32 family; +- char hostname[1024] = {0}; ++ char hostname[NI_MAXHOST] = {0}; + int flags = 0; + #else + struct in_addr inaddr; diff --git a/lang/mono/patches/patch-bh b/lang/mono/patches/patch-bh new file mode 100644 index 00000000000..93c7a0c06d5 --- /dev/null +++ b/lang/mono/patches/patch-bh @@ -0,0 +1,12 @@ +$NetBSD: patch-bh,v 1.1 2008/02/13 14:16:43 kefren Exp $ +--- mcs/class/Managed.Windows.Forms/build-csproj.orig 2008-02-07 08:44:48.000000000 +0200 ++++ mcs/class/Managed.Windows.Forms/build-csproj 2008-02-07 08:44:59.000000000 +0200 +@@ -177,7 +177,7 @@ + { + cat $Resource | while read SRC; do + SRC=`echo $SRC | $tr '/' '\\\\'` +-SRC=`echo $SRC | sed 's/-resource://' | gawk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"` ++SRC=`echo $SRC | sed 's/-resource://' | awk -F , '{print " RelPath = \"" $1 "\"\n CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"` + + cat << EOT + uc_mcontext; + #else + guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs; diff --git a/lang/mono/patches/patch-ce b/lang/mono/patches/patch-ce new file mode 100644 index 00000000000..a763974cbf9 --- /dev/null +++ b/lang/mono/patches/patch-ce @@ -0,0 +1,32 @@ +$NetBSD: patch-ce,v 1.1 2008/02/13 14:16:43 kefren Exp $ +--- mcs/class/System/System.Net.Sockets/Socket.cs.orig 2008-02-08 11:30:11.000000000 +0200 ++++ mcs/class/System/System.Net.Sockets/Socket.cs 2008-02-08 11:33:32.000000000 +0200 +@@ -1452,7 +1452,7 @@ + } + + int error = 0; +- if (!blocking) { ++// if (!blocking) { + SocketAddress serial = end_point.Serialize (); + Connect_internal (socket, serial, out error); + if (error == 0) { +@@ -1464,16 +1464,16 @@ + connected = false; + req.Complete (new SocketException (error), true); + } +- } ++// } + +- if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) { ++/* if (blocking || error == (int) SocketError.InProgress || error == (int) SocketError.WouldBlock) { + // continue asynch + connected = false; + Worker worker = new Worker (req); + SocketAsyncCall sac = new SocketAsyncCall (worker.Connect); + sac.BeginInvoke (null, req); + } +- ++*/ + return(req); + } + -- cgit v1.2.3