Bundle patches into distfiles tarball. Closes #343731

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
author: Keri Harris <keri@gentoo.org> 2010-11-03 07:10:10 +0000
committer: Keri Harris <keri@gentoo.org> 2010-11-03 07:10:10 +0000
commit: f63f524051d0e372f6908fb90c65143e428d703c (patch)
tree: e973418fe8294b3159ba638b650de08c4c44aa2a /dev-lang/mercury
parent: Respect CC (bug #343945). (diff)
download: historical-f63f524051d0e372f6908fb90c65143e428d703c.tar.gz
historical-f63f524051d0e372f6908fb90c65143e428d703c.tar.bz2
historical-f63f524051d0e372f6908fb90c65143e428d703c.zip
42 files changed, 74 insertions, 2871 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index a8582095b390..1de7ac2359a4 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.124 2010/11/03 06:54:29 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.125 2010/11/03 07:10:08 keri Exp $
+
+  03 Nov 2010; <keri@gentoo.org> mercury-10.04.ebuild,
+  mercury-10.04.1.ebuild, -files/mercury-10.04.1-boehm_gc.patch,
+  -files/mercury-10.04.1-bootstrap-depend.patch,
+  -files/mercury-10.04.1-char-det-from-int.patch,
+  -files/mercury-10.04.1-default-grade.patch,
+  -files/mercury-10.04.1-docs.patch,
+  -files/mercury-10.04.1-linker-flags.patch,
+  -files/mercury-10.04.1-multilib.patch,
+  -files/mercury-10.04.1-no-reconf.patch,
+  -files/mercury-10.04.1-sparc-llds-base-grade.patch,
+  -files/mercury-10.04.1-tests-sandbox.patch,
+  -files/mercury-10.04.1-tests-static-link.patch,
+  -files/mercury-10.04.1-tests-workspace.patch, mercury-10.04.2.ebuild,
+  mercury-10.04.2-r1.ebuild, -files/mercury-10.04.2-boehm_gc.patch,
+  -files/mercury-10.04.2-bootstrap-depend.patch,
+  -files/mercury-10.04.2-char-det-from-int.patch,
+  -files/mercury-10.04.2-default-grade.patch,
+  -files/mercury-10.04.2-docs.patch,
+  -files/mercury-10.04.2-linker-flags.patch,
+  -files/mercury-10.04.2-multilib.patch,
+  -files/mercury-10.04.2-no-reconf.patch,
+  -files/mercury-10.04.2-prepare-install-dir.patch,
+  -files/mercury-10.04.2-sparc-llds-base-grade.patch,
+  -files/mercury-10.04.2-tests-sandbox.patch,
+  -files/mercury-10.04.2-tests-static-link.patch,
+  -files/mercury-10.04.2-tests-workspace.patch,
+  -files/mercury-10.04-boehm_gc.patch,
+  -files/mercury-10.04-default-grade.patch, -files/mercury-10.04-docs.patch,
+  -files/mercury-10.04-linker-flags.patch,
+  -files/mercury-10.04-multilib.patch, -files/mercury-10.04-no-reconf.patch,
+  -files/mercury-10.04-sparc-llds-base-grade.patch,
+  -files/mercury-10.04-tests-mercury-float.patch,
+  -files/mercury-10.04-tests-sandbox.patch,
+  -files/mercury-10.04-tests-static-link.patch,
+  -files/mercury-10.04-tests-workspace.patch:
+  Bundle patches into distfiles tarball. Closes #343731
 
   03 Nov 2010; <keri@gentoo.org> -mercury-10.04_beta1.ebuild,
   -files/mercury-10.04_beta1-atomic-ops.patch,
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 46c5b1d0e6b1..98d8b0dc0205 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -9,42 +9,9 @@ AUX mercury-0.13.1-tests-dir_test.patch 2476 RMD160 99c040bc588d0f455b1da42279fe
 AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c06187a0af02086e6c0527a8b8c SHA1 efe5458ab76060a37f0110000ee68e07212ff8d6 SHA256 d81c5e0a3cbf07190433cee583f9be8f14624b3f5e982bf04079fdb559b1f88c
 AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d918e42c9c3e95122c5 SHA1 fb78eba72aae7de933951941f6db890548e298b0 SHA256 a0a3f1a5d9d75443d9f442925eb15131b7bfbe3c92f737a51f1340111b46a34e
 AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
-AUX mercury-10.04-boehm_gc.patch 5908 RMD160 08ce24e7df84974b9c77ead866a3b10738b35132 SHA1 822914bf2116d2227097fa725705cd2ec5d4c55d SHA256 5cd45f249b6c0dd74b43f4c2e4237184da722e0a25941f3070804e56418a5467
-AUX mercury-10.04-default-grade.patch 9201 RMD160 e4a68ccedf91d6fa366a819b54270c13cf44bca2 SHA1 12f510d62530506c2df6d21cfb36b4840fbb7621 SHA256 678a6ce56acd14ea40e834bee6165022600582b1a965682107a99389c5d071c7
-AUX mercury-10.04-docs.patch 1071 RMD160 7227e1c079b269f332081b956e53b85358d72a70 SHA1 f27b48ecb5ba991261f93c2c8d640b7fd213830b SHA256 a4514f76a7174d16f392e3f9aa55d19a468f114541cf93129908feeaec462c06
-AUX mercury-10.04-linker-flags.patch 3012 RMD160 355d9a021917326ea6b6df76277c62486cab9510 SHA1 0bc4a826c41af938cd422c50bb6bdc9d22f973c3 SHA256 9ca221ec91ff144a3871278bfde86ece642cc27446f6dca418496222564fa5a1
-AUX mercury-10.04-multilib.patch 6602 RMD160 e1bbc09b05d6861885ff910ca6636c3f700933a8 SHA1 c2b786ac16f55b74ea6332ce6afcdc1c4f8aa005 SHA256 5b5e94ef4ba12aad2b3a41ff1a5114612ee774c84efdaf543590444a693384e9
-AUX mercury-10.04-no-reconf.patch 2337 RMD160 f39b7e0c777eba144d103078d3e81fb0a4ea21c7 SHA1 a4166eaf922e6423ff8761f486691f5b75fc14f9 SHA256 3b4dc9724fe9baed3222e43d86d3af73692d0f3f7285f6b6dbd4df0407690921
-AUX mercury-10.04-sparc-llds-base-grade.patch 467 RMD160 de8ae191173d077806650db073aaefb7d89c50c1 SHA1 61aa9fd27cfd896ecfdc43e053cad4c923405226 SHA256 3b1080bdb5bac32ac2f83a6b6de0584aa4f68d9f3cfcd113396946598b61ab9f
-AUX mercury-10.04-tests-mercury-float.patch 2056 RMD160 0eeda80258e9e675be1866d42428618efa1cc2f9 SHA1 d69de5c6e94601e49c4e4d459996e0fa5fda996e SHA256 79f6b92ea2d37d3c0b8147497a110266278a193fcee825270c2217c1d44aa4a1
-AUX mercury-10.04-tests-sandbox.patch 2932 RMD160 2cb2b82e4d282c31ecfd350e732f5ccf505debb9 SHA1 922226b4344ca2833da734d7ab271c756a440a62 SHA256 9e67a417ce59d0e0e9c698a3573902829222ad28462ff246809bd7c6318e15ed
-AUX mercury-10.04-tests-static-link.patch 568 RMD160 72a38e289d1e7f76e4dfdae21c42322d452b8fcf SHA1 76b78ee37ac2b3ef4ddc804485d7bd10a9720dff SHA256 f37e8399aed753a947062d40573ba5205ef62ecfbbe87ecb8632cf1895002663
-AUX mercury-10.04-tests-workspace.patch 1058 RMD160 34f0623fdf595bdd4c098cf57573178a622fc4e4 SHA1 e6afeec2e55d8b61dbf6359fb03289534059f86c SHA256 7551204ad0bd0fdbe6b17d29bd44d7ab4ae5a1f1b51d32391e368bbb747a3d1d
-AUX mercury-10.04.1-boehm_gc.patch 5932 RMD160 a7432297f4a03af8072444f05d1f3a22282620cb SHA1 c98916c2459e677b34e6fbfbd163a89a4571b22b SHA256 eb88c6a4560e6bb7adf2b27271543bdd4bc9b69bde726109ef719fcaeb48585a
-AUX mercury-10.04.1-bootstrap-depend.patch 1605 RMD160 ae6c62b0cf7d23254fcc486f5b64ba9d970774e6 SHA1 32449197095bac791c6c877019bf16e41a7f3677 SHA256 137f1349c17ec357f215892eba9d1cd5b3c276e70137ab303feba6495522fba1
-AUX mercury-10.04.1-char-det-from-int.patch 507 RMD160 b620007cd4c161ac51ba3417b0ff8fe1427670ec SHA1 92bfab764bb57fad2a5e5087dea2a28586986e55 SHA256 125794808c1b222bd97c43f205dbe678c0dc0edc0204f6a6df304f80a037c2b2
-AUX mercury-10.04.1-default-grade.patch 9273 RMD160 d66b819f9a21e07de7cccda39c64c87c5cb2f1da SHA1 459b5340fd57035843a85b883432c2a96ca6b5f4 SHA256 41b5329f001812584eba7b9a70553cc09bfaff9c66baff2a64305625111942ee
-AUX mercury-10.04.1-docs.patch 890 RMD160 03cbff1254b61261cbca8fa2d518f02c3544bf42 SHA1 327891efea1c84d68326564e435ea093b91fc262 SHA256 492b3a92e93359330648f51f8b82d9d8b7addb22ba56bd7bfc8489aaedbc1764
-AUX mercury-10.04.1-linker-flags.patch 3044 RMD160 fc729659474a93a9528386b22970470c622dadd3 SHA1 17d7bc190257d85f4cfc1fda2f430897ca0b07bd SHA256 2e798b89a7335526af0cb3e998372aaad2374ec8f225912fa45034c26ba59469
-AUX mercury-10.04.1-multilib.patch 11698 RMD160 cc84d5b4cb35ccbb143903ad74991ccda760774b SHA1 8b476a0822570ad663dd8b29f6da37d9dd0c8272 SHA256 f247d7f8b312e1dca80b203bd7fd7e56ec79669b4de89eb4efc662dc8a50d4d3
-AUX mercury-10.04.1-no-reconf.patch 2058 RMD160 b94029c812ad662f8ec95eabebfc30451b2d0fb0 SHA1 c273f5ffa5b89dd52b04f60a7c3e61b6ca5e3c1e SHA256 f2edfaa6f7944357e9aebe0e916b6c7b8db604a419af0be8a989d74f30a19c85
-AUX mercury-10.04.1-sparc-llds-base-grade.patch 475 RMD160 0595dec723fb51333e489ab26aec5692a7761a4e SHA1 e5b0d5650d5b1641c7a989fff479c660c7761b51 SHA256 abad03efd5f4b4030cbf1888ca536abd1f01813886d79d0a69d34f640924479b
-AUX mercury-10.04.1-tests-sandbox.patch 2972 RMD160 beaac1ff68613a165c273f6f463c94372095bba2 SHA1 2819c6dbb1d80983581f39eb3e7da265240018fa SHA256 619a33f5e944b6899fed6dc178abfef811554d60bca716dc972bf200aef4a41f
-AUX mercury-10.04.1-tests-static-link.patch 572 RMD160 cd7c1e31cde2e3f3264b9037cb8eec58d3fbbb15 SHA1 8375c73e51d10a59a5679fc17227b03c4b4517fe SHA256 a2bab04b4c91b76ba1cffe6d5bf2d769cb3bdeaa8537e0629898ba24815b4e14
-AUX mercury-10.04.1-tests-workspace.patch 1076 RMD160 3357f508e955e2bb2456834deb1da84ae6e04d7c SHA1 8a83a3a080edba16f63f45b08ba9c4725abcee87 SHA256 9fe6b5b6c9ff4344e67f2719cf7361eb0090398a6910009ac406d6df1e288fe4
-AUX mercury-10.04.2-boehm_gc.patch 5932 RMD160 e158a84b42ead8cfd9a16ed6f7b1fb0c47388d66 SHA1 074e8ab1acd0c1be5b2adaf78f4e05cfce6c1f53 SHA256 d3a10debd38c4b022d412f053119c9288d5f3ec3eb06bff23f174ccc5f7134a5
-AUX mercury-10.04.2-bootstrap-depend.patch 1605 RMD160 06deb85b725cb5f4a5d6bcf5b426a9801d7f12b7 SHA1 0603658f948cfd709bae613200dee8919731f630 SHA256 92b43ba47ea08b116ff99a2ad648c03b03f0440722205ffc2c6f843183693f20
-AUX mercury-10.04.2-char-det-from-int.patch 507 RMD160 1b2e47fca930e47a7701dde20c35d9a73f8795a2 SHA1 a50d4611f484b216bdade08176720dd2ea1de0c9 SHA256 66d733f5631642165278dee50704387154fde06204f6c976bd9fdd9bf7ce0101
-AUX mercury-10.04.2-default-grade.patch 9273 RMD160 5d3f35782dd530743c9bad5896c423e119556ac1 SHA1 b1723e857696d595ba705ac1c5c3c6a4858da75a SHA256 4e66b3790ff34812cd323a517e668047e5320740a81a64ee13692331e7b419df
-AUX mercury-10.04.2-docs.patch 890 RMD160 e09211243ff6e8220b73c559a5ed0925b79dcda5 SHA1 c406b326fb8a99ded69339d75480156860763397 SHA256 93cc1df3c82bc76c89dae303ed7d3a4ad938bdd337c9df23941ef8ad5945621c
-AUX mercury-10.04.2-linker-flags.patch 2972 RMD160 e49e09f61154db5e3b5dac204d3aff30ce76cbd0 SHA1 04895fd6216e3a2ecae34ce19589f20c73eeb56e SHA256 c5dc5afc99e55b9533adf7090d340638b2824a71d982705c6476388e4c86f063
-AUX mercury-10.04.2-multilib.patch 11698 RMD160 803c0f28a2b741a0bbc29a38f1900c0b750cadd4 SHA1 8c5fb27e5a706b8acc01941938a516cbc4df4603 SHA256 1db7fab98b4ded569e2010c294b5c11646820aa7bcfbeb62b00b4efeec56da9a
-AUX mercury-10.04.2-no-reconf.patch 2482 RMD160 f45d48ebfca9ea407a873ab73b5d662ea4eeda0c SHA1 c0e08dd8a55f6be08169ad25a318b297e6ddeefc SHA256 5ad4d7a28b0040197ae23cf9c713a8a5ef06b1a03a88a954972a4f0cbce1bee5
-AUX mercury-10.04.2-prepare-install-dir.patch 664 RMD160 49bee41b1b2f49b5c549ceb437e99c214bc5ad52 SHA1 49895a25936004206e7b6e2f5608531086a76d56 SHA256 91a68d28d1898fac8901d672cb3735c1be39f8a679e4757bd827afb8c173d004
-AUX mercury-10.04.2-sparc-llds-base-grade.patch 475 RMD160 bafaf30660d61ddce88437c67edcdf613ddf574d SHA1 2d493a6ae29bf86ede1dee20dee1e2b3fd3f301b SHA256 3f8bc1d1fd77617c9747bbe787108e5ebdb3c8a7bc24aa540150229ac3e6b853
-AUX mercury-10.04.2-tests-sandbox.patch 2972 RMD160 f5a0a67a435c86e674cf06fa919fa1b5ff09a4c2 SHA1 0c6e49ebbac387b26cf20e4a326ac070c249306c SHA256 7d4c732b50452347346dab0a9f552d34b46c6b15f9ec9f6ba0425878be3072af
-AUX mercury-10.04.2-tests-static-link.patch 572 RMD160 1825c6f50fccbe97eae4b7f60465a5ead232e5e2 SHA1 26e0a011f8583df2338aca1ebc3f97f19842a668 SHA256 92146292f9440f3ee89a71c943eda88653db3711bb033c78c68119c4654cf1aa
-AUX mercury-10.04.2-tests-workspace.patch 1076 RMD160 ba6a0f98914be9d8e607baf8ba978ceda58a5ba3 SHA1 10e64aadd4b7bc118470ce62600b3bc1e32becf5 SHA256 eeac8cf720fee8b709d1f7c71ea492d3b8071f6b0761fa5977c793329e05b25a
+DIST mercury-10.04-gentoo-patchset-0.tar.gz 8036 RMD160 6afb964cf8b592141e6b3af3b9e6cc0679a34914 SHA1 0a5fa28b9577184165ec715ba928d7430c9b03c9 SHA256 25f350abc14bc1638d328df2365aa5fa4f3208b7c3c244cf3908cfdb54d36c1a
+DIST mercury-10.04.1-gentoo-patchset-0.tar.gz 9013 RMD160 59e8c0507bd2bcfb55d83425d72a89adfa5e64a0 SHA1 30b10271f342e893cfab67426c0fd25d3f06845f SHA256 14f1fb3c3927cd7c5d16407e0003b5531248f7b49f4a202e7dd288f8da5fddac
+DIST mercury-10.04.2-gentoo-patchset-0.tar.gz 9352 RMD160 475bdba037ca93062a96092bc049bf4f6659ca99 SHA1 6d614541b3c4760910f263cc6e57e09697e324db SHA256 1c1323602a30d734b298521a1749d2a25196b290d416b51f8ce512321d0f7df6
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
 DIST mercury-compiler-10.04.1.tar.gz 24600120 RMD160 99f998845ad5c952860cd5ba3051c948dc7f3397 SHA1 9d9135d171128ce53cc77680423c5fd5e4ea4530 SHA256 63fa2b5661ab34bcb7d199c7686753c7c20b85b989c18e67f682f00cd91a02bb
 DIST mercury-compiler-10.04.2.tar.gz 24608706 RMD160 efcc35f8fcfaa66413bb04956e79a7708531327f SHA1 c1ade62620a6092f345c9c850abecfa8c69349e1 SHA256 cc7682971cb5377f69f2dbbf04cd3c7545ac98079e51dac92d71979d85fd01a8
@@ -55,9 +22,9 @@ DIST mercury-tests-10.04.2.tar.gz 1332984 RMD160 5c56b4c92627be5903b9a7fcaa7af9d
 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
 EBUILD mercury-10.04-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1b42 SHA1 b7d1d4b635f916f1be1a4fc496c2d80f9949ab30 SHA256 55dfdb3ae95f0dfc74014d2f87085d568316c84d78d74805e30c8674f8ece543
-EBUILD mercury-10.04.1.ebuild 4915 RMD160 cac82413b0a1aa53998a83e07b94f1223f2a9ba1 SHA1 6754bbe32a7c4640d3aaf9df80dc30c59ba5d1eb SHA256 4cdaf57b11824775f6095cc0df92bf8b563acddf64a6e8d27b0c92155046f8f6
-EBUILD mercury-10.04.2-r1.ebuild 5447 RMD160 1887a7c6411358a9c11393f9a3ff4daf6d6cf82b SHA1 0ecb31da730250cd782675883251616b143c8521 SHA256 1bf24eea3ff3b3d6de1141c8254cbf22a01dac2ca07dc3261e526272c325109f
-EBUILD mercury-10.04.2.ebuild 4915 RMD160 488b30f0d614523a5e74f415ba08be5cb52b2e64 SHA1 0f68beff3fe86278634ff59f55fd24d60c7eecb4 SHA256 71c639b3eea70fcc183d5ec6803bd12e14213c590733b1c12b4c608bf5bb6b9f
-EBUILD mercury-10.04.ebuild 4150 RMD160 565ad36c8253f0da62f6a4256cbf45d2655a6223 SHA1 3f6363b22b7b4dcd0fe731f404d6d8dadb6cebff SHA256 943ee918a3113d45d268f4091de5a0767d05e99194f121771ce43c3a9c71eba0
-MISC ChangeLog 25850 RMD160 808d7e1061263d100c57dda20a4bfd4a877ce014 SHA1 2e23d53a62f044fdfddf1520465e0a2c0a5646ad SHA256 f4ee6078d3443bd2e1a6c57366b57c9b3c94dd715a3e75ca803b0abc503fb9bb
+EBUILD mercury-10.04.1.ebuild 4529 RMD160 91e2a1ddf874123394ae90431608525ae0a26f6c SHA1 273b09516ff839983613fbd526f6a7d12b2536c9 SHA256 8ae2505b6e5bcd624692c29cdba4963a8931b5e1b87ef4e5ac0b21a0a19e52eb
+EBUILD mercury-10.04.2-r1.ebuild 5008 RMD160 9468feb07ac943c954af4faf13f69737c7ff15ac SHA1 b933bd55c2b9a121e17362324cbb74c55d66929e SHA256 4c3e45638ba4e95b4678bb895f9f47ae58d22949240b93d710d5c2182db8f601
+EBUILD mercury-10.04.2.ebuild 4529 RMD160 43477f989449a2fe794afb35df94855175bb7a0a SHA1 1e14fef6fbabaf466ca0237286978b281f0a2aee SHA256 e5ca10919d13cf82701d98a5a3acdf4c495238842d4b65eed87064a5ef86983a
+EBUILD mercury-10.04.ebuild 3857 RMD160 d9bb8e9e002d2f50b384c24733d64c6a02f7e4f6 SHA1 70aae9ae137fb35dacdcaf3541ec78b5f4c1ddaa SHA256 0133dfea517707ff1d1d2e9275a6051be07911d9b374cc91016ee166a94b5f20
+MISC ChangeLog 27663 RMD160 b033be8e22e4572d9bf6c5a8244e0015c9584e40 SHA1 f135e5a368a3e68460122eb6f5447fc5276583f0 SHA256 83e0dbe9f46c48f398b175a95b5d1b6650ba5d2ce8637897cf51fc86d0eb18e3
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch b/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch
deleted file mode 100644
index a3c6d943cf19..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-boehm_gc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urN mercury-compiler-10.04.orig/boehm_gc/Makefile.direct mercury-compiler-10.04/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04/boehm_gc/Makefile.direct	2010-07-24 14:11:41.000000000 +1200
-@@ -407,6 +407,7 @@
- 	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
- 	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
- 	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
-+	./if_mach SPARC LINUX $(CC) -c -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
- 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
- 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-diff -urN mercury-compiler-10.04.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h mercury-compiler-10.04/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
---- mercury-compiler-10.04.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-02-23 19:28:41.000000000 +1300
-+++ mercury-compiler-10.04/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-07-24 13:56:06.000000000 +1200
-@@ -39,32 +39,6 @@
- 
- #define AO_HAVE_test_and_set_full
- 
--#ifndef AO_NO_SPARC_V9
--/* Returns nonzero if the comparison succeeded. */
--AO_INLINE int
--AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val) {
--  char ret;
--  __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
--#                       if defined(__arch64__)
--                          "casx [%2],%0,%1\n\t"
--#                       else
--                          "cas [%2],%0,%1\n\t" /* 32-bit version */
--#                       endif
--                        "membar #StoreLoad | #StoreStore\n\t"
--                        "cmp %0,%1\n\t"
--                        "be,a 0f\n\t"
--                        "mov 1,%0\n\t"/* one insn after branch always executed */
--                        "clr %0\n\t"
--                        "0:\n\t"
--                        : "=r" (ret), "+r" (new_val)
--                        : "r" (addr), "0" (old)
--                        : "memory", "cc");
--  return (int)ret;
--}
--
--#define AO_HAVE_compare_and_swap_full
--#endif /* AO_NO_SPARC_V9 */
--
- /* FIXME: This needs to be extended for SPARC v8 and v9.        */
- /* SPARC V8 also has swap.  V9 has CAS.                         */
- /* There are barriers like membar #LoadStore.                   */
-diff -urN mercury-compiler-10.04.orig/boehm_gc/sparc_generic_mach_dep.c mercury-compiler-10.04/boehm_gc/sparc_generic_mach_dep.c
---- mercury-compiler-10.04.orig/boehm_gc/sparc_generic_mach_dep.c	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-compiler-10.04/boehm_gc/sparc_generic_mach_dep.c	2010-07-24 14:12:18.000000000 +1200
-@@ -0,0 +1,82 @@
-+# include "private/gc_priv.h"
-+
-+/* On register window machines, we need a way to force registers into 	*/
-+/* the stack.	Return sp.						*/
-+# ifdef SPARC
-+    asm("	.seg 	\"text\"");
-+#   if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
-+      asm("	.globl	GC_save_regs_in_stack");
-+      asm("GC_save_regs_in_stack:");
-+      asm("	.type GC_save_regs_in_stack,#function");
-+#   else
-+      asm("	.globl	_GC_save_regs_in_stack");
-+      asm("_GC_save_regs_in_stack:");
-+#   endif
-+#   if defined(__arch64__) || defined(__sparcv9)
-+      asm("	save	%sp,-128,%sp");
-+      asm("	flushw");
-+      asm("	ret");
-+      asm("	restore %sp,2047+128,%o0");
-+#   else
-+      asm("	ta	0x3   ! ST_FLUSH_WINDOWS");
-+      asm("	retl");
-+      asm("	mov	%sp,%o0");
-+#   endif
-+#   ifdef SVR4
-+      asm("	.GC_save_regs_in_stack_end:");
-+      asm("	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
-+#   endif
-+#   ifdef LINT
-+	word GC_save_regs_in_stack() { return(0 /* sp really */);}
-+#   endif
-+# endif
-+
-+/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and	*/
-+/* returns arg.  Stack clearing is crucial on SPARC, so we supply	*/
-+/* an assembly version that's more careful.  Assumes limit is hotter	*/
-+/* than sp, and limit is 8 byte aligned.				*/
-+#if defined(ASM_CLEAR_CODE)
-+# ifdef SUNOS4
-+    asm(".globl _GC_clear_stack_inner");
-+    asm("_GC_clear_stack_inner:");
-+# else
-+    asm(".globl GC_clear_stack_inner");
-+    asm("GC_clear_stack_inner:");
-+    asm(".type GC_save_regs_in_stack,#function");
-+# endif
-+#if defined(__arch64__) || defined(__sparcv9)
-+  asm("mov %sp,%o2");		/* Save sp			*/
-+  asm("add %sp,2047-8,%o3");	/* p = sp+bias-8		*/
-+  asm("add %o1,-2047-192,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("stx %g0,[%o3]");		/* *(long *)p = 0		*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu,pt %xcc, loop");	/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#else
-+  asm("mov %sp,%o2");		/* Save sp	*/
-+  asm("add %sp,-8,%o3");	/* p = sp-8	*/
-+  asm("clr %g1");		/* [g0,g1] = 0	*/
-+  asm("add %o1,-0x60,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("std %g0,[%o3]");		/* *(long long *)p = 0	*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu loop	");		/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#endif /* old SPARC */
-+  /* First argument = %o0 = return value */
-+#   ifdef SVR4
-+      asm("	.GC_clear_stack_inner_end:");
-+      asm("	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
-+#   endif  
-+#endif
diff --git a/dev-lang/mercury/files/mercury-10.04-default-grade.patch b/dev-lang/mercury/files/mercury-10.04-default-grade.patch
deleted file mode 100644
index c612845c53d0..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-default-grade.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur mercury-compiler-10.04.orig/Makefile mercury-compiler-10.04/Makefile
---- mercury-compiler-10.04.orig/Makefile	2010-07-12 04:31:01.000000000 +1200
-+++ mercury-compiler-10.04/Makefile	2010-07-25 20:05:55.000000000 +1200
-@@ -69,6 +69,6 @@
- 	$(MMAKE) uninstall
- 
- .DEFAULT:
--	$(MMAKE) $@
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
- 
- #-----------------------------------------------------------------------------#
-diff -ur mercury-compiler-10.04.orig/Mmakefile mercury-compiler-10.04/Mmakefile
---- mercury-compiler-10.04.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04/Mmakefile	2010-07-25 21:18:31.000000000 +1200
-@@ -286,6 +286,47 @@
- 		mdbcomp browser ssdb trace
- 	+cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+.PHONY: default_grade
-+default_grade:
-+	+if test "$(DEFAULT_GRADE)" != "$(GRADE)"; then                              \
-+	    gc_grade=`scripts/ml --grade $(DEFAULT_GRADE) --print-gc-grade`;         \
-+	    IWS=`/bin/pwd`/install_grade_dir.$(DEFAULT_GRADE);                       \
-+	    (                                                                        \
-+		scripts/prepare_install_dir $${IWS} &&                               \
-+		( cd $${IWS}/boehm_gc &&                                             \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			GC_GRADE=$${gc_grade} libgrade ) &&                          \
-+		( cd $${IWS}/runtime &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/library &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/mdbcomp &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/browser &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/ssdb &&                                                 \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/trace &&                                                \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		true                                                                 \
-+	    ) ||                                                                     \
-+	    { exit 1; };                                                             \
-+	fi;
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-diff -ur mercury-compiler-10.04.orig/boehm_gc/Mmakefile mercury-compiler-10.04/boehm_gc/Mmakefile
---- mercury-compiler-10.04.orig/boehm_gc/Mmakefile	2010-02-27 02:16:44.000000000 +1300
-+++ mercury-compiler-10.04/boehm_gc/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -176,6 +176,9 @@
- 
- # No need to install the Boehm collector for grades which don't use it.
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -187,6 +190,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: install_dirs
- 	cp $(HEADERS) $(INSTALL_INC_DIR)
-diff -ur mercury-compiler-10.04.orig/browser/Mmakefile mercury-compiler-10.04/browser/Mmakefile
---- mercury-compiler-10.04.orig/browser/Mmakefile	2010-05-10 18:31:55.000000000 +1200
-+++ mercury-compiler-10.04/browser/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -256,16 +256,28 @@
- 
- # there is no browser in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(BROWSER_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(BROWSER_LIB_NAME).$A \
-+	lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(BROWSER_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.orig/library/Mmakefile mercury-compiler-10.04/library/Mmakefile
---- mercury-compiler-10.04.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04/library/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -493,6 +493,9 @@
- 
- # XXX some modules in the browser directory need library.int3
- 
-+.PHONY: libgrade
-+libgrade: mercury.dll
-+
- .PHONY: install_library
- install_library: mercury.dll install_grade_dirs install_gac \
- 		install_strong_name lib$(STD_LIB_NAME).install_grade_hdrs \
-@@ -531,6 +534,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- # we depend on lib$(STD_LIB_NAME) because lib$(STD_LIB_NAME).install_library
- # doesn't make library.int3, but some modules in the browser directory need it.
- 
-@@ -541,6 +547,9 @@
- 
- else	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME) all-ints
-+
- .PHONY: install_mercury
- install_mercury: install_library
- 
-diff -ur mercury-compiler-10.04.orig/mdbcomp/Mmakefile mercury-compiler-10.04/mdbcomp/Mmakefile
---- mercury-compiler-10.04.orig/mdbcomp/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04/mdbcomp/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -215,16 +215,28 @@
- 
- # there is no debugger in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(MDBCOMP_LIB_NAME).install
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(MDBCOMP_LIB_NAME).$A \
-+	lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(MDBCOMP_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile
---- mercury-compiler-10.04.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04/runtime/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -466,6 +466,9 @@
- # mercury/library/Mmakefile.)
- # (Runtime support for the Erlang backend is in the library directory.)
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -478,6 +481,9 @@
- else
- ifeq ($(findstring il,$(GRADE)),il)
- 
-+.PHONY: libgrade
-+libgrade: $(DOTNET_DLLS)
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -492,6 +498,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- # mercury_conf.h needs to be in a separate directory so it can be
- # overridden by a different configuration.
- .PHONY: install_headers
-diff -ur mercury-compiler-10.04.orig/ssdb/Mmakefile mercury-compiler-10.04/ssdb/Mmakefile
---- mercury-compiler-10.04.orig/ssdb/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04/ssdb/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -250,16 +250,28 @@
- 
- # there is no ssdb in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(SSDB_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(SSDB_LIB_NAME).$A \
-+	lib$(SSDB_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(SSDB_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.orig/trace/Mmakefile mercury-compiler-10.04/trace/Mmakefile
---- mercury-compiler-10.04.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04/trace/Mmakefile	2010-07-25 20:05:55.000000000 +1200
-@@ -324,6 +324,9 @@
- 
- # there is no tracing in the .NET, Java, Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -332,6 +335,13 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(TRACE_LIB_NAME).$A \
-+		lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+		lib$(EVENTSPEC_LIB_NAME).$A \
-+		lib$(EVENTSPEC_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: $(HDRS) $(LIB_GLOBALS_H)
- 	cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
diff --git a/dev-lang/mercury/files/mercury-10.04-docs.patch b/dev-lang/mercury/files/mercury-10.04-docs.patch
deleted file mode 100644
index 552ae4bc081f..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-docs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Only in mercury-compiler-10.04/boehm_gc: Makefile.direct.orig
-Only in mercury-compiler-10.04/compiler: make.program_target.c.orig
-diff -ur mercury-compiler-10.04.orig/doc/Mmakefile mercury-compiler-10.04/doc/Mmakefile
---- mercury-compiler-10.04.orig/doc/Mmakefile	2010-07-07 01:42:07.000000000 +1200
-+++ mercury-compiler-10.04/doc/Mmakefile	2010-07-19 21:01:50.000000000 +1200
-@@ -120,7 +120,7 @@
- 	# formatted versions of the man pages.
- 	# But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -351,7 +351,7 @@
- 	# versions of the documentation.  If they are added they should
- 	# be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
- 	install_mdb_doc
- 	# install_text install_ps
- 
-Only in mercury-compiler-10.04/scripts: Mmake.vars.in.orig
diff --git a/dev-lang/mercury/files/mercury-10.04-linker-flags.patch b/dev-lang/mercury/files/mercury-10.04-linker-flags.patch
deleted file mode 100644
index 9b993efce948..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-linker-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur mercury-compiler-10.04.orig/boehm_gc/Makefile.direct mercury-compiler-10.04/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04/boehm_gc/Makefile.direct	2010-08-22 17:21:08.000000000 +1200
-@@ -351,7 +351,7 @@
- 		-ldl `./threadlibs`
- 	./if_not_there on_sparc_sunos5_so $(MAKE) dyn_load.o
- 	./if_not_there on_sparc_sunos5_so \
--	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc
-+	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc $(EXTRA_LDFLAGS)
- 
- # Darwin shared library version of the gc.
- lib$(GC_GRADE).dylib: $(OBJS) $(UTILS)
-diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile
---- mercury-compiler-10.04.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04/runtime/Mmakefile	2010-08-22 16:44:33.000000000 +1200
-@@ -387,7 +387,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(RT_LIB_NAME).so $(PIC_OBJS)			\
- 		$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_GC_LIB_DIR)	\
--		$(LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
-+		$(ALL_LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
- 		$(SHARED_LIBS)
- 
- # For Darwin we should pass the -install_name option.
-diff -ur mercury-compiler-10.04.orig/trace/Mmakefile mercury-compiler-10.04/trace/Mmakefile
---- mercury-compiler-10.04.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04/trace/Mmakefile	2010-08-22 16:57:29.000000000 +1200
-@@ -273,6 +273,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(TRACE_LIB_NAME).so $(TRACE_PIC_OBJS)		\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)                                          \
- 		$(TRACE_LDFLAGS) $(TRACE_LDLIBS) $(THREADLIBS)		\
- 		$(SHARED_LIBS)
- 
-@@ -280,6 +281,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(EVENTSPEC_LIB_NAME).so $(EVENTSPEC_PIC_OBJS)	\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)                                          \
- 		$(EVENTSPEC_LDFLAGS) $(EVENTSPEC_LDLIBS) $(THREADLIBS)	\
- 		$(SHARED_LIBS)
- 
-diff -ur mercury-compiler-10.04.orig/util/Mmakefile mercury-compiler-10.04/util/Mmakefile
---- mercury-compiler-10.04.orig/util/Mmakefile	2010-07-12 04:31:03.000000000 +1200
-+++ mercury-compiler-10.04/util/Mmakefile	2010-08-22 11:54:02.000000000 +1200
-@@ -41,16 +41,16 @@
- 
- .c:
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ $< $(GETOPT_SRC)
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ $< $(GETOPT_SRC)
- 
- mkinit: mkinit.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit.c mkinit_common.c $(GETOPT_SRC)
- 
- mkinit_erl: mkinit_erl.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit_erl.c mkinit_common.c $(GETOPT_SRC)
- 
- tags:
diff --git a/dev-lang/mercury/files/mercury-10.04-multilib.patch b/dev-lang/mercury/files/mercury-10.04-multilib.patch
deleted file mode 100644
index 0c66afb64b5b..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-multilib.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur mercury-compiler-10.04.orig/compiler/make.program_target.c mercury-compiler-10.04/compiler/make.program_target.c
---- mercury-compiler-10.04.orig/compiler/make.program_target.c	2010-07-19 02:00:13.000000000 +1200
-+++ mercury-compiler-10.04/compiler/make.program_target.c	2010-07-19 21:00:29.000000000 +1200
-@@ -5422,7 +5422,7 @@
- 		make__program_target__install_grade_init_6_0_i2);
- MR_def_label(make__program_target__install_grade_init_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_init_6_0_i3);
- MR_def_label(make__program_target__install_grade_init_6_0,3)
-@@ -5873,7 +5873,7 @@
- 		make__program_target__make_grade_install_dirs_6_0_i2);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_grade_install_dirs_6_0_i3);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
-@@ -6318,7 +6318,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i14);
- MR_def_label(make__program_target__install_library_grade_files_10_0,14)
-@@ -6382,7 +6382,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i20);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i23);
- MR_def_label(make__program_target__install_library_grade_files_10_0,23)
-@@ -6448,7 +6448,7 @@
- MR_def_label(make__program_target__install_library_grade_files_10_0,20)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i30);
- MR_def_label(make__program_target__install_library_grade_files_10_0,30)
-@@ -6585,7 +6585,7 @@
- 		make__program_target__make_install_dirs_5_0_i2);
- MR_def_label(make__program_target__make_install_dirs_5_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_install_dirs_5_0_i3);
- MR_def_label(make__program_target__make_install_dirs_5_0,3)
-@@ -6806,7 +6806,7 @@
- 		make__program_target__install_library_7_0_i11);
- MR_def_label(make__program_target__install_library_7_0,11)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_7_0_i12);
- MR_def_label(make__program_target__install_library_7_0,12)
-@@ -10596,7 +10596,7 @@
- 		make__program_target__install_ints_and_headers_8_0_i13);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_ints_and_headers_8_0_i14);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
-@@ -11222,7 +11222,7 @@
- 		make__program_target__install_grade_ints_and_headers_9_0_i5);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_ints_and_headers_9_0_i6);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
-diff -ur mercury-compiler-10.04.orig/library/Mmakefile mercury-compiler-10.04/library/Mmakefile
---- mercury-compiler-10.04.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04/library/Mmakefile	2010-09-05 11:49:30.000000000 +1200
-@@ -268,8 +268,8 @@
- 	[ -d jmercury/runtime ] || cp -r ../java/runtime jmercury
- 
- install_mer_rt: $(RT_LIB_NAME).jar
--	mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
--	cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
-+	mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE)
-+	cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE)
- 
- else
- 
-diff -ur mercury-compiler-10.04.orig/scripts/Mmake.vars.in mercury-compiler-10.04/scripts/Mmake.vars.in
---- mercury-compiler-10.04.orig/scripts/Mmake.vars.in	2010-05-20 21:29:31.000000000 +1200
-+++ mercury-compiler-10.04/scripts/Mmake.vars.in	2010-07-19 21:00:29.000000000 +1200
-@@ -688,17 +688,17 @@
- INSTALL_PREFIX		= @prefix@
- FINAL_INSTALL_PREFIX	= @prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
- INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PS_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
- INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-10.04-no-reconf.patch b/dev-lang/mercury/files/mercury-10.04-no-reconf.patch
deleted file mode 100644
index 9a264f99509a..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-no-reconf.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Only in mercury-compiler-10.04/boehm_gc: Makefile.direct.orig
-Only in mercury-compiler-10.04/compiler: make.program_target.c.orig
-Only in mercury-compiler-10.04/doc: Mmakefile.orig
-diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile
---- mercury-compiler-10.04.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04/runtime/Mmakefile	2010-07-19 21:02:09.000000000 +1200
-@@ -455,8 +455,6 @@
- 		mkdir -p $(INSTALL_GRADE_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifneq "$(filter java% erlang%,$(GRADE))" ""
- 
-@@ -502,7 +500,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
-Only in mercury-compiler-10.04/runtime: Mmakefile.orig
-Only in mercury-compiler-10.04/scripts: Mmake.vars.in.orig
-diff -ur mercury-compiler-10.04.orig/scripts/Mmakefile mercury-compiler-10.04/scripts/Mmakefile
---- mercury-compiler-10.04.orig/scripts/Mmakefile	2009-09-02 11:54:38.000000000 +1200
-+++ mercury-compiler-10.04/scripts/Mmakefile	2010-07-19 21:02:09.000000000 +1200
-@@ -24,17 +24,13 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
- 	mprof \
--	mtags \
--	prepare_install_dir
-+	mtags
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -113,8 +109,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -132,7 +126,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch b/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch
deleted file mode 100644
index 8c766d5c5ecd..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-sparc-llds-base-grade.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-10.04.orig/configure	2010-07-18 20:40:26.000000000 +1200
-+++ mercury-compiler-10.04/configure	2010-07-24 19:26:57.000000000 +1200
-@@ -10804,7 +10804,7 @@
- # The asm_fast and reg grades also do not currently work on Linux/PPC.
- #
- case "$host" in
--    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu)
-+    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu|sparc*-linux-gnu)
-         BEST_LLDS_BASE_GRADE=none
-         ;;
- esac
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-mercury-float.patch b/dev-lang/mercury/files/mercury-10.04-tests-mercury-float.patch
deleted file mode 100644
index cc63ec07fc48..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-tests-mercury-float.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Common subdirectories: mercury-tests-10.04.orig/hard_coded/CVS and mercury-tests-10.04/hard_coded/CVS
-Common subdirectories: mercury-tests-10.04.orig/hard_coded/exceptions and mercury-tests-10.04/hard_coded/exceptions
-Common subdirectories: mercury-tests-10.04.orig/hard_coded/purity and mercury-tests-10.04/hard_coded/purity
-Common subdirectories: mercury-tests-10.04.orig/hard_coded/sub-modules and mercury-tests-10.04/hard_coded/sub-modules
-Common subdirectories: mercury-tests-10.04.orig/hard_coded/typeclasses and mercury-tests-10.04/hard_coded/typeclasses
-diff -u mercury-tests-10.04.orig/hard_coded/write_reg1.exp3 mercury-tests-10.04/hard_coded/write_reg1.exp3
---- mercury-tests-10.04.orig/hard_coded/write_reg1.exp3	2007-02-22 18:35:31.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/write_reg1.exp3	2010-07-24 11:57:06.000000000 +1200
-@@ -23,8 +23,8 @@
- 'a'
- '&'
- 3.14159
--1.12832498300000e-21
--2.23954899000000e+23
-+1.128324983e-21
-+2.23954899e+23
- -65
- 4
- univ_cons(["hi! I\'m a univ!"])
-diff -u mercury-tests-10.04.orig/hard_coded/write_xml.exp2 mercury-tests-10.04/hard_coded/write_xml.exp2
---- mercury-tests-10.04.orig/hard_coded/write_xml.exp2	2007-02-22 18:35:31.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/write_xml.exp2	2010-07-24 11:56:36.000000000 +1200
-@@ -25,7 +25,7 @@
- 			<Int type="int">123456</Int>
- 			<Tuple--2--Tag_-123character-44-32float-125 functor="{}" type="{character, float}" arity="2">
- 				<Char type="character">a</Char>
--				<Float type="float">1.23553225220000e-97</Float>
-+				<Float type="float">1.2355322522e-97</Float>
- 			</Tuple--2--Tag_-123character-44-32float-125>
- 		</Tuple--3--Tag_-123string-44-32int-44-32-123character-44-32float-125-125>
- 	</a_tuple--1--write_xml-46mytype>
-@@ -404,7 +404,7 @@
- 						<Int type="int">123456</Int>
- 						<Tuple functor="{}" type="{character, float}" arity="2">
- 							<Char type="character">a</Char>
--							<Float type="float">1.23553225220000e-97</Float>
-+							<Float type="float">1.2355322522e-97</Float>
- 						</Tuple>
- 					</Tuple>
- 				</a_tuple>
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
deleted file mode 100644
index 3161df4482c2..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-tests-sandbox.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp mercury-tests-10.04/hard_coded/dir_test.exp
---- mercury-tests-10.04.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
-+++ mercury-tests-10.04/hard_coded/dir_test.exp	2010-07-19 21:03:29.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".
- "foo/"/"bar/baz" = "foo\bar\baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp2 mercury-tests-10.04/hard_coded/dir_test.exp2
---- mercury-tests-10.04.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/dir_test.exp2	2010-07-19 21:03:29.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp3 mercury-tests-10.04/hard_coded/dir_test.exp3
---- mercury-tests-10.04.orig/hard_coded/dir_test.exp3	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/dir_test.exp3	2010-07-19 21:03:30.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.exp4 mercury-tests-10.04/hard_coded/dir_test.exp4
---- mercury-tests-10.04.orig/hard_coded/dir_test.exp4	2010-03-04 13:39:48.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/dir_test.exp4	2010-07-19 21:03:30.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.orig/hard_coded/dir_test.m mercury-tests-10.04/hard_coded/dir_test.m
---- mercury-tests-10.04.orig/hard_coded/dir_test.m	2010-02-09 16:39:39.000000000 +1300
-+++ mercury-tests-10.04/hard_coded/dir_test.m	2010-07-19 21:03:30.000000000 +1200
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	% Execute permissions are not handled correctly on all platforms so
- 	% just check that it doesn't crash.
- 	io__check_file_accessibility("unwritable",
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch b/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch
deleted file mode 100644
index 149fa3b5c9e5..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-tests-static-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-tests-10.04.orig/hard_coded/Mmakefile	2010-05-03 22:27:02.000000000 +1200
-+++ mercury-tests-10.04/hard_coded/Mmakefile	2010-07-28 20:17:50.000000000 +1200
-@@ -677,7 +677,7 @@
- PROGS = $(ORDINARY_PROGS) $(PROF_PROGS) $(BROKEN_FOR_LCC_PROGS) \
- 	$(CLOSURE_LAYOUT_PROGS) $(NON_PROFDEEP_PROGS) \
- 	$(BACKEND_PROGS) $(NONDET_C_PROGS) \
--	$(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \
-+	$(C_AND_GC_ONLY_PROGS) \
- 	$(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
- 	$(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
- 	$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
diff --git a/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
deleted file mode 100644
index fa4b12e9f077..000000000000
--- a/dev-lang/mercury/files/mercury-10.04-tests-workspace.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mercury-tests-10.04.orig/Mmake.common	2010-02-15 19:49:51.000000000 +1300
-+++ mercury-tests-10.04/Mmake.common	2010-07-20 19:40:29.000000000 +1200
-@@ -79,8 +79,8 @@
- -include $(TESTS_DIR)/Mmake.params
- 
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
--ifdef WORKSPACE_FLAGS
--MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+ifdef WORKSPACE
-+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
- endif
- 
- # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-10.04.orig/configure	2010-07-18 20:40:26.000000000 +1200
-+++ mercury-compiler-10.04/configure	2010-07-20 19:42:09.000000000 +1200
-@@ -14778,10 +14778,10 @@
-     test_flags="tests/TESTS_FLAGS"
-     test_mdbrc="tests/mdbrc"
- else
--    if test -e ../tests/TESTS_FLAGS.in
-+    if test -e ../mercury-tests-10.04/TESTS_FLAGS.in
-     then
--        test_flags="../tests/TESTS_FLAGS"
--        test_mdbrc="../tests/mdbrc"
-+        test_flags="../mercury-tests-10.04/TESTS_FLAGS"
-+        test_mdbrc="../mercury-tests-10.04/mdbrc"
-     else
-         test_flags=""
-         test_mdbrc=""
diff --git a/dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch b/dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch
deleted file mode 100644
index 948193a6dc67..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-boehm_gc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urN mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.1/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04.1/boehm_gc/Makefile.direct	2010-09-05 09:07:10.000000000 +1200
-@@ -407,6 +407,7 @@
- 	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
- 	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
- 	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
-+	./if_mach SPARC LINUX $(CC) -c -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
- 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
- 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-diff -urN mercury-compiler-10.04.1.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h mercury-compiler-10.04.1/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
---- mercury-compiler-10.04.1.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-02-23 19:28:41.000000000 +1300
-+++ mercury-compiler-10.04.1/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-09-05 09:07:10.000000000 +1200
-@@ -39,32 +39,6 @@
- 
- #define AO_HAVE_test_and_set_full
- 
--#ifndef AO_NO_SPARC_V9
--/* Returns nonzero if the comparison succeeded. */
--AO_INLINE int
--AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val) {
--  char ret;
--  __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
--#                       if defined(__arch64__)
--                          "casx [%2],%0,%1\n\t"
--#                       else
--                          "cas [%2],%0,%1\n\t" /* 32-bit version */
--#                       endif
--                        "membar #StoreLoad | #StoreStore\n\t"
--                        "cmp %0,%1\n\t"
--                        "be,a 0f\n\t"
--                        "mov 1,%0\n\t"/* one insn after branch always executed */
--                        "clr %0\n\t"
--                        "0:\n\t"
--                        : "=r" (ret), "+r" (new_val)
--                        : "r" (addr), "0" (old)
--                        : "memory", "cc");
--  return (int)ret;
--}
--
--#define AO_HAVE_compare_and_swap_full
--#endif /* AO_NO_SPARC_V9 */
--
- /* FIXME: This needs to be extended for SPARC v8 and v9.        */
- /* SPARC V8 also has swap.  V9 has CAS.                         */
- /* There are barriers like membar #LoadStore.                   */
-diff -urN mercury-compiler-10.04.1.orig/boehm_gc/sparc_generic_mach_dep.c mercury-compiler-10.04.1/boehm_gc/sparc_generic_mach_dep.c
---- mercury-compiler-10.04.1.orig/boehm_gc/sparc_generic_mach_dep.c	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-compiler-10.04.1/boehm_gc/sparc_generic_mach_dep.c	2010-09-05 09:07:10.000000000 +1200
-@@ -0,0 +1,82 @@
-+# include "private/gc_priv.h"
-+
-+/* On register window machines, we need a way to force registers into 	*/
-+/* the stack.	Return sp.						*/
-+# ifdef SPARC
-+    asm("	.seg 	\"text\"");
-+#   if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
-+      asm("	.globl	GC_save_regs_in_stack");
-+      asm("GC_save_regs_in_stack:");
-+      asm("	.type GC_save_regs_in_stack,#function");
-+#   else
-+      asm("	.globl	_GC_save_regs_in_stack");
-+      asm("_GC_save_regs_in_stack:");
-+#   endif
-+#   if defined(__arch64__) || defined(__sparcv9)
-+      asm("	save	%sp,-128,%sp");
-+      asm("	flushw");
-+      asm("	ret");
-+      asm("	restore %sp,2047+128,%o0");
-+#   else
-+      asm("	ta	0x3   ! ST_FLUSH_WINDOWS");
-+      asm("	retl");
-+      asm("	mov	%sp,%o0");
-+#   endif
-+#   ifdef SVR4
-+      asm("	.GC_save_regs_in_stack_end:");
-+      asm("	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
-+#   endif
-+#   ifdef LINT
-+	word GC_save_regs_in_stack() { return(0 /* sp really */);}
-+#   endif
-+# endif
-+
-+/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and	*/
-+/* returns arg.  Stack clearing is crucial on SPARC, so we supply	*/
-+/* an assembly version that's more careful.  Assumes limit is hotter	*/
-+/* than sp, and limit is 8 byte aligned.				*/
-+#if defined(ASM_CLEAR_CODE)
-+# ifdef SUNOS4
-+    asm(".globl _GC_clear_stack_inner");
-+    asm("_GC_clear_stack_inner:");
-+# else
-+    asm(".globl GC_clear_stack_inner");
-+    asm("GC_clear_stack_inner:");
-+    asm(".type GC_save_regs_in_stack,#function");
-+# endif
-+#if defined(__arch64__) || defined(__sparcv9)
-+  asm("mov %sp,%o2");		/* Save sp			*/
-+  asm("add %sp,2047-8,%o3");	/* p = sp+bias-8		*/
-+  asm("add %o1,-2047-192,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("stx %g0,[%o3]");		/* *(long *)p = 0		*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu,pt %xcc, loop");	/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#else
-+  asm("mov %sp,%o2");		/* Save sp	*/
-+  asm("add %sp,-8,%o3");	/* p = sp-8	*/
-+  asm("clr %g1");		/* [g0,g1] = 0	*/
-+  asm("add %o1,-0x60,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("std %g0,[%o3]");		/* *(long long *)p = 0	*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu loop	");		/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#endif /* old SPARC */
-+  /* First argument = %o0 = return value */
-+#   ifdef SVR4
-+      asm("	.GC_clear_stack_inner_end:");
-+      asm("	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
-+#   endif  
-+#endif
diff --git a/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch b/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch
deleted file mode 100644
index 955cf45de4e6..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-bootstrap-depend.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-compiler-10.04.1.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04.1/Mmakefile	2010-10-10 10:05:55.000000000 +1300
-@@ -167,6 +167,13 @@
- 		library/$(deps_subdir)$(STD_LIB_NAME).dep
- 	+cd deep_profiler && $(SUBDIR_MMAKE) depend
- 
-+.PHONY: bootstrap_depend
-+ifeq ("$(BOOTSTRAP_MC)","")
-+bootstrap_depend:
-+else
-+bootstrap_depend: depend
-+endif
-+
- # depend_library MUST be done before depend_compiler and depend_profiler
- 
- .PHONY: depend
---- mercury-compiler-10.04.1.orig/Mmake.common.in	2009-10-10 23:44:13.000000000 +1300
-+++ mercury-compiler-10.04.1/Mmake.common.in	2010-10-10 10:21:52.000000000 +1300
-@@ -30,6 +30,7 @@
- 
- # Specify the Mercury compiler to use for bootstrapping.
- MC		= @BOOTSTRAP_MC_COMPILER@
-+BOOTSTRAP_MC    = @BOOTSTRAP_MC@
- 
- # Specify the compilation model to use for compiling the compiler.
- GRADE		= @GRADE@
---- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:42:43.000000000 +1300
-@@ -4426,11 +4426,11 @@
- #-----------------------------------------------------------------------------#
- 
- if test "$BOOTSTRAP_MC" = ""; then
--    BOOTSTRAP_MC=mmc
-+    BOOTSTRAP_MC_COMPILER=mmc
-+else
-+    BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
- fi
--BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
- BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
--BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
- AC_SUBST(BOOTSTRAP_MC_COMPILER)
- AC_SUBST(BOOTSTRAP_MC_ARGS)
- AC_SUBST(BOOTSTRAP_MC)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
deleted file mode 100644
index 8a6e8824048f..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:39:59.000000000 +1300
-@@ -309,7 +309,8 @@
-                 Version >= 8,
-                 ac(2) ^ elem(3, 5) = 17,
-                 (1 .. 2) = [[1, 2]],
--                Global = 561
-+                Global = 561,
-+                char.det_from_int(255) = '\xFF\'
-             ->
-                 trace [[io(!S)]] (
-                     io.print("Hello, world\n", !S)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-default-grade.patch b/dev-lang/mercury/files/mercury-10.04.1-default-grade.patch
deleted file mode 100644
index a0b1898645ed..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-default-grade.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur mercury-compiler-10.04.1.orig/Makefile mercury-compiler-10.04.1/Makefile
---- mercury-compiler-10.04.1.orig/Makefile	2010-07-12 04:31:01.000000000 +1200
-+++ mercury-compiler-10.04.1/Makefile	2010-09-05 09:02:03.000000000 +1200
-@@ -69,6 +69,6 @@
- 	$(MMAKE) uninstall
- 
- .DEFAULT:
--	$(MMAKE) $@
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
- 
- #-----------------------------------------------------------------------------#
-diff -ur mercury-compiler-10.04.1.orig/Mmakefile mercury-compiler-10.04.1/Mmakefile
---- mercury-compiler-10.04.1.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04.1/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -286,6 +286,47 @@
- 		mdbcomp browser ssdb trace
- 	+cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+.PHONY: default_grade
-+default_grade:
-+	+if test "$(DEFAULT_GRADE)" != "$(GRADE)"; then                              \
-+	    gc_grade=`scripts/ml --grade $(DEFAULT_GRADE) --print-gc-grade`;         \
-+	    IWS=`/bin/pwd`/install_grade_dir.$(DEFAULT_GRADE);                       \
-+	    (                                                                        \
-+		scripts/prepare_install_dir $${IWS} &&                               \
-+		( cd $${IWS}/boehm_gc &&                                             \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			GC_GRADE=$${gc_grade} libgrade ) &&                          \
-+		( cd $${IWS}/runtime &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/library &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/mdbcomp &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/browser &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/ssdb &&                                                 \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/trace &&                                                \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		true                                                                 \
-+	    ) ||                                                                     \
-+	    { exit 1; };                                                             \
-+	fi;
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-diff -ur mercury-compiler-10.04.1.orig/boehm_gc/Mmakefile mercury-compiler-10.04.1/boehm_gc/Mmakefile
---- mercury-compiler-10.04.1.orig/boehm_gc/Mmakefile	2010-02-27 02:16:44.000000000 +1300
-+++ mercury-compiler-10.04.1/boehm_gc/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -176,6 +176,9 @@
- 
- # No need to install the Boehm collector for grades which don't use it.
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -187,6 +190,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: install_dirs
- 	cp $(HEADERS) $(INSTALL_INC_DIR)
-diff -ur mercury-compiler-10.04.1.orig/browser/Mmakefile mercury-compiler-10.04.1/browser/Mmakefile
---- mercury-compiler-10.04.1.orig/browser/Mmakefile	2010-05-10 18:31:55.000000000 +1200
-+++ mercury-compiler-10.04.1/browser/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -256,16 +256,28 @@
- 
- # there is no browser in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(BROWSER_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(BROWSER_LIB_NAME).$A \
-+	lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(BROWSER_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
---- mercury-compiler-10.04.1.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04.1/library/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -493,6 +493,9 @@
- 
- # XXX some modules in the browser directory need library.int3
- 
-+.PHONY: libgrade
-+libgrade: mercury.dll
-+
- .PHONY: install_library
- install_library: mercury.dll install_grade_dirs install_gac \
- 		install_strong_name lib$(STD_LIB_NAME).install_grade_hdrs \
-@@ -531,6 +534,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- # we depend on lib$(STD_LIB_NAME) because lib$(STD_LIB_NAME).install_library
- # doesn't make library.int3, but some modules in the browser directory need it.
- 
-@@ -541,6 +547,9 @@
- 
- else	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME) all-ints
-+
- .PHONY: install_mercury
- install_mercury: install_library
- 
-diff -ur mercury-compiler-10.04.1.orig/mdbcomp/Mmakefile mercury-compiler-10.04.1/mdbcomp/Mmakefile
---- mercury-compiler-10.04.1.orig/mdbcomp/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04.1/mdbcomp/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -215,16 +215,28 @@
- 
- # there is no debugger in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(MDBCOMP_LIB_NAME).install
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(MDBCOMP_LIB_NAME).$A \
-+	lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(MDBCOMP_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
---- mercury-compiler-10.04.1.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.1/runtime/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -466,6 +466,9 @@
- # mercury/library/Mmakefile.)
- # (Runtime support for the Erlang backend is in the library directory.)
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -478,6 +481,9 @@
- else
- ifeq ($(findstring il,$(GRADE)),il)
- 
-+.PHONY: libgrade
-+libgrade: $(DOTNET_DLLS)
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -492,6 +498,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- # mercury_conf.h needs to be in a separate directory so it can be
- # overridden by a different configuration.
- .PHONY: install_headers
-diff -ur mercury-compiler-10.04.1.orig/ssdb/Mmakefile mercury-compiler-10.04.1/ssdb/Mmakefile
---- mercury-compiler-10.04.1.orig/ssdb/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04.1/ssdb/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -250,16 +250,28 @@
- 
- # there is no ssdb in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(SSDB_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(SSDB_LIB_NAME).$A \
-+	lib$(SSDB_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(SSDB_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.1.orig/trace/Mmakefile mercury-compiler-10.04.1/trace/Mmakefile
---- mercury-compiler-10.04.1.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04.1/trace/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -324,6 +324,9 @@
- 
- # there is no tracing in the .NET, Java, Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -332,6 +335,13 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(TRACE_LIB_NAME).$A \
-+		lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+		lib$(EVENTSPEC_LIB_NAME).$A \
-+		lib$(EVENTSPEC_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: $(HDRS) $(LIB_GLOBALS_H)
- 	cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
diff --git a/dev-lang/mercury/files/mercury-10.04.1-docs.patch b/dev-lang/mercury/files/mercury-10.04.1-docs.patch
deleted file mode 100644
index c50d1d455599..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur mercury-compiler-10.04.1.orig/doc/Mmakefile mercury-compiler-10.04.1/doc/Mmakefile
---- mercury-compiler-10.04.1.orig/doc/Mmakefile	2010-07-07 01:42:07.000000000 +1200
-+++ mercury-compiler-10.04.1/doc/Mmakefile	2010-09-05 09:13:40.000000000 +1200
-@@ -120,7 +120,7 @@
- 	# formatted versions of the man pages.
- 	# But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -351,7 +351,7 @@
- 	# versions of the documentation.  If they are added they should
- 	# be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
- 	install_mdb_doc
- 	# install_text install_ps
- 
diff --git a/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch b/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch
deleted file mode 100644
index f053eb2930d2..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-linker-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.1/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.1.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04.1/boehm_gc/Makefile.direct	2010-09-05 17:42:33.000000000 +1200
-@@ -351,7 +351,7 @@
- 		-ldl `./threadlibs`
- 	./if_not_there on_sparc_sunos5_so $(MAKE) dyn_load.o
- 	./if_not_there on_sparc_sunos5_so \
--	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc
-+	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc $(EXTRA_LDFLAGS)
- 
- # Darwin shared library version of the gc.
- lib$(GC_GRADE).dylib: $(OBJS) $(UTILS)
-diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
---- mercury-compiler-10.04.1.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.1/runtime/Mmakefile	2010-09-05 17:42:33.000000000 +1200
-@@ -387,7 +387,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(RT_LIB_NAME).so $(PIC_OBJS)			\
- 		$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_GC_LIB_DIR)	\
--		$(LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
-+		$(ALL_LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
- 		$(SHARED_LIBS)
- 
- # For Darwin we should pass the -install_name option.
-diff -ur mercury-compiler-10.04.1.orig/trace/Mmakefile mercury-compiler-10.04.1/trace/Mmakefile
---- mercury-compiler-10.04.1.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04.1/trace/Mmakefile	2010-09-05 17:42:33.000000000 +1200
-@@ -273,6 +273,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(TRACE_LIB_NAME).so $(TRACE_PIC_OBJS)		\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)                                          \
- 		$(TRACE_LDFLAGS) $(TRACE_LDLIBS) $(THREADLIBS)		\
- 		$(SHARED_LIBS)
- 
-@@ -280,6 +281,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(EVENTSPEC_LIB_NAME).so $(EVENTSPEC_PIC_OBJS)	\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)                                          \
- 		$(EVENTSPEC_LDFLAGS) $(EVENTSPEC_LDLIBS) $(THREADLIBS)	\
- 		$(SHARED_LIBS)
- 
-diff -ur mercury-compiler-10.04.1.orig/util/Mmakefile mercury-compiler-10.04.1/util/Mmakefile
---- mercury-compiler-10.04.1.orig/util/Mmakefile	2010-07-12 04:31:03.000000000 +1200
-+++ mercury-compiler-10.04.1/util/Mmakefile	2010-09-05 17:42:33.000000000 +1200
-@@ -41,16 +41,16 @@
- 
- .c:
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ $< $(GETOPT_SRC)
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ $< $(GETOPT_SRC)
- 
- mkinit: mkinit.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit.c mkinit_common.c $(GETOPT_SRC)
- 
- mkinit_erl: mkinit_erl.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit_erl.c mkinit_common.c $(GETOPT_SRC)
- 
- tags:
diff --git a/dev-lang/mercury/files/mercury-10.04.1-multilib.patch b/dev-lang/mercury/files/mercury-10.04.1-multilib.patch
deleted file mode 100644
index ba62e85fdf67..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-multilib.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-diff -ur mercury-compiler-10.04.1.orig/compiler/file_util.m mercury-compiler-10.04.1/compiler/file_util.m
---- mercury-compiler-10.04.1.orig/compiler/file_util.m	2009-10-14 18:28:32.000000000 +1300
-+++ mercury-compiler-10.04.1/compiler/file_util.m	2010-09-05 15:35:56.000000000 +1200
-@@ -261,7 +261,7 @@
-     ( InstallNamePath0 = "" ->
-         globals.lookup_string_option(Globals, install_prefix, InstallPrefix),
-         grade_directory_component(Globals, GradeDir),
--        InstallNamePath = InstallPrefix / "lib" / "mercury" / "lib" / GradeDir
-+        InstallNamePath = InstallPrefix / "@libdir@" / "mercury" / "lib" / GradeDir
-     ;
-         InstallNamePath = InstallNamePath0
-     ),
-diff -ur mercury-compiler-10.04.1.orig/compiler/libs.file_util.c mercury-compiler-10.04.1/compiler/libs.file_util.c
---- mercury-compiler-10.04.1.orig/compiler/libs.file_util.c	2010-08-30 04:35:03.000000000 +1200
-+++ mercury-compiler-10.04.1/compiler/libs.file_util.c	2010-09-05 11:29:44.000000000 +1200
-@@ -856,7 +856,7 @@
- 	MR_tempr1 = MR_sv(1);
- 	MR_sv(1) = MR_r1;
- 	MR_r1 = MR_tempr1;
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	}
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		libs__file_util__get_install_name_option_3_0_i8);
-diff -ur mercury-compiler-10.04.1.orig/compiler/make.program_target.c mercury-compiler-10.04.1/compiler/make.program_target.c
---- mercury-compiler-10.04.1.orig/compiler/make.program_target.c	2010-08-30 04:37:52.000000000 +1200
-+++ mercury-compiler-10.04.1/compiler/make.program_target.c	2010-09-05 08:58:59.000000000 +1200
-@@ -5422,7 +5422,7 @@
- 		make__program_target__install_grade_init_6_0_i2);
- MR_def_label(make__program_target__install_grade_init_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_init_6_0_i3);
- MR_def_label(make__program_target__install_grade_init_6_0,3)
-@@ -5873,7 +5873,7 @@
- 		make__program_target__make_grade_install_dirs_6_0_i2);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_grade_install_dirs_6_0_i3);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
-@@ -6318,7 +6318,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i14);
- MR_def_label(make__program_target__install_library_grade_files_10_0,14)
-@@ -6382,7 +6382,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i20);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i23);
- MR_def_label(make__program_target__install_library_grade_files_10_0,23)
-@@ -6448,7 +6448,7 @@
- MR_def_label(make__program_target__install_library_grade_files_10_0,20)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i30);
- MR_def_label(make__program_target__install_library_grade_files_10_0,30)
-@@ -6585,7 +6585,7 @@
- 		make__program_target__make_install_dirs_5_0_i2);
- MR_def_label(make__program_target__make_install_dirs_5_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_install_dirs_5_0_i3);
- MR_def_label(make__program_target__make_install_dirs_5_0,3)
-@@ -6806,7 +6806,7 @@
- 		make__program_target__install_library_7_0_i11);
- MR_def_label(make__program_target__install_library_7_0,11)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_7_0_i12);
- MR_def_label(make__program_target__install_library_7_0,12)
-@@ -10596,7 +10596,7 @@
- 		make__program_target__install_ints_and_headers_8_0_i13);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_ints_and_headers_8_0_i14);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
-@@ -11222,7 +11222,7 @@
- 		make__program_target__install_grade_ints_and_headers_9_0_i5);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_ints_and_headers_9_0_i6);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
-diff -ur mercury-compiler-10.04.1.orig/compiler/make.program_target.m mercury-compiler-10.04.1/compiler/make.program_target.m
---- mercury-compiler-10.04.1.orig/compiler/make.program_target.m	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04.1/compiler/make.program_target.m	2010-09-05 15:35:08.000000000 +1200
-@@ -1370,7 +1370,7 @@
-         ),
- 
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
--        LibDir = Prefix/"lib"/"mercury",
-+        LibDir = Prefix/"@libdir@"/"mercury",
-         list.map_foldl(
-             install_subdir_file(Globals, SubdirLinkSucceeded, LibDir/"ints",
-                 ModuleName),
-@@ -1424,7 +1424,7 @@
-     globals.lookup_accumulating_option(Globals, extra_library_header,
-         ExtraHdrs),
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    IncDir = Prefix / "lib" / "mercury" / "inc",
-+    IncDir = Prefix / "@libdir@" / "mercury" / "inc",
-     list.foldl2(install_extra_header(Globals, IncDir), ExtraHdrs,
-         yes, ExtraHdrsSucceeded, !IO).
- 
-@@ -1572,19 +1572,19 @@
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
- 
-         ( string.prefix(GradeDir, "java") ->
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             install_file(Globals, JarFileName, GradeLibDir, LibsSucceeded,
-                 !IO),
-             InitSucceeded = yes
-         ; string.prefix(GradeDir, "erlang") ->
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             % Our "Erlang archives" are actually directories.
-             install_directory(Globals, ErlangArchiveFileName, GradeLibDir,
-                 LibsSucceeded, !IO),
-             install_grade_init(Globals, GradeDir, ModuleName, InitSucceeded,
-                 !IO)
-         ;
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             maybe_install_library_file(Globals, "static", LibFileName,
-                 GradeLibDir, LibSuccess, !IO),
-             ( LibFileName = SharedLibFileName ->
-@@ -1615,7 +1615,7 @@
- 
- install_grade_init(Globals, GradeDir, ModuleName, Succeeded, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    GradeModulesDir = Prefix / "lib" / "mercury" / "modules" / GradeDir,
-+    GradeModulesDir = Prefix / "@libdir@" / "mercury" / "modules" / GradeDir,
-     module_name_to_file_name(Globals, ModuleName, ".init", do_not_create_dirs,
-         InitFileName, !IO),
-     install_file(Globals, InitFileName, GradeModulesDir, Succeeded, !IO).
-@@ -1632,7 +1632,7 @@
-     (
-         MaybeImports = yes(Imports),
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
--        LibDir = Prefix/"lib"/"mercury",
-+        LibDir = Prefix/"@libdir@"/"mercury",
- 
-         globals.get_target(Globals, Target),
-         globals.lookup_bool_option(Globals, highlevel_code, HighLevelCode),
-@@ -1784,7 +1784,7 @@
- 
- make_install_dirs(Globals, Result, LinkResult, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    LibDir = Prefix/"lib"/"mercury",
-+    LibDir = Prefix/"@libdir@"/"mercury",
-     make_directory(LibDir/"inc", Result1, !IO),
-     make_directory(LibDir/"modules", Result2, !IO),
- 
-@@ -1815,7 +1815,7 @@
- 
- make_grade_install_dirs(Globals, Grade, Result, LinkResult, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    LibDir = Prefix/"lib"/"mercury",
-+    LibDir = Prefix/"@libdir@"/"mercury",
- 
-     GradeIntsSubdir = LibDir/"ints"/Grade/"Mercury",
-     make_directory(GradeIntsSubdir, Result1, !IO),
-diff -ur mercury-compiler-10.04.1.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
---- mercury-compiler-10.04.1.orig/library/Mmakefile	2010-09-05 11:44:16.000000000 +1200
-+++ mercury-compiler-10.04.1/library/Mmakefile	2010-09-05 09:02:39.000000000 +1200
-@@ -268,8 +268,8 @@
- 	[ -d jmercury/runtime ] || cp -r ../java/runtime jmercury
- 
- install_mer_rt: $(RT_LIB_NAME).jar
--	mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
--	cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
-+	mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE)
-+	cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE)
- 
- else
- 
-diff -ur mercury-compiler-10.04.1.orig/scripts/Mmake.vars.in mercury-compiler-10.04.1/scripts/Mmake.vars.in
---- mercury-compiler-10.04.1.orig/scripts/Mmake.vars.in	2010-05-20 21:29:31.000000000 +1200
-+++ mercury-compiler-10.04.1/scripts/Mmake.vars.in	2010-09-05 08:59:58.000000000 +1200
-@@ -688,17 +688,17 @@
- INSTALL_PREFIX		= @prefix@
- FINAL_INSTALL_PREFIX	= @prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
- INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PS_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
- INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch b/dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch
deleted file mode 100644
index 6d3cf73f8446..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-no-reconf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur mercury-compiler-10.04.1.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
---- mercury-compiler-10.04.1.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.1/runtime/Mmakefile	2010-09-05 09:15:31.000000000 +1200
-@@ -455,8 +455,6 @@
- 		mkdir -p $(INSTALL_GRADE_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifneq "$(filter java% erlang%,$(GRADE))" ""
- 
-@@ -502,7 +500,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
-diff -ur mercury-compiler-10.04.1.orig/scripts/Mmakefile mercury-compiler-10.04.1/scripts/Mmakefile
---- mercury-compiler-10.04.1.orig/scripts/Mmakefile	2009-09-02 11:54:38.000000000 +1200
-+++ mercury-compiler-10.04.1/scripts/Mmakefile	2010-09-05 09:15:31.000000000 +1200
-@@ -24,17 +24,13 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
- 	mprof \
--	mtags \
--	prepare_install_dir
-+	mtags
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -113,8 +109,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -132,7 +126,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch b/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
deleted file mode 100644
index 67f83705eb02..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-sparc-llds-base-grade.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:45:32.000000000 +1300
-@@ -3079,7 +3079,7 @@
- # The asm_fast and reg grades also do not currently work on Linux/PPC.
- #
- case "$host" in
--    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu)
-+    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu|sparc*-linux-gnu)
-         BEST_LLDS_BASE_GRADE=none
-         ;;
- esac
diff --git a/dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch
deleted file mode 100644
index 90efcf5d78e6..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-tests-sandbox.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp mercury-tests-10.04.1/hard_coded/dir_test.exp
---- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
-+++ mercury-tests-10.04.1/hard_coded/dir_test.exp	2010-09-05 09:40:36.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".
- "foo/"/"bar/baz" = "foo\bar\baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp2 mercury-tests-10.04.1/hard_coded/dir_test.exp2
---- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04.1/hard_coded/dir_test.exp2	2010-09-05 09:40:36.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp3 mercury-tests-10.04.1/hard_coded/dir_test.exp3
---- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp3	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04.1/hard_coded/dir_test.exp3	2010-09-05 09:40:36.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.exp4 mercury-tests-10.04.1/hard_coded/dir_test.exp4
---- mercury-tests-10.04.1.orig/hard_coded/dir_test.exp4	2010-03-04 13:39:48.000000000 +1300
-+++ mercury-tests-10.04.1/hard_coded/dir_test.exp4	2010-09-05 09:40:36.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.1.orig/hard_coded/dir_test.m mercury-tests-10.04.1/hard_coded/dir_test.m
---- mercury-tests-10.04.1.orig/hard_coded/dir_test.m	2010-02-09 16:39:39.000000000 +1300
-+++ mercury-tests-10.04.1/hard_coded/dir_test.m	2010-09-05 09:40:36.000000000 +1200
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	% Execute permissions are not handled correctly on all platforms so
- 	% just check that it doesn't crash.
- 	io__check_file_accessibility("unwritable",
diff --git a/dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch b/dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch
deleted file mode 100644
index b33e868821e8..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-tests-static-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-tests-10.04.1.orig/hard_coded/Mmakefile	2010-05-03 22:27:02.000000000 +1200
-+++ mercury-tests-10.04.1/hard_coded/Mmakefile	2010-07-28 20:17:50.000000000 +1200
-@@ -677,7 +677,7 @@
- PROGS = $(ORDINARY_PROGS) $(PROF_PROGS) $(BROKEN_FOR_LCC_PROGS) \
- 	$(CLOSURE_LAYOUT_PROGS) $(NON_PROFDEEP_PROGS) \
- 	$(BACKEND_PROGS) $(NONDET_C_PROGS) \
--	$(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \
-+	$(C_AND_GC_ONLY_PROGS) \
- 	$(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
- 	$(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
- 	$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
diff --git a/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
deleted file mode 100644
index e68899edfe92..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.1-tests-workspace.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mercury-tests-10.04.1.orig/Mmake.common	2010-02-15 19:49:51.000000000 +1300
-+++ mercury-tests-10.04.1/Mmake.common	2010-09-05 09:34:38.000000000 +1200
-@@ -79,8 +79,8 @@
- -include $(TESTS_DIR)/Mmake.params
- 
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
--ifdef WORKSPACE_FLAGS
--MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+ifdef WORKSPACE
-+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
- endif
- 
- # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-10.04.1.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.1/configure.in	2010-10-10 11:49:06.000000000 +1300
-@@ -5048,10 +5048,10 @@
-     test_flags="tests/TESTS_FLAGS"
-     test_mdbrc="tests/mdbrc"
- else
--    if test -e ../tests/TESTS_FLAGS.in
-+    if test -e ../mercury-tests-10.04.1/TESTS_FLAGS.in
-     then
--        test_flags="../tests/TESTS_FLAGS"
--        test_mdbrc="../tests/mdbrc"
-+        test_flags="../mercury-tests-10.04.1/TESTS_FLAGS"
-+        test_mdbrc="../mercury-tests-10.04.1/mdbrc"
-     else
-         test_flags=""
-         test_mdbrc=""
diff --git a/dev-lang/mercury/files/mercury-10.04.2-boehm_gc.patch b/dev-lang/mercury/files/mercury-10.04.2-boehm_gc.patch
deleted file mode 100644
index 5aea83405c2d..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-boehm_gc.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -urN mercury-compiler-10.04.2.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.1/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.2.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04.2/boehm_gc/Makefile.direct	2010-09-05 09:07:10.000000000 +1200
-@@ -407,6 +407,7 @@
- 	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
- 	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
- 	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
-+	./if_mach SPARC LINUX $(CC) -c -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
- 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
- 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-diff -urN mercury-compiler-10.04.2.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h mercury-compiler-10.04.1/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
---- mercury-compiler-10.04.2.orig/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-02-23 19:28:41.000000000 +1300
-+++ mercury-compiler-10.04.2/boehm_gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h	2010-09-05 09:07:10.000000000 +1200
-@@ -39,32 +39,6 @@
- 
- #define AO_HAVE_test_and_set_full
- 
--#ifndef AO_NO_SPARC_V9
--/* Returns nonzero if the comparison succeeded. */
--AO_INLINE int
--AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val) {
--  char ret;
--  __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
--#                       if defined(__arch64__)
--                          "casx [%2],%0,%1\n\t"
--#                       else
--                          "cas [%2],%0,%1\n\t" /* 32-bit version */
--#                       endif
--                        "membar #StoreLoad | #StoreStore\n\t"
--                        "cmp %0,%1\n\t"
--                        "be,a 0f\n\t"
--                        "mov 1,%0\n\t"/* one insn after branch always executed */
--                        "clr %0\n\t"
--                        "0:\n\t"
--                        : "=r" (ret), "+r" (new_val)
--                        : "r" (addr), "0" (old)
--                        : "memory", "cc");
--  return (int)ret;
--}
--
--#define AO_HAVE_compare_and_swap_full
--#endif /* AO_NO_SPARC_V9 */
--
- /* FIXME: This needs to be extended for SPARC v8 and v9.        */
- /* SPARC V8 also has swap.  V9 has CAS.                         */
- /* There are barriers like membar #LoadStore.                   */
-diff -urN mercury-compiler-10.04.2.orig/boehm_gc/sparc_generic_mach_dep.c mercury-compiler-10.04.1/boehm_gc/sparc_generic_mach_dep.c
---- mercury-compiler-10.04.2.orig/boehm_gc/sparc_generic_mach_dep.c	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-compiler-10.04.2/boehm_gc/sparc_generic_mach_dep.c	2010-09-05 09:07:10.000000000 +1200
-@@ -0,0 +1,82 @@
-+# include "private/gc_priv.h"
-+
-+/* On register window machines, we need a way to force registers into 	*/
-+/* the stack.	Return sp.						*/
-+# ifdef SPARC
-+    asm("	.seg 	\"text\"");
-+#   if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
-+      asm("	.globl	GC_save_regs_in_stack");
-+      asm("GC_save_regs_in_stack:");
-+      asm("	.type GC_save_regs_in_stack,#function");
-+#   else
-+      asm("	.globl	_GC_save_regs_in_stack");
-+      asm("_GC_save_regs_in_stack:");
-+#   endif
-+#   if defined(__arch64__) || defined(__sparcv9)
-+      asm("	save	%sp,-128,%sp");
-+      asm("	flushw");
-+      asm("	ret");
-+      asm("	restore %sp,2047+128,%o0");
-+#   else
-+      asm("	ta	0x3   ! ST_FLUSH_WINDOWS");
-+      asm("	retl");
-+      asm("	mov	%sp,%o0");
-+#   endif
-+#   ifdef SVR4
-+      asm("	.GC_save_regs_in_stack_end:");
-+      asm("	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
-+#   endif
-+#   ifdef LINT
-+	word GC_save_regs_in_stack() { return(0 /* sp really */);}
-+#   endif
-+# endif
-+
-+/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and	*/
-+/* returns arg.  Stack clearing is crucial on SPARC, so we supply	*/
-+/* an assembly version that's more careful.  Assumes limit is hotter	*/
-+/* than sp, and limit is 8 byte aligned.				*/
-+#if defined(ASM_CLEAR_CODE)
-+# ifdef SUNOS4
-+    asm(".globl _GC_clear_stack_inner");
-+    asm("_GC_clear_stack_inner:");
-+# else
-+    asm(".globl GC_clear_stack_inner");
-+    asm("GC_clear_stack_inner:");
-+    asm(".type GC_save_regs_in_stack,#function");
-+# endif
-+#if defined(__arch64__) || defined(__sparcv9)
-+  asm("mov %sp,%o2");		/* Save sp			*/
-+  asm("add %sp,2047-8,%o3");	/* p = sp+bias-8		*/
-+  asm("add %o1,-2047-192,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("stx %g0,[%o3]");		/* *(long *)p = 0		*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu,pt %xcc, loop");	/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#else
-+  asm("mov %sp,%o2");		/* Save sp	*/
-+  asm("add %sp,-8,%o3");	/* p = sp-8	*/
-+  asm("clr %g1");		/* [g0,g1] = 0	*/
-+  asm("add %o1,-0x60,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("std %g0,[%o3]");		/* *(long long *)p = 0	*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu loop	");		/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#endif /* old SPARC */
-+  /* First argument = %o0 = return value */
-+#   ifdef SVR4
-+      asm("	.GC_clear_stack_inner_end:");
-+      asm("	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
-+#   endif  
-+#endif
diff --git a/dev-lang/mercury/files/mercury-10.04.2-bootstrap-depend.patch b/dev-lang/mercury/files/mercury-10.04.2-bootstrap-depend.patch
deleted file mode 100644
index c4e5d89e5c75..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-bootstrap-depend.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-compiler-10.04.2.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04.2/Mmakefile	2010-10-10 10:05:55.000000000 +1300
-@@ -167,6 +167,13 @@
- 		library/$(deps_subdir)$(STD_LIB_NAME).dep
- 	+cd deep_profiler && $(SUBDIR_MMAKE) depend
- 
-+.PHONY: bootstrap_depend
-+ifeq ("$(BOOTSTRAP_MC)","")
-+bootstrap_depend:
-+else
-+bootstrap_depend: depend
-+endif
-+
- # depend_library MUST be done before depend_compiler and depend_profiler
- 
- .PHONY: depend
---- mercury-compiler-10.04.2.orig/Mmake.common.in	2009-10-10 23:44:13.000000000 +1300
-+++ mercury-compiler-10.04.2/Mmake.common.in	2010-10-10 10:21:52.000000000 +1300
-@@ -30,6 +30,7 @@
- 
- # Specify the Mercury compiler to use for bootstrapping.
- MC		= @BOOTSTRAP_MC_COMPILER@
-+BOOTSTRAP_MC    = @BOOTSTRAP_MC@
- 
- # Specify the compilation model to use for compiling the compiler.
- GRADE		= @GRADE@
---- mercury-compiler-10.04.2.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.2/configure.in	2010-10-10 11:42:43.000000000 +1300
-@@ -4426,11 +4426,11 @@
- #-----------------------------------------------------------------------------#
- 
- if test "$BOOTSTRAP_MC" = ""; then
--    BOOTSTRAP_MC=mmc
-+    BOOTSTRAP_MC_COMPILER=mmc
-+else
-+    BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
- fi
--BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
- BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
--BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
- AC_SUBST(BOOTSTRAP_MC_COMPILER)
- AC_SUBST(BOOTSTRAP_MC_ARGS)
- AC_SUBST(BOOTSTRAP_MC)
diff --git a/dev-lang/mercury/files/mercury-10.04.2-char-det-from-int.patch b/dev-lang/mercury/files/mercury-10.04.2-char-det-from-int.patch
deleted file mode 100644
index 6136ec3ab501..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-char-det-from-int.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mercury-compiler-10.04.2.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.2/configure.in	2010-10-10 11:39:59.000000000 +1300
-@@ -309,7 +309,8 @@
-                 Version >= 8,
-                 ac(2) ^ elem(3, 5) = 17,
-                 (1 .. 2) = [[1, 2]],
--                Global = 561
-+                Global = 561,
-+                char.det_from_int(255) = '\xFF\'
-             ->
-                 trace [[io(!S)]] (
-                     io.print("Hello, world\n", !S)
diff --git a/dev-lang/mercury/files/mercury-10.04.2-default-grade.patch b/dev-lang/mercury/files/mercury-10.04.2-default-grade.patch
deleted file mode 100644
index e507e05a1aba..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-default-grade.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -ur mercury-compiler-10.04.2.orig/Makefile mercury-compiler-10.04.1/Makefile
---- mercury-compiler-10.04.2.orig/Makefile	2010-07-12 04:31:01.000000000 +1200
-+++ mercury-compiler-10.04.2/Makefile	2010-09-05 09:02:03.000000000 +1200
-@@ -69,6 +69,6 @@
- 	$(MMAKE) uninstall
- 
- .DEFAULT:
--	$(MMAKE) $@
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
- 
- #-----------------------------------------------------------------------------#
-diff -ur mercury-compiler-10.04.2.orig/Mmakefile mercury-compiler-10.04.1/Mmakefile
---- mercury-compiler-10.04.2.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04.2/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -286,6 +286,47 @@
- 		mdbcomp browser ssdb trace
- 	+cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+.PHONY: default_grade
-+default_grade:
-+	+if test "$(DEFAULT_GRADE)" != "$(GRADE)"; then                              \
-+	    gc_grade=`scripts/ml --grade $(DEFAULT_GRADE) --print-gc-grade`;         \
-+	    IWS=`/bin/pwd`/install_grade_dir.$(DEFAULT_GRADE);                       \
-+	    (                                                                        \
-+		scripts/prepare_install_dir $${IWS} &&                               \
-+		( cd $${IWS}/boehm_gc &&                                             \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			GC_GRADE=$${gc_grade} libgrade ) &&                          \
-+		( cd $${IWS}/runtime &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/library &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/mdbcomp &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/browser &&                                              \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/ssdb &&                                                 \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			depend &&                                                    \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		( cd $${IWS}/trace &&                                                \
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$(DEFAULT_GRADE) WORKSPACE=$${IWS}    \
-+			libgrade ) &&                                                \
-+		true                                                                 \
-+	    ) ||                                                                     \
-+	    { exit 1; };                                                             \
-+	fi;
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-diff -ur mercury-compiler-10.04.2.orig/boehm_gc/Mmakefile mercury-compiler-10.04.1/boehm_gc/Mmakefile
---- mercury-compiler-10.04.2.orig/boehm_gc/Mmakefile	2010-02-27 02:16:44.000000000 +1300
-+++ mercury-compiler-10.04.2/boehm_gc/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -176,6 +176,9 @@
- 
- # No need to install the Boehm collector for grades which don't use it.
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -187,6 +190,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: install_dirs
- 	cp $(HEADERS) $(INSTALL_INC_DIR)
-diff -ur mercury-compiler-10.04.2.orig/browser/Mmakefile mercury-compiler-10.04.1/browser/Mmakefile
---- mercury-compiler-10.04.2.orig/browser/Mmakefile	2010-05-10 18:31:55.000000000 +1200
-+++ mercury-compiler-10.04.2/browser/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -256,16 +256,28 @@
- 
- # there is no browser in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(BROWSER_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(BROWSER_LIB_NAME).$A \
-+	lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(BROWSER_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.2.orig/library/Mmakefile mercury-compiler-10.04.1/library/Mmakefile
---- mercury-compiler-10.04.2.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04.2/library/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -493,6 +493,9 @@
- 
- # XXX some modules in the browser directory need library.int3
- 
-+.PHONY: libgrade
-+libgrade: mercury.dll
-+
- .PHONY: install_library
- install_library: mercury.dll install_grade_dirs install_gac \
- 		install_strong_name lib$(STD_LIB_NAME).install_grade_hdrs \
-@@ -531,6 +534,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- # we depend on lib$(STD_LIB_NAME) because lib$(STD_LIB_NAME).install_library
- # doesn't make library.int3, but some modules in the browser directory need it.
- 
-@@ -541,6 +547,9 @@
- 
- else	#ifneq ($(MMAKE_USE_MMC_MAKE),yes)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME) all-ints
-+
- .PHONY: install_mercury
- install_mercury: install_library
- 
-diff -ur mercury-compiler-10.04.2.orig/mdbcomp/Mmakefile mercury-compiler-10.04.1/mdbcomp/Mmakefile
---- mercury-compiler-10.04.2.orig/mdbcomp/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04.2/mdbcomp/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -215,16 +215,28 @@
- 
- # there is no debugger in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(MDBCOMP_LIB_NAME).install
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(MDBCOMP_LIB_NAME).$A \
-+	lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(MDBCOMP_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.2.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
---- mercury-compiler-10.04.2.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.2/runtime/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -466,6 +466,9 @@
- # mercury/library/Mmakefile.)
- # (Runtime support for the Erlang backend is in the library directory.)
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -478,6 +481,9 @@
- else
- ifeq ($(findstring il,$(GRADE)),il)
- 
-+.PHONY: libgrade
-+libgrade: $(DOTNET_DLLS)
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -492,6 +498,9 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- # mercury_conf.h needs to be in a separate directory so it can be
- # overridden by a different configuration.
- .PHONY: install_headers
-diff -ur mercury-compiler-10.04.2.orig/ssdb/Mmakefile mercury-compiler-10.04.1/ssdb/Mmakefile
---- mercury-compiler-10.04.2.orig/ssdb/Mmakefile	2010-05-10 18:32:00.000000000 +1200
-+++ mercury-compiler-10.04.2/ssdb/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -250,16 +250,28 @@
- 
- # there is no ssdb in the .NET or Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library:
- 
- else ifneq (,$(findstring java,$(GRADE)))
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_library
- install_library: lib$(SSDB_LIB_NAME).install
- 
- else 
- 
-+.PHONY: libgrade
-+libgrade: \
-+	lib$(SSDB_LIB_NAME).$A \
-+	lib$(SSDB_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+	all-ints
-+
- .PHONY: install_library
- install_library:				\
- 	lib$(SSDB_LIB_NAME).install_library	\
-diff -ur mercury-compiler-10.04.2.orig/trace/Mmakefile mercury-compiler-10.04.1/trace/Mmakefile
---- mercury-compiler-10.04.2.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04.2/trace/Mmakefile	2010-09-05 09:02:03.000000000 +1200
-@@ -324,6 +324,9 @@
- 
- # there is no tracing in the .NET, Java, Erlang backends
- 
-+.PHONY: libgrade
-+libgrade:
-+
- .PHONY: install_headers
- install_headers:
- 
-@@ -332,6 +335,13 @@
- 
- else
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(TRACE_LIB_NAME).$A \
-+		lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+		lib$(EVENTSPEC_LIB_NAME).$A \
-+		lib$(EVENTSPEC_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- .PHONY: install_headers
- install_headers: $(HDRS) $(LIB_GLOBALS_H)
- 	cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
diff --git a/dev-lang/mercury/files/mercury-10.04.2-docs.patch b/dev-lang/mercury/files/mercury-10.04.2-docs.patch
deleted file mode 100644
index 83aeb51981a9..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur mercury-compiler-10.04.2.orig/doc/Mmakefile mercury-compiler-10.04.1/doc/Mmakefile
---- mercury-compiler-10.04.2.orig/doc/Mmakefile	2010-07-07 01:42:07.000000000 +1200
-+++ mercury-compiler-10.04.2/doc/Mmakefile	2010-09-05 09:13:40.000000000 +1200
-@@ -120,7 +120,7 @@
- 	# formatted versions of the man pages.
- 	# But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -351,7 +351,7 @@
- 	# versions of the documentation.  If they are added they should
- 	# be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
- 	install_mdb_doc
- 	# install_text install_ps
- 
diff --git a/dev-lang/mercury/files/mercury-10.04.2-linker-flags.patch b/dev-lang/mercury/files/mercury-10.04.2-linker-flags.patch
deleted file mode 100644
index 521914121e45..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-linker-flags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur mercury-compiler-10.04.2.orig/boehm_gc/Makefile.direct mercury-compiler-10.04.2/boehm_gc/Makefile.direct
---- mercury-compiler-10.04.2.orig/boehm_gc/Makefile.direct	2010-02-24 20:04:32.000000000 +1300
-+++ mercury-compiler-10.04.2/boehm_gc/Makefile.direct	2010-10-10 17:46:02.000000000 +1300
-@@ -351,7 +351,7 @@
- 		-ldl `./threadlibs`
- 	./if_not_there on_sparc_sunos5_so $(MAKE) dyn_load.o
- 	./if_not_there on_sparc_sunos5_so \
--	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc
-+	$(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc $(EXTRA_LDFLAGS)
- 
- # Darwin shared library version of the gc.
- lib$(GC_GRADE).dylib: $(OBJS) $(UTILS)
-diff -ur mercury-compiler-10.04.2.orig/runtime/Mmakefile mercury-compiler-10.04.2/runtime/Mmakefile
---- mercury-compiler-10.04.2.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.2/runtime/Mmakefile	2010-10-10 17:48:34.000000000 +1300
-@@ -387,7 +387,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(RT_LIB_NAME).so $(PIC_OBJS)			\
- 		$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_GC_LIB_DIR)	\
--		$(LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
-+		$(ALL_LDFLAGS) $(LDLIBS) $(THREADLIBS)			\
- 		$(SHARED_LIBS)
- 
- # For Darwin we should pass the -install_name option.
-diff -ur mercury-compiler-10.04.2.orig/trace/Mmakefile mercury-compiler-10.04.2/trace/Mmakefile
---- mercury-compiler-10.04.2.orig/trace/Mmakefile	2008-07-30 05:58:58.000000000 +1200
-+++ mercury-compiler-10.04.2/trace/Mmakefile	2010-10-10 17:49:27.000000000 +1300
-@@ -273,6 +273,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(TRACE_LIB_NAME).so $(TRACE_PIC_OBJS)		\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)						\
- 		$(TRACE_LDFLAGS) $(TRACE_LDLIBS) $(THREADLIBS)		\
- 		$(SHARED_LIBS)
- 
-@@ -280,6 +281,7 @@
- 	$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED)				\
- 		-o lib$(EVENTSPEC_LIB_NAME).so $(EVENTSPEC_PIC_OBJS)	\
- 		$(RPATH_1)$(RPATH_2)					\
-+		$(ALL_LDFLAGS)						\
- 		$(EVENTSPEC_LDFLAGS) $(EVENTSPEC_LDLIBS) $(THREADLIBS)	\
- 		$(SHARED_LIBS)
- 
-diff -ur mercury-compiler-10.04.2.orig/util/Mmakefile mercury-compiler-10.04.2/util/Mmakefile
---- mercury-compiler-10.04.2.orig/util/Mmakefile	2010-07-12 04:31:03.000000000 +1200
-+++ mercury-compiler-10.04.2/util/Mmakefile	2010-10-10 17:50:21.000000000 +1300
-@@ -41,16 +41,16 @@
- 
- .c:
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ $< $(GETOPT_SRC)
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ $< $(GETOPT_SRC)
- 
- mkinit: mkinit.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit.c mkinit_common.c $(GETOPT_SRC)
- 
- mkinit_erl: mkinit_erl.c mkinit_common.c mkinit_common.h
- 	$(MGNUC) --no-mercury-stdlib-dir \
--		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \
-+		$(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \
- 			mkinit_erl.c mkinit_common.c $(GETOPT_SRC)
- 
- tags:
diff --git a/dev-lang/mercury/files/mercury-10.04.2-multilib.patch b/dev-lang/mercury/files/mercury-10.04.2-multilib.patch
deleted file mode 100644
index 1c22c82415c5..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-multilib.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-diff -ur mercury-compiler-10.04.2.orig/compiler/file_util.m mercury-compiler-10.04.2/compiler/file_util.m
---- mercury-compiler-10.04.2.orig/compiler/file_util.m	2009-10-14 18:28:32.000000000 +1300
-+++ mercury-compiler-10.04.2/compiler/file_util.m	2010-10-10 17:25:54.000000000 +1300
-@@ -261,7 +261,7 @@
-     ( InstallNamePath0 = "" ->
-         globals.lookup_string_option(Globals, install_prefix, InstallPrefix),
-         grade_directory_component(Globals, GradeDir),
--        InstallNamePath = InstallPrefix / "lib" / "mercury" / "lib" / GradeDir
-+        InstallNamePath = InstallPrefix / "@libdir@" / "mercury" / "lib" / GradeDir
-     ;
-         InstallNamePath = InstallNamePath0
-     ),
-diff -ur mercury-compiler-10.04.2.orig/compiler/libs.file_util.c mercury-compiler-10.04.2/compiler/libs.file_util.c
---- mercury-compiler-10.04.2.orig/compiler/libs.file_util.c	2010-10-04 23:20:31.000000000 +1300
-+++ mercury-compiler-10.04.2/compiler/libs.file_util.c	2010-10-10 17:27:26.000000000 +1300
-@@ -856,7 +856,7 @@
- 	MR_tempr1 = MR_sv(1);
- 	MR_sv(1) = MR_r1;
- 	MR_r1 = MR_tempr1;
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	}
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		libs__file_util__get_install_name_option_3_0_i8);
-diff -ur mercury-compiler-10.04.2.orig/compiler/make.program_target.c mercury-compiler-10.04.2/compiler/make.program_target.c
---- mercury-compiler-10.04.2.orig/compiler/make.program_target.c	2010-10-04 23:23:09.000000000 +1300
-+++ mercury-compiler-10.04.2/compiler/make.program_target.c	2010-10-10 17:33:27.000000000 +1300
-@@ -5422,7 +5422,7 @@
- 		make__program_target__install_grade_init_6_0_i2);
- MR_def_label(make__program_target__install_grade_init_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_init_6_0_i3);
- MR_def_label(make__program_target__install_grade_init_6_0,3)
-@@ -5873,7 +5873,7 @@
- 		make__program_target__make_grade_install_dirs_6_0_i2);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_grade_install_dirs_6_0_i3);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
-@@ -6318,7 +6318,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i14);
- MR_def_label(make__program_target__install_library_grade_files_10_0,14)
-@@ -6382,7 +6382,7 @@
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i20);
- 	}
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i23);
- MR_def_label(make__program_target__install_library_grade_files_10_0,23)
-@@ -6448,7 +6448,7 @@
- MR_def_label(make__program_target__install_library_grade_files_10_0,20)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
- 	MR_r1 = MR_sv(10);
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i30);
- MR_def_label(make__program_target__install_library_grade_files_10_0,30)
-@@ -6585,7 +6585,7 @@
- 		make__program_target__make_install_dirs_5_0_i2);
- MR_def_label(make__program_target__make_install_dirs_5_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_install_dirs_5_0_i3);
- MR_def_label(make__program_target__make_install_dirs_5_0,3)
-@@ -6806,7 +6806,7 @@
- 		make__program_target__install_library_7_0_i11);
- MR_def_label(make__program_target__install_library_7_0,11)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_7_0_i12);
- MR_def_label(make__program_target__install_library_7_0,12)
-@@ -10596,7 +10596,7 @@
- 		make__program_target__install_ints_and_headers_8_0_i13);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_ints_and_headers_8_0_i14);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
-@@ -11222,7 +11222,7 @@
- 		make__program_target__install_grade_ints_and_headers_9_0_i5);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_ints_and_headers_9_0_i6);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
-diff -ur mercury-compiler-10.04.2.orig/compiler/make.program_target.m mercury-compiler-10.04.2/compiler/make.program_target.m
---- mercury-compiler-10.04.2.orig/compiler/make.program_target.m	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04.2/compiler/make.program_target.m	2010-10-10 17:37:09.000000000 +1300
-@@ -1370,7 +1370,7 @@
-         ),
- 
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
--        LibDir = Prefix/"lib"/"mercury",
-+        LibDir = Prefix/"@libdir@"/"mercury",
-         list.map_foldl(
-             install_subdir_file(Globals, SubdirLinkSucceeded, LibDir/"ints",
-                 ModuleName),
-@@ -1424,7 +1424,7 @@
-     globals.lookup_accumulating_option(Globals, extra_library_header,
-         ExtraHdrs),
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    IncDir = Prefix / "lib" / "mercury" / "inc",
-+    IncDir = Prefix / "@libdir@" / "mercury" / "inc",
-     list.foldl2(install_extra_header(Globals, IncDir), ExtraHdrs,
-         yes, ExtraHdrsSucceeded, !IO).
- 
-@@ -1572,19 +1572,19 @@
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
- 
-         ( string.prefix(GradeDir, "java") ->
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             install_file(Globals, JarFileName, GradeLibDir, LibsSucceeded,
-                 !IO),
-             InitSucceeded = yes
-         ; string.prefix(GradeDir, "erlang") ->
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             % Our "Erlang archives" are actually directories.
-             install_directory(Globals, ErlangArchiveFileName, GradeLibDir,
-                 LibsSucceeded, !IO),
-             install_grade_init(Globals, GradeDir, ModuleName, InitSucceeded,
-                 !IO)
-         ;
--            GradeLibDir = Prefix/"lib"/"mercury"/"lib"/GradeDir,
-+            GradeLibDir = Prefix/"@libdir@"/"mercury"/"lib"/GradeDir,
-             maybe_install_library_file(Globals, "static", LibFileName,
-                 GradeLibDir, LibSuccess, !IO),
-             ( LibFileName = SharedLibFileName ->
-@@ -1615,7 +1615,7 @@
- 
- install_grade_init(Globals, GradeDir, ModuleName, Succeeded, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    GradeModulesDir = Prefix / "lib" / "mercury" / "modules" / GradeDir,
-+    GradeModulesDir = Prefix / "@libdir@" / "mercury" / "modules" / GradeDir,
-     module_name_to_file_name(Globals, ModuleName, ".init", do_not_create_dirs,
-         InitFileName, !IO),
-     install_file(Globals, InitFileName, GradeModulesDir, Succeeded, !IO).
-@@ -1632,7 +1632,7 @@
-     (
-         MaybeImports = yes(Imports),
-         globals.lookup_string_option(Globals, install_prefix, Prefix),
--        LibDir = Prefix/"lib"/"mercury",
-+        LibDir = Prefix/"@libdir@"/"mercury",
- 
-         globals.get_target(Globals, Target),
-         globals.lookup_bool_option(Globals, highlevel_code, HighLevelCode),
-@@ -1784,7 +1784,7 @@
- 
- make_install_dirs(Globals, Result, LinkResult, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    LibDir = Prefix/"lib"/"mercury",
-+    LibDir = Prefix/"@libdir@"/"mercury",
-     make_directory(LibDir/"inc", Result1, !IO),
-     make_directory(LibDir/"modules", Result2, !IO),
- 
-@@ -1815,7 +1815,7 @@
- 
- make_grade_install_dirs(Globals, Grade, Result, LinkResult, !IO) :-
-     globals.lookup_string_option(Globals, install_prefix, Prefix),
--    LibDir = Prefix/"lib"/"mercury",
-+    LibDir = Prefix/"@libdir@"/"mercury",
- 
-     GradeIntsSubdir = LibDir/"ints"/Grade/"Mercury",
-     make_directory(GradeIntsSubdir, Result1, !IO),
-diff -ur mercury-compiler-10.04.2.orig/library/Mmakefile mercury-compiler-10.04.2/library/Mmakefile
---- mercury-compiler-10.04.2.orig/library/Mmakefile	2010-05-20 21:29:30.000000000 +1200
-+++ mercury-compiler-10.04.2/library/Mmakefile	2010-10-10 17:38:55.000000000 +1300
-@@ -268,8 +268,8 @@
- 	[ -d jmercury/runtime ] || cp -r ../java/runtime jmercury
- 
- install_mer_rt: $(RT_LIB_NAME).jar
--	mkdir -p $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
--	cp $(RT_LIB_NAME).jar $(INSTALL_PREFIX)/lib/mercury/lib/$(GRADE)
-+	mkdir -p $(INSTALL_LIBDIR)/lib/$(GRADE)
-+	cp $(RT_LIB_NAME).jar $(INSTALL_LIBDIR)/lib/$(GRADE)
- 
- else
- 
-diff -ur mercury-compiler-10.04.2.orig/scripts/Mmake.vars.in mercury-compiler-10.04.2/scripts/Mmake.vars.in
---- mercury-compiler-10.04.2.orig/scripts/Mmake.vars.in	2010-05-20 21:29:31.000000000 +1200
-+++ mercury-compiler-10.04.2/scripts/Mmake.vars.in	2010-10-10 17:40:53.000000000 +1300
-@@ -688,17 +688,17 @@
- INSTALL_PREFIX		= @prefix@
- FINAL_INSTALL_PREFIX	= @prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
- INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PS_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
- INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-10.04.2-no-reconf.patch b/dev-lang/mercury/files/mercury-10.04.2-no-reconf.patch
deleted file mode 100644
index 2cfb5ba2e2c3..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-no-reconf.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur mercury-compiler-10.04.2.orig/Mmakefile mercury-compiler-10.04.1/Mmakefile
---- mercury-compiler-10.04.2.orig/Mmakefile	2009-10-20 17:07:24.000000000 +1300
-+++ mercury-compiler-10.04.2/Mmakefile	2010-10-23 09:45:13.000000000 +1300
-@@ -533,8 +533,7 @@
- 	install_slice \
- 	install_profiler \
- 	install_deep_profiler \
--	install_doc \
--	install_config
-+	install_doc
- 
- .PHONY: install_scripts
- install_scripts: scripts
-diff -ur mercury-compiler-10.04.2.orig/runtime/Mmakefile mercury-compiler-10.04.1/runtime/Mmakefile
---- mercury-compiler-10.04.2.orig/runtime/Mmakefile	2010-07-16 03:24:52.000000000 +1200
-+++ mercury-compiler-10.04.2/runtime/Mmakefile	2010-09-05 09:15:31.000000000 +1200
-@@ -455,8 +455,6 @@
- 		mkdir -p $(INSTALL_GRADE_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifneq "$(filter java% erlang%,$(GRADE))" ""
- 
-@@ -502,7 +500,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
-diff -ur mercury-compiler-10.04.2.orig/scripts/Mmakefile mercury-compiler-10.04.1/scripts/Mmakefile
---- mercury-compiler-10.04.2.orig/scripts/Mmakefile	2009-09-02 11:54:38.000000000 +1200
-+++ mercury-compiler-10.04.2/scripts/Mmakefile	2010-09-05 09:15:31.000000000 +1200
-@@ -24,17 +24,13 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
- 	mprof \
--	mtags \
--	prepare_install_dir
-+	mtags
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -113,8 +109,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -132,7 +126,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch b/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch
deleted file mode 100644
index b6740d5abb01..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-prepare-install-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-10.04.2.orig/scripts/prepare_install_dir.in	2010-02-24 20:04:42.000000000 +1300
-+++ mercury-compiler-10.04.2/scripts/prepare_install_dir.in	2010-10-31 12:50:11.000000000 +1300
-@@ -56,7 +56,7 @@
- cp boehm_gc/configure_atomic_ops.sh ${installdir}/boehm_gc
- cp boehm_gc/build_atomic_ops.sh* ${installdir}/boehm_gc
- cp -r boehm_gc/libatomic_ops-*[0-9] ${installdir}/boehm_gc
--cp -r boehm_gc/libatomic_ops ${installdir}/boehm_gc
-+cp -pr boehm_gc/libatomic_ops ${installdir}/boehm_gc
- cp -r boehm_gc/extra ${installdir}/boehm_gc
- rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.o
- rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.a
diff --git a/dev-lang/mercury/files/mercury-10.04.2-sparc-llds-base-grade.patch b/dev-lang/mercury/files/mercury-10.04.2-sparc-llds-base-grade.patch
deleted file mode 100644
index 7f1d0ce0597a..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-sparc-llds-base-grade.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-10.04.2.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.2/configure.in	2010-10-10 11:45:32.000000000 +1300
-@@ -3079,7 +3079,7 @@
- # The asm_fast and reg grades also do not currently work on Linux/PPC.
- #
- case "$host" in
--    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu)
-+    i*86*apple*darwin*|x86_64*apple*darwin*|powerpc*-linux-gnu|sparc*-linux-gnu)
-         BEST_LLDS_BASE_GRADE=none
-         ;;
- esac
diff --git a/dev-lang/mercury/files/mercury-10.04.2-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04.2-tests-sandbox.patch
deleted file mode 100644
index 828ea4d5566d..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-tests-sandbox.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur mercury-tests-10.04.2.orig/hard_coded/dir_test.exp mercury-tests-10.04.1/hard_coded/dir_test.exp
---- mercury-tests-10.04.2.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
-+++ mercury-tests-10.04.2/hard_coded/dir_test.exp	2010-09-05 09:40:36.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".
- "foo/"/"bar/baz" = "foo\bar\baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.2.orig/hard_coded/dir_test.exp2 mercury-tests-10.04.1/hard_coded/dir_test.exp2
---- mercury-tests-10.04.2.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04.2/hard_coded/dir_test.exp2	2010-09-05 09:40:36.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.2.orig/hard_coded/dir_test.exp3 mercury-tests-10.04.1/hard_coded/dir_test.exp3
---- mercury-tests-10.04.2.orig/hard_coded/dir_test.exp3	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04.2/hard_coded/dir_test.exp3	2010-09-05 09:40:36.000000000 +1200
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.2.orig/hard_coded/dir_test.exp4 mercury-tests-10.04.1/hard_coded/dir_test.exp4
---- mercury-tests-10.04.2.orig/hard_coded/dir_test.exp4	2010-03-04 13:39:48.000000000 +1300
-+++ mercury-tests-10.04.2/hard_coded/dir_test.exp4	2010-09-05 09:40:36.000000000 +1200
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -ur mercury-tests-10.04.2.orig/hard_coded/dir_test.m mercury-tests-10.04.1/hard_coded/dir_test.m
---- mercury-tests-10.04.2.orig/hard_coded/dir_test.m	2010-02-09 16:39:39.000000000 +1300
-+++ mercury-tests-10.04.2/hard_coded/dir_test.m	2010-09-05 09:40:36.000000000 +1200
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	% Execute permissions are not handled correctly on all platforms so
- 	% just check that it doesn't crash.
- 	io__check_file_accessibility("unwritable",
diff --git a/dev-lang/mercury/files/mercury-10.04.2-tests-static-link.patch b/dev-lang/mercury/files/mercury-10.04.2-tests-static-link.patch
deleted file mode 100644
index ec9b6b9672e3..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-tests-static-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-tests-10.04.2.orig/hard_coded/Mmakefile	2010-05-03 22:27:02.000000000 +1200
-+++ mercury-tests-10.04.2/hard_coded/Mmakefile	2010-07-28 20:17:50.000000000 +1200
-@@ -677,7 +677,7 @@
- PROGS = $(ORDINARY_PROGS) $(PROF_PROGS) $(BROKEN_FOR_LCC_PROGS) \
- 	$(CLOSURE_LAYOUT_PROGS) $(NON_PROFDEEP_PROGS) \
- 	$(BACKEND_PROGS) $(NONDET_C_PROGS) \
--	$(C_AND_GC_ONLY_PROGS) $(STATIC_LINK_PROGS) \
-+	$(C_AND_GC_ONLY_PROGS) \
- 	$(CHAR_REP_PROGS) $(C_ONLY_PROGS) \
- 	$(DOTNET_PROGS) $(JAVA_PROGS) $(SOLVER_PROGS) \
- 	$(TRAILED_PROGS) $(MUTABLE_PROGS) $(TRACE_GOAL_ENV_PROGS) \
diff --git a/dev-lang/mercury/files/mercury-10.04.2-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04.2-tests-workspace.patch
deleted file mode 100644
index 225497f4ce4e..000000000000
--- a/dev-lang/mercury/files/mercury-10.04.2-tests-workspace.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mercury-tests-10.04.2.orig/Mmake.common	2010-02-15 19:49:51.000000000 +1300
-+++ mercury-tests-10.04.2/Mmake.common	2010-09-05 09:34:38.000000000 +1200
-@@ -79,8 +79,8 @@
- -include $(TESTS_DIR)/Mmake.params
- 
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
--ifdef WORKSPACE_FLAGS
--MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+ifdef WORKSPACE
-+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
- endif
- 
- # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-10.04.2.orig/configure.in	2010-08-23 23:04:53.000000000 +1200
-+++ mercury-compiler-10.04.2/configure.in	2010-10-10 11:49:06.000000000 +1300
-@@ -5048,10 +5048,10 @@
-     test_flags="tests/TESTS_FLAGS"
-     test_mdbrc="tests/mdbrc"
- else
--    if test -e ../tests/TESTS_FLAGS.in
-+    if test -e ../mercury-tests-10.04.2/TESTS_FLAGS.in
-     then
--        test_flags="../tests/TESTS_FLAGS"
--        test_mdbrc="../tests/mdbrc"
-+        test_flags="../mercury-tests-10.04.2/TESTS_FLAGS"
-+        test_mdbrc="../mercury-tests-10.04.2/mdbrc"
-     else
-         test_flags=""
-         test_mdbrc=""
diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild
index 8386c60c226b..f7c02e2c8891 100644
--- a/dev-lang/mercury/mercury-10.04.1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.3 2010/10/10 00:09:47 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.4 2010/11/03 07:10:08 keri Exp $
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
 HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
 SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,15 +36,9 @@ SITEFILE=50${PN}-gentoo.el
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-linker-flags.patch
-	epatch "${FILESDIR}"/${P}-bootstrap-depend.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-char-det-from-int.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/file_util.m \
@@ -62,9 +58,7 @@ src_unpack() {
 	touch "${S}"/compiler/*.c
 
 	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-		epatch "${FILESDIR}"/${P}-tests-static-link.patch
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
 	cd "${S}"
diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild
index 1a7615e76941..4613b4f01346 100644
--- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.2-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.3 2010/10/31 00:02:59 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2-r1.ebuild,v 1.4 2010/11/03 07:10:08 keri Exp $
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
 HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
 SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,16 +36,9 @@ SITEFILE=50${PN}-gentoo.el
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-linker-flags.patch
-	epatch "${FILESDIR}"/${P}-bootstrap-depend.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-prepare-install-dir.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-char-det-from-int.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/file_util.m \
@@ -64,9 +59,7 @@ src_unpack() {
 	touch "${S}"/compiler/*.c
 
 	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-		epatch "${FILESDIR}"/${P}-tests-static-link.patch
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
 	cd "${S}"
diff --git a/dev-lang/mercury/mercury-10.04.2.ebuild b/dev-lang/mercury/mercury-10.04.2.ebuild
index f349bbe30627..8884d52dd56f 100644
--- a/dev-lang/mercury/mercury-10.04.2.ebuild
+++ b/dev-lang/mercury/mercury-10.04.2.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v 1.1 2010/10/10 05:01:38 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.2.ebuild,v 1.2 2010/11/03 07:10:08 keri Exp $
 
 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
 HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
 SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,15 +36,9 @@ SITEFILE=50${PN}-gentoo.el
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-linker-flags.patch
-	epatch "${FILESDIR}"/${P}-bootstrap-depend.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-char-det-from-int.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/file_util.m \
@@ -62,9 +58,7 @@ src_unpack() {
 	touch "${S}"/compiler/*.c
 
 	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-		epatch "${FILESDIR}"/${P}-tests-static-link.patch
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 
 	cd "${S}"
diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
index 76cad9f26f9a..a0ec717a9742 100644
--- a/dev-lang/mercury/mercury-10.04.ebuild
+++ b/dev-lang/mercury/mercury-10.04.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.6 2010/07/28 08:24:55 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.ebuild,v 1.7 2010/11/03 07:10:08 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
+PATCHSET_VER="0"
 MY_P=${PN}-compiler-${PV}
 
 DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
 HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
 SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
 	test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -34,22 +36,16 @@ SITEFILE=50${PN}-gentoo.el
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-default-grade.patch
-	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	sed -i -e "s/@libdir@/$(get_libdir)/" \
 		"${S}"/compiler/make.program_target.c \
 		"${S}"/scripts/Mmake.vars.in
 
 	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-		epatch "${FILESDIR}"/${P}-tests-mercury-float.patch
-		epatch "${FILESDIR}"/${P}-tests-static-link.patch
+		epatch "${WORKDIR}"/${PV}-tests
 	fi
 }
author	Keri Harris <keri@gentoo.org>	2010-11-03 07:10:10 +0000
committer	Keri Harris <keri@gentoo.org>	2010-11-03 07:10:10 +0000
commit	f63f524051d0e372f6908fb90c65143e428d703c (patch)
tree	e973418fe8294b3159ba638b650de08c4c44aa2a /dev-lang/mercury
parent	Respect CC (bug #343945). (diff)
download	historical-f63f524051d0e372f6908fb90c65143e428d703c.tar.gz historical-f63f524051d0e372f6908fb90c65143e428d703c.tar.bz2 historical-f63f524051d0e372f6908fb90c65143e428d703c.zip