cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to the latest stable version: 2.6.3

Browse Source 
- move to autoconf
- regen patches

ok ajacoutot@, jasper@
This commit is contained in:
robert 2010-03-20 17:16:44 +00:00
parent 64b561914e
commit d3f436429f
17 changed files with 200 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lang/mono/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.16 2010/01/19 15:07:01 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2010/03/20 17:16:44 robert Exp $
# sync with net/avahi,-mono
ONLY_FOR_ARCHS= amd64 i386 powerpc # arm
COMMENT= cross platform, open source .NET developement framework
DISTNAME= mono-2.5
PKGNAME= ${DISTNAME}p1
DISTNAME= mono-2.6.3
PKGNAME= ${DISTNAME}
CATEGORIES= lang devel
@ -27,8 +27,7 @@ PERMIT_DISTFILES_CDROM= Yes
WANTLIB= c glib-2.0 gmodule-2.0 gthread-2.0 \
m pcre pthread z
#MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/moon/1.99.1/
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext \
@ -46,7 +45,8 @@ BUILD_DEPENDS= :bison-*:devel/bison \
RUN_DEPENDS= ::x11/libgdiplus
LIB_DEPENDS= gc::devel/boehm-gc
CONFIGURE_STYLE=gnu
AUTOCONF_VERSION=2.62
CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \
LC_ALL=C
@ -61,6 +61,12 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-quiet-build=no \
--disable-shared-handles
.if ${MACHINE_ARCH} == "amd64"
CONFIGURE_ENV+= CFLAGS="-DSIZEOF_VOID_P=8"
.else
CONFIGURE_ENV+= CFLAGS="-DSIZEOF_VOID_P=4"
.endif
REGRESS_TARGET=check
DLLMAP_FILES= mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs \

10
lang/mono/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mono-2.5.tar.bz2) = UmhaijWSWvmdQCqZ24ExKA==
RMD160 (mono-2.5.tar.bz2) = oX2lOAvD/yCQuaTpaGfUXUMorVo=
SHA1 (mono-2.5.tar.bz2) = Cjhi3SWGF3AWt59B6NcE4y0q/Cg=
SHA256 (mono-2.5.tar.bz2) = IjWNFiyxXgv735FfY5vChkZBdjoQVbxtibFzh9GvtJs=
SIZE (mono-2.5.tar.bz2) = 27000116
MD5 (mono-2.6.3.tar.bz2) = sdwhusLHx1gUqfMiRura3Q==
RMD160 (mono-2.6.3.tar.bz2) = 49YfYYoOnwY9brhuM29d6qI8vMg=
SHA1 (mono-2.6.3.tar.bz2) = pKq39GmDZk3Ez2OgHk/nqKSd4sY=
SHA256 (mono-2.6.3.tar.bz2) = DsuC0gB/Ry+O68hcNJgTUVv2QubqAhiQ7OQFVa1Q2Uc=
SIZE (mono-2.6.3.tar.bz2) = 27761467

103
lang/mono/patches/patch-configure
View File

