aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/mono/Makefile4
-rw-r--r--lang/mono/distinfo2
-rw-r--r--lang/mono/files/patch-mono_io-layer_daemon.c20
-rw-r--r--lang/mono/files/patch-mono_io-layer_handles-private.h29
-rw-r--r--lang/mono/files/patch-mono_io-layer_handles.c47
-rw-r--r--lang/mono/files/patch-mono_io-layer_wapi-private.h20
-rw-r--r--lang/mono/files/patch-mono_jit_debug.c34
-rw-r--r--lang/mono/files/patch-mono_jit_jit.c11
-rw-r--r--lang/mono/files/patch-mono_metadata_threads.c14
-rw-r--r--lang/mono/pkg-plist2
10 files changed, 39 insertions, 144 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 153c9774ec6b..197fe53767e1 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mono
-PORTVERSION= 0.17
+PORTVERSION= 0.18
CATEGORIES= lang
MASTER_SITES= http://www.go-mono.com/archive/
@@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= mcs.1 mint.1 mono.1 monoburg.1 monodis.1 monostyle.1 \
- sqlsharpcli.1
+ sqlsharp.1
MAN5= mono-config.5
post-patch:
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index 7a3f1e6e6863..053d1b3e6106 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1 +1 @@
-MD5 (mono-0.17.tar.gz) = e148e98f0689703218abbd97179fbe84
+MD5 (mono-0.18.tar.gz) = 54f24ddd75ef1a71aa1516706b5870d3
diff --git a/lang/mono/files/patch-mono_io-layer_daemon.c b/lang/mono/files/patch-mono_io-layer_daemon.c
deleted file mode 100644
index 919cc9128c1f..000000000000
--- a/lang/mono/files/patch-mono_io-layer_daemon.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- mono/io-layer/daemon.c.orig Sat Nov 30 14:40:33 2002
-+++ mono/io-layer/daemon.c Sat Nov 30 14:43:38 2002
-@@ -384,7 +384,7 @@
-
- thread_handle->exitstatus=0;
-
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- _wapi_handle_lock_handle (handle);
- _wapi_handle_set_signal_state (handle, TRUE, TRUE);
- _wapi_handle_unlock_handle (handle);
-@@ -442,7 +442,7 @@
- _wapi_time_t_to_filetime (time (NULL),
- &process_handle_data->exit_time);
-
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- _wapi_handle_lock_handle (process_handle);
- _wapi_handle_set_signal_state (process_handle, TRUE, TRUE);
- _wapi_handle_unlock_handle (process_handle);
diff --git a/lang/mono/files/patch-mono_io-layer_handles-private.h b/lang/mono/files/patch-mono_io-layer_handles-private.h
deleted file mode 100644
index a548017ff553..000000000000
--- a/lang/mono/files/patch-mono_io-layer_handles-private.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- mono/io-layer/handles-private.h.orig Sat Nov 30 14:47:32 2002
-+++ mono/io-layer/handles-private.h Sat Nov 30 14:48:28 2002
-@@ -103,7 +103,7 @@
- /* Tell everyone blocking on multiple handles that something
- * was signalled
- */
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- mono_mutex_lock (&_wapi_shared_data->signal_mutex);
- pthread_cond_broadcast (&_wapi_shared_data->signal_cond);
- mono_mutex_unlock (&_wapi_shared_data->signal_mutex);
-@@ -138,7 +138,7 @@
- #ifdef DEBUG
- g_message (G_GNUC_PRETTY_FUNCTION ": lock global signal mutex");
- #endif
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- return(mono_mutex_lock (&_wapi_shared_data->signal_mutex));
- #else
- return(mono_mutex_lock (&_wapi_private_data->signal_mutex));
-@@ -150,7 +150,7 @@
- #ifdef DEBUG
- g_message (G_GNUC_PRETTY_FUNCTION ": unlock global signal mutex");
- #endif
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- return(mono_mutex_unlock (&_wapi_shared_data->signal_mutex));
- #else
- return(mono_mutex_unlock (&_wapi_private_data->signal_mutex));
diff --git a/lang/mono/files/patch-mono_io-layer_handles.c b/lang/mono/files/patch-mono_io-layer_handles.c
deleted file mode 100644
index 163a8b978973..000000000000
--- a/lang/mono/files/patch-mono_io-layer_handles.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- mono/io-layer/handles.c.orig Sat Nov 30 14:40:33 2002
-+++ mono/io-layer/handles.c Sat Nov 30 14:45:13 2002
-@@ -153,7 +153,7 @@
- pthread_mutexattr_init (&mutex_shared_attr);
- pthread_condattr_init (&cond_shared_attr);
-
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- pthread_mutexattr_setpshared (&mutex_shared_attr,
- PTHREAD_PROCESS_SHARED);
- pthread_condattr_setpshared (&cond_shared_attr,
-@@ -881,7 +881,7 @@
- */
- int _wapi_handle_wait_signal (void)
- {
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- return(mono_cond_wait (&_wapi_shared_data->signal_cond,
- &_wapi_shared_data->signal_mutex));
- #else
-@@ -903,7 +903,7 @@
-
- int _wapi_handle_timedwait_signal (struct timespec *timeout)
- {
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- return(mono_cond_timedwait (&_wapi_shared_data->signal_cond,
- &_wapi_shared_data->signal_mutex,
- timeout));
-@@ -935,7 +935,7 @@
-
- int _wapi_handle_wait_signal_handle (gpointer handle)
- {
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- guint32 idx=GPOINTER_TO_UINT (handle);
-
- return(mono_cond_wait (&_wapi_shared_data->handles[idx].signal_cond,
-@@ -961,7 +961,7 @@
- int _wapi_handle_timedwait_signal_handle (gpointer handle,
- struct timespec *timeout)
- {
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- guint32 idx=GPOINTER_TO_UINT (handle);
-
- return(mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond,
diff --git a/lang/mono/files/patch-mono_io-layer_wapi-private.h b/lang/mono/files/patch-mono_io-layer_wapi-private.h
deleted file mode 100644
index 92b95f17b136..000000000000
--- a/lang/mono/files/patch-mono_io-layer_wapi-private.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- mono/io-layer/wapi-private.h.orig Sat Jul 20 14:31:18 2002
-+++ mono/io-layer/wapi-private.h Sat Nov 30 14:42:43 2002
-@@ -105,7 +105,7 @@
- guchar daemon[MONO_SIZEOF_SUNPATH];
- _wapi_daemon_status daemon_running;
-
--#ifdef _POSIX_THREAD_PROCESS_SHARED
-+#if defined(_POSIX_THREAD_PROCESS_SHARED) && _POSIX_THREAD_PROCESS_SHARED != -1
- mono_mutex_t signal_mutex;
- pthread_cond_t signal_cond;
- #endif
-@@ -133,7 +133,7 @@
- */
- struct _WapiHandlePrivate_list
- {
--#ifndef _POSIX_THREAD_PROCESS_SHARED
-+#if !defined(_POSIX_THREAD_PROCESS_SHARED) || _POSIX_THREAD_PROCESS_SHARED == -1
- mono_mutex_t signal_mutex;
- pthread_cond_t signal_cond;
- #endif
diff --git a/lang/mono/files/patch-mono_jit_debug.c b/lang/mono/files/patch-mono_jit_debug.c
new file mode 100644
index 000000000000..31fec9e02d43
--- /dev/null
+++ b/lang/mono/files/patch-mono_jit_debug.c
@@ -0,0 +1,34 @@
+--- mono/jit/debug.c.orig Mon Jan 13 12:16:11 2003
++++ mono/jit/debug.c Mon Jan 13 12:35:17 2003
+@@ -37,9 +37,11 @@
+ static gconstpointer debugger_notification_address = NULL;
+ #ifndef PLATFORM_WIN32
+ static pthread_cond_t debugger_thread_cond = PTHREAD_COND_INITIALIZER;
+-static pthread_mutex_t debugger_thread_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++static pthread_mutex_t debugger_thread_mutex = PTHREAD_MUTEX_INITIALIZER;
++static pthread_mutexattr_t debugger_thread_mutex_attr;
+ static pthread_cond_t debugger_finished_cond = PTHREAD_COND_INITIALIZER;
+-static pthread_mutex_t debugger_finished_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++static pthread_mutex_t debugger_finished_mutex = PTHREAD_MUTEX_INITIALIZER;
++static pthread_mutexattr_t debugger_finished_mutex_attr;
+ static pthread_cond_t debugger_start_cond = PTHREAD_COND_INITIALIZER;
+ static pthread_mutex_t debugger_start_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static gboolean debugger_signalled = FALSE;
+@@ -1389,6 +1391,17 @@
+ x86_ret (buf);
+
+ #ifndef PLATFORM_WIN32
++
++ pthread_mutexattr_init(&debugger_thread_mutex_attr);
++ pthread_mutexattr_init(&debugger_finished_mutex_attr);
++ pthread_mutexattr_settype(&debugger_thread_mutex_attr,
++ PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutexattr_settype(&debugger_finished_mutex_attr,
++ PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutex_init(&debugger_thread_mutex, &debugger_thread_mutex_attr);
++ pthread_mutex_init(&debugger_finished_mutex,
++ &debugger_finished_mutex_attr);
++
+ pthread_mutex_lock (&debugger_start_mutex);
+
+ /*
diff --git a/lang/mono/files/patch-mono_jit_jit.c b/lang/mono/files/patch-mono_jit_jit.c
deleted file mode 100644
index 5295734e99f7..000000000000
--- a/lang/mono/files/patch-mono_jit_jit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono/jit/jit.c.orig Thu Dec 26 13:13:15 2002
-+++ mono/jit/jit.c Thu Dec 26 13:13:31 2002
-@@ -4184,7 +4184,7 @@
- sigemptyset (&sa.sa_mask);
- sa.sa_flags = 0;
- //g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
-- g_assert (sigaction (SIGRTMIN, &sa, NULL) != -1);
-+ g_assert (sigaction (SIGUSR1, &sa, NULL) != -1);
-
- #if 1
- /* catch SIGSEGV */
diff --git a/lang/mono/files/patch-mono_metadata_threads.c b/lang/mono/files/patch-mono_metadata_threads.c
deleted file mode 100644
index 9a32d90d0571..000000000000
--- a/lang/mono/files/patch-mono_metadata_threads.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- mono/metadata/threads.c.orig Thu Dec 26 13:00:05 2002
-+++ mono/metadata/threads.c Thu Dec 26 13:00:28 2002
-@@ -1099,9 +1099,9 @@
- /* fixme: store the state somewhere */
- #ifndef __MINGW32__
- #ifdef PTHREAD_POINTER_ID
-- pthread_kill (GUINT_TO_POINTER(thread->tid), SIGRTMIN);
-+ pthread_kill (GUINT_TO_POINTER(thread->tid), SIGUSR1);
- #else
-- pthread_kill (thread->tid, SIGRTMIN);
-+ pthread_kill (thread->tid, SIGUSR1);
- #endif
- #else
- g_assert_not_reached ();
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 8fc12d83e385..21f3b8b4c733 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -6,6 +6,8 @@ bin/monodis
bin/monograph
bin/monoresgen.exe
bin/monosn
+bin/secutil.exe
+bin/sqlsharp.exe
etc/mono/config
etc/mono/machine.config
include/mono/cil/opcode.def
generated by cgit (git 2.34.1) at 2024-12-24 09:23:03 +0800