From: Benjamin R. <ran...@us...> - 2005-06-06 20:21:16
|
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20271/10.3/unstable/main/finkinfo/languages Modified Files: mono.info mono.patch Added Files: boo.info ikvm.info ikvm.patch Log Message: mono 1.1.7 and friends --- NEW FILE: boo.info --- Package: boo Version: 0.5.5.1651 Revision: 1 Source: http://dist.codehaus.org/%n/distributions/%n-%v-src.tar.bz2 Source-MD5: 4674fa8845802ebcc2cca111eef1afd9 SourceDirectory: %n-%v DocFiles: *.txt docs/* Depends: gtksourceview-shlibs (>= 1.0-1), mono (>= 1.1.7-1), shared-mime-info Suggests: monodevelop BuildDepends: gtksourceview-dev (>= 1.0-1), mono-dev (>= 1.1.7-1), nant, shared-mime-info Homepage: http://go-mono.com/ Maintainer: Benjamin Reed <bo...@fi...> Description: A wrist-friendly language for the CLI/Mono NoSetCPPFLAGS: true SetCPPFLAGS: -I%p/include NoSETLDFLAGS: true SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking CompileScript: << #!/bin/sh -ex nant -D:install.prefix=%p << InstallScript: << #!/bin/sh -ex nant -D:install.prefix=%p -D:install.destdir=%d install install -d -m 755 %i/share/doc/%N mv examples %i/share/doc/%N/ << DescDetail: << Boo is a new object oriented statically typed programming language for the Common Language Infrastructure with a python inspired syntax and a special focus on language and compiler extensibility. << License: GPL --- NEW FILE: ikvm.info --- Package: ikvm Version: 0.14.0.1 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.zip Source-MD5: 41aac88c0e0a6f148af8ad378eb60d69 SourceDirectory: %n Source2: mirror:gnu:classpath/classpath-0.15.tar.gz Source2-MD5: 036c23aec7cb53a43b7b9dc63a92fbbe Source3: http://go-mono.com/sources/%n/%n-0.14.tar.gz Source3-MD5: 042e49520251f9c76c0180cc2437a0b4 Patch: %n.patch DocFiles: LICENSE THANKYOU website/*.txt Depends: mono (>= 1.1.7-1) Suggests: monodevelop BuildDepends: mono-dev (>= 1.1.7-1), nant Homepage: http://go-mono.com/ Maintainer: Benjamin Reed <bo...@fi...> Description: Java implementation for .Net NoSetCPPFLAGS: true SetCPPFLAGS: -I%p/include NoSETLDFLAGS: true SetLIBS: -L%p/lib NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --libdir=%p/lib CompileScript: << #!/bin/sh -ex pushd ../%n-0.14 ./configure %c make popd nant all << InstallScript: << #!/bin/sh -ex pushd ../%n-0.14 make install DESTDIR=%d popd perl -pi -e 's,0.14,%v,g' %i/lib/pkgconfig/*.pc install -c -m 755 bin/*.exe bin/IKVM*.dll %i/lib/%n/ << DescDetail: << IKVM.NET is an implementation of Java for Mono and the Microsoft .NET Framework. It includes the following components: * A Java Virtual Machine implemented in .NET * 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.3/unstable/main/finkinfo/languages/mono.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- mono.info 12 Mar 2005 17:47:35 -0000 1.16 +++ mono.info 6 Jun 2005 20:20:19 -0000 1.17 @@ -1,12 +1,12 @@ Package: mono -Version: 1.0.2 +Version: 1.1.7 Revision: 11 -Source: http://www.go-%n.com/archive/%v/%n-%v.tar.gz -Source-MD5: 4490424a30ce40d1d7534cc681f6c14c +Source: http://www.go-mono.com/sources/%n-1.1/%n-%v.tar.gz +Source-MD5: f81c6b02ef0c5d5ef7ab827d28eb9731 PatchScript: sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1 DocFiles: AUTHORS COPYING* ChangeLog NEWS README -Depends: cairo-shlibs (>= 0.1.23-4), glib2-shlibs (>= 2.0.4-1), system-java14 -BuildDepends: cairo (>= 0.1.23-4), dlcompat-dev, fink (>= 0.22.2-1), gettext-dev, gettext-bin, gettext-tools, glib2-dev (>= 2.0.4-1), glib2 (>= 2.0.4-1), glitz (>= 0.1.5-1), libiconv-dev, libicu31-dev (>= 3.1-1), libpixman1, pkgconfig, system-java14-dev, gcc3.3 +Depends: cairo-shlibs (>= 0.5.0-1), glib2-shlibs (>= 2.4.6-7), libgettext3-shlibs, system-java14 +BuildDepends: cairo (>= 0.5.0-1), fink (>= 0.22.2-1), libgettext3-dev, gettext-tools, glib2-dev (>= 2.4.6-7), glib2 (>= 2.4.6-7), glitz (>= 0.4.0-1), libiconv-dev, libicu31-dev, libpixman1 (>= 0.1.5-1), pkgconfig, system-java14-dev BuildConflicts: libicu26-dev, libicu28-dev, libicu30-dev Type: java(1.4) Homepage: http://go-mono.com/ @@ -16,18 +16,21 @@ SetCPPFLAGS: -I%p/include NoSETLDFLAGS: true SetLIBS: -L%p/lib -ConfigureParams: --mandir=%p/share/man --sysconfdir=%p/etc +NoSetMAKEFLAGS: true +SetMAKEFLAGS: -j1 +ConfigureParams: --mandir=%p/share/man --sysconfdir=%p/etc --with-icu=yes --with-preview=yes --disable-dependency-tracking 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 - %p/etc/mono/DefaultWsdlHelpGenerator.aspx - %p/etc/mono/machine.config << -SetCC: gcc-3.3 -SetCXX: g++-3.3 CompileScript: << #!/bin/sh -ex + export lt_cv_sys_max_cmd_len=65536 perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure ./configure %c --with-jdk=$JAVA_HOME export DYLD_LIBRARY_PATH="%i/lib:$DYLD_LIBRARY_PATH" @@ -48,11 +51,10 @@ include lib/*.a lib/*.la - lib/libMonoPosixHelper.dylib - lib/libmint.dylib - lib/libmono-ikvm-jni.dylib + lib/libikvm-native.dylib lib/libmono-profiler-cov.dylib lib/libmono.dylib + lib/libMonoPosixHelper.dylib lib/pkgconfig << << --- NEW FILE: ikvm.patch --- diff -uNr ikvm/native/native.build ikvm-patched/native/native.build --- ikvm/native/native.build 2004-08-30 17:56:26.000000000 -0400 +++ ikvm-patched/native/native.build 2005-06-05 21:18:15.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 -bundle -fPIC `pkg-config --cflags gmodule-2.0; pkg-config --libs gmodule-2.0` jni.c os.c'"/> <copy file="libikvm-native.so" todir="../bin"/> </target> <target name="ikvm-native-win32"> diff -uNr ikvm/runtime/JniInterface.cs ikvm-patched/runtime/JniInterface.cs --- ikvm/runtime/JniInterface.cs 2005-05-03 16:26:00.000000000 -0400 +++ ikvm-patched/runtime/JniInterface.cs 2005-06-05 21:31:53.000000000 -0400 @@ -903,12 +903,7 @@ { JNI.jvmCreated = true; pJavaVM = (JavaVM*)(void*)JniMem.Alloc(IntPtr.Size * (1 + vtableDelegates.Length)); -#if __MonoCS__ - // MONOBUG mcs requires this bogus fixed construct (and Microsoft doesn't allow it) - fixed(void** p = &pJavaVM->firstVtableEntry) { pJavaVM->vtable = p; } -#else pJavaVM->vtable = &pJavaVM->firstVtableEntry; -#endif for(int i = 0; i < vtableDelegates.Length; i++) { pJavaVM->vtable[i] = JniHelper.ikvm_MarshalDelegate(vtableDelegates[i]); Index: mono.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/mono.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mono.patch 23 Sep 2004 17:48:24 -0000 1.6 +++ mono.patch 6 Jun 2005 20:20:20 -0000 1.7 @@ -1,24 +1,43 @@ -diff -uNr mono-1.0.2/data/config.in mono-1.0.2-new/data/config.in ---- mono-1.0.2/data/config.in Wed Jun 23 13:21:02 2004 -+++ mono-1.0.2-new/data/config.in Wed Sep 22 10:01:00 2004 -@@ -7,4 +7,8 @@ - <dllmap dll="odbc32.dll" target="libodbc@libsuffix@" /> - <dllmap dll="oci" target="clntsh" /> +diff -uNr mono-1.1.5/data/config.in mono-1.1.5-new/data/config.in +--- mono-1.1.5/data/config.in Tue Mar 15 19:38:18 2005 ++++ mono-1.1.5-new/data/config.in Thu Mar 24 11:28:58 2005 +@@ -9,4 +9,8 @@ <dllmap dll="db2cli" target="libdb2_36@libsuffix@"/> -+ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.dylib"/> -+ <dllmap dll="glib-2.0" target="libglib-2.0.dylib"/> -+ <dllmap dll="gnomevfs-2" target="libgnomevfs-2.dylib"/> -+ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.dylib"/> + <dllmap dll="msvcrt" target="@LIBC@"/> + <dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@"/> ++ <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@libsuffix@"/> ++ <dllmap dll="glib-2.0" target="libglib-2.0@libsuffix@"/> ++ <dllmap dll="gnomevfs-2" target="libgnomevfs-2@libsuffix@"/> ++ <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0@libsuffix@"/> </configuration> -diff -uNr mono-1.0.2/mono/metadata/loader.c mono-1.0.2-new/mono/metadata/loader.c ---- mono-1.0.2/mono/metadata/loader.c Tue Sep 21 14:27:39 2004 -+++ mono-1.0.2-new/mono/metadata/loader.c Wed Sep 22 10:01:04 2004 -@@ -656,6 +656,12 @@ +diff -uNr mono-1.1.5/mono/metadata/Makefile.in mono-1.1.5-new/mono/metadata/Makefile.in +--- mono-1.1.5/mono/metadata/Makefile.in Fri Mar 18 10:08:49 2005 ++++ mono-1.1.5-new/mono/metadata/Makefile.in Thu Mar 24 11:28:46 2005 +@@ -68,7 +68,7 @@ + am_libmonoruntime_static_la_OBJECTS = $(am__objects_1) + libmonoruntime_static_la_OBJECTS = \ + $(am_libmonoruntime_static_la_OBJECTS) +-libmonoruntime_la_LIBADD = ++libmonoruntime_la_LIBADD = $(ICU_LIBS) + am_libmonoruntime_la_OBJECTS = reflection.lo object.lo icall.lo \ + decimal.lo boehm-gc.lo null-gc.lo gc.lo marshal.lo monitor.lo \ + threads.lo threadpool.lo file-io.lo socket-io.lo exception.lo \ +diff -uNr mono-1.1.5/mono/metadata/loader.c mono-1.1.5-new/mono/metadata/loader.c +--- mono-1.1.5/mono/metadata/loader.c Thu Feb 24 22:52:24 2005 ++++ mono-1.1.5-new/mono/metadata/loader.c Thu Mar 24 11:28:58 2005 +@@ -704,6 +704,19 @@ } if (!gmodule) { + full_name = g_module_build_path ("@PREFIX@/lib", file_name); ++ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, ++ "DllImport loading library: '@PREFIX@/lib/%s'.", full_name); + gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY); ++ if (!gmodule) { ++ mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, ++ "DllImport error loading library '%s'.", ++ g_module_error ()); ++ } + g_free (full_name); + } + |