@ -1,103 +0,0 @@
$OpenBSD: patch-configure,v 1.4 2009/09/22 17:55:23 ajacoutot Exp $
--- configure.orig Sat Aug 15 03:06:17 2009
+++ configure Mon Sep 21 23:43:54 2009
@@ -3013,8 +3013,11 @@ _ACEOF
;;
*-*-*openbsd*)
platform_win32=no
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD"
- libmono_cflags="-D_THREAD_SAFE"
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
+ if test "x$disable_munmap" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+ fi
+ libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
need_link_unlink=yes
@@ -22353,6 +22356,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <sys/param.h>
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -29227,13 +29231,13 @@ fi
;;
*)
- { echo "$as_me:$LINENO: checking for main in -lpthread" >&5
-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for main in -pthread" >&5
+echo $ECHO_N "checking for main in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29283,7 +29287,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6; }
if test $ac_cv_lib_pthread_main = yes; then
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS -pthread"
fi
;;
@@ -37294,6 +37298,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
@@ -37337,6 +37342,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
@@ -39366,7 +39372,7 @@ echo "${ECHO_T}$try_dev_random" >&6; }
case "{$target}" in
*-openbsd*)
- NAME_DEV_RANDOM="/dev/srandom"
+ NAME_DEV_RANDOM="/dev/arandom"
;;
@@ -39870,8 +39876,8 @@ JIT_SUPPORTED=no
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
-SQLITE="libsqlite.so.0"
-SQLITE3="libsqlite3.so.0"
+SQLITE="libsqlite.so"
+SQLITE3="libsqlite3.so"
X11="libX11.so"
sizeof_register="SIZEOF_VOID_P"
@@ -40163,6 +40169,15 @@ _ACEOF
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
+ ;;
+ arm*-openbsd*)
+ TARGET=ARM;
+ arch_target=arm;
+ ACCESS_UNALIGNED="no"
+ JIT_SUPPORTED=yes
+ jit_wanted=true
+ INTERP_SUPPORTED=no
+ interp_wanted=false
;;
s390-*-linux*)
TARGET=S390;

47
lang/mono/patches/patch-configure_in Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-configure_in,v 1.1 2010/03/20 17:16:44 robert Exp $
--- configure.in.orig Fri Mar 19 23:30:15 2010
+++ configure.in Fri Mar 19 23:28:41 2010
@@ -147,8 +147,11 @@ case "$host" in
;;
*-*-*openbsd*)
platform_win32=no
- CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD"
- libmono_cflags="-D_THREAD_SAFE"
++ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
+ if test "x$disable_munmap" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+ fi
+ libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
need_link_unlink=yes
@@ -1228,6 +1231,9 @@ if test x$platform_win32 = xno; then
*-*-*freebsd*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
+ *-*-*openbsd*)
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+ ;;
*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
;;
@@ -1743,7 +1749,7 @@ AC_MSG_RESULT($try_dev_random)
case "{$target}" in
*-openbsd*)
- NAME_DEV_RANDOM="/dev/srandom"
+ NAME_DEV_RANDOM="/dev/arandom"
;;
dnl Win32 does not have /dev/random, they have their own method...
@@ -1932,8 +1938,8 @@ JIT_SUPPORTED=no
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
-SQLITE="libsqlite.so.0"
-SQLITE3="libsqlite3.so.0"
+SQLITE="libsqlite.so"
+SQLITE3="libsqlite3.so"
X11="libX11.so"
sizeof_register="SIZEOF_VOID_P"

12
lang/mono/patches/patch-mcs_class_Managed_Windows_Forms_build-csproj
View File

@ -1,6 +1,12 @@
$OpenBSD: patch-mcs_class_Managed_Windows_Forms_build-csproj,v 1.2 2009/09/06 07:25:27 ajacoutot Exp $
--- mcs/class/Managed.Windows.Forms/build-csproj.orig Tue Oct 7 22:36:46 2008
+++ mcs/class/Managed.Windows.Forms/build-csproj Tue Oct 7 22:39:08 2008
$OpenBSD: patch-mcs_class_Managed_Windows_Forms_build-csproj,v 1.3 2010/03/20 17:16:44 robert Exp $
--- mcs/class/Managed.Windows.Forms/build-csproj.orig Fri Sep 25 16:59:05 2009
+++ mcs/class/Managed.Windows.Forms/build-csproj Sat Mar 20 11:03:12 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# I got tired of editing the SWF.csproj
# This script will generate it from our System.Windows.Forms.dll.sources
@@ -177,7 +177,7 @@ SWFresourcelist()
{
cat $Resource | while read SRC; do

10
lang/mono/patches/patch-mcs_class_System_System_Net_Sockets_Socket_cs
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mcs_class_System_System_Net_Sockets_Socket_cs,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- mcs/class/System/System.Net.Sockets/Socket.cs.orig Thu Jul 2 22:22:52 2009
+++ mcs/class/System/System.Net.Sockets/Socket.cs Tue Sep 1 14:25:03 2009
@@ -1278,7 +1278,7 @@ namespace System.Net.Sockets
$OpenBSD: patch-mcs_class_System_System_Net_Sockets_Socket_cs,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mcs/class/System/System.Net.Sockets/Socket.cs.orig Wed Oct 21 14:27:35 2009
+++ mcs/class/System/System.Net.Sockets/Socket.cs Fri Mar 19 23:29:31 2010
@@ -1272,7 +1272,7 @@ namespace System.Net.Sockets
}
int error = 0;
@ -10,7 +10,7 @@ $OpenBSD: patch-mcs_class_System_System_Net_Sockets_Socket_cs,v 1.1 2009/09/06 0
SocketAddress serial = end_point.Serialize ();
Connect_internal (socket, serial, out error);
if (error == 0) {
@@ -1290,15 +1290,16 @@ namespace System.Net.Sockets
@@ -1284,15 +1284,16 @@ namespace System.Net.Sockets
connected = false;
req.Complete (new SocketException (error), true);
}

