Merge branch 'mono-dev2-prepare-to-commit' into org.openembedded.dev

9 files changed, 239 insertions, 48 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index fb2e7f2aa1..0d636c035f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -58,10 +58,6 @@ sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
 md5=f13ab353b11329ce3d605b6f40e77fa6
 sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
 
-[http://hg.openjdk.java.net/hsx/hsx14/master/archive/25a020f13592.tar.gz]
-md5=dbd7aca5544d1aeebf0eadd45d29d08e
-sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
-
 [http://sense.net/zc/free42/42c_skins.tgz]
 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
@@ -1546,10 +1542,6 @@ sha256=caba504ca4f769c5f3f8b4e97ed0da1888bd0be2efd3c33cac9bf36e7c285bc3
 md5=0d68db4a1ada5c91bcbf53cefd0c2fd7
 sha256=4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
 
-[http://ftp.riken.jp/net/apache/ant/source/apache-ant-1.7.1-src.tar.gz]
-md5=2a44ff60456cf67bb83771cfcedb8e33
-sha256=1a2fceea38f04e6fea0c0cb8ad7312dc948004af4d9308b5e630d299d89dfb38
-
 [http://archive.apache.org/dist/logging/log4j/1.2.15/apache-log4j-1.2.15.tar.gz]
 md5=10f04abe4d68d5a89e8eb167e4e45e1a
 sha256=f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
@@ -4682,10 +4674,6 @@ sha256=9ae500ffb1af6e29da00114bad18b776c2f24872c254ee62f6283948beaefc15
 md5=e52d681c5ca11f4a9491624ab8c4fa90
 sha256=e9f0cd45a82d2f60af7e927b1740b5971e9007bf7d05e39a900db2dcb7871916
 
-[http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/devhelp-0.23.tar.bz2]
-md5=704c0c90616aeb1c52ca3af1df93fde6
-sha256=60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
-
 [ftp://sources.redhat.com/pub/dm/device-mapper.1.01.04.tgz]
 md5=42dd0610e24d4b4f2409a32a04e6e37f
 sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048
@@ -4735,8 +4723,8 @@ md5=e23f236e94be4c429aa1ceac0f01544b
 sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
 
 [http://www.lartmaker.nl/lartware/port/devmem2.c]
-md5=e23f236e94be4c429aa1ceac0f01544b
-sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
+md5=be12c0132a1ae118cbf5e79d98427c1d
+sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
 
 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
 md5=b1896c1b21ddb152626aec2e8a157a3a
@@ -5330,10 +5318,6 @@ sha256=b5725fa7f8b1f7dc28776e60591e9ef0c171629fe567ef49ab9be28516ff2cd6
 md5=f7b84d912e61dfdd77b7173065845250
 sha256=a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
 
-[http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.5-200906111540/ecjsrc-3.5.zip]
-md5=356f1d337833670e34cf53b58513daeb
-sha256=f3f82d0b91f63fa3aab52f61ad8f5d50c0e4029479cf4b720b83a3424074bd38
-
 [http://mirror.calvin.edu/eclipse/downloads/drops/S-3.3M5eh-200702220951/ecjsrc.zip]
 md5=9e1fc1c86c85e72df5e141069b82041d
 sha256=f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
@@ -5938,14 +5922,6 @@ sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
 md5=87970d6784f536cde84f9bcbaaa52720
 sha256=6810168a3f2e20103d936513bce225dfcdda4bf1ae5f9f8042af47025c097cef
 
-[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz]
-md5=aaefede2405a40c87438e7e833d69b70
-sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d
-
-[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.12.4.tar.gz]
-md5=aaefede2405a40c87438e7e833d69b70
-sha256=dbcab1f495b857e67feff882e018ca59958b8d189ff1f76684d28e35463ec29d
-
 [http://openzaurus.org/mirror/fakeroot_1.2.13.tar.gz]
 md5=cf25d5d4c943ebf2293fe6f23ecba0fd
 sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
@@ -10994,10 +10970,6 @@ sha256=c15fb24475ad93e064ba252f2739c020f9981a808bde6cbd6c41eae38dd0143d
 md5=6428ca1b0c38111cca230f5b69460b03
 sha256=4f23aadcee80a9a03c858e36a8eaaa92149987ce0a3eac276e3003c9b2462739
 
-[http://icedtea.classpath.org/download/source/icedtea6-1.5.tar.gz]
-md5=a67303675a53781c4e42bdb02ec78e40
-sha256=1ec328f41f8adfbf797599bc7bf4c07de162ac6d565d2b9fd95685b1cbc99ac8
-
 [http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2]
 md5=ce7b1827e6f4cbe73b9ffa90b0d45a6a
 sha256=63170836095f8451498c813a1f93a9ec70a1164d82aa30650c0f2216ca4377ab
@@ -14262,10 +14234,6 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 md5=6d6b6a75bc8751a7421b5e739c53ef6e
 sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c
 
-[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.1.tar.gz]
-md5=757371e21e4f3653ce4d12d3ba0be1e0
-sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a
-
 [http://download.ofb.net/liboop/liboop-1.0.tar.bz2]
 md5=88fc8decf99fd75d2af40e0a005fa0d3
 sha256=4a973d28466fde0b689099192f9bcd081b129d90b3c5a9815e5ade73052cf8d2
@@ -17150,6 +17118,10 @@ sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
 md5=6610c3b999d791553a9dc21059ca9d35
 sha256=990af2fa20ad4e99ae5000df1afdb2e3b70400ba22d62e8917123d6a9d966397
 
+[http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2]
+md5=696f25afc8453cd0d1c78de6e905dcf2
+sha256=1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
+
 [http://bec-systems.com/pub/mono/mono-2.2-rc1.tar.bz2]
 md5=6dfc8364f6e761d558f134a707bae421
 sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067
@@ -17934,10 +17906,6 @@ sha256=b5bbf81230bb21573d69fc471721b0b0c404eaa5040ef28e7dcec38320a1b2e4
 md5=56e4aed24d0c2543597de0ba52b3ed64
 sha256=0e02ff891645658c1801ba7d665c0ff3a4231e5570b974a803ffc2974ef68e45
 
-[http://www.ntfs-3g.org/ntfs-3g-2009.4.4.tgz]
-md5=e0b5c170f088a8d82968f0a6b34d31da
-sha256=bcd39ebe90541f512e605b62911f14f6107239c4ff032d56d5da3dc3c05e0d0f
-
 [http://downloads.sourceforge.net/ntop/ntop-3.0.tgz]
 md5=1ec6055c75f1acbb5d5600492481ef85
 sha256=c50cdf2c6cf7309f88c7ec0a56158eca76c80532502b36f3378eeca433423d83
@@ -18294,10 +18262,6 @@ sha256=f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
 md5=9f9773a822156dd3d576d83d794364ce
 sha256=1272f975052e51d3faf2d7ac13d0b8b4ac68019a688bffe03d9b684a9e3b4480
 
-[http://download.java.net/openjdk/jdk6/promoted/b16/openjdk-6-src-b16-24_apr_2009.tar.gz]
-md5=850a29b70206bc7fa083cd26acc781f3
-sha256=96159489d8b70db275c125b627c6e6912e6c078279d76b968d2e0969359c9420
-
 [http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2]
 md5=670931f67b2e4ac46c6e0cd15418f2fa
 sha256=f8b8820e410c137d279d14dec7e7a93217cc371acdfe1b3343b2278d1728932e
@@ -23722,10 +23686,6 @@ sha256=944ab9cfcfc9a4bd7efeecf32ea609fa6517970a9708c44eee6d5750c4ff8e0c
 md5=0b0428f4a6237a64dc8b7d378ace3f06
 sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
 
-[http://mirrors.m0k.org/transmission/files/transmission-1.73.tar.bz2]
-md5=9c1b5d84fb9ddbbd50b5776c1cd6daa4
-sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866
-
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -28378,3 +28338,6 @@ sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
+[http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.2.tar.bz2]
+md5=54aac9b914c5a4dc81c2bfd058df1c93
+sha256=e3b965c56a669c3012856dcc17b7400d28505dd4bb8a3c6eb3e653bb41b5e6ba
diff --git a/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch b/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch
new file mode 100644
index 0000000000..4e276e3f0c
--- /dev/null
+++ b/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch
@@ -0,0 +1,30 @@
+From 2ca04d7b2af1f1d690d918da047b03de768f1a8b Mon Sep 17 00:00:00 2001
+From: Cliff Brake <cbrake@bec-systems.com>
+Date: Fri, 31 Jul 2009 17:48:47 -0400
+Subject: [PATCH] remove docs dir from build
+
+---
+ Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 083bb82..386ed91 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,11 +1,11 @@
+ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I .
+ 
+-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
++SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc
+ 
+ # Keep in sync with SUBDIRS
+ ## 'tools' is not normally built
+-DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
++DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc
+ 
+ EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs
+ 
+-- 
+1.6.0.4
+
diff --git a/recipes/mono/mono-2.4.2.3/configure.patch b/recipes/mono/mono-2.4.2.3/configure.patch
new file mode 100644
index 0000000000..7ca874ab07
--- /dev/null
+++ b/recipes/mono/mono-2.4.2.3/configure.patch
@@ -0,0 +1,44 @@
+Index: mono-2.4.2.1/configure.in
+===================================================================
+--- mono-2.4.2.1.orig/configure.in	2008-11-13 18:22:29.000000000 -0500
++++ mono-2.4.2.1/configure.in	2008-12-10 16:03:11.000000000 -0500
+@@ -1155,6 +1155,8 @@
+ 		], [
+ 				AC_MSG_RESULT(no)
+ 				with_tls=pthread
++		], [
++				AC_MSG_RESULT(yes)
+ 		])
+ 	fi
+ 
+@@ -1257,6 +1259,9 @@
+ 		], [
+ 				with_sigaltstack=no
+ 				AC_MSG_RESULT(no)
++		], [
++				AC_MSG_RESULT(yes)
++				AC_DEFINE(HAVE_WORKING_SIGALTSTACK)
+ 		])
+ 	fi
+ 
+@@ -1746,6 +1751,7 @@
+ 
+ jit_wanted=false
+ interp_wanted=false
++echo "CLIFF: checking host = $host"
+ case "$host" in
+ #	mips-sgi-irix5.* | mips-sgi-irix6.*)
+ #		TARGET=MIPS;
+@@ -1882,10 +1888,12 @@
+ 		jit_wanted=true
+ 		;;
+ 	arm*-linux*)
++    echo "CLIFF: found arm linux"
+ 		TARGET=ARM;
+ 		arch_target=arm;
+ 		ACCESS_UNALIGNED="no"
+ 		JIT_SUPPORTED=yes
++		CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1"
+ 		jit_wanted=true
+ 		;;
+ 	s390-*-linux*)
diff --git a/recipes/mono/mono-2.4.2.3/mini-arm.patch b/recipes/mono/mono-2.4.2.3/mini-arm.patch
new file mode 100644
index 0000000000..d517a5a276
--- /dev/null
+++ b/recipes/mono/mono-2.4.2.3/mini-arm.patch
@@ -0,0 +1,11 @@
+--- mono-2.4.2.1/mono/mini/mini-arm.h	2009-06-23 09:41:00.000000000 -0600
++++ mono-2.4.2.1/mono/mini/mini-arm.h	2009-06-23 09:40:27.000000000 -0600
+@@ -9,7 +9,7 @@
+ #endif
+ 
+ #ifdef ARM_FPU_VFP
+-#error "VFP support is not complete, try mono SVN for that."
++//#error "VFP support is not complete, try mono SVN for that."
+ #endif
+ 
+ #if defined(__ARM_EABI__)
diff --git a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
new file mode 100644
index 0000000000..258f812602
--- /dev/null
+++ b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb
@@ -0,0 +1,17 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_2.4.2.3.inc
+require mono-mcs-intermediate.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += ""
+
+PR = "${INC_PR}.1"
+
+
diff --git a/recipes/mono/mono-native_2.4.2.3.bb b/recipes/mono/mono-native_2.4.2.3.bb
new file mode 100644
index 0000000000..44ac053e99
--- /dev/null
+++ b/recipes/mono/mono-native_2.4.2.3.bb
@@ -0,0 +1,20 @@
+require mono_2.4.2.3.inc
+DEPENDS = "glib-2.0-native perl-native"
+
+PR = "${INC_PR}.1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += ""
+
+inherit native
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.4.2.3.bb
new file mode 100644
index 0000000000..e1f1968cdb
--- /dev/null
+++ b/recipes/mono/mono_2.4.2.3.bb
@@ -0,0 +1,85 @@
+require mono_2.4.2.3.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.1"
+
+# mono makes use of non-thumb-compatible inline asm.
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI += "file://configure.patch;patch=1\
+	    file://mini-arm.patch;patch=1\
+            file://0001-remove-docs-dir-from-build.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+
+# Import file definitions from Debian
+require mono_2.x-files.inc
+
+# Add some packages
+PACKAGES_append = "mono-doc mono mono-runtime"
+
+#FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = ""
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+# Packages not included in Debian
+PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
+	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
+	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
+
+FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
+FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
+FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
+
+FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
+FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
+
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
+
+# Move .pc files
+FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
+PACKAGES =+ " libmono-cairo1.0-cil-dev "
diff --git a/recipes/mono/mono_2.4.2.3.inc b/recipes/mono/mono_2.4.2.3.inc
new file mode 100644
index 0000000000..21e596090c
--- /dev/null
+++ b/recipes/mono/mono_2.4.2.3.inc
@@ -0,0 +1,21 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2"
+
+INC_PR = "r3"
+
+S = "${WORKDIR}/mono-2.4.2.3"
+
+do_fix_dolt_libtool() {
+	# look for libtool prefixed with HOST_SYS
+	sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4
+	echo No acinclude!
+}
+
+inherit autotools
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
+addtask fix_dolt_libtool after do_patch before do_configure
diff --git a/recipes/mono/mono_svn.bb b/recipes/mono/mono_svn.bb
index a5ba966796..311d2a38dd 100644
--- a/recipes/mono/mono_svn.bb
+++ b/recipes/mono/mono_svn.bb
@@ -5,7 +5,7 @@ DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI += "file://configure-svnr87352.patch;patch=1"
+SRC_URI += ""
 
 # Per http://www.mono-project.com/Mono:ARM
 EXTRA_OECONF += " --disable-mcs-build "
@@ -37,7 +37,7 @@ do_install_append() {
 inherit mono
 
 # Import file definitions from Debian
-require mono_1.2.5.1-files.inc
+require mono_2.x-files.inc
 
 # Add some packages
 PACKAGES_append = " mono-doc mono mono-runtime"