diff options
author | Romain Tartière <romain@FreeBSD.org> | 2014-09-12 16:34:06 +0000 |
---|---|---|
committer | Romain Tartière <romain@FreeBSD.org> | 2014-09-12 16:34:06 +0000 |
commit | ace571914ed258f58117a3c2890a1ed04cee0bd7 (patch) | |
tree | 1ef11e84965e8cbb2159aaa882e4956ec2639c3b /lang | |
parent | Remove compiler:features from USES=, too (diff) |
Update to 3.6.0.
Notes
Notes:
svn path=/head/; revision=368043
Diffstat (limited to 'lang')
-rw-r--r-- | lang/mono/Makefile | 5 | ||||
-rw-r--r-- | lang/mono/distinfo | 4 | ||||
-rw-r--r-- | lang/mono/files/patch-mcs_class_Microsoft.Build.Engine_Microsoft.Build.BuildEngine_DirectoryScanner.cs | 11 | ||||
-rw-r--r-- | lang/mono/files/patch-mcs_class_System_System.IO_KeventWatcher.cs | 196 | ||||
-rw-r--r-- | lang/mono/pkg-plist | 28 |
5 files changed, 11 insertions, 233 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 2f81b692b50f..905f2e0fe153 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mono -PORTVERSION= 3.4.0 -PORTREVISION= 3 +PORTVERSION= 3.6.0 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/ @@ -52,7 +51,7 @@ post-patch: tests: build @${ECHO_MSG} "===> Running mono regression tests" @(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ - ${MAKE_FLAGS} Makefile ${MAKE_ARGS} test) + ${MAKE_FLAGS} Makefile ${MAKE_ARGS} check) post-configure: @${REINPLACE_CMD} -e 's|share\/man|man|g' \ diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 24fcd2a94774..ee38cc1af7da 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,2 +1,2 @@ -SHA256 (mono-3.4.0.tar.bz2) = fd4cadc6a849896c6a4382321f06ce9f224326affd2c8aaa47ba7218c0d951d4 -SIZE (mono-3.4.0.tar.bz2) = 77992708 +SHA256 (mono-3.6.0.tar.bz2) = 4dff480a7b6af25e5316b4a8d7afabd1f46f2fdf36c16847aed79fc04075e938 +SIZE (mono-3.6.0.tar.bz2) = 84031890 diff --git a/lang/mono/files/patch-mcs_class_Microsoft.Build.Engine_Microsoft.Build.BuildEngine_DirectoryScanner.cs b/lang/mono/files/patch-mcs_class_Microsoft.Build.Engine_Microsoft.Build.BuildEngine_DirectoryScanner.cs deleted file mode 100644 index 6c24d65eb6f9..000000000000 --- a/lang/mono/files/patch-mcs_class_Microsoft.Build.Engine_Microsoft.Build.BuildEngine_DirectoryScanner.cs +++ /dev/null @@ -1,11 +0,0 @@ ---- mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs.orig 2014-02-28 08:27:40.000000000 +0100 -+++ mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/DirectoryScanner.cs 2014-02-28 08:28:16.000000000 +0100 -@@ -98,7 +98,7 @@ - int offset = 0; - string full_path; - if (Path.IsPathRooted (name)) { -- full_path = name; -+ full_path = Path.GetFullPath (name); - baseDirectory = new DirectoryInfo (Path.GetPathRoot (name)); - if (IsRunningOnWindows) - // skip the "drive:" diff --git a/lang/mono/files/patch-mcs_class_System_System.IO_KeventWatcher.cs b/lang/mono/files/patch-mcs_class_System_System.IO_KeventWatcher.cs deleted file mode 100644 index 63a16f16c45e..000000000000 --- a/lang/mono/files/patch-mcs_class_System_System.IO_KeventWatcher.cs +++ /dev/null @@ -1,196 +0,0 @@ - -$FreeBSD$ - -https://bugzilla.novell.com/show_bug.cgi?id=542485 - ---- mcs/class/System/System.IO/KeventWatcher.cs.orig -+++ mcs/class/System/System.IO/KeventWatcher.cs -@@ -38,11 +38,11 @@ - namespace System.IO { - - struct kevent : IDisposable { -- public int ident; -+ public IntPtr ident; - public short filter; - public ushort flags; - public uint fflags; -- public int data; -+ public IntPtr data; - public IntPtr udata; - - public void Dispose () -@@ -53,8 +53,8 @@ - } - - struct timespec { -- public int tv_sec; -- public int tv_usec; -+ public IntPtr tv_sec; -+ public IntPtr tv_usec; - } - - class KeventFileData { -@@ -88,6 +88,31 @@ - static Thread thread; - static int conn; - static bool stop; -+ -+ /* Flags */ -+ -+ const int EV_ADD = 0x0001; /* add event to kq (implies enable) */ -+ const int EV_DELETE = 0x0002; /* delete event from kq */ -+ const int EV_ENABLE = 0x0004; /* enable event */ -+ const int EV_DISABLE = 0x0008; /* disable event (not reported) */ -+ const int EV_ONESHOT = 0x0010; /* only report one occurrence */ -+ const int EV_CLEAR = 0x0020; /* clear event state after reporting */ -+ const int EV_EOF = 0x8000; /* EOF detected */ -+ const int EV_ERROR = 0x4000; /* error, data contains errno */ -+ -+ /* System defined filters */ -+ const int EVFILT_READ = -1; -+ const int EVFILT_VNODE = -4; /* attached to vnodes */ -+ -+ /* Events */ -+ -+ const int NOTE_DELETE = 0x0001; /* vnode was removed */ -+ const int NOTE_WRITE = 0x0002; /* data contents changed */ -+ const int NOTE_EXTEND = 0x0004; /* size increased */ -+ const int NOTE_ATTRIB = 0x0008; /* attributes changed */ -+ const int NOTE_LINK = 0x0010; /* link count changed */ -+ const int NOTE_RENAME = 0x0020; /* vnode was renamed */ -+ const int NOTE_REVOKE = 0x0040; /* vnode access was revoked */ - - private KeventWatcher () - { -@@ -142,9 +167,9 @@ - - data.Enabled = true; - lock (this) { -+ stop = false; - StartMonitoringDirectory (data); - watches [fsw] = data; -- stop = false; - } - } - } -@@ -162,20 +187,23 @@ - kevent ev = new kevent(); - ev.udata = IntPtr.Zero; - timespec nullts = new timespec(); -- nullts.tv_sec = 0; -- nullts.tv_usec = 0; -+ nullts.tv_sec = IntPtr.Zero; -+ nullts.tv_usec = IntPtr.Zero; - if (fd > 0) { -- ev.ident = fd; -- ev.filter = -4; -- ev.flags = 1 | 4 | 20; -- ev.fflags = 20 | 2 | 1 | 8; -- ev.data = 0; -+ ev.ident = (IntPtr)fd; -+ ev.filter = EVFILT_VNODE; -+ ev.flags = EV_ADD | EV_ENABLE | EV_CLEAR; -+ ev.fflags = NOTE_RENAME | NOTE_WRITE | NOTE_DELETE | NOTE_ATTRIB; -+ ev.data = IntPtr.Zero; - ev.udata = Marshal.StringToHGlobalAuto (data.Directory); - kevent outev = new kevent(); - outev.udata = IntPtr.Zero; -- kevent (conn, ref ev, 1, ref outev, 0, ref nullts); -+ int ret = kevent (conn, ref ev, 1, ref outev, 0, ref nullts); -+ if ((ret == -1) || ((ev.flags & EV_ERROR) > 0)) { -+ return; -+ } - data.ev = ev; -- requests [fd] = data; -+ requests [(IntPtr)fd] = data; - } - - if (!data.IncludeSubdirs) -@@ -204,31 +232,35 @@ - - static void StopMonitoringDirectory (KeventData data) - { -- close(data.ev.ident); -+ close((int)(data.ev.ident)); - } - - void Monitor () - { -- -+ - while (!stop) { - kevent ev = new kevent(); - ev.udata = IntPtr.Zero; - kevent nullev = new kevent(); - nullev.udata = IntPtr.Zero; - timespec ts = new timespec(); -- ts.tv_sec = 0; -- ts.tv_usec = 0; -+ ts.tv_sec = IntPtr.Zero; -+ ts.tv_usec = IntPtr.Zero; - int haveEvents; - lock (this) { - haveEvents = kevent (conn, ref nullev, 0, ref ev, 1, ref ts); - } - -- if (haveEvents > 0) { -- // Restart monitoring -- KeventData data = (KeventData) requests [ev.ident]; -- StopMonitoringDirectory (data); -- StartMonitoringDirectory (data); -- ProcessEvent (ev); -+ if (haveEvents != 0) { -+ if ((haveEvents == -1) || ((ev.flags & EV_ERROR) > 0)) { -+ Error (); -+ } else { -+ // Restart monitoring -+ KeventData data = (KeventData) requests [(IntPtr)(ev.ident)]; -+ StopMonitoringDirectory (data); -+ StartMonitoringDirectory (data); -+ ProcessEvent (ev); -+ } - } else { - System.Threading.Thread.Sleep (500); - } -@@ -240,10 +272,18 @@ - } - } - -+ void Error () -+ { -+ // Something went wrong. Stop the thread. -+ lock (this) { -+ stop = true; -+ } -+ } -+ - void ProcessEvent (kevent ev) - { - lock (this) { -- KeventData data = (KeventData) requests [ev.ident]; -+ KeventData data = (KeventData) requests [(IntPtr)(ev.ident)]; - if (!data.Enabled) - return; - -@@ -265,7 +305,7 @@ - data.DirEntries [fsi.FullName] = new KeventFileData(fsi, fsi.LastAccessTime, fsi.LastWriteTime); - if (fsw.IncludeSubdirectories && fsi is DirectoryInfo) { - data.Directory = filename; -- requests [ev.ident] = data; -+ requests [(IntPtr)(ev.ident)] = data; - ProcessEvent(ev); - } - PostEvent(filename, fsw, fa, changedFsi); -@@ -348,10 +388,10 @@ - [DllImport ("libc")] - extern static int close(int fd); - -- [DllImport ("libc")] -+ [DllImport ("libc", SetLastError=true)] - extern static int kqueue(); - -- [DllImport ("libc")] -+ [DllImport ("libc", SetLastError=true)] - extern static int kevent(int kqueue, ref kevent ev, int nchanges, ref kevent evtlist, int nevents, ref timespec ts); - } - } diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist index 2e52ecf08258..26ebb93f14f9 100644 --- a/lang/mono/pkg-plist +++ b/lang/mono/pkg-plist @@ -17,6 +17,7 @@ bin/gacutil2 bin/genxs bin/gmcs bin/httpcfg +bin/ikdasm bin/ilasm bin/installvst bin/lc @@ -128,6 +129,7 @@ include/mono-2.0/mono/metadata/sgen-bridge.h include/mono-2.0/mono/metadata/threads.h include/mono-2.0/mono/metadata/tokentype.h include/mono-2.0/mono/metadata/verify.h +include/mono-2.0/mono/utils/mono-counters.h include/mono-2.0/mono/utils/mono-dl-fallback.h include/mono-2.0/mono/utils/mono-error.h include/mono-2.0/mono/utils/mono-logger.h @@ -207,12 +209,10 @@ lib/mono/2.0/Mono.Security.Win32.dll lib/mono/2.0/Mono.Security.dll lib/mono/2.0/Mono.Simd.dll lib/mono/2.0/Mono.Tasklets.dll -lib/mono/2.0/Mono.Web.dll lib/mono/2.0/Mono.WebBrowser.dll lib/mono/2.0/Mono.XBuild.Tasks.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/RabbitMQ.Client.Apigen.exe lib/mono/2.0/RabbitMQ.Client.Apigen.exe.mdb @@ -354,12 +354,10 @@ lib/mono/4.0/Mono.Security.Win32.dll lib/mono/4.0/Mono.Security.dll lib/mono/4.0/Mono.Simd.dll lib/mono/4.0/Mono.Tasklets.dll -lib/mono/4.0/Mono.Web.dll lib/mono/4.0/Mono.WebBrowser.dll lib/mono/4.0/Mono.XBuild.Tasks.dll lib/mono/4.0/Novell.Directory.Ldap.dll lib/mono/4.0/Npgsql.dll -lib/mono/4.0/OpenSystem.C.dll lib/mono/4.0/PEAPI.dll lib/mono/4.0/RabbitMQ.Client.Apigen.exe lib/mono/4.0/RabbitMQ.Client.dll @@ -434,6 +432,7 @@ lib/mono/4.5/Facades/System.ComponentModel.dll lib/mono/4.5/Facades/System.Diagnostics.Contracts.dll lib/mono/4.5/Facades/System.Diagnostics.Debug.dll lib/mono/4.5/Facades/System.Diagnostics.Tools.dll +lib/mono/4.5/Facades/System.Diagnostics.Tracing.dll lib/mono/4.5/Facades/System.Dynamic.Runtime.dll lib/mono/4.5/Facades/System.Globalization.dll lib/mono/4.5/Facades/System.IO.dll @@ -463,11 +462,13 @@ lib/mono/4.5/Facades/System.Runtime.dll lib/mono/4.5/Facades/System.Security.Principal.dll lib/mono/4.5/Facades/System.ServiceModel.Http.dll lib/mono/4.5/Facades/System.ServiceModel.Primitives.dll +lib/mono/4.5/Facades/System.ServiceModel.Security.dll lib/mono/4.5/Facades/System.Text.Encoding.Extensions.dll lib/mono/4.5/Facades/System.Text.Encoding.dll lib/mono/4.5/Facades/System.Text.RegularExpressions.dll lib/mono/4.5/Facades/System.Threading.Tasks.Parallel.dll lib/mono/4.5/Facades/System.Threading.Tasks.dll +lib/mono/4.5/Facades/System.Threading.Timer.dll lib/mono/4.5/Facades/System.Threading.dll lib/mono/4.5/Facades/System.Xml.ReaderWriter.dll lib/mono/4.5/Facades/System.Xml.XDocument.dll @@ -513,12 +514,10 @@ lib/mono/4.5/Mono.Security.Win32.dll lib/mono/4.5/Mono.Security.dll lib/mono/4.5/Mono.Simd.dll lib/mono/4.5/Mono.Tasklets.dll -lib/mono/4.5/Mono.Web.dll lib/mono/4.5/Mono.WebBrowser.dll lib/mono/4.5/Mono.XBuild.Tasks.dll lib/mono/4.5/Novell.Directory.Ldap.dll lib/mono/4.5/Npgsql.dll -lib/mono/4.5/OpenSystem.C.dll lib/mono/4.5/PEAPI.dll lib/mono/4.5/RabbitMQ.Client.Apigen.exe lib/mono/4.5/RabbitMQ.Client.Apigen.exe.mdb @@ -642,6 +641,8 @@ lib/mono/4.5/httpcfg.exe lib/mono/4.5/httpcfg.exe.mdb lib/mono/4.5/ictool.exe lib/mono/4.5/ictool.exe.mdb +lib/mono/4.5/ikdasm.exe +lib/mono/4.5/ikdasm.exe.mdb lib/mono/4.5/ilasm.exe lib/mono/4.5/ilasm.exe.mdb lib/mono/4.5/installutil.exe @@ -894,10 +895,6 @@ lib/mono/gac/Mono.Tasklets/2.0.0.0__0738eb9f132ed756/Mono.Tasklets.dll lib/mono/gac/Mono.Tasklets/2.0.0.0__0738eb9f132ed756/Mono.Tasklets.dll.mdb lib/mono/gac/Mono.Tasklets/4.0.0.0__0738eb9f132ed756/Mono.Tasklets.dll lib/mono/gac/Mono.Tasklets/4.0.0.0__0738eb9f132ed756/Mono.Tasklets.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.Web/4.0.0.0__0738eb9f132ed756/Mono.Web.dll -lib/mono/gac/Mono.Web/4.0.0.0__0738eb9f132ed756/Mono.Web.dll.mdb lib/mono/gac/Mono.WebBrowser/2.0.0.0__0738eb9f132ed756/Mono.WebBrowser.dll lib/mono/gac/Mono.WebBrowser/2.0.0.0__0738eb9f132ed756/Mono.WebBrowser.dll.mdb lib/mono/gac/Mono.WebBrowser/4.0.0.0__0738eb9f132ed756/Mono.WebBrowser.dll @@ -916,10 +913,6 @@ 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/Npgsql/4.0.0.0__5d8b90d52f46fda7/Npgsql.dll lib/mono/gac/Npgsql/4.0.0.0__5d8b90d52f46fda7/Npgsql.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/OpenSystem.C/4.0.0.0__b77a5c561934e089/OpenSystem.C.dll -lib/mono/gac/OpenSystem.C/4.0.0.0__b77a5c561934e089/OpenSystem.C.dll.mdb lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756/PEAPI.dll.mdb lib/mono/gac/PEAPI/4.0.0.0__0738eb9f132ed756/PEAPI.dll @@ -1280,7 +1273,6 @@ libdata/pkgconfig/mono-lineeditor.pc libdata/pkgconfig/mono-nunit.pc libdata/pkgconfig/mono-options.pc libdata/pkgconfig/mono.pc -libdata/pkgconfig/mono.web.pc libdata/pkgconfig/monodoc.pc libdata/pkgconfig/monosgen-2.pc libdata/pkgconfig/reactive.pc @@ -1666,9 +1658,6 @@ share/locale/pt_BR/LC_MESSAGES/mcs.mo @dirrmtry lib/mono/gac/PEAPI/4.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/PEAPI/2.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/PEAPI -@dirrmtry lib/mono/gac/OpenSystem.C/4.0.0.0__b77a5c561934e089 -@dirrmtry lib/mono/gac/OpenSystem.C/2.0.0.0__b77a5c561934e089 -@dirrmtry lib/mono/gac/OpenSystem.C @dirrmtry lib/mono/gac/Npgsql/4.0.0.0__5d8b90d52f46fda7 @dirrmtry lib/mono/gac/Npgsql/2.0.0.0__5d8b90d52f46fda7 @dirrmtry lib/mono/gac/Npgsql @@ -1682,9 +1671,6 @@ share/locale/pt_BR/LC_MESSAGES/mcs.mo @dirrmtry lib/mono/gac/Mono.WebBrowser/4.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/Mono.WebBrowser/2.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/Mono.WebBrowser -@dirrmtry lib/mono/gac/Mono.Web/4.0.0.0__0738eb9f132ed756 -@dirrmtry lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756 -@dirrmtry lib/mono/gac/Mono.Web @dirrmtry lib/mono/gac/Mono.Tasklets/4.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/Mono.Tasklets/2.0.0.0__0738eb9f132ed756 @dirrmtry lib/mono/gac/Mono.Tasklets |