8
lang/mono/patches/patch-mono_arch_arm_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_arch_arm_Makefile_in,v 1.1 2009/09/22 11:19:37 ajacoutot Exp $
--- mono/arch/arm/Makefile.in.orig Tue Sep 22 12:34:12 2009
+++ mono/arch/arm/Makefile.in Tue Sep 22 12:34:25 2009
@@ -525,15 +525,15 @@ uninstall-am:
$OpenBSD: patch-mono_arch_arm_Makefile_in,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/arch/arm/Makefile.in.orig Thu Mar 11 01:57:12 2010
+++ mono/arch/arm/Makefile.in Fri Mar 19 23:29:31 2010
@@ -535,15 +535,15 @@ uninstall-am:
arm_dpimacros.h: dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th

12
lang/mono/patches/patch-mono_arch_arm_dpiops_sh
View File

@ -1,6 +1,12 @@
$OpenBSD: patch-mono_arch_arm_dpiops_sh,v 1.1 2009/09/22 11:19:37 ajacoutot Exp $
--- mono/arch/arm/dpiops.sh.orig Tue Sep 22 08:26:16 2009
+++ mono/arch/arm/dpiops.sh Tue Sep 22 08:26:31 2009
$OpenBSD: patch-mono_arch_arm_dpiops_sh,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/arch/arm/dpiops.sh.orig Fri Sep 25 16:58:13 2009
+++ mono/arch/arm/dpiops.sh Sat Mar 20 11:03:12 2010
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
OPCODES="AND EOR SUB RSB ADD ADC SBC RSC ORR BIC"
CMP_OPCODES="TST TEQ CMP CMN"
@@ -6,7 +6,7 @@ MOV_OPCODES="MOV MVN"
# $1: opcode list

