Author: ranger
Date: Thu Dec 13 21:33:52 2007
New Revision: 1089
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1089&repname=user%3a+ranger
Log:
more mono fixups
Modified:
trunk/experimental/common/crypto/finkinfo/gnome-sharp2.info
trunk/experimental/common/crypto/finkinfo/gtk-sharp-monodoc.info
trunk/experimental/common/crypto/finkinfo/gtk-sharp.info
trunk/experimental/common/crypto/finkinfo/gtk-sharp2.info
trunk/experimental/common/crypto/finkinfo/mono-tools.info
trunk/experimental/common/crypto/finkinfo/monodevelop.info
trunk/experimental/common/crypto/finkinfo/monodevelop.patch
trunk/experimental/common/main/finkinfo/languages/ikvm.info
trunk/experimental/common/main/finkinfo/languages/ikvm.patch
Modified: trunk/experimental/common/crypto/finkinfo/gnome-sharp2.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/gnome-sharp2.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/gnome-sharp2.info (original)
+++ trunk/experimental/common/crypto/finkinfo/gnome-sharp2.info Thu Dec 13
21:33:52 2007
@@ -15,18 +15,19 @@
gnome-panel-dev (>= 2.20.0-1),
gnome-vfs2-unified-dev (>= 1:2.20.0-1),
gtk+2-dev (>= 2.10.2-1),
+ gtk-sharp2 (>= 2.10.2-1),
gtkhtml3.14-dev,
libart2 (>= 2.3.19-1),
libbonobo2-dev (>= 2.20.0-1),
libbonoboui2-dev (>= 2.20.0-1),
libcroco3,
libgettext3-dev,
- libgda-dev,
+ libgda3-dev,
libglade2 (>= 2.6.2-1),
libgnome2-dev (>= 2.20.0-1),
libgnomeui2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomedb-dev,
+ libgnomedb3-dev,
libgnomeprint2.2-dev (>= 2.18.2-1),
libgnomeprintui2.2-dev (>= 2.18.1-1),
libgsf-dev,
@@ -48,6 +49,7 @@
gnome-panel-shlibs (>= 2.20.0-1),
gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
gtk+2-shlibs (>= 2.10.2-1),
+ gtk-sharp2 (>= 2.10.2-1),
gtkhtml3.14-shlibs,
libart2-shlibs (>= 2.3.19-1),
libbonobo2-shlibs (>= 2.20.0-1),
Modified: trunk/experimental/common/crypto/finkinfo/gtk-sharp-monodoc.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/gtk-sharp-monodoc.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/gtk-sharp-monodoc.info (original)
+++ trunk/experimental/common/crypto/finkinfo/gtk-sharp-monodoc.info Thu Dec 13
21:33:52 2007
@@ -24,12 +24,12 @@
libbonoboui2-dev (>= 2.20.0-1),
libcroco3,
libgettext3-dev,
- libgda-dev,
+ libgda3-dev,
libglade2 (>= 2.6.2-1),
libgnome2-dev (>= 2.20.0-1),
libgnomeui2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomedb-dev,
+ libgnomedb3-dev,
libgnomeprint2.2-dev (>= 2.18.2-1),
libgnomeprintui2.2-dev (>= 2.18.1-1),
libgsf,
Modified: trunk/experimental/common/crypto/finkinfo/gtk-sharp.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/gtk-sharp.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/gtk-sharp.info (original)
+++ trunk/experimental/common/crypto/finkinfo/gtk-sharp.info Thu Dec 13
21:33:52 2007
@@ -22,11 +22,11 @@
libbonobo2-dev (>= 2.20.0-1),
libbonoboui2-dev (>= 2.20.0-1),
libcroco3,
- libgda-dev,
+ libgda3-dev,
libgettext3-dev,
libgnome2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomedb-dev,
+ libgnomedb3-dev,
libgnomeprint2.2-dev (>= 2.18.2-1),
libgnomeprintui2.2-dev (>= 2.18.1-1),
libgnomeui2-dev (>= 2.20.0-1),
Modified: trunk/experimental/common/crypto/finkinfo/gtk-sharp2.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/gtk-sharp2.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/gtk-sharp2.info (original)
+++ trunk/experimental/common/crypto/finkinfo/gtk-sharp2.info Thu Dec 13
21:33:52 2007
@@ -22,12 +22,12 @@
libbonoboui2-dev (>= 2.20.0-1),
libcroco3,
libgettext3-dev,
- libgda-dev,
+ libgda3-dev,
libglade2 (>= 2.6.2-1),
libgnome2-dev (>= 2.20.0-1),
libgnomeui2-dev (>= 2.20.0-1),
libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomedb-dev,
+ libgnomedb3-dev,
libgnomeprint2.2-dev (>= 2.18.2-1),
libgnomeprintui2.2-dev (>= 2.18.1-1),
libgsf-dev,
Modified: trunk/experimental/common/crypto/finkinfo/mono-tools.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/mono-tools.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/mono-tools.info (original)
+++ trunk/experimental/common/crypto/finkinfo/mono-tools.info Thu Dec 13
21:33:52 2007
@@ -58,7 +58,7 @@
#!/bin/sh -ex
export MONO_PATH="%i/lib:$MONO_PATH"
- make install DESTDIR="%d" mkinstalldirs='$(install_sh) -d'
+ make -j1 install DESTDIR="%d" top_builddir=`pwd`
<<
Description: Tools for use with the Mono runtime
Modified: trunk/experimental/common/crypto/finkinfo/monodevelop.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/monodevelop.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/monodevelop.info (original)
+++ trunk/experimental/common/crypto/finkinfo/monodevelop.info Thu Dec 13
21:33:52 2007
@@ -5,9 +5,6 @@
CustomMirror: RangerMirror
Source: http://go-mono.com/sources/%n/%n-%v.tar.bz2
Source-MD5: ea7288bc7ac88f699ac0aa1c10fffa82
-#Source: mirror:custom:%n-2007-09-20.tar.bz2
-#Source-MD5: 7253355cd6564bb6b6126646d6855a96
-SourceDirectory: %n
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
perl -pi -e 's,libgtkembedmoz.so,libgtkembedmoz.dylib,g' configure
monodevelop.in
Modified: trunk/experimental/common/crypto/finkinfo/monodevelop.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/monodevelop.patch&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/monodevelop.patch (original)
+++ trunk/experimental/common/crypto/finkinfo/monodevelop.patch Thu Dec 13
21:33:52 2007
@@ -1,7 +1,19 @@
-diff -uNr monodevelop-0.15/monodevelop.in monodevelop-0.15-new/monodevelop.in
---- monodevelop-0.15/monodevelop.in 2007-07-31 13:56:11.000000000 -0400
-+++ monodevelop-0.15-new/monodevelop.in 2007-09-20 22:25:24.000000000
-0400
-@@ -36,13 +36,17 @@
+diff -uNr monodevelop-0.17/Makefile.in monodevelop-0.17-new/Makefile.in
+--- monodevelop-0.17/Makefile.in 2007-11-02 14:48:34.000000000 -0400
++++ monodevelop-0.17-new/Makefile.in 2007-12-13 15:29:45.000000000 -0500
+@@ -332,7 +332,7 @@
+ # cd docs/apiguide && mdassembler --out monodevelop-api-guide --xhtml
toc.xhtml && mv monodevelop-api-guide.zip ../web/sources
+
+ ### SYNCH BLOCK: any changes to this line should be kept in sync with the
corresponding block in Makefile.am
+-MD_PKG_CONFIG_PATH =
$(gtksharp_prefix)/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/$(shell
if test -d /usr/lib64; then echo
":/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/"; fi)
++MD_PKG_CONFIG_PATH =
@FINKPREFIX@/lib/fontconfig2/lib/pkgconfig/:@FINKPREFIX@/lib/freetype219/lib/pkgconfig/:@FINKPREFIX@/lib/pango-ft219/lib/pkgconfig/:$(gtksharp_prefix)/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/$(shell
if test -d /usr/lib64; then echo
":/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/"; fi)
+ ### END BLOCK
+ MD_LAUNCH_SETUP = \
+ cd build/bin && \
+diff -uNr monodevelop-0.17/monodevelop.in monodevelop-0.17-new/monodevelop.in
+--- monodevelop-0.17/monodevelop.in 2007-11-02 14:47:48.000000000 -0400
++++ monodevelop-0.17-new/monodevelop.in 2007-12-13 15:28:04.000000000
-0500
+@@ -54,14 +54,18 @@
[EMAIL PROTECTED]@/lib/monodevelop/bin
@@ -14,12 +26,13 @@
+ export DYLD_LIBRARY_PATH=$MOZILLA_HOME
fi
[EMAIL
PROTECTED]@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
-+for dir in fontconfig2 freetyp219; do
++for dir in fontconfig2 freetype219; do
+ DYLD_LIBRARY_PATH="@FINKPREFIX@/lib/$dir/lib:$DYLD_LIBRARY_PATH"
+done
+
[EMAIL
PROTECTED]@/lib/fontconfig2/lib/pkgconfig/:@FINKPREFIX@/lib/freetype219/lib/pkgconfig/:@FINKPREFIX@/lib/pango-ft219/lib/pkgconfig/@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
+ ### SYNCH BLOCK: any changes to this block should be kept in sync with the
one in Makefile.am
[EMAIL
PROTECTED]@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
[EMAIL
PROTECTED]@/lib/fontconfig2/lib/pkgconfig/:@FINKPREFIX@/lib/freetype219/lib/pkgconfig/:@FINKPREFIX@/lib/pango-ft219/lib/pkgconfig/:@gtksharp_prefix@/lib/pkgconfig/:/usr/lib/pkgconfig/:/usr/local/lib/pkgconfig/:/usr/share/pkgconfig/:/usr/local/share/pkgconfig/
+ if test -d /usr/lib64; then
MD_PKG_CONFIG_PATH=$MD_PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/local/lib64/pkgconfig/;
fi
+ ### END BLOCK
- if [ -n $PKG_CONFIG_PATH ]; then
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$MD_PKG_CONFIG_PATH
Modified: trunk/experimental/common/main/finkinfo/languages/ikvm.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/ikvm.info&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/ikvm.info (original)
+++ trunk/experimental/common/main/finkinfo/languages/ikvm.info Thu Dec 13
21:33:52 2007
@@ -1,20 +1,26 @@
Package: ikvm
-Version: 0.30.0.0
+Version: 0.36.0.5
Revision: 1
Source: mirror:sourceforge:%n/%n-%v.zip
-Source-MD5: 8239e284cafd57ed6435bdc47f926521
-#SourceDirectory: %n
-Source2: mirror:gnu:classpath/classpath-0.92.tar.gz
-Source2-MD5: 4603ef3e593713d94788b919bc0b6c75
-Source3: mirror:gnu:classpath/classpath-0.92-generics.tar.gz
-Source3-MD5: 3efacbefe0224dfe57d9049619095b32
-Source4: http://go-mono.com/sources/%n/%n-0.14.tar.gz
-Source4-MD5: 042e49520251f9c76c0180cc2437a0b4
+Source-MD5: 3653fa50bcd84b61510935b6077d9ec6
+Source2: mirror:sourceforge:%n/classpath-0.95-stripped.zip
+Source2-MD5: 61abaabd02bcd11b275a2ad6ed6cb401
+Source3: mirror:sourceforge:%n/openjdk-b13-stripped.zip
+Source3-MD5: f47f3bf819919e585854de401099a626
Patch: %n.patch
DocFiles: LICENSE THANKYOU website/*.txt
-Depends: mono (>= 1.2.6-1), pkgconfig (>= 0.21-1)
+Depends: <<
+ mono (>= 1.2.6-1),
+ pkgconfig (>= 0.21-1)
+<<
Suggests: monodevelop
-BuildDepends: mono-dev (>= 1.2.6-1), nant (>= 0.85-10), ecj, glib2-dev (>=
2.14.0-1), libgettext3-dev
+BuildDepends: <<
+ mono-dev (>= 1.2.6-1),
+ nant (>= 0.85-10),
+ ecj,
+ glib2-dev (>= 2.14.0-1),
+ libgettext3-dev
+<<
Homepage: http://go-mono.com/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Description: Java implementation for .Net
@@ -27,7 +33,7 @@
CompileScript: <<
#!/bin/sh -ex
- nant -t:mono-1.0 generics
+ nant -t:mono-1.0
<<
InstallScript: <<
#!/bin/sh -ex
@@ -40,7 +46,7 @@
cat <<END > %i/bin/$script
#!/bin/sh
-%p/bin/mono %p/lib/%N/${script}.exe "$@"
+%p/bin/mono %p/lib/%N/${script}.exe "\$@"
END
chmod 755 %i/bin/$script
done
Modified: trunk/experimental/common/main/finkinfo/languages/ikvm.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/ikvm.patch&rev=1089&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/ikvm.patch (original)
+++ trunk/experimental/common/main/finkinfo/languages/ikvm.patch Thu Dec 13
21:33:52 2007
@@ -1,6 +1,6 @@
-diff -uNr ikvm-0.30.0.0/native/native.build
ikvm-0.30.0.0-patched/native/native.build
---- ikvm-0.30.0.0/native/native.build 2005-12-07 10:06:32.000000000 -0500
-+++ ikvm-0.30.0.0-patched/native/native.build 2006-08-22 13:04:35.000000000
-0400
+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
@@ -9,7 +9,7 @@
</if>
</target>
@@ -10,31 +10,3 @@
<copy file="libikvm-native.so" todir="../bin"/>
</target>
<target name="ikvm-native-win32">
-diff -uNr ikvm-0.30.0.0/runtime/MemberWrapper.cs
ikvm-0.30.0.0-patched/runtime/MemberWrapper.cs
---- ikvm-0.30.0.0/runtime/MemberWrapper.cs 2006-08-02 15:45:54.000000000
-0400
-+++ ikvm-0.30.0.0-patched/runtime/MemberWrapper.cs 2006-08-22
13:04:58.000000000 -0400
-@@ -468,9 +468,9 @@
- // the method had any declared exceptions, the
declaredExceptions field would have
- // been set)
- if(method != null
--#if !COMPACT_FRAMEWORK
-+
- && !(method is MethodBuilder)
--#endif
-+
- )
- {
- ThrowsAttribute attr =
AttributeHelper.GetThrows(method);
-diff -uNr ikvm-0.30.0.0/runtime/classpath.cs
ikvm-0.30.0.0-patched/runtime/classpath.cs
---- ikvm-0.30.0.0/runtime/classpath.cs 2006-08-03 09:11:06.000000000 -0400
-+++ ikvm-0.30.0.0-patched/runtime/classpath.cs 2006-08-22 13:04:58.000000000
-0400
-@@ -771,9 +771,7 @@
- // HACK we have to exclude DynamicTypeWrapper
instances, because proxies that are created by the bootstrap
- // class loader also need to return null (but
they don't live in the CoreAssembly)
- if(loader == null && tw.Assembly !=
JVM.CoreAssembly
--#if !COMPACT_FRAMEWORK
- && !(tw is DynamicTypeWrapper)
--#endif // !COMPACT_FRAMEWORK
- )
- {
- return
JVM.Library.getSystemClassLoader();
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
