diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-01-13 03:40:07 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-01-13 03:40:07 +0000 |
| commit | d79581738e602a7adff9ee7fcfb119602bbae281 (patch) | |
| tree | b3b7659d21a740b80f254bcd939e7a3efd207f57 /dev-lang/mercury | |
| parent | Remove old -0.13.0 version. (diff) | |
| download | historical-d79581738e602a7adff9ee7fcfb119602bbae281.tar.gz historical-d79581738e602a7adff9ee7fcfb119602bbae281.tar.bz2 historical-d79581738e602a7adff9ee7fcfb119602bbae281.zip | |
Remove old -0.13.0 version.
Package-Manager: portage-2.1.2_rc4-r2
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/Manifest | 61 | ||||
| -rw-r--r-- | dev-lang/mercury/files/digest-mercury-0.13.0 | 6 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-CFLAGS.patch | 31 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-LIBDIR.patch | 55 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch | 19 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-bootstrap.patch | 60 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch | 75 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-docs.patch | 20 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-libgrades.patch | 375 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch | 14 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch | 63 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-portage.patch | 91 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0-tests.patch | 120 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-0.13.0.ebuild | 121 |
14 files changed, 4 insertions, 1107 deletions
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index bbd6e1d4bc8f..7e8ae49e93a6 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -70,50 +70,6 @@ AUX mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322 MD5 cdfafee8cc55f364644e65a4fc841b1c files/mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322070 files/mercury-0.12.2-tests.patch 7502 SHA256 8895bb246d111c3c09b309f3332a42f6bc3b6ea1f96f56537c2ccd2f82ac362f files/mercury-0.12.2-tests.patch 7502 -AUX mercury-0.13.0-CFLAGS.patch 1323 RMD160 7de97579d81eaad521232981d32f0e9f2113a03f SHA1 0bb34affd44043dd6df58aadaa17e85204468fbc SHA256 7be5d4a8563fc17ea06fc064814d5963a61b2ff9978565270a1f67f06185e383 -MD5 cdcf65c651f63996b24a247f1566a684 files/mercury-0.13.0-CFLAGS.patch 1323 -RMD160 7de97579d81eaad521232981d32f0e9f2113a03f files/mercury-0.13.0-CFLAGS.patch 1323 -SHA256 7be5d4a8563fc17ea06fc064814d5963a61b2ff9978565270a1f67f06185e383 files/mercury-0.13.0-CFLAGS.patch 1323 -AUX mercury-0.13.0-LIBDIR.patch 2436 RMD160 f195f31663239ef050890f2405ced4e920384f67 SHA1 e8c37195a812543c9044583118dbb598deeff961 SHA256 fcd7d5065ca6fbf2ce8e566c44c48c13941c6c0c3f196d6d9d92f21ff06e53d4 -MD5 520754764f22b8c6e2d79d5688663047 files/mercury-0.13.0-LIBDIR.patch 2436 -RMD160 f195f31663239ef050890f2405ced4e920384f67 files/mercury-0.13.0-LIBDIR.patch 2436 -SHA256 fcd7d5065ca6fbf2ce8e566c44c48c13941c6c0c3f196d6d9d92f21ff06e53d4 files/mercury-0.13.0-LIBDIR.patch 2436 -AUX mercury-0.13.0-MAKEOPTS.patch 602 RMD160 c643bc8e7bd7d0702daa28399ecd0832eba67052 SHA1 233cef75ae8fb4929c817a567b62069cd6afa539 SHA256 b574a179667a77f66e125a8532c3241f144fd76c15c9a6d2d337be715451db08 -MD5 258fdfa846053588ee0ee46b498bf231 files/mercury-0.13.0-MAKEOPTS.patch 602 -RMD160 c643bc8e7bd7d0702daa28399ecd0832eba67052 files/mercury-0.13.0-MAKEOPTS.patch 602 -SHA256 b574a179667a77f66e125a8532c3241f144fd76c15c9a6d2d337be715451db08 files/mercury-0.13.0-MAKEOPTS.patch 602 -AUX mercury-0.13.0-bootstrap.patch 2277 RMD160 2983cbd69ef84a8a6a12e88755971b8c5616fe09 SHA1 e6562b9dc32ec661be48c9b78d48133568a3a864 SHA256 464ec654c11f95f80bd5afda0a3272240ff65b75aaebc220e108a701c6aba5e4 -MD5 304a52a90c4dada7ab8956edfeca06db files/mercury-0.13.0-bootstrap.patch 2277 -RMD160 2983cbd69ef84a8a6a12e88755971b8c5616fe09 files/mercury-0.13.0-bootstrap.patch 2277 -SHA256 464ec654c11f95f80bd5afda0a3272240ff65b75aaebc220e108a701c6aba5e4 files/mercury-0.13.0-bootstrap.patch 2277 -AUX mercury-0.13.0-deep_profiler.patch 2807 RMD160 6d801fca00afdd1d2f13d83eaf26e028cc5505e8 SHA1 34bd7f90ccd05fd8bdb08f830c4456b8bfa4f571 SHA256 fc97b4151e3f3539955d78ff0dbb2d35c4f9cfd5e63aa64abd868fcd42d398f9 -MD5 9a6d2467a9a15bb0f851d2e44bd414d0 files/mercury-0.13.0-deep_profiler.patch 2807 -RMD160 6d801fca00afdd1d2f13d83eaf26e028cc5505e8 files/mercury-0.13.0-deep_profiler.patch 2807 -SHA256 fc97b4151e3f3539955d78ff0dbb2d35c4f9cfd5e63aa64abd868fcd42d398f9 files/mercury-0.13.0-deep_profiler.patch 2807 -AUX mercury-0.13.0-docs.patch 796 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 SHA1 ec8d4e4a0f014d7371859380fa560d330ad82069 SHA256 5ec2c671e14a07f087ae2c997b2ca5a7c2b176ee46685d86f8e995535f76625c -MD5 07927ea891d5688ff041bc2c2bc82d2e files/mercury-0.13.0-docs.patch 796 -RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 files/mercury-0.13.0-docs.patch 796 -SHA256 5ec2c671e14a07f087ae2c997b2ca5a7c2b176ee46685d86f8e995535f76625c files/mercury-0.13.0-docs.patch 796 -AUX mercury-0.13.0-libgrades.patch 13854 RMD160 508cac88dd9abbde70861665ce4b3098b8c2643b SHA1 6628636cee4ef3221d8212dbc51625c153d12ed9 SHA256 5e5d2640c4ad2679b54c7d79106f64cdf4f1b47460bcbe8bafe142d3e7c62902 -MD5 1fdf1180e5bb0171e3dbdfca11ba83c2 files/mercury-0.13.0-libgrades.patch 13854 -RMD160 508cac88dd9abbde70861665ce4b3098b8c2643b files/mercury-0.13.0-libgrades.patch 13854 -SHA256 5e5d2640c4ad2679b54c7d79106f64cdf4f1b47460bcbe8bafe142d3e7c62902 files/mercury-0.13.0-libgrades.patch 13854 -AUX mercury-0.13.0-parallel-install_grades.patch 633 RMD160 c29c09ab486d5844267c7252e3ef7b7fe2e9400f SHA1 95592fb1348b1e1c512f90cbf179b6fedd2e7a6a SHA256 b55252444d4e93d80879151490ed6f3f58b3db6185e6defc44a0cf0152cc06c1 -MD5 19a002d59bfd65b6e582af78b2c6cbff files/mercury-0.13.0-parallel-install_grades.patch 633 -RMD160 c29c09ab486d5844267c7252e3ef7b7fe2e9400f files/mercury-0.13.0-parallel-install_grades.patch 633 -SHA256 b55252444d4e93d80879151490ed6f3f58b3db6185e6defc44a0cf0152cc06c1 files/mercury-0.13.0-parallel-install_grades.patch 633 -AUX mercury-0.13.0-pic_o-dependencies.patch 2812 RMD160 13eb8a0647c31a00981b88c7911bcfa2d963094b SHA1 fbee22ca0703378ac0da99522f4dbf569577bdea SHA256 375190a73f7e227e92676da91f0ce90d5fdb70c4d4227fc687ab7b8491eb1591 -MD5 bf059ec3d719d394425386adf0aebe48 files/mercury-0.13.0-pic_o-dependencies.patch 2812 -RMD160 13eb8a0647c31a00981b88c7911bcfa2d963094b files/mercury-0.13.0-pic_o-dependencies.patch 2812 -SHA256 375190a73f7e227e92676da91f0ce90d5fdb70c4d4227fc687ab7b8491eb1591 files/mercury-0.13.0-pic_o-dependencies.patch 2812 -AUX mercury-0.13.0-portage.patch 2891 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 SHA1 7ea86360ddfdd869640980fcfae78f933becc02e SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c -MD5 c50f24a88e741f61d40a29cfa974607f files/mercury-0.13.0-portage.patch 2891 -RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 files/mercury-0.13.0-portage.patch 2891 -SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c files/mercury-0.13.0-portage.patch 2891 -AUX mercury-0.13.0-tests.patch 5614 RMD160 14d7e47cbdd33dfd982610578d161405f5947809 SHA1 54716f5822d7ef39613d119eef295f7b87d38135 SHA256 8e4f97836d09ca7f16f809de999d4f8e7649ff9ed19341dfb8443c35c7ea2baa -MD5 7c1c6efd4d47e98f1bafcf15303b4f4d files/mercury-0.13.0-tests.patch 5614 -RMD160 14d7e47cbdd33dfd982610578d161405f5947809 files/mercury-0.13.0-tests.patch 5614 -SHA256 8e4f97836d09ca7f16f809de999d4f8e7649ff9ed19341dfb8443c35c7ea2baa files/mercury-0.13.0-tests.patch 5614 AUX mercury-0.13.1-CFLAGS.patch 1323 RMD160 9a2dbc8c0e7bbd9b3848b5e04cf8119801891f91 SHA1 b632dd91ceabbd3a5de7605a1679848a48148fd8 SHA256 aa202b69450f4f122128f31c1976d45a7b05993629e5a7d3f60884c410a31ac6 MD5 316d2f1c83b67dc73f38d192802c030d files/mercury-0.13.1-CFLAGS.patch 1323 RMD160 9a2dbc8c0e7bbd9b3848b5e04cf8119801891f91 files/mercury-0.13.1-CFLAGS.patch 1323 @@ -187,10 +143,8 @@ MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074 SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647 files/mercury-0.13.1-tests.patch 15074 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572 -DIST mercury-compiler-0.13.0.tar.gz 15861463 RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b SHA1 7a9362225e1b51d7d1b342c39203ad0ef1b9f952 SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280 -DIST mercury-tests-0.13.0.tar.gz 984910 RMD160 1b90b941488b9da57ff27ab1506b902b5fa5e170 SHA1 df5fa6725bb37fdba8085a441687bf056111e4e7 SHA256 227561407d63d177e6bfdf08d58481a9dcf6228d225ca2b67643c1af16cedc08 DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc EBUILD mercury-0.12.2-r3.ebuild 3480 RMD160 76aa125496eea3c83dd164a46f251981c4abcd3d SHA1 69ad4061c397804cd87733c19d2b8287dee54508 SHA256 ab2021cbf4a9c321844c043e1209b12f78860633154ae1e30352d12a34d950c2 MD5 a23fff3e33f967e55271be97e02cc9e8 mercury-0.12.2-r3.ebuild 3480 @@ -200,10 +154,6 @@ EBUILD mercury-0.12.2-r4.ebuild 3812 RMD160 e324a875a6af507727359ed6ab10b7a75f42 MD5 aabaad45ab2a0e5a17de09ecf8cc5465 mercury-0.12.2-r4.ebuild 3812 RMD160 e324a875a6af507727359ed6ab10b7a75f427b72 mercury-0.12.2-r4.ebuild 3812 SHA256 1894ee8da875f74594f8c2ad6f1c970b4ee3593499c67555d00a40b6e9af7ce7 mercury-0.12.2-r4.ebuild 3812 -EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a -MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399 -RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399 -SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399 EBUILD mercury-0.13.1-r1.ebuild 3956 RMD160 947cc36d0888d23e3861794324d6142a485de89e SHA1 a3896bbbaeb92fd448f0c4a62864662b65d81d0b SHA256 c06850243311267c14787cc69c3aae358388306a0d7abcbc9e9aa0444ff280f5 MD5 a81531e708d8ef0335a7797476605bd1 mercury-0.13.1-r1.ebuild 3956 RMD160 947cc36d0888d23e3861794324d6142a485de89e mercury-0.13.1-r1.ebuild 3956 @@ -212,10 +162,10 @@ EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6a MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346 -MISC ChangeLog 472 RMD160 e65ad8ba44f398e1ba14942079a8f2f499b8ed74 SHA1 559117e59e5afe9ad93f3ca0a24f341589955c4a SHA256 b94a357057a7f2428354a0737125c5cec6673253ef1f2499616ea10d319112ba -MD5 6365f92e6246f4887f4f07f173bd04e4 ChangeLog 472 -RMD160 e65ad8ba44f398e1ba14942079a8f2f499b8ed74 ChangeLog 472 -SHA256 b94a357057a7f2428354a0737125c5cec6673253ef1f2499616ea10d319112ba ChangeLog 472 +MISC ChangeLog 1019 RMD160 dc363d5a5c07e9a7a10327b98c4faae6c37352c0 SHA1 89840383d2f6e71d5c95cf9369a67a2fa570775f SHA256 5e00f6ca438fb61712026350c9ae754b40541ff4afb1025c224c9188cab5524a +MD5 09e2a78b600a97fa0c8d8c53979e62e1 ChangeLog 1019 +RMD160 dc363d5a5c07e9a7a10327b98c4faae6c37352c0 ChangeLog 1019 +SHA256 5e00f6ca438fb61712026350c9ae754b40541ff4afb1025c224c9188cab5524a ChangeLog 1019 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 @@ -226,9 +176,6 @@ SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/di MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r4 539 RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r4 539 SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r4 539 -MD5 abd1c2293e5003b768dcb1eb1887b169 files/digest-mercury-0.13.0 539 -RMD160 236f26377c7b9be80a71be194ffc81a5e17e951c files/digest-mercury-0.13.0 539 -SHA256 d1aea703e42770341422638e334bea55c6ec6e502d4bd15ef3667d675a903a06 files/digest-mercury-0.13.0 539 MD5 0f39d29a07bf6effc2c408dec8260607 files/digest-mercury-0.13.1 539 RMD160 5e08dc52485dd743b512598f32091e3d32ed2baa files/digest-mercury-0.13.1 539 SHA256 9848939c8bd8cbe954cf0eb5056cd843a0e5c4c53706fac6b44dd6d068bd8f9d files/digest-mercury-0.13.1 539 diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0 b/dev-lang/mercury/files/digest-mercury-0.13.0 deleted file mode 100644 index 5009a8bfe67c..000000000000 --- a/dev-lang/mercury/files/digest-mercury-0.13.0 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e2e08bdddce39bc8eccd2a2c0cbf9ad5 mercury-compiler-0.13.0.tar.gz 15861463 -RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b mercury-compiler-0.13.0.tar.gz 15861463 -SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342 mercury-compiler-0.13.0.tar.gz 15861463 -MD5 03e9490b1261c74542cb4178510cce4b mercury-tests-0.13.0.tar.gz 984910 -RMD160 1b90b941488b9da57ff27ab1506b902b5fa5e170 mercury-tests-0.13.0.tar.gz 984910 -SHA256 227561407d63d177e6bfdf08d58481a9dcf6228d225ca2b67643c1af16cedc08 mercury-tests-0.13.0.tar.gz 984910 diff --git a/dev-lang/mercury/files/mercury-0.13.0-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.13.0-CFLAGS.patch deleted file mode 100644 index 0dfc2db8ecc2..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-CFLAGS.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- mercury-compiler-0.13.0.orig/scripts/mgnuc.in 2006-08-03 00:56:05.000000000 +1200 -+++ mercury-compiler-0.13.0/scripts/mgnuc.in 2006-09-16 10:56:07.000000000 +1200 -@@ -53,7 +53,7 @@ - # -Wenum-clash is for C++ only - # -Wunused causes various spurious warnings - -- OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer" -+ OPT_OPTS="@CFLAGS_FOR_OPT@" - DEBUG_OPT="-g" - COMPILER=gcc - ;; ---- mercury-compiler-0.13.0.orig/configure 2006-09-14 16:06:21.000000000 +1200 -+++ mercury-compiler-0.13.0/configure 2006-09-16 10:58:44.000000000 +1200 -@@ -3740,7 +3740,7 @@ - # the `-lc' and `-lg' libraries have different contents; specifically, - # only the latter contains memalign(). We need to make sure that the - # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'. --CFLAGS="-O" -+# CFLAGS="-O" - - # we also need to add the appropriate `-I' options so that the test programs - # can #include various Mercury runtime headers. -@@ -10038,7 +10038,7 @@ - # enable, and why, see scripts/mgnuc.in. - CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes" - -- CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer" -+ CFLAGS_FOR_OPT="$CFLAGS" - CFLAGS_FOR_DEBUG="-g" - MCFLAGS_FOR_CC= - ;; diff --git a/dev-lang/mercury/files/mercury-0.13.0-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.0-LIBDIR.patch deleted file mode 100644 index 00ba68f096dc..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-LIBDIR.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- mercury-compiler-0.13.0.orig/configure 2006-09-14 16:06:21.000000000 +1200 -+++ mercury-compiler-0.13.0/configure 2006-09-16 11:01:27.000000000 +1200 -@@ -1609,7 +1609,7 @@ - - - PREFIX="`$CYGPATH $PREFIX`" --LIBDIR="`$CYGPATH $PREFIX/lib/mercury`" -+LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`" - NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared} - - ---- mercury-compiler-0.13.0.orig/scripts/Mmake.vars.in 2006-05-23 18:46:54.000000000 +1200 -+++ mercury-compiler-0.13.0/scripts/Mmake.vars.in 2006-09-16 11:06:12.000000000 +1200 -@@ -717,18 +717,18 @@ - 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_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java -+INSTALL_LIBDIR = $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@ -+FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@ -+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java - 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_LIBDIR)/doc -+INSTALL_TEXT_DIR = $(INSTALL_LIBDIR)/doc -+INSTALL_PS_DIR = $(INSTALL_LIBDIR)/doc -+INSTALL_PDF_DIR = $(INSTALL_LIBDIR)/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_LIBDIR)/html -+INSTALL_MDB_DOC_DIR = $(INSTALL_LIBDIR)/mdb -+INSTALL_ELISP_DIR = $(INSTALL_LIBDIR)/elisp - INSTALL_CGI_DIR = @CGIDIR@ - - # You should not need to override anything below here ---- mercury-compiler-0.13.0.orig/scripts/mercury_config.in 2005-10-27 14:48:24.000000000 +1300 -+++ mercury-compiler-0.13.0/scripts/mercury_config.in 2006-09-16 11:16:27.000000000 +1200 -@@ -90,8 +90,8 @@ - shift - done - --input_libdir="$input_prefix/lib/mercury" --output_libdir="$output_prefix/lib/mercury" -+input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@" -+output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@" - - # mercury_config regenerates itself, so we can't just execute it in place. - case $recursive in diff --git a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch deleted file mode 100644 index 30892a68c74a..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-MAKEOPTS.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- mercury-compiler-0.13.0.orig/Makefile 2005-08-22 15:38:34.000000000 +1200 -+++ mercury-compiler-0.13.0/Makefile 2006-09-16 11:24:58.000000000 +1200 -@@ -15,7 +15,7 @@ - # - #-----------------------------------------------------------------------------# - -- -+PARALLEL= $(MAKEOPTS) - SHELL= /bin/sh - MMAKE= MMAKE_DIR=`pwd`/scripts scripts/mmake - MMAKE_SUBDIR= MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL) -@@ -69,6 +69,6 @@ - $(MMAKE) uninstall - - .DEFAULT: -- $(MMAKE) $@ -+ $(MMAKE) MMAKEFLAGS=$(PARALLEL) $@ - - #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury/files/mercury-0.13.0-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.0-bootstrap.patch deleted file mode 100644 index 17ce514d3bd2..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-bootstrap.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- mercury-compiler-0.13.0.orig/configure 2006-09-14 16:06:21.000000000 +1200 -+++ mercury-compiler-0.13.0/configure 2006-09-16 11:34:59.000000000 +1200 -@@ -8977,34 +8977,34 @@ - - if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then - if test "$BOOTSTRAP_MC" = ""; then -- GRADE="$BOOTSTRAP_GRADE" -- { echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed --**** cannot use grade \`$BEST_GRADE_FOR_COMPILER' --**** using grade \`$GRADE' to compile the compiler --**** after installation is complete you should reinstall --**** from scratch so you can use the more efficient --**** grade \`$BEST_GRADE_FOR_COMPILER'." >&5 --echo "$as_me: WARNING: Mercury compiler not yet installed --**** cannot use grade \`$BEST_GRADE_FOR_COMPILER' --**** using grade \`$GRADE' to compile the compiler --**** after installation is complete you should reinstall --**** from scratch so you can use the more efficient --**** grade \`$BEST_GRADE_FOR_COMPILER'." >&2;} -- -+ if test "$BOOTSTRAP_STAGE" = "1"; then -+ GRADE="$BOOTSTRAP_GRADE" -+ else -+ GRADE=$BEST_GRADE_FOR_COMPILER -+ find library compiler browser mdbcomp analysis \ -+ profiler deep_profiler \ -+ -name \*.c -o -name \*.c_date | \ -+ xargs rm > /dev/null 2>&1 -+ find -name \*.o -o -name \*.pic_o -o \ -+ -name \*.a -o -name \*.so | \ -+ xargs rm > /dev/null 2>&1 -++ rm -f compiler/mercury_compile profiler/mercury_profile -+ fi - else -- GRADE=$BEST_GRADE_FOR_COMPILER -- echo "using grade \`$GRADE' to compile the compiler -- compiler and library will be rebuilt with new grade -- installation may take a long time" 1>&6 -- find library compiler browser mdbcomp analysis \ -- profiler deep_profiler \ -- -name \*.c -o -name \*.c_date | \ -- xargs rm > /dev/null 2>&1 -+ if test "$BOOTSTRAP_STAGE" = "1"; then -+ GRADE=$BEST_GRADE_FOR_COMPILER -+ find library compiler browser mdbcomp analysis \ -+ profiler deep_profiler \ -+ -name \*.c -o -name \*.c_date | \ -+ xargs rm > /dev/null 2>&1 -+ else -+ GRADE=$BEST_GRADE_FOR_COMPILER -+ fi - fi - else - GRADE=$BEST_GRADE_FOR_COMPILER -- echo "using grade \`$GRADE' to compile the compiler" 1>&6 - fi -+echo "using grade \`$GRADE' to compile the compiler" 1>&6 - - - #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch b/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch deleted file mode 100644 index 0daad9656956..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-deep_profiler.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- mercury-compiler-0.13.0.orig/configure 2006-09-14 16:06:21.000000000 +1200 -+++ mercury-compiler-0.13.0/configure 2006-09-17 22:14:27.000000000 +1200 -@@ -8663,14 +8663,14 @@ - esac - - case $enable_deep_profiler in -- default) -- if test -d $mercury_cv_default_cgi_dir; then -- mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler -- mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir -- else -- mercury_cv_enable_deep_profiler=no -- fi -- ;; -+# default) -+# if test -d $mercury_cv_default_cgi_dir; then -+# mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler -+# mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir -+# else -+# mercury_cv_enable_deep_profiler=no -+# fi -+# ;; - no) - mercury_cv_enable_deep_profiler=no - ;; -@@ -8695,17 +8695,17 @@ - ;; - esac - --if test $mercury_cv_enable_deep_profiler = yes; then -- if test -d $mercury_cv_cgi_dir; then -- true -- else -- echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5 --echo "${ECHO_T}$enable_deep_profiler" >&6 -- { { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5 --echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;} -- { (exit 1); exit 1; }; } -- fi --fi -+#if test $mercury_cv_enable_deep_profiler = yes; then -+# if test -d $mercury_cv_cgi_dir; then -+# true -+# else -+# echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5 -+#echo "${ECHO_T}$enable_deep_profiler" >&6 -+# { { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5 -+#echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;} -+# { (exit 1); exit 1; }; } -+# fi -+#fi - - echo "$as_me:$LINENO: result: $mercury_cv_enable_deep_profiler" >&5 - echo "${ECHO_T}$mercury_cv_enable_deep_profiler" >&6 ---- mercury-compiler-0.13.0.orig/deep_profiler/Mmakefile 2005-12-16 18:49:39.000000000 +1300 -+++ mercury-compiler-0.13.0/deep_profiler/Mmakefile 2006-09-17 22:14:27.000000000 +1200 -@@ -155,12 +155,12 @@ - # executed when we do the install. The mv is of course expected to - # fail during a first-time installation. The rm is before the move - # in case this is the third or later installation. -- -if test $(ENABLE_DEEP_PROFILER) = yes ; then \ -- rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \ -- mv $(INSTALL_CGI_DIR)/mdprof_cgi \ -- $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \ -- cp mdprof_cgi $(INSTALL_CGI_DIR) ; \ -- fi -+ #-if test $(ENABLE_DEEP_PROFILER) = yes ; then \ -+ # rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \ -+ # mv $(INSTALL_CGI_DIR)/mdprof_cgi \ -+ # $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \ -+ # cp mdprof_cgi $(INSTALL_CGI_DIR) ; \ -+ #fi - # We also install mdprof_cgi in $(INSTALL_MERC_BIN_DIR). - # This is done just so that it can easily get put in the - # binary distribution (even if the step above failed). diff --git a/dev-lang/mercury/files/mercury-0.13.0-docs.patch b/dev-lang/mercury/files/mercury-0.13.0-docs.patch deleted file mode 100644 index b1908ab32afc..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-docs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mercury-compiler-0.13.0.orig/doc/Mmakefile 2006-03-29 13:35:18.000000000 +1200 -+++ mercury-compiler-0.13.0/doc/Mmakefile 2006-09-16 12:34:15.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 - - #-----------------------------------------------------------------------------# -@@ -331,7 +331,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-0.13.0-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch deleted file mode 100644 index e79d839d099f..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch +++ /dev/null @@ -1,375 +0,0 @@ ---- mercury-compiler-0.13.0.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 -+++ mercury-compiler-0.13.0/Mmakefile 2006-09-16 11:58:30.000000000 +1200 -@@ -281,6 +281,54 @@ - mdbcomp browser trace - +cd deep_profiler && $(SUBDIR_MMAKE) - -+libgrades: -+ +for grade in x $(LIBGRADES); do \ -+ if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ -+ gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ -+ TWS=`/bin/pwd`/libgrades/$$grade; \ -+ /bin/rm -fr libgrades/$$grade; \ -+ mkdir -p libgrades/$$grade; \ -+ ( scripts/prepare_tmp_dir_fixed_part $$grade && \ -+ scripts/prepare_tmp_dir_grade_part $$grade ) && \ -+ ( cd libgrades/$$grade/boehm_gc && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ -+ WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ ( cd libgrades/$$grade/runtime && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ ( cd libgrades/$$grade/library && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ ( cd libgrades/$$grade/mdbcomp && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ ( cd libgrades/$$grade/browser && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ depend && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ ( cd libgrades/$$grade/trace && \ -+ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -+ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ -+ libgrade ) && \ -+ true || \ -+ exit 1; \ -+ fi; \ -+ done -+ - #-----------------------------------------------------------------------------# - - .PHONY: tags -@@ -483,28 +531,13 @@ - @echo - @echo "-- Installation complete." - @echo -- @echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH," -- @echo "-- $(INSTALL_MAN_DIR) to your MANPATH," -- @echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH," -- @if test $(ENABLE_DEEP_PROFILER) != yes || \ -- cmp -s deep_profiler/mdprof_cgi \ -- $(INSTALL_CGI_DIR)/mdprof_cgi; \ -- then true ; else \ -- echo "-- to copy deep_profiler/mdprof_cgi" \ -- "to $(INSTALL_CGI_DIR),"; \ -- fi -- @echo "-- and to add the following lines to the \`.emacs' file" -- @echo "-- in your home directory:" -- @echo " (setq load-path (cons (expand-file-name " -- @echo " \"$(INSTALL_ELISP_DIR)\") load-path))" -- @echo " (autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)" - - .PHONY: install_main - install_main: all \ - install_scripts install_util install_runtime install_boehm_gc \ - install_library install_mdbcomp install_browser install_trace \ - install_compiler install_slice install_profiler \ -- install_deep_profiler install_doc install_config -+ install_deep_profiler install_doc - - .PHONY: install_scripts - install_scripts: scripts -@@ -569,7 +602,7 @@ - # .trans_opt .trans_opt_date .d .mh .mih .c_date .c .o .pic_o - - .PHONY: install_grades --install_grades: all -+install_grades: all libgrades - # - # Use the newly installed compiler to build the libraries - # in various different grades. We need to override MC=mmc -@@ -577,44 +610,33 @@ - # runs the newly installed compiler, rather than using the - # bootstrap compiler. - # -- /bin/rm -fr tmp_dir -- scripts/prepare_tmp_dir_fixed_part - +for grade in x $(LIBGRADES); do \ - if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ - gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ -- TWS=`/bin/pwd`/tmp_dir; \ -- scripts/prepare_tmp_dir_grade_part; \ -- ( cd tmp_dir/boehm_gc && \ -+ TWS=`/bin/pwd`/libgrades/$$grade; \ -+ ( cd libgrades/$$grade/boehm_gc && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ - WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ - install_lib ) && \ -- ( cd tmp_dir/runtime && \ -+ ( cd libgrades/$$grade/runtime && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ - install_lib ) && \ -- ( cd tmp_dir/library && \ -- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -- depend && \ -+ ( cd libgrades/$$grade/library && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ - install_library ) && \ -- ( cd tmp_dir/mdbcomp && \ -- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -- depend && \ -+ ( cd libgrades/$$grade/mdbcomp && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ - install_library ) && \ -- ( cd tmp_dir/browser && \ -- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ -- depend && \ -+ ( cd libgrades/$$grade/browser && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ - install_library ) && \ -- ( cd tmp_dir/trace && \ -+ ( cd libgrades/$$grade/trace && \ - $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ - install_lib ) && \ - true || \ -- { echo "To clean up from failed install, remove tmp_dir"; \ -- exit 1; }; \ -+ exit 1; \ - fi; \ - done -- if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi - - .PHONY: install_split_library - install_split_library: scripts dep_library ---- mercury-compiler-0.13.0.orig/boehm_gc/Mmakefile 2004-10-19 19:01:36.000000000 +1300 -+++ mercury-compiler-0.13.0/boehm_gc/Mmakefile 2006-09-16 12:01:01.000000000 +1200 -@@ -90,6 +90,9 @@ - .PHONY: force - force: - -+.PHONY: libgrade -+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB) -+ - #-----------------------------------------------------------------------------# - - # installation rules ---- mercury-compiler-0.13.0.orig/browser/Mmakefile 2005-12-16 18:49:31.000000000 +1300 -+++ mercury-compiler-0.13.0/browser/Mmakefile 2006-09-16 12:18:39.000000000 +1200 -@@ -186,6 +186,11 @@ - .PHONY: int3s - int3s: $(INT3S_TARGETS) - -+.PHONY: libgrade -+libgrade: \ -+ lib$(BROWSER_LIB_NAME).$A \ -+ lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) -+ - #-----------------------------------------------------------------------------# - - tags: $(MTAGS) $($(BROWSER_LIB_NAME).ms) ---- mercury-compiler-0.13.0.orig/library/Mmakefile 2006-01-10 18:30:36.000000000 +1300 -+++ mercury-compiler-0.13.0/library/Mmakefile 2006-09-16 12:20:37.000000000 +1200 -@@ -196,6 +196,9 @@ - trans_opts: $(STD_LIB_NAME).trans_opts - $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts) - -+.PHONY: libgrade -+libgrade: lib$(STD_LIB_NAME) -+ - #-----------------------------------------------------------------------------# - - tags: $(MTAGS) $($(STD_LIB_NAME).ms) ---- mercury-compiler-0.13.0.orig/mdbcomp/Mmakefile 2005-12-16 18:49:40.000000000 +1300 -+++ mercury-compiler-0.13.0/mdbcomp/Mmakefile 2006-09-16 12:22:14.000000000 +1200 -@@ -150,6 +150,13 @@ - .PHONY: int3s - int3s: $(INT3S_TARGETS) - -+.PHONY: libgrade -+libgrade: \ -+ $(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \ -+ lib$(MDBCOMP_LIB_NAME).$A \ -+ lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \ -+ all-ints -+ - #-----------------------------------------------------------------------------# - - tags: $(MTAGS) $($(MDBCOMP_LIB_NAME).ms) ---- mercury-compiler-0.13.0.orig/runtime/Mmakefile 2006-03-30 18:13:48.000000000 +1200 -+++ mercury-compiler-0.13.0/runtime/Mmakefile 2006-09-16 12:23:46.000000000 +1200 -@@ -420,6 +420,9 @@ - @if test ! -f tags; then echo making tags; \ - ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi - -+.PHONY: libgrade -+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) -+ - #-----------------------------------------------------------------------------# - - # installation rules ---- mercury-compiler-0.13.0.orig/scripts/prepare_tmp_dir_fixed_part.in 2005-01-28 20:11:59.000000000 +1300 -+++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_fixed_part.in 2006-10-12 21:35:17.000000000 +1300 -@@ -12,18 +12,20 @@ - fi - wd=`/bin/pwd` - --mkdir tmp_dir --cp Mmake* tmp_dir --cp Mercury.* tmp_dir --cp VERSION tmp_dir --cp config* tmp_dir --cp aclocal.m4 tmp_dir --mkdir tmp_dir/scripts --cp scripts/* tmp_dir/scripts --mkdir tmp_dir/tools --cp tools/* tmp_dir/tools --$ln_s $wd/compiler tmp_dir --$ln_s $wd/analysis tmp_dir --$ln_s $wd/robdd tmp_dir --$ln_s $wd/util tmp_dir -+libgrade_dir=libgrades/$1 -+ -+mkdir -p $libgrade_dir -+cp Mmake* $libgrade_dir -+cp Mercury.* $libgrade_dir -+cp VERSION $libgrade_dir -+cp config* $libgrade_dir -+cp aclocal.m4 $libgrade_dir -+mkdir $libgrade_dir/scripts -+cp scripts/* $libgrade_dir/scripts -+mkdir $libgrade_dir/tools -+cp tools/* $libgrade_dir/tools -+$ln_s $wd/compiler $libgrade_dir -+$ln_s $wd/analysis $libgrade_dir -+$ln_s $wd/robdd $libgrade_dir -+$ln_s $wd/util $libgrade_dir - exit 0 ---- mercury-compiler-0.13.0.orig/scripts/prepare_tmp_dir_grade_part 2005-05-20 18:15:20.000000000 +1200 -+++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_grade_part 2006-10-12 21:36:07.000000000 +1300 -@@ -5,55 +5,57 @@ - # Public License - see the file COPYING in the Mercury distribution. - #---------------------------------------------------------------------------# - --rm -fr tmp_dir/boehm_gc --rm -fr tmp_dir/runtime --rm -fr tmp_dir/trace --rm -fr tmp_dir/library --rm -fr tmp_dir/mdbcomp --rm -fr tmp_dir/browser --mkdir tmp_dir/boehm_gc --mkdir tmp_dir/boehm_gc/Mac_files --mkdir tmp_dir/boehm_gc/cord --mkdir tmp_dir/boehm_gc/include --mkdir tmp_dir/boehm_gc/include/private --cp boehm_gc/Makefile* tmp_dir/boehm_gc --cp boehm_gc/Mmake* tmp_dir/boehm_gc --cp boehm_gc/ac* tmp_dir/boehm_gc --cp boehm_gc/*.[chsS] tmp_dir/boehm_gc --cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files --cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord --cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include --cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private --mkdir tmp_dir/runtime --mkdir tmp_dir/runtime/machdeps --cp runtime/Mmake* tmp_dir/runtime --cp runtime/.mgnuc* tmp_dir/runtime --cp runtime/*.in tmp_dir/runtime --cp runtime/*.[ch] tmp_dir/runtime --cp runtime/*.il tmp_dir/runtime --cp runtime/machdeps/*.h tmp_dir/runtime/machdeps --mkdir tmp_dir/trace --cp trace/Mmake* tmp_dir/trace --cp trace/.mgnuc* tmp_dir/trace --cp trace/*.[ch] tmp_dir/trace --mkdir tmp_dir/library --cp library/Mmake* tmp_dir/library --cp library/Mercury.* tmp_dir/library --cp library/.mgnuc* tmp_dir/library --cp library/*FLAGS* tmp_dir/library --cp library/print_extra_inits tmp_dir/library --cp library/library_strong_name.sn tmp_dir/library --cp library/*.m tmp_dir/library --mkdir tmp_dir/mdbcomp --cp mdbcomp/Mmake* tmp_dir/mdbcomp --cp mdbcomp/Mercury.* tmp_dir/mdbcomp --cp mdbcomp/.mgnuc* tmp_dir/mdbcomp --cp mdbcomp/*FLAGS* tmp_dir/mdbcomp --cp mdbcomp/*.m tmp_dir/mdbcomp --mkdir tmp_dir/browser --cp browser/Mmake* tmp_dir/browser --cp browser/Mercury.* tmp_dir/browser --cp browser/.mgnuc* tmp_dir/browser --cp browser/*FLAGS* tmp_dir/browser --cp browser/*.m tmp_dir/browser -+libgrade_dir=libgrades/$1 -+ -+rm -fr $libgrade_dir/boehm_gc -+rm -fr $libgrade_dir/runtime -+rm -fr $libgrade_dir/trace -+rm -fr $libgrade_dir/library -+rm -fr $libgrade_dir/mdbcomp -+rm -fr $libgrade_dir/browser -+mkdir $libgrade_dir/boehm_gc -+mkdir $libgrade_dir/boehm_gc/Mac_files -+mkdir $libgrade_dir/boehm_gc/cord -+mkdir $libgrade_dir/boehm_gc/include -+mkdir $libgrade_dir/boehm_gc/include/private -+cp boehm_gc/Makefile* $libgrade_dir/boehm_gc -+cp boehm_gc/Mmake* $libgrade_dir/boehm_gc -+cp boehm_gc/ac* $libgrade_dir/boehm_gc -+cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc -+cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files -+cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord -+cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include -+cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private -+mkdir $libgrade_dir/runtime -+mkdir $libgrade_dir/runtime/machdeps -+cp runtime/Mmake* $libgrade_dir/runtime -+cp runtime/.mgnuc* $libgrade_dir/runtime -+cp runtime/*.in $libgrade_dir/runtime -+cp runtime/*.[ch] $libgrade_dir/runtime -+cp runtime/*.il $libgrade_dir/runtime -+cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps -+mkdir $libgrade_dir/trace -+cp trace/Mmake* $libgrade_dir/trace -+cp trace/.mgnuc* $libgrade_dir/trace -+cp trace/*.[ch] $libgrade_dir/trace -+mkdir $libgrade_dir/library -+cp library/Mmake* $libgrade_dir/library -+cp library/Mercury.* $libgrade_dir/library -+cp library/.mgnuc* $libgrade_dir/library -+cp library/*FLAGS* $libgrade_dir/library -+cp library/print_extra_inits $libgrade_dir/library -+cp library/library_strong_name.sn $libgrade_dir/library -+cp library/*.m $libgrade_dir/library -+mkdir $libgrade_dir/mdbcomp -+cp mdbcomp/Mmake* $libgrade_dir/mdbcomp -+cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp -+cp mdbcomp/.mgnuc* $libgrade_dir/mdbcomp -+cp mdbcomp/*FLAGS* $libgrade_dir/mdbcomp -+cp mdbcomp/*.m $libgrade_dir/mdbcomp -+mkdir $libgrade_dir/browser -+cp browser/Mmake* $libgrade_dir/browser -+cp browser/Mercury.* $libgrade_dir/browser -+cp browser/.mgnuc* $libgrade_dir/browser -+cp browser/*FLAGS* $libgrade_dir/browser -+cp browser/*.m $libgrade_dir/browser - exit 0 ---- mercury-compiler-0.13.0.orig/trace/Mmakefile 2006-04-04 19:42:03.000000000 +1200 -+++ mercury-compiler-0.13.0/trace/Mmakefile 2006-09-16 12:25:49.000000000 +1200 -@@ -204,6 +204,9 @@ - @if test ! -f tags; then echo making tags; \ - ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi - -+.PHONY: libgrade -+libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) -+ - #-----------------------------------------------------------------------------# - - # installation rules diff --git a/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch b/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch deleted file mode 100644 index efd43ccba069..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-parallel-install_grades.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mercury-compiler-0.13.0.orig/scripts/Mmake.rules 2006-02-24 20:11:20.000000000 +1300 -+++ mercury-compiler-0.13.0/scripts/Mmake.rules 2006-10-23 16:01:05.000000000 +1300 -@@ -505,9 +505,9 @@ - *.a *.so tmp_dir || true; } && \ - for grade in $(ALL_LIBGRADES); do \ - if [ "$$grade" != "$(GRADE)" ]; then \ -- $(MMAKE) GRADE=$$grade $*.depend || \ -+ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade $*.depend || \ - exit 1; \ -- $(MMAKE) GRADE=$$grade lib$*.install_library || \ -+ $(MMAKE) $(MMAKEFLAGS) GRADE=$$grade lib$*.install_library || \ - exit 1; \ - for file in x $$grade_files; do \ - if [ "$$file" != "x" ]; then \ diff --git a/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch b/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch deleted file mode 100644 index c14c4ea63efb..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-pic_o-dependencies.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- mercury-compiler-0.13.0.orig/compiler/modules.m 2006-05-23 18:46:52.000000000 +1200 -+++ mercury-compiler-0.13.0/compiler/modules.m 2006-11-23 21:45:11.000000000 +1300 -@@ -3384,27 +3384,32 @@ - ForeignImportedModules = [_ | _], - ( - Target = il, -- ForeignImportTarget = DllFileName, -+ ForeignImportTargets = [DllFileName], - ForeignImportExt = ".dll" - ; - Target = java, -- ForeignImportTarget = ClassFileName, -+ ForeignImportTargets = [ClassFileName], - ForeignImportExt = ".java" - ; - Target = c, -- ForeignImportTarget = ObjFileName, -+ ForeignImportTargets = [ObjFileName, PicObjFileName], - ForeignImportExt = ".mh" - ; - Target = asm, -- ForeignImportTarget = ObjFileName, -+ ForeignImportTargets = [ObjFileName, PicObjFileName], - ForeignImportExt = ".mh" - ), -- io.write_string(DepStream, "\n\n", !IO), -- io.write_string(DepStream, ForeignImportTarget, !IO), -- io.write_string(DepStream, " : ", !IO), -- write_dependencies_list(ForeignImportedModules, ForeignImportExt, -- DepStream, !IO), -- io.write_string(DepStream, "\n\n", !IO) -+ WriteForeignImportTarget = (pred(ForeignImportTarget::in, -+ !.IO::di, !:IO::uo) is det :- -+ io.write_string(DepStream, "\n\n", !IO), -+ io.write_string(DepStream, ForeignImportTarget, !IO), -+ io.write_string(DepStream, " : ", !IO), -+ write_dependencies_list(ForeignImportedModules, -+ ForeignImportExt, DepStream, !IO), -+ io.write_string(DepStream, "\n\n", !IO) -+ ), -+ list.foldl(WriteForeignImportTarget, ForeignImportTargets, -+ !IO) - ), - - ( -@@ -5242,7 +5247,7 @@ - module_name_to_file_name(ModuleName, ".dv", no, DvFileName, !IO), - - io.write_strings(DepStream, [ -- InitFileName, " : ", DepFileName, "\n", -+ InitFileName, " : ", DepFileName, " $(", MakeVarName, ".cs)\n", - "\techo > ", InitFileName, "\n" - ], !IO), - -@@ -5266,7 +5271,7 @@ - TmpInitCFileName = InitCFileName ++ ".tmp", - io.write_strings(DepStream, [ - ForceC2InitTarget, " :\n\n", -- InitCFileName, " : ", ForceC2InitTarget, "\n", -+ InitCFileName, " : ", ForceC2InitTarget, " $(", MakeVarName, ".init_cs)\n", - "\t@$(C2INIT) $(ALL_GRADEFLAGS) $(ALL_C2INITFLAGS) ", - "--init-c-file ", TmpInitCFileName, - " $(", MakeVarName, ".init_cs) $(ALL_C2INITARGS)\n", diff --git a/dev-lang/mercury/files/mercury-0.13.0-portage.patch b/dev-lang/mercury/files/mercury-0.13.0-portage.patch deleted file mode 100644 index 0db4ff431af6..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-portage.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- mercury-compiler-0.13.0.orig/Makefile 2005-08-22 15:38:34.000000000 +1200 -+++ mercury-compiler-0.13.0/Makefile 2006-09-16 10:38:21.000000000 +1200 -@@ -26,7 +26,7 @@ - - .PHONY: all - all: -- $(MMAKE) MMAKEFLAGS=$(PARALLEL) all -+ $(MMAKE) MMAKEFLAGS=$(PARALLEL) all || exit 1 - - .PHONY: libmmc - libmmc: -@@ -34,7 +34,7 @@ - - .PHONY: install - install: -- $(MMAKE) MMAKEFLAGS=$(PARALLEL) install -+ $(MMAKE) MMAKEFLAGS=$(PARALLEL) install || exit 1 - - # `mmake clean' has a different meaning to the usual GNU standard `make clean': - # it removes the .c files, which makes bootstrapping impossible unless you ---- mercury-compiler-0.13.0.orig/configure 2006-09-14 16:06:21.000000000 +1200 -+++ mercury-compiler-0.13.0/configure 2006-09-16 10:41:52.000000000 +1200 -@@ -9148,11 +9148,11 @@ - enable_mm_grades=no - enable_dmm_grades=no - enable_hlc_prof_grades=no -- enable_par_grades=no - enable_dotnet_grades=no - enable_java_grade=no - fi - -+ - #-----------------------------------------------------------------------------# - - # ---- mercury-compiler-0.13.0.orig/runtime/Mmakefile 2006-03-30 18:13:48.000000000 +1200 -+++ mercury-compiler-0.13.0/runtime/Mmakefile 2006-09-16 10:45:05.000000000 +1200 -@@ -434,8 +434,6 @@ - -[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_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 - - ifeq ($(findstring java,$(GRADE)),java) - -@@ -481,7 +479,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 ---- mercury-compiler-0.13.0.orig/scripts/Mmakefile 2006-04-04 19:41:49.000000000 +1200 -+++ mercury-compiler-0.13.0/scripts/Mmakefile 2006-09-16 10:52:36.000000000 +1200 -@@ -26,16 +26,12 @@ - canonical_grade \ - mdb \ - mdprof \ -- mercury.bat \ -- mercury_config \ - mercury_update_interface \ - mgnuc \ -- mkfifo_using_mknod \ - ml \ - mmake \ - mmc \ -- mprof \ -- prepare_tmp_dir_fixed_part -+ mprof - - SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS) - -@@ -103,8 +99,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 -@@ -122,7 +116,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-0.13.0-tests.patch b/dev-lang/mercury/files/mercury-0.13.0-tests.patch deleted file mode 100644 index 2320fd405279..000000000000 --- a/dev-lang/mercury/files/mercury-0.13.0-tests.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -urN mercury-tests-0.13.0.orig/hard_coded/dir_test.exp mercury-tests-0.13.0/hard_coded/dir_test.exp ---- mercury-tests-0.13.0.orig/hard_coded/dir_test.exp 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.0/hard_coded/dir_test.exp 2006-09-16 12:41:31.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
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.0.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.0/hard_coded/dir_test.exp2 ---- mercury-tests-0.13.0.orig/hard_coded/dir_test.exp2 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.0/hard_coded/dir_test.exp2 2006-09-16 12:41:31.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 - make_directory succeeded - make_directory succeeded - dir.make_single_directory with non-existent parent failed as expected. -diff -urN mercury-tests-0.13.0.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.0/hard_coded/dir_test.exp3 ---- mercury-tests-0.13.0.orig/hard_coded/dir_test.exp3 2003-07-29 03:50:45.000000000 +1200 -+++ mercury-tests-0.13.0/hard_coded/dir_test.exp3 2006-09-16 12:41:31.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 - make_directory succeeded - make_directory succeeded - dir.make_single_directory with non-existent parent failed as expected. -diff -urN mercury-tests-0.13.0.orig/hard_coded/dir_test.m mercury-tests-0.13.0/hard_coded/dir_test.m ---- mercury-tests-0.13.0.orig/hard_coded/dir_test.m 2006-03-29 20:08:00.000000000 +1200 -+++ mercury-tests-0.13.0/hard_coded/dir_test.m 2006-09-16 12:41:31.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") -- ), -- - { Dir1 = "test_dir"/"d1" }, - test0("make_directory", dir__make_directory(Dir1)), - % Test making a directory that already exists. -diff -urN mercury-tests-0.13.0.orig/mdbrc mercury-tests-0.13.0/mdbrc ---- mercury-tests-0.13.0.orig/mdbrc 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/mdbrc 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,19 @@ -+source MDB_DOC -+alias s step -+alias g goto -+alias f finish -+alias r retry -+alias v vars -+alias p print -+alias P print * -+alias d stack -+alias c continue -+alias b break -+alias h help -+alias ? help -+alias excp exception -+alias e exception -+alias EMPTY step -+alias NUMBER step -+xml_browser_cmd '' -+xml_tmp_filename '' -diff -urN mercury-tests-0.13.0.orig/tabling/loopcheck.exp5 mercury-tests-0.13.0/tabling/loopcheck.exp5 ---- mercury-tests-0.13.0.orig/tabling/loopcheck.exp5 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/tabling/loopcheck.exp5 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,3 @@ -+Uncaught Mercury exception: -+Software Error: detected infinite recursion in pred loopcheck.loop/1 -+Stack dump not available in this grade. -diff -urN mercury-tests-0.13.0.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.13.0/tabling/loopcheck_nondet.exp2 ---- mercury-tests-0.13.0.orig/tabling/loopcheck_nondet.exp2 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/tabling/loopcheck_nondet.exp2 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,3 @@ -+Uncaught Mercury exception: -+Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2 -+Stack dump not available in this grade. -diff -urN mercury-tests-0.13.0.orig/tabling/tc_loop.exp3 mercury-tests-0.13.0/tabling/tc_loop.exp3 ---- mercury-tests-0.13.0.orig/tabling/tc_loop.exp3 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/tabling/tc_loop.exp3 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,3 @@ -+Uncaught Mercury exception: -+Software Error: detected infinite recursion in pred tc_loop.tc/2 -+Stack dump not available in this grade. -diff -urN mercury-tests-0.13.0.orig/tabling/tc_memo.exp2 mercury-tests-0.13.0/tabling/tc_memo.exp2 ---- mercury-tests-0.13.0.orig/tabling/tc_memo.exp2 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/tabling/tc_memo.exp2 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,3 @@ -+Uncaught Mercury exception: -+Software Error: detected infinite recursion in pred tc_memo.tc/2 -+Stack dump not available in this grade. -diff -urN mercury-tests-0.13.0.orig/tabling/tc_memo2.exp2 mercury-tests-0.13.0/tabling/tc_memo2.exp2 ---- mercury-tests-0.13.0.orig/tabling/tc_memo2.exp2 1970-01-01 12:00:00.000000000 +1200 -+++ mercury-tests-0.13.0/tabling/tc_memo2.exp2 2006-09-16 12:41:44.000000000 +1200 -@@ -0,0 +1,3 @@ -+Uncaught Mercury exception: -+Software Error: detected need for minimal model in pred tc_memo2.tc/2 -+Stack dump not available in this grade. -diff -urN mercury-tests-0.13.0.orig/valid/Mmakefile mercury-tests-0.13.0/valid/Mmakefile ---- mercury-tests-0.13.0.orig/valid/Mmakefile 2006-08-07 17:02:39.000000000 +1200 -+++ mercury-tests-0.13.0/valid/Mmakefile 2006-09-16 12:41:44.000000000 +1200 -@@ -397,3 +397,5 @@ - rm -f *.err *.h - - #-----------------------------------------------------------------------------# -+ -+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order diff --git a/dev-lang/mercury/mercury-0.13.0.ebuild b/dev-lang/mercury/mercury-0.13.0.ebuild deleted file mode 100644 index 2fec75ed457d..000000000000 --- a/dev-lang/mercury/mercury-0.13.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0.ebuild,v 1.11 2006/11/23 09:16:40 keri Exp $ - -inherit eutils - -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="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-compiler-0.13.0.tar.gz - ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-0.13.0.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~ppc ~sparc ~x86" - -IUSE="debug minimal readline threads" - -DEPEND="readline? ( sys-libs/readline )" - -S="${WORKDIR}"/${MY_P} -TESTDIR="${WORKDIR}"/${PN}-tests-${PV} - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}"/${P}-portage.patch - epatch "${FILESDIR}"/${P}-CFLAGS.patch - epatch "${FILESDIR}"/${P}-MAKEOPTS.patch - epatch "${FILESDIR}"/${P}-bootstrap.patch - epatch "${FILESDIR}"/${P}-LIBDIR.patch - epatch "${FILESDIR}"/${P}-libgrades.patch - epatch "${FILESDIR}"/${P}-parallel-install_grades.patch - epatch "${FILESDIR}"/${P}-deep_profiler.patch - epatch "${FILESDIR}"/${P}-docs.patch - - cd "${TESTDIR}" - epatch "${FILESDIR}"/${P}-tests.patch - sed -i -e "s:MDB_DOC:${S}/doc/mdb_doc:" mdbrc -} - -src_compile() { - local myconf - myconf="--disable-gcc-back-end \ - --enable-aditi-back-end \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - --disable-java-grades \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline) \ - PACKAGE_VERSION=${PV}" - - einfo "Performing stage 1 bootstrap" - econf \ - ${myconf} \ - BOOTSTRAP_STAGE="1" \ - || die "econf stage 1 failed" - emake \ - EXTRA_MLFLAGS=--no-strip \ - || die "emake stage 1 failed" - - einfo "Performing stage 2 bootstrap" - cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile - epatch "${FILESDIR}"/${P}-pic_o-dependencies.patch - econf \ - ${myconf} \ - BOOTSTRAP_STAGE="2" \ - || die "econf stage 2 failed" - emake \ - MERCURY_COMPILER="${S}"/mercury_compile \ - depend || die "emake stage 2 depend failed" - emake \ - MERCURY_COMPILER="${S}"/mercury_compile \ - EXTRA_MLFLAGS=--no-strip \ - || die "emake stage 2 failed" - - einfo "Compiling libgrades" - emake \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - libgrades || die "emake libgrades failed" -} - -src_test() { - cd "${S}" - TEST_GRADE=`scripts/ml --print-grade` - if [ -d "${S}"/libgrades/${TEST_GRADE} ] ; then - TWS="${S}"/libgrades/${TEST_GRADE} - cp browser/mer_browser.init "${TWS}"/browser/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp runtime/mer_rt.init "${TWS}"/runtime/ - else - TWS="${S}" - fi - - cd "${TESTDIR}" - PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \ - WORKSPACE="${TWS}" \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \ - GRADE=${TEST_GRADE} \ - mmake || die "mmake test failed" -} - -src_install() { - make \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - install || die "make install failed" - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS -} |