12
lang/mono/patches/patch-mono_metadata_socket-io_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_metadata_socket-io_c,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- mono/metadata/socket-io.c.orig Thu Jul 2 22:21:10 2009
+++ mono/metadata/socket-io.c Tue Sep 1 14:57:32 2009
@@ -2779,7 +2779,7 @@ MonoBoolean ves_icall_System_Net_Dns_GetHostByName_int
$OpenBSD: patch-mono_metadata_socket-io_c,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/metadata/socket-io.c.orig Tue Jan 12 01:00:55 2010
+++ mono/metadata/socket-io.c Fri Mar 19 23:29:31 2010
@@ -2767,7 +2767,7 @@ MonoBoolean ves_icall_System_Net_Dns_GetHostByName_int
memset(&hints, 0, sizeof(hints));
hints.ai_family = get_family_hint ();
hints.ai_socktype = SOCK_STREAM;
@ -10,7 +10,7 @@ $OpenBSD: patch-mono_metadata_socket-io_c,v 1.1 2009/09/06 07:25:27 ajacoutot Ex
if (*hostname && getaddrinfo(hostname, NULL, &hints, &info) == -1) {
return(FALSE);
@@ -2924,7 +2924,7 @@ extern MonoBoolean ves_icall_System_Net_Dns_GetHostByA
@@ -2912,7 +2912,7 @@ extern MonoBoolean ves_icall_System_Net_Dns_GetHostByA
struct sockaddr_in6 saddr6;
struct addrinfo *info = NULL, hints;
gint32 family;
@ -19,7 +19,7 @@ $OpenBSD: patch-mono_metadata_socket-io_c,v 1.1 2009/09/06 07:25:27 ajacoutot Ex
int flags = 0;
#else
struct in_addr inaddr;
@@ -2981,7 +2981,7 @@ extern MonoBoolean ves_icall_System_Net_Dns_GetHostByA
@@ -2969,7 +2969,7 @@ extern MonoBoolean ves_icall_System_Net_Dns_GetHostByA
memset (&hints, 0, sizeof(hints));
hints.ai_family = get_family_hint ();
hints.ai_socktype = SOCK_STREAM;

47
lang/mono/patches/patch-mono_mini_exceptions-arm_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mono_mini_exceptions-arm_c,v 1.1 2009/09/22 17:55:23 ajacoutot Exp $
--- mono/mini/exceptions-arm.c.orig Tue Sep 22 11:43:34 2009
+++ mono/mini/exceptions-arm.c Tue Sep 22 11:34:31 2009
$OpenBSD: patch-mono_mini_exceptions-arm_c,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/mini/exceptions-arm.c.orig Sat Mar 20 18:01:34 2010
+++ mono/mini/exceptions-arm.c Sat Mar 20 18:03:17 2010
@@ -12,7 +12,9 @@
#include <glib.h>
#include <signal.h>
@ -11,34 +11,34 @@ $OpenBSD: patch-mono_mini_exceptions-arm_c,v 1.1 2009/09/22 17:55:23 ajacoutot E
#include <mono/arch/arm/arm-codegen.h>
#include <mono/metadata/appdomain.h>
@@ -83,6 +85,7 @@ typedef struct ucontext {
@@ -80,6 +82,7 @@ typedef struct ucontext {
* We define our own version here and use it instead.
*/
+#ifdef MONO_ARCH_USE_SIGACTION
#if __APPLE__
#define my_ucontext ucontext_t
#else
+#ifdef MONO_ARCH_USE_SIGACTION
typedef struct my_ucontext {
unsigned long uc_flags;
struct my_ucontext *uc_link;
@@ -97,6 +100,7 @@ typedef struct my_ucontext {
*/
} my_ucontext;
#endif
+#endif
#define restore_regs_from_context(ctx_reg,ip_reg,tmp_reg) do { \
ARM_LDR_IMM (code, ip_reg, ctx_reg, G_STRUCT_OFFSET (MonoContext, eip)); \
@@ -455,6 +459,7 @@ mono_arch_find_jit_info (MonoDomain *domain, MonoJitTl
/*
* arch_get_restore_context:
@@ -467,6 +471,7 @@ mono_arch_find_jit_info_ext (MonoDomain *domain, MonoJ
void
mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext *mctx)
{
+#ifdef MONO_ARCH_USE_SIGACTION
#if BROKEN_LINUX
struct ucontext *uc = sigctx;
@@ -469,11 +474,13 @@ mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext
mctx->ebp = UCONTEXT_REG_SP (my_uc);
memcpy (&mctx->regs, &UCONTEXT_REG_R4 (my_uc), sizeof (gulong) * 8);
g_assert_not_reached ();
#else
@@ -477,11 +482,13 @@ mono_arch_sigctx_to_monoctx (void *sigctx, MonoContext
memcpy (&mctx->regs, &UCONTEXT_REG_R0 (my_uc), sizeof (gulong) * 16);
#endif
mctx->ebp = mctx->regs [ARMREG_FP];
+#endif
}
@ -47,24 +47,23 @@ $OpenBSD: patch-mono_mini_exceptions-arm_c,v 1.1 2009/09/22 17:55:23 ajacoutot E
{
+#ifdef MONO_ARCH_USE_SIGACTION
#if BROKEN_LINUX
struct ucontext *uc = ctx;
@@ -488,6 +495,7 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *
UCONTEXT_REG_SP (my_uc) = mctx->ebp;
memcpy (&UCONTEXT_REG_R4 (my_uc), &mctx->regs, sizeof (gulong) * 8);
g_assert_not_reached ();
#else
@@ -492,6 +499,7 @@ mono_arch_monoctx_to_sigctx (MonoContext *mctx, void *
/* The upper registers are not guaranteed to be valid */
memcpy (&UCONTEXT_REG_R0 (my_uc), &mctx->regs, sizeof (gulong) * 12);
#endif
+#endif
}
/*
@@ -512,12 +520,14 @@ mono_arch_handle_exception (void *ctx, gpointer obj, g
@@ -516,11 +524,13 @@ mono_arch_handle_exception (void *ctx, gpointer obj, g
gpointer
mono_arch_ip_from_context (void *sigctx)
{
+#ifdef MONO_ARCH_USE_SIGACTION
#if BROKEN_LINUX
struct ucontext *uc = sigctx;
return (gpointer)uc->uc_mcontext.gregs [ARMREG_PC];
g_assert_not_reached ();
#else
my_ucontext *my_uc = sigctx;
return (void*) UCONTEXT_REG_PC (my_uc);

8
lang/mono/patches/patch-mono_mini_mini-arm_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_mini_mini-arm_h,v 1.1 2009/09/22 17:55:23 ajacoutot Exp $
--- mono/mini/mini-arm.h.orig Tue Sep 22 11:43:58 2009
+++ mono/mini/mini-arm.h Tue Sep 22 11:34:25 2009
@@ -137,7 +137,9 @@ typedef struct MonoCompileArch {
$OpenBSD: patch-mono_mini_mini-arm_h,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/mini/mini-arm.h.orig Tue Nov 24 23:15:33 2009
+++ mono/mini/mini-arm.h Fri Mar 19 23:29:31 2010
@@ -142,7 +142,9 @@ typedef struct MonoCompileArch {
#define ARM_FIRST_ARG_REG 0
#define ARM_LAST_ARG_REG 3

13
lang/mono/patches/patch-mono_mini_mini_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-mono_mini_mini_c,v 1.1 2010/03/20 17:16:44 robert Exp $
--- mono/mini/mini.c.orig Sat Mar 20 18:05:26 2010
+++ mono/mini/mini.c Sat Mar 20 14:50:27 2010
@@ -4781,6 +4781,9 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
#endif
MonoJitInfo *ji;
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+#if !(defined(MONO_ARCH_USE_SIGACTION) || defined(PLATFORM_WIN32))
+ siginfo_t *info;
+#endif
GET_CONTEXT;

8
lang/mono/patches/patch-mono_tests_libtest_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mono_tests_libtest_c,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- mono/tests/libtest.c.orig Tue Sep 1 14:21:36 2009
+++ mono/tests/libtest.c Tue Sep 1 14:22:24 2009
@@ -3000,7 +3000,7 @@ mono_test_marshal_ccw_itest (MonoComObject *pUnk)
$OpenBSD: patch-mono_tests_libtest_c,v 1.2 2010/03/20 17:16:44 robert Exp $
--- mono/tests/libtest.c.orig Wed Feb 3 22:26:25 2010
+++ mono/tests/libtest.c Fri Mar 19 23:29:31 2010
@@ -3190,7 +3190,7 @@ mono_test_marshal_ccw_itest (MonoComObject *pUnk)
* mono_method_get_unmanaged_thunk tests
*/

40
lang/mono/patches/patch-mono_utils_mono-proclib_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mono_utils_mono-proclib_c,v 1.2 2010/01/19 15:07:01 jasper Exp $
--- mono/utils/mono-proclib.c.orig Sat Aug 15 03:03:11 2009
+++ mono/utils/mono-proclib.c Tue Jan 19 07:11:00 2010
$OpenBSD: patch-mono_utils_mono-proclib_c,v 1.3 2010/03/20 17:16:44 robert Exp $
--- mono/utils/mono-proclib.c.orig Sat Oct 31 05:22:03 2009
+++ mono/utils/mono-proclib.c Sat Mar 20 11:12:40 2010
@@ -13,6 +13,9 @@
#endif
@ -11,23 +11,24 @@ $OpenBSD: patch-mono_utils_mono-proclib_c,v 1.2 2010/01/19 15:07:01 jasper Exp $
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -41,9 +44,14 @@ gpointer*
@@ -41,9 +44,15 @@ gpointer*
mono_process_list (int *size)
{
#if USE_SYSCTL
- int mib [4];
int res, i;
+ //int res, i;
+ int res;
+#ifdef KERN_PROC2
+ int mib [6];
+ size_t data_len = sizeof (struct kinfo_proc2) * 400;
+#else
+ int mib [4];
int mib [4];
- int res, i;
size_t data_len = sizeof (struct kinfo_proc) * 400;
+#endif /* KERN_PROC2 */
+#endif
struct kinfo_proc *processes = malloc (data_len);
void **buf = NULL;
@@ -52,17 +60,34 @@ mono_process_list (int *size)
@@ -52,20 +61,37 @@ mono_process_list (int *size)
if (!processes)
return NULL;
@ -53,22 +54,25 @@ $OpenBSD: patch-mono_utils_mono-proclib_c,v 1.2 2010/01/19 15:07:01 jasper Exp $
free (processes);
return NULL;
}
+
+#ifdef KERN_PROC2
+ res = data_len/sizeof (struct kinfo_proc2);
+#else
res = data_len/sizeof (struct kinfo_proc);
+#endif /* KERN_PROC2 */
buf = g_realloc (buf, res * sizeof (void*));
for (i = 0; i < res; ++i)
- for (i = 0; i < res; ++i)
+/* for (i = 0; i < res; ++i)
buf [i] = GINT_TO_POINTER (processes [i].kinfo_pid_member);
@@ -155,23 +180,45 @@ char*
+*/
free (processes);
if (size)
*size = res;
@@ -155,14 +181,33 @@ char*
mono_process_get_name (gpointer pid, char *buf, int len)
{
#if USE_SYSCTL
- int mib [4];
int res;
char *p;
+#ifdef KERN_PROC2
+ int mib [6];
+ size_t data_len = sizeof (struct kinfo_proc2);
@ -98,15 +102,13 @@ $OpenBSD: patch-mono_utils_mono-proclib_c,v 1.2 2010/01/19 15:07:01 jasper Exp $
mib [1] = KERN_PROC;
mib [2] = KERN_PROC_PID;
mib [3] = GPOINTER_TO_UINT (pid);
-
+
res = sysctl (mib, 4, &processi, &data_len, NULL, 0);
+
@@ -171,7 +216,8 @@ mono_process_get_name (gpointer pid, char *buf, int le
if (res < 0 || data_len != sizeof (struct kinfo_proc)) {
return buf;
}
- strncpy (buf, processi.kinfo_name_member, len - 1);
+#endif /* KERN_PROC2 */
+
strncpy (buf, processi.kinfo_name_member, len - 1);
+// strncpy (buf, processi.kinfo_name_member, len - 1);
return buf;
#else
char fname [128];

8
lang/mono/patches/patch-runtime_mono-wrapper_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-runtime_mono-wrapper_in,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- runtime/mono-wrapper.in.orig Sun Aug 23 17:44:05 2009
+++ runtime/mono-wrapper.in Sun Aug 23 17:44:47 2009
$OpenBSD: patch-runtime_mono-wrapper_in,v 1.2 2010/03/20 17:16:44 robert Exp $
--- runtime/mono-wrapper.in.orig Fri Sep 25 16:58:09 2009
+++ runtime/mono-wrapper.in Sat Mar 20 11:03:12 2010
@@ -4,4 +4,4 @@ MONO_CFG_DIR='@mono_cfg_dir@'
PATH="$r/runtime/_tmpinst/bin:$PATH"
MONO_SHARED_DIR=$r/runtime
export MONO_CFG_DIR MONO_SHARED_DIR PATH
-exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"
+exec "${LIBTOOL}" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"
+exec "/usr/local/bin/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"

8
lang/mono/patches/patch-runtime_monodis-wrapper_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-runtime_monodis-wrapper_in,v 1.1 2009/09/06 07:25:27 ajacoutot Exp $
--- runtime/monodis-wrapper.in.orig Sun Aug 23 17:44:58 2009
+++ runtime/monodis-wrapper.in Sun Aug 23 17:45:13 2009
$OpenBSD: patch-runtime_monodis-wrapper_in,v 1.2 2010/03/20 17:16:44 robert Exp $
--- runtime/monodis-wrapper.in.orig Fri Sep 25 16:58:09 2009
+++ runtime/monodis-wrapper.in Sat Mar 20 11:03:12 2010
@@ -3,4 +3,4 @@ r='@mono_build_root@'
MONO_CFG_DIR='@mono_cfg_dir@'
MONO_SHARED_DIR=$r/runtime
export MONO_CFG_DIR MONO_SHARED_DIR
-exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono.la" "$r/mono/dis/monodis" "$@"
+exec "${LIBTOOL}" --mode=execute -dlopen "$r/mono/mini/libmono.la" "$r/mono/dis/monodis" "$@"
+exec "/usr/local/bin/libtool" --mode=execute -dlopen "$r/mono/mini/libmono.la" "$r/mono/dis/monodis" "$@"

31
lang/mono/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2009/09/06 07:25:27 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.7 2010/03/20 17:16:44 robert Exp $
%%SHARED%%
bin/al
bin/al1
@ -24,6 +24,7 @@ bin/ilasm1
bin/ilasm2
bin/installvst
@bin bin/jay
bin/lc
bin/macpack
bin/makecert
bin/mconfig
@ -47,6 +48,7 @@ bin/mono-api-info
bin/mono-cil-strip
bin/mono-find-provides
bin/mono-find-requires
bin/mono-gdb.py
bin/mono-service
bin/mono-service2
bin/mono-shlib-cop
@ -215,6 +217,8 @@ 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/RabbitMQ.Client.Apigen.exe
lib/mono/1.0/RabbitMQ.Client.Apigen.exe.mdb
lib/mono/1.0/RabbitMQ.Client.dll
lib/mono/1.0/System.Configuration.Install.dll
lib/mono/1.0/System.Data.OracleClient.dll
@ -362,6 +366,7 @@ lib/mono/2.0/Mono.Data.SybaseClient.dll
lib/mono/2.0/Mono.Data.Tds.dll
lib/mono/2.0/Mono.Data.TdsClient.dll
lib/mono/2.0/Mono.Data.dll
lib/mono/2.0/Mono.Debugger.Soft.dll
lib/mono/2.0/Mono.GetOptions.dll
lib/mono/2.0/Mono.Http.dll
lib/mono/2.0/Mono.Management.dll
@ -378,6 +383,8 @@ 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
lib/mono/2.0/RabbitMQ.Client.dll
lib/mono/2.0/System.ComponentModel.DataAnnotations.dll
lib/mono/2.0/System.Configuration.Install.dll
@ -416,6 +423,7 @@ 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/WindowsBase.dll
lib/mono/2.0/al.exe
lib/mono/2.0/al.exe.mdb
lib/mono/2.0/cscompmgd.dll
@ -432,6 +440,8 @@ lib/mono/2.0/ilasm.exe
lib/mono/2.0/ilasm.exe.mdb
lib/mono/2.0/installutil.exe
lib/mono/2.0/installutil.exe.mdb
lib/mono/2.0/lc.exe
lib/mono/2.0/lc.exe.mdb
lib/mono/2.0/mconfig.exe
lib/mono/2.0/mconfig.exe.mdb
lib/mono/2.0/mdoc.exe
@ -709,6 +719,10 @@ lib/mono/gac/Mono.Data/1.0.5000.0__0738eb9f132ed756/Mono.Data.dll.mdb
lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/
lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll
lib/mono/gac/Mono.Data/2.0.0.0__0738eb9f132ed756/Mono.Data.dll.mdb
lib/mono/gac/Mono.Debugger.Soft/
lib/mono/gac/Mono.Debugger.Soft/0.0.0.0__0738eb9f132ed756/
lib/mono/gac/Mono.Debugger.Soft/0.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll
lib/mono/gac/Mono.Debugger.Soft/0.0.0.0__0738eb9f132ed756/Mono.Debugger.Soft.dll.mdb
lib/mono/gac/Mono.GetOptions/
lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/
lib/mono/gac/Mono.GetOptions/1.0.5000.0__0738eb9f132ed756/Mono.GetOptions.dll
@ -849,6 +863,10 @@ lib/mono/gac/System.Data.OracleClient/1.0.5000.0__b77a5c561934e089/System.Data.O
lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/
lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll
lib/mono/gac/System.Data.OracleClient/2.0.0.0__b77a5c561934e089/System.Data.OracleClient.dll.mdb
lib/mono/gac/System.Data.Services/
lib/mono/gac/System.Data.Services/2.0.0.0__0738eb9f132ed756/
lib/mono/gac/System.Data.Services/2.0.0.0__0738eb9f132ed756/System.Data.Services.dll
lib/mono/gac/System.Data.Services/2.0.0.0__0738eb9f132ed756/System.Data.Services.dll.mdb
lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/
lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll
lib/mono/gac/System.Data/1.0.5000.0__b77a5c561934e089/System.Data.dll.mdb
@ -1024,6 +1042,10 @@ lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb
lib/mono/gac/System/2.0.0.0__b77a5c561934e089/
lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll
lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb
lib/mono/gac/WindowsBase/
lib/mono/gac/WindowsBase/3.0.0.0__31bf3856ad364e35/
lib/mono/gac/WindowsBase/3.0.0.0__31bf3856ad364e35/WindowsBase.dll
lib/mono/gac/WindowsBase/3.0.0.0__31bf3856ad364e35/WindowsBase.dll.mdb
lib/mono/gac/cscompmgd/
lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/
lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
@ -1078,6 +1100,11 @@ lib/mono/gac/nunit.util/2.4.8.0__96d09a1eb7f44a77/nunit.util.dll.mdb
lib/mono/monodoc/
lib/mono/monodoc/monodoc.dll
lib/mono/xbuild/
lib/mono/xbuild/Microsoft/
lib/mono/xbuild/Microsoft/VisualStudio/
lib/mono/xbuild/Microsoft/VisualStudio/v9.0/
lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/
lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
lib/monodoc/
lib/monodoc/monodoc.xml
lib/monodoc/sources/
@ -1131,6 +1158,7 @@ lib/pkgconfig/wcf.pc
@man man/man1/httpcfg.1
@man man/man1/ilasm.1
@man man/man1/jay.1
@man man/man1/lc.1
@man man/man1/macpack.1
@man man/man1/makecert.1
@man man/man1/mconfig.1
@ -1170,6 +1198,7 @@ lib/pkgconfig/wcf.pc
@man man/man1/soapsuds.1
@man man/man1/sqlsharp.1
@man man/man1/wsdl.1
@man man/man1/xbuild.1
@man man/man1/xsd.1
@man man/man5/mdoc.5
@man man/man5/mono-config.5