Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23588/main/finkinfo/languages
Modified Files: ikvm.info ikvm.patch mono.info mono.patch Log Message: mono 2.4, monodevelop 2.0, and all the trappings Index: ikvm.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ikvm.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ikvm.info 12 Jan 2009 04:51:21 -0000 1.7 +++ ikvm.info 22 May 2009 20:03:59 -0000 1.8 @@ -1,14 +1,14 @@ Package: ikvm -Version: 0.36.0.11 +Version: 0.38.0.2 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.zip -Source-MD5: 3fb7a80285d3c3c52a4de7c41d9eee46 +Source-MD5: d5ca2e341b2d0b8b1f14da31bb495103 Source2: mirror:sourceforge:%n/classpath-0.95-stripped.zip Source2-MD5: 61abaabd02bcd11b275a2ad6ed6cb401 -Source3: mirror:sourceforge:%n/openjdk-b13-stripped.zip -Source3-MD5: f47f3bf819919e585854de401099a626 +Source3: mirror:sourceforge:%n/openjdk6-b12-stripped.zip +Source3-MD5: 1d3e236ea3df0b334665d9e6754fd246 PatchFile: %n.patch -PatchFile-MD5: 60f21d7eece03a7571c31cfb0e7b42ef +PatchFile-MD5: 122bc479ab8e31d93c4b2845eb4261f9 DocFiles: LICENSE THANKYOU website/*.txt Depends: << mono (>= 2.0-1), @@ -16,12 +16,12 @@ << Suggests: monodevelop BuildDepends: << - mono-dev (>= 2.0-1), - nant (>= 0.85-10), ecj, + fink (>= 0.28.0-1), glib2-dev (>= 2.14.0-1), libgettext3-dev, - fink (>= 0.24.12-1) + mono-dev (>= 2.0-1), + nant (>= 0.85-10) << Homepage: http://www.mono-project.com/ Maintainer: Benjamin Reed <i...@fink.racoonfink.com> @@ -35,7 +35,7 @@ CompileScript: << #!/bin/sh -ex - nant -t:mono-1.0 + nant -t:mono-2.0 << InstallScript: << #!/bin/sh -ex Index: mono.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.info,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- mono.info 24 Oct 2008 02:38:14 -0000 1.14 +++ mono.info 22 May 2009 20:03:59 -0000 1.15 @@ -1,25 +1,26 @@ +Info4: << Package: mono -Version: 2.0.1 +Version: 2.4 Revision: 1 +Architecture: i386, powerpc +Description: .NET-compatible CIL engine +Type: java(1.5) +License: LGPL +Maintainer: Benjamin Reed <m...@fink.racoonfink.com> -Source: http://ftp.novell.com/pub/mono/sources/%n/%n-%v.tar.bz2 -Source-MD5: 60ab4d1d1990826578891e90cd560fa0 -PatchFile: %n.patch -PatchFile-MD5: 8144a1dfad41942685bd56d5ae68ccfc -PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1 -DocFiles: AUTHORS COPYING* ChangeLog NEWS README Depends: << %N-shlibs (= %v-%r), libgettext3-shlibs, - system-java14 + system-java15 << BuildDepends: << atk1 (>= 1.20.0-1), - cairo (>= 1.8-1), + cairo (>= 1.8.6-1), expat1, - fink (>= 0.28-1), + fink (>= 0.28.0-1), fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.7-7), + # gc (>= 7.1-1), gettext-tools, glib2-dev (>= 2.14.0-1), glitz (>= 0.4.4-1), @@ -28,70 +29,95 @@ libpng3, pixman (>= 0.12.0-1), pkgconfig (>= 0.22-3), - system-java14-dev, + system-java15-dev, xmkmf << -BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev, gc -Replaces: %N-dev (<< %v-%r) -Type: java(1.4) -Homepage: http://www.mono-project.com/ -Maintainer: Benjamin Reed <m...@fink.racoonfink.com> -Description: .NET-compatible CIL engine -NoSetCPPFLAGS: true +BuildConflicts: libicu28-dev, libicu30-dev +Replaces: << + %N-dev (<< %v-%r), + monodoc (<< 2.4-1) +<< + +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 +PatchFile: %n.patch +PatchFile-MD5: c4ed22de8fd4fa31cee29051361a23ec + SetCPPFLAGS: -I%p/include -NoSetLDFLAGS: true SetLDFLAGS: -bind_at_load SetLIBS: -L%p/lib -ConfigureParams: --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-dependency-tracking CFLAGS="-Os" CXXFLAGS="-Os" -ConfFiles: << - %p/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx - %p/etc/mono/1.0/machine.config - %p/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx - %p/etc/mono/2.0/machine.config - %p/etc/mono/browscap.ini - %p/etc/mono/config -<< +SetMAKEFLAGS: -j1 +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" CompileScript: << #!/bin/sh -ex - case `uname -r` in - 8.*) - ulimit -n unlimited - ;; - esac + ulimit -n unlimited || : + + # %p/bin and %p/sbin have mono stuff that conflicts on upgrade + save_IFS=$IFS + IFS=: + for DIR in $PATH; do + if [ "$DIR" != "%p/bin" ] && [ "$DIR" != "%p/sbin" ]; then + NEWPATH="$NEWPATH:$DIR" + fi + done + IFS=$save_IFS + export PATH="%p/lib/xmkmf/bin$NEWPATH" + export lt_cv_sys_max_cmd_len=65536 lt_cv_apple_cc_single_mod=yes + export ac_cv_header_poll_h=no ac_cv_header_sys_poll_h=no ac_cv_type_struct_pollfd=no + + # configure stuff to work around %p/bin being gone + export HAVE_MSGFMT="yes" + export MSGFMT="%p/bin/msgfmt" + export MSGMERGE="%p/bin/msgmerge" + export PKG_CONFIG="%p/bin/pkg-config" + 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 - export lt_cv_sys_max_cmd_len=65536 PATH="%p/lib/xmkmf/bin:$PATH" 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 - for dir in libgc mono ikvm-native; do - pushd $dir - make - popd - done - make -j1 + make << + InstallScript: << #!/bin/sh -ex ulimit -n unlimited || : - make -j1 install DESTDIR="%d" + make install DESTDIR="%d" find %i/lib/mono -name \*.config -print0 | xargs -0 perl -pi -e 's,target="lib,target="%p/lib/lib,g' + + install -d -m 755 "%i/etc/profile.d" + cat <<END >"%i/etc/profile.d/mono.sh" +export MONO_PATH='%p/lib:/usr/lib' +export MONO_SHARED_DIR="\$HOME" +END + cat <<END >"%i/etc/profile.d/mono.csh" +setenv MONO_PATH '%p/lib:/usr/lib' +setenv MONO_SHARED_DIR "\$HOME" +END + chmod 755 "%i/etc/profile.d"/* << -# dynamically loaded -Shlibs: << - %p/lib/libMonoPosixHelper.dylib 0.0.0 %n (>= 1.2.5-1) - %p/lib/libMonoSupportW.dylib 0.0.0 %n (>= 1.2.5-1) - %p/lib/libikvm-native.dylib 0.0.0 %n (>= 1.2.5-1) -<< +DocFiles: AUTHORS COPYING* ChangeLog NEWS README SplitOff: << Package: %N-shlibs - Replaces: %N (<< %v-%r) Depends: << - cairo-shlibs (>= 1.8-1), + cairo-shlibs (>= 1.8.6-1), + # gc-shlibs (>= 7.1-1), glib2-shlibs (>= 2.14.0-1), macosx (>= 10.4.3-1) << + Replaces: %N (<< %v-%r) Files: << lib/libmono-profiler-*.0*.dylib lib/libmono.0*.dylib @@ -102,11 +128,14 @@ %p/lib/libmono.0.dylib 1.0.0 %n (>= 1.2.5-1) << << -SplitOff2: << +SplitOff10: << Package: %N-dev - BuildDependsOnly: true Depends: %N (>= %v-%r) - Replaces: %N (<< %v-%r) + Replaces: << + %N (<< %v-%r), + monodoc (<< 2.4-1) + << + BuildDependsOnly: true Files: << include lib/*.a @@ -116,12 +145,46 @@ lib/pkgconfig << << +SplitOff2: << + Package: monodoc + Depends: %N (>= %v-%r) + Files: << + bin/mdassembler + bin/mdoc* + bin/mdvalidater + bin/mod + bin/monodoc* + lib/mono/gac/monodoc + lib/mono/monodoc + lib/monodoc + lib/pkgconfig/monodoc.pc + share/man/man1/mdassembler.1 + share/man/man1/mdoc*.1 + share/man/man1/monodoc*.1 + share/man/man5/mdoc.5 + << +<< +Shlibs: << + %p/lib/libMonoPosixHelper.dylib 0.0.0 %n (>= 1.2.5-1) + %p/lib/libMonoSupportW.dylib 0.0.0 %n (>= 1.2.5-1) + %p/lib/libikvm-native.dylib 0.0.0 %n (>= 1.2.5-1) +<< -RuntimeVars: MONO_PATH: "%p/lib:/usr/lib" +ConfFiles: << + %p/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx + %p/etc/mono/1.0/machine.config + %p/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx + %p/etc/mono/2.0/machine.config + %p/etc/mono/browscap.ini + %p/etc/mono/config +<< + +Homepage: http://www.mono-project.com/ DescDetail: << The Mono runtime implements a JIT engine for the CIL virtual machine (as well as a byte code interpreter, this is to quickly port it to new systems), the class loader, the garbage collector, threading system and metadata access libraries. << -License: LGPL +<< + Index: ikvm.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ikvm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ikvm.patch 15 Jul 2008 01:41:15 -0000 1.3 +++ ikvm.patch 22 May 2009 20:03:59 -0000 1.4 @@ -1,11 +1,11 @@ -diff -uNr ikvm-0.36.0.5/native/native.build ikvm-0.36.0.5-patched/native/native.build ---- ikvm-0.36.0.5/native/native.build 2006-10-16 07:40:36.000000000 -0400 -+++ ikvm-0.36.0.5-patched/native/native.build 2007-12-13 13:52:12.000000000 -0500 +diff -Nurd ikvm-0.38.0.2/native/native.build ikvm-0.38.0.2-new/native/native.build +--- ikvm-0.38.0.2/native/native.build 2008-05-18 09:54:12.000000000 -0400 ++++ ikvm-0.38.0.2-new/native/native.build 2009-05-22 12:08:47.000000000 -0400 @@ -9,7 +9,7 @@ </if> </target> <target name="ikvm-native-unix"> -- <exec program="/bin/bash" commandline="-c 'gcc -o libikvm-native.so --shared -fPIC `pkg-config --cflags gmodule-2.0` jni.c os.c'"/> +- <exec program="/bin/bash" commandline="-c 'gcc -o libikvm-native.so --shared -fPIC `pkg-config --cflags --libs gmodule-2.0` jni.c os.c'"/> + <exec program="/bin/bash" commandline="-c 'gcc -o libikvm-native.so -bundle -fPIC `pkg-config --cflags --libs gmodule-2.0` jni.c os.c'"/> <copy file="libikvm-native.so" todir="../bin"/> </target> Index: mono.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/mono.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- mono.patch 10 Oct 2008 14:25:20 -0000 1.7 +++ mono.patch 22 May 2009 20:03:59 -0000 1.8 @@ -1,16 +1,43 @@ -diff -Nurd mono-2.0/configure mono-2.0-new/configure ---- mono-2.0/configure 2008-10-01 17:07:24.000000000 -0400 -+++ mono-2.0-new/configure 2008-10-07 16:52:15.000000000 -0400 -@@ -3066,7 +3066,7 @@ - ;; +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" -@@ -38516,11 +38516,11 @@ +- 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 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <zlib.h> +-int +-main () +-{ +- + void main () { + #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230) + } + #else + #error No good zlib found + #endif +- +- ; +- return 0; +-} + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -40039,11 +40031,11 @@ case "$host" in *-*-darwin*) libsuffix=".dylib" @@ -27,9 +54,9 @@ ;; *-*-*netbsd*) LIBC="libc.so.12" -diff -Nurd mono-2.0/data/config.in mono-2.0-new/data/config.in ---- mono-2.0/data/config.in 2008-09-02 11:42:56.000000000 -0400 -+++ mono-2.0-new/data/config.in 2008-10-07 16:52:15.000000000 -0400 +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 @@ <dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/> <dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/> @@ -56,10 +83,24 @@ <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.0/mono/metadata/loader.c mono-2.0-new/mono/metadata/loader.c ---- mono-2.0/mono/metadata/loader.c 2008-09-02 11:42:41.000000000 -0400 -+++ mono-2.0-new/mono/metadata/loader.c 2008-10-07 16:52:15.000000000 -0400 -@@ -1171,6 +1171,24 @@ +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 @@ + ubuf.machine[0] = '\0'; + ubuf.sysname[0] = '\0'; + } else { +- g_strdelimit (ubuf.sysname, "/", '_'); +- g_strdelimit (ubuf.machine, "/", '_'); ++ g_strdelimit (ubuf.sysname, NULL, '_'); ++ g_strdelimit (ubuf.machine, NULL, '_'); + } + + 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 @@ if (!module) { void *iter = NULL; @@ -84,3 +125,38 @@ while ((full_name = mono_dl_build_path (".", 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 ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://www.creativitycat.com _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs