Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10934/main/finkinfo/languages
Modified Files: ikvm.info mono.info mono.patch Log Message: major mono-related updates, works on 10.6 (but not x86_64) Index: ikvm.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ikvm.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ikvm.info 22 May 2009 20:03:59 -0000 1.8 +++ ikvm.info 23 Feb 2010 21:55:42 -0000 1.9 @@ -1,48 +1,50 @@ Package: ikvm -Version: 0.38.0.2 +Version: 0.42.0.3 Revision: 1 -Source: mirror:sourceforge:%n/%n-%v.zip -Source-MD5: d5ca2e341b2d0b8b1f14da31bb495103 -Source2: mirror:sourceforge:%n/classpath-0.95-stripped.zip -Source2-MD5: 61abaabd02bcd11b275a2ad6ed6cb401 -Source3: mirror:sourceforge:%n/openjdk6-b12-stripped.zip -Source3-MD5: 1d3e236ea3df0b334665d9e6754fd246 -PatchFile: %n.patch -PatchFile-MD5: 122bc479ab8e31d93c4b2845eb4261f9 -DocFiles: LICENSE THANKYOU website/*.txt +Architecture: i386, powerpc +Description: Java implementation for .Net +Type: java(1.5) +License: BSD +Maintainer: Benjamin Reed <i...@fink.racoonfink.com> + Depends: << - mono (>= 2.0-1), - pkgconfig (>= 0.22-3) + mono (>= 2.6.1-1), + pkgconfig (>= 0.23-1) << -Suggests: monodevelop BuildDepends: << ecj, - fink (>= 0.28.0-1), - glib2-dev (>= 2.14.0-1), - libgettext3-dev, - mono-dev (>= 2.0-1), - nant (>= 0.85-10) + fink (>= 0.29.7-1), + glib2-dev (>= 2.18.4-1), + libgettext8-dev, + mono-dev (>= 2.6.1-1), + nant (>= 0.86-0) << -Homepage: http://www.mono-project.com/ -Maintainer: Benjamin Reed <i...@fink.racoonfink.com> -Description: Java implementation for .Net -NoSetCPPFLAGS: true +Suggests: monodevelop + +Source: mirror:sourceforge:%n/%n-%v.zip +Source-MD5: c784e20fba577cff0c636f6c89ed62c3 +Source2: mirror:sourceforge:%n/openjdk6-b16-stripped.zip +Source2-MD5: c7f13c808e195df27c9bdc1f8f1090c1 +PatchFile: %n.patch +PatchFile-MD5: 8e22e5e12afa6ca27f7a8c0d512c10ef + SetCPPFLAGS: -I%p/include -NoSETLDFLAGS: true SetLIBS: -L%p/lib -NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 +NoSetCPPFLAGS: true +NoSetLDFLAGS: true +NoSetMAKEFLAGS: true CompileScript: << #!/bin/sh -ex nant -t:mono-2.0 << + InstallScript: << #!/bin/sh -ex install -d -m 755 %i/lib/%N %i/bin %i/lib/pkgconfig install -c -m 755 bin/*.exe bin/*.dll %i/lib/%N/ - install -c -m 755 bin/JVM.DLL %i/lib/%N/jvm.dll for script in ikvm ikvmc ikvmstub; do cat <<END > %i/bin/$script @@ -58,14 +60,15 @@ exec_prefix=\${prefix} libdir=\${prefix}/lib - Name: IKVM.NET Description: An implementation of Java for Mono and the Microsoft .NET Framework. Version: %v Libs: -r:\${libdir}/ikvm/IKVM.Runtime.dll -r:\${libdir}/ikvm/IKVM.GNU.Classpath.dll END << +DocFiles: LICENSE THANKYOU website/*.txt +Homepage: http://www.mono-project.com/ DescDetail: << IKVM.NET is an implementation of Java for Mono and the Microsoft .NET Framework. It includes the following components: @@ -74,4 +77,4 @@ * A .NET implementation of the Java class libraries * Tools that enable Java and .NET interoperability << -License: BSD + Index: mono.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.info,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- mono.info 16 Jan 2010 04:07:09 -0000 1.17 +++ mono.info 23 Feb 2010 21:55:43 -0000 1.18 @@ -1,8 +1,7 @@ Info4: << Package: mono -Version: 2.4 -Revision: 1 -Distribution: 10.4, 10.5 +Version: 2.6.1 +Revision: 2 Architecture: i386, powerpc Description: .NET-compatible CIL engine Type: java(1.5) @@ -11,25 +10,24 @@ Depends: << %N-shlibs (= %v-%r), - libgettext3-shlibs, + libgettext8-shlibs, system-java15 << BuildDepends: << - atk1 (>= 1.20.0-1), - cairo (>= 1.8.6-1), + atk1 (>= 1.26.0-1), + cairo (>= 1.8.8-1), expat1, - fink (>= 0.28.0-1), + fink (>= 0.29.7-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.7-7), - # gc (>= 7.1-1), gettext-tools, - glib2-dev (>= 2.14.0-1), + glib2-dev (>= 2.18.4-1), glitz (>= 0.4.4-1), - libgettext3-dev, + libgettext8-dev, libiconv-dev, libpng3, - pixman (>= 0.12.0-1), - pkgconfig (>= 0.22-3), + pixman (>= 0.16.0-1), + pkgconfig (>= 0.23-1), system-java15-dev, xmkmf << @@ -40,10 +38,13 @@ << Source: http://ftp.novell.com/pub/mono/sources/%n/%n-%v.tar.bz2 -Source-MD5: da2bf1c0aba2958d26c5e8a9a49fd9d1 -PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1 +Source-MD5: 4cd2157c9eabbe9f49232d5ee3a2a57e +PatchScript: << + sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1 + perl -pi -e 's,JIT_SUPPORTED=yes,JIT_SUPPORTED=no,g' configure +<< PatchFile: %n.patch -PatchFile-MD5: c4ed22de8fd4fa31cee29051361a23ec +PatchFile-MD5: 01d28083e8b67d924a7b7f2960688ef6 SetCPPFLAGS: -I%p/include SetLDFLAGS: -bind_at_load @@ -52,7 +53,19 @@ NoSetCPPFLAGS: true NoSetLDFLAGS: true NoSetMAKEFLAGS: true -ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.` --mandir=%p/share/man --sysconfdir=%p/etc --with-glib=system --with-ikvm-native=yes --with-jit=yes --with-preview=yes --with-x --with-moonlight --disable-dtrace --disable-dependency-tracking CFLAGS="-Os" CXXFLAGS="-Os" +ConfigureParams: << +--build=%m-apple-darwin`uname -r|cut -f1 -d.` \ +--with-jit=yes \ +--with-ikvm-native=yes \ +--mandir=%p/share/man \ +--sysconfdir=%p/etc \ +--with-glib=system \ +--with-preview=yes \ +--with-x \ +--with-moonlight \ +--disable-dependency-tracking \ +CFLAGS="-Os" CXXFLAGS="-Os" +<< CompileScript: << #!/bin/sh -ex @@ -79,12 +92,6 @@ export XGETTEXT="%p/bin/xgettext" export XMKMF="%p/lib/xmkmf/bin/xmkmf" -# if [ "%m" = "x86_64" ]; then -# export CFLAGS="$CFLAGS -arch x86_64" -# export CXXFLAGS="$CXXFLAGS -arch x86_64" -# export CPPFLAGS="$CPPFLAGS -arch x86_64" -# fi - perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g; s/need_relink=yes/need_relink=no/g' configure ltmain.sh ./configure %c --with-jdk=$JAVA_HOME @@ -113,9 +120,8 @@ SplitOff: << Package: %N-shlibs Depends: << - cairo-shlibs (>= 1.8.6-1), - # gc-shlibs (>= 7.1-1), - glib2-shlibs (>= 2.14.0-1), + cairo-shlibs (>= 1.8.8-1), + glib2-shlibs (>= 2.18.4-1), macosx (>= 10.4.3-1) << Replaces: %N (<< %v-%r) Index: mono.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mono.patch 22 May 2009 20:03:59 -0000 1.8 +++ mono.patch 23 Feb 2010 21:55:43 -0000 1.9 @@ -1,32 +1,26 @@ -diff -Nurd mono-2.4/configure mono-2.4-new/configure ---- mono-2.4/configure 2009-03-13 10:51:11.000000000 -0400 -+++ mono-2.4-new/configure 2009-05-21 11:40:07.000000000 -0400 -@@ -3029,11 +3029,11 @@ - *-*-darwin*) - platform_win32=no - platform_darwin=yes -- CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" -+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP" - CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent" - libmono_cflags="-D_THREAD_SAFE" -- LDFLAGS="$LDFLAGS -pthread" -- libmono_ldflags="-pthread" -+ LDFLAGS="$LDFLAGS" -+ libmono_ldflags="" - need_link_unlink=yes - cat >>confdefs.h <<\_ACEOF - #define PTHREAD_POINTER_ID 1 -@@ -22546,20 +22546,12 @@ +diff -Nurd mono-2.6.1/configure mono-2.6.1-new/configure +--- mono-2.6.1/configure 2009-12-17 10:50:43.000000000 -0500 ++++ mono-2.6.1-new/configure 2010-02-23 15:08:22.000000000 -0500 +@@ -3239,7 +3239,7 @@ + fi + case "$host" in + i*86-*-darwin10*) +- BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5" ++ BROKEN_DARWIN_FLAGS="-D_XOPEN_SOURCE -mmacosx-version-min=10.5" + CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS" + CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS" + CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS" +@@ -18140,9 +18140,6 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <zlib.h> -int -main () -{ -- + void main () { #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230) - } +@@ -18150,10 +18147,6 @@ #else #error No good zlib found #endif @@ -37,7 +31,24 @@ _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" -@@ -40039,11 +40031,11 @@ +@@ -36561,11 +36554,11 @@ + + JIT_SUPPORTED=no + INTERP_SUPPORTED=no +-LIBC="libc.so.6" +-INTL="libc.so.6" +-SQLITE="libsqlite.so.0" +-SQLITE3="libsqlite3.so.0" +-X11="libX11.so" ++LIBC="/usr/lib/libSystem.dylib" ++INTL="@FINKPREFIX@/lib/libintl.dylib" ++SQLITE="@FINKPREFIX@/lib/libsqlite.0.dylib" ++SQLITE3="@FINKPREFIX@/lib/libsqlite3.0.dylib" ++X11="/usr/X11R6/lib/libX11.6.dylib" + + sizeof_register="SIZEOF_VOID_P" + +@@ -37047,11 +37040,11 @@ case "$host" in *-*-darwin*) libsuffix=".dylib" @@ -54,10 +65,10 @@ ;; *-*-*netbsd*) LIBC="libc.so.12" -diff -Nurd mono-2.4/data/config.in mono-2.4-new/data/config.in ---- mono-2.4/data/config.in 2009-02-13 18:34:32.000000000 -0500 -+++ mono-2.4-new/data/config.in 2009-05-21 11:40:07.000000000 -0400 -@@ -5,18 +5,18 @@ +diff -Nurd mono-2.6.1/data/config.in mono-2.6.1-new/data/config.in +--- mono-2.6.1/data/config.in 2009-09-25 10:58:13.000000000 -0400 ++++ mono-2.6.1-new/data/config.in 2010-02-23 15:07:47.000000000 -0500 +@@ -5,19 +5,19 @@ <dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/> <dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/> <dllmap dll="libintl" target="@INTL@" os="!windows"/> @@ -79,14 +90,16 @@ <dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/> <dllmap dll="libX11" target="@X11@" os="!windows" /> - <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/> +- <dllmap dll="libcups" target="libcups.so.2" os="!windows"/> + <dllmap dll="libcairo-2.dll" target="@FINKPREFIX@/lib/libcairo.2.dylib" os="!windows"/> ++ <dllmap dll="libcups" target="/usr/lib/libcups.2.dylib" os="!windows"/> <dllmap dll="i:kernel32.dll"> <dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/> <dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/> -diff -Nurd mono-2.4/mono/io-layer/shared.c mono-2.4-new/mono/io-layer/shared.c ---- mono-2.4/mono/io-layer/shared.c 2009-02-13 18:33:11.000000000 -0500 -+++ mono-2.4-new/mono/io-layer/shared.c 2009-05-21 12:09:10.000000000 -0400 -@@ -53,8 +53,8 @@ +diff -Nurd mono-2.6.1/mono/io-layer/shared.c mono-2.6.1-new/mono/io-layer/shared.c +--- mono-2.6.1/mono/io-layer/shared.c 2009-09-25 10:58:10.000000000 -0400 ++++ mono-2.6.1-new/mono/io-layer/shared.c 2010-02-23 15:07:47.000000000 -0500 +@@ -168,8 +168,8 @@ ubuf.machine[0] = '\0'; ubuf.sysname[0] = '\0'; } else { @@ -97,21 +110,21 @@ } fake_name = g_getenv ("MONO_SHARED_HOSTNAME"); -diff -Nurd mono-2.4/mono/metadata/loader.c mono-2.4-new/mono/metadata/loader.c ---- mono-2.4/mono/metadata/loader.c 2009-02-23 13:43:32.000000000 -0500 -+++ mono-2.4-new/mono/metadata/loader.c 2009-05-21 11:40:07.000000000 -0400 -@@ -1196,6 +1196,24 @@ +diff -Nurd mono-2.6.1/mono/metadata/loader.c mono-2.6.1-new/mono/metadata/loader.c +--- mono-2.6.1/mono/metadata/loader.c 2009-12-14 15:16:11.000000000 -0500 ++++ mono-2.6.1-new/mono/metadata/loader.c 2010-02-23 15:07:47.000000000 -0500 +@@ -1269,6 +1269,24 @@ if (!module) { void *iter = NULL; + while ((full_name = mono_dl_build_path ("@FINKPREFIX@/lib", file_name, &iter))) { + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -+ "DllImport loading library: '%s'.", full_name); ++ "DllImport loading location: '%s'.", full_name); + module = cached_module_load (full_name, MONO_DL_LAZY, &error_msg); + if (!module) { + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -+ "DllImport error loading library '%s'.", -+ error_msg); ++ "DllImport error loading library: '%s'.", ++ error_msg); + g_free (error_msg); + } + g_free (full_name); @@ -122,41 +135,6 @@ + + if (!module) { + void *iter = NULL; - while ((full_name = mono_dl_build_path (".", file_name, &iter))) { + while ((full_name = mono_dl_build_path (NULL, file_name, &iter))) { mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, - "DllImport loading library: '%s'.", full_name); -diff -Nurd mono-2.4/mono/mini/exceptions-amd64.c mono-2.4-new/mono/mini/exceptions-amd64.c ---- mono-2.4/mono/mini/exceptions-amd64.c 2009-03-09 12:51:42.000000000 -0400 -+++ mono-2.4-new/mono/mini/exceptions-amd64.c 2009-05-21 11:40:07.000000000 -0400 -@@ -740,7 +740,7 @@ - static inline guint64* - gregs_from_ucontext (ucontext_t *ctx) - { --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__APPLE__) - guint64 *gregs = (guint64 *) &ctx->uc_mcontext; - #else - guint64 *gregs = (guint64 *) &ctx->uc_mcontext.gregs; -diff -Nurd mono-2.4/mono/mini/mini-amd64.h mono-2.4-new/mono/mini/mini-amd64.h ---- mono-2.4/mono/mini/mini-amd64.h 2009-02-13 18:34:26.000000000 -0500 -+++ mono-2.4-new/mono/mini/mini-amd64.h 2009-05-21 11:40:07.000000000 -0400 -@@ -213,7 +213,9 @@ - - #ifndef PLATFORM_WIN32 - -+#ifndef __APPLE__ - #define MONO_ARCH_USE_SIGACTION 1 -+#endif - - #ifdef HAVE_WORKING_SIGALTSTACK - -@@ -319,7 +321,9 @@ - #define MONO_ARCH_MONITOR_OBJECT_REG AMD64_RDI - #endif - -+#if !defined(__APPLE__) - #define MONO_ARCH_AOT_SUPPORTED 1 -+#endif - - #if !defined(PLATFORM_WIN32) || defined(__sun) - #define MONO_ARCH_ENABLE_MONITOR_IL_FASTPATH 1 + "DllImport loading location: '%s'.", full_name); ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs