diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-11-05 22:01:24 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-11-05 22:01:24 +0000 |
| commit | c58107aa9b90297dbfaebd78da9a52c5dd610da0 (patch) | |
| tree | 1245ecd7c95a4f22157051f2b6bfd9f868df8439 /dev-lang/yap | |
| parent | Remove old. (diff) | |
| download | historical-c58107aa9b90297dbfaebd78da9a52c5dd610da0.tar.gz historical-c58107aa9b90297dbfaebd78da9a52c5dd610da0.tar.bz2 historical-c58107aa9b90297dbfaebd78da9a52c5dd610da0.zip | |
Bundle patches into tarballs; Closes #344013
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/yap')
45 files changed, 113 insertions, 2627 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog index 34dcf9a0a139..df974200cc67 100644 --- a/dev-lang/yap/ChangeLog +++ b/dev-lang/yap/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for dev-lang/yap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.47 2010/10/30 08:34:24 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.48 2010/11/05 22:01:24 keri Exp $ + + 05 Nov 2010; <keri@gentoo.org> yap-6.0.1.ebuild, + -files/yap-6.0.1-bootfile.patch, -files/yap-6.0.1-dynamic-lib.patch, + -files/yap-6.0.1-mpi-include.patch, -files/yap-6.0.1-multilib.patch, + -files/yap-6.0.1-myddas-include.patch, -files/yap-6.0.1-yapsharedir.patch, + yap-6.0.2.ebuild, -files/yap-6.0.2-bootfile.patch, + -files/yap-6.0.2-dynamic-lib.patch, -files/yap-6.0.2-mpi-include.patch, + -files/yap-6.0.2-multilib.patch, -files/yap-6.0.2-myddas-include.patch, + -files/yap-6.0.2-yapsharedir.patch, yap-6.0.3.ebuild, + -files/yap-6.0.3-install-clause.patch, -files/yap-6.0.3-yapsharedir.patch, + yap-6.0.4.ebuild, -files/yap-6.0.4-JAVALIBPATH.patch, + -files/yap-6.0.4-chr-sublist.patch, -files/yap-6.0.4-yapsharedir.patch, + yap-6.0.5.ebuild, yap-6.0.5-r1.ebuild, -files/yap-6.0.5-JAVALIBPATH.patch, + -files/yap-6.0.5-chr-sublist.patch, -files/yap-6.0.5-ldflags.patch, + -files/yap-6.0.5-yapsharedir.patch, yap-6.0.6.ebuild, + -files/yap-6.0.6-DESTDIR.patch, -files/yap-6.0.6-chr-sublist.patch, + -files/yap-6.0.6-itries.patch, -files/yap-6.0.6-ldflags.patch, + -files/yap-6.0.6-runpath.patch, -files/yap-6.0.6-yapsharedir.patch, + yap-6.2.0.ebuild, yap-6.2.0-r1.ebuild, -files/yap-6.2.0-chr-sublist.patch, + -files/yap-6.2.0-have-config.patch, + -files/yap-6.2.0-ld-library-path.patch, -files/yap-6.2.0-ldflags.patch, + -files/yap-6.2.0-lib-soname.patch, -files/yap-6.2.0-parallel-make.patch, + -files/yap-6.2.0-yapsharedir.patch: + Bundle patches into tarballs; Closes #344013 30 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild, +files/yap-6.2.0-lib-soname.patch: diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest index e5ba9528a8cb..b005e6379619 100644 --- a/dev-lang/yap/Manifest +++ b/dev-lang/yap/Manifest @@ -9,57 +9,30 @@ AUX yap-5.1.3-fortify_sources-ubuntu.patch 910 RMD160 00518b6ffbe4a3119821799f86 AUX yap-5.1.3-multilib.patch 10161 RMD160 d19b31c8b9a7b4c71165f6397076be3ed75d1112 SHA1 0225e01a9fb1b27b0f5e4df62e3c6251e62c4d78 SHA256 5a07da0160c8e5d56e2902e162a5bb4eb1e1027f7e78f8ff041fa025770ce06e AUX yap-5.1.3-parallel-make.patch 6384 RMD160 b5f107a748b4d13832dfc9f7f1446f4b90e6317c SHA1 d7a0b16cbd0a843a5c96bd6dcee901f383d92db0 SHA256 99edc0a21ccb7354437c43b66dea6b264c3764c3c748b6c441d70112b885414b AUX yap-5.1.3-tkyap.patch 695 RMD160 a723ec3962b2072b64fd045f424d3c7a1b1f0b03 SHA1 e04ea927dab423b358e025c563fcc7179fdf7cc5 SHA256 58f6b3314b7091f3abbf9f378dc65018390c91a6e3578d4a7826c7b49c5eb319 -AUX yap-6.0.1-bootfile.patch 1390 RMD160 16364d2e4df4c9274225fcb177e0b300eaee6ee4 SHA1 50b16a55cd78744d7507adff35688a6da9f4c09e SHA256 d7822fa6d5e53a64b3be7ff80467988e5f3715ab4dca001f5e9c4c18bba4c12b -AUX yap-6.0.1-dynamic-lib.patch 359 RMD160 976053f9655510a5037a57f46a411aa35e35b613 SHA1 0d8b2237b67cc88b50978aedff477cd2bcdfe896 SHA256 b1fe461133ff58aba8856e3854488e14ecfdd8cf45144484e7b3690cfec34368 -AUX yap-6.0.1-mpi-include.patch 301 RMD160 6ec4079e391b71e2439db134dfdc6314d155fa7e SHA1 c3c53822893050e7721365549cb2065560d2af71 SHA256 ef4fe7438bab61566a642a2401cc2f02133417f06061861d2f661abcd1e71384 -AUX yap-6.0.1-multilib.patch 12454 RMD160 0b509f4597458e825e51026dd3d4d4b8b3c53a7f SHA1 fdbacbfbf72c26447bad9c262a1ade431d32d263 SHA256 49fa168a1cfcc824459c566003431c4654b7fd4cdde2b099001aaacef911d150 -AUX yap-6.0.1-myddas-include.patch 583 RMD160 8dcb400961cf1c3eb80245e04153e575c10cecab SHA1 3243e8d2ab9f5f41957513e3631de446dad5f874 SHA256 5fd4f7db00d2917433fa414101f2b117bbf9a71b3f8d4e33fc4a4c52dc3c7d2a -AUX yap-6.0.1-yapsharedir.patch 569 RMD160 7b1a1017f3a5014e0d1b2691d0ea5753684d522d SHA1 3d450b01332c96cbb43be1a78adf27678748fbb8 SHA256 4f9739c1c396b6b45272c754270bedb90173818bcee44fffa0b4a5d58b6a98d7 -AUX yap-6.0.2-bootfile.patch 1390 RMD160 40363ef6afbc44e2202c8cf7b18e9b0a64168157 SHA1 b3cbcfd052fe75164fa3c6c35a56ded97cc065e5 SHA256 907da2ce1cefae20b891db75f23af100637a0bed8e4a11843803e8273ec3395e -AUX yap-6.0.2-dynamic-lib.patch 359 RMD160 65de367470793eb5127c905f816fbb88641c9675 SHA1 84a505fee05e8eced7761a3e7c76a34dbac2a045 SHA256 17532220d4ec6db2a6127f947a305afb3e882153c57e29cdd1c7d97a6cffe2fd -AUX yap-6.0.2-mpi-include.patch 301 RMD160 04c779a7cbc61d98d762cf63d4f3dd2bb64c3f27 SHA1 35fafd8b3144c5a10457d3ce984338a268001579 SHA256 a15ee91980df0cf36125241491f0458231a2674367fbb5eb9ad1da3554464770 -AUX yap-6.0.2-multilib.patch 12454 RMD160 5191c4ec8e75bfc2ebf53e6848e1b78b16c65335 SHA1 2fa40faa799039432da03c85ce5342e4651362b4 SHA256 7ea723eedae1acb7ca4340cdceff82d1accd6b0d93a445327ea207da0de2e148 -AUX yap-6.0.2-myddas-include.patch 583 RMD160 90f54ecc28e8dac64edd7544358f356abc9ef9a4 SHA1 e40fb124b45fd59c4c504f63158ce0ef4d60e604 SHA256 e3c0de4e7cbcca60b02d8955969e48ec40615afa5ac812863f367aebd02393d2 -AUX yap-6.0.2-yapsharedir.patch 569 RMD160 547981acfd2793c2bd96f3551b373a372ced403c SHA1 61288eb0707a455b0429e7aa2dc76edaa1241bb1 SHA256 f02aa21276cb953f939dd020ab1656b05027af3334ac2352e8a05b38ac6e840d -AUX yap-6.0.3-install-clause.patch 364 RMD160 06d30d47387b8491ba254e71d973fb323bd7bf2a SHA1 19f4701d791fb1131e202d35cd89f868625099c7 SHA256 7c6cd98cc35da96d25bdeeb66df1fbcd5ed1a80248fef04c1c6e5750c4d04edc -AUX yap-6.0.3-yapsharedir.patch 520 RMD160 65417f2cfc659192f051c31e9fe2b02f9ecb9061 SHA1 ed3be8a6f477be9d40b6a6bdad6ff5f7db1702a8 SHA256 be04c9ba4c3712035fc585834c43692dfb195f1b1a0ee89e1c8532308f8ab6b3 -AUX yap-6.0.4-JAVALIBPATH.patch 1269 RMD160 7c123eae21c4487d6f09215c5ccfae5eb08a0a72 SHA1 79a7ebead473c809a39c646047a186bdab3d0cad SHA256 4c4fab906da364c2b4d7c6410927d526e95d2c1efdc045cb785fbcb9870e916a -AUX yap-6.0.4-chr-sublist.patch 1351 RMD160 8766497eede000bb55cc8f6deb74aa37ff1e3b33 SHA1 b551c4a828196054a1f1ffc82d5321d63916e174 SHA256 e59142a58b8cb0fc2bdd9123c989189e2c8b60ef140a3863d200ffad179f6ea7 -AUX yap-6.0.4-yapsharedir.patch 520 RMD160 e1442c81f3375179cdc96c5cf53403a6faa6a660 SHA1 73a8294e282377fa41b965a5d6fa9e3337cea669 SHA256 bba8b8e34f56362cdeaed778ad37489805c10a25358815e0643bc28868b91c46 -AUX yap-6.0.5-JAVALIBPATH.patch 1261 RMD160 ad4adf0ea06aec59fe7f752beb5b6682332683bd SHA1 cedbe29d06f7a081de19725064d87bcf526a519d SHA256 6a3704750cc6377d222ebdf1e68c3fb3274c3dd4ea4fc55da02abd416d6fa845 -AUX yap-6.0.5-chr-sublist.patch 1343 RMD160 3c10944127f1121d91b9117fa98831d68c4ed355 SHA1 3782420b45427189ae949b1788657764a695666d SHA256 ccbc8d574f9d71f3f625b244a3024dc72527858fba555ec311e4adce6a57bc5d -AUX yap-6.0.5-ldflags.patch 10792 RMD160 53458d2995621a5d0da66f0889db32d3e9eddc81 SHA1 d3a7954dc0d9178cadc12663175a110bd60bcd0b SHA256 fca0eb619260fc0214b5672d22ba2a55cc366089a27894b908bc7a9567575f7e -AUX yap-6.0.5-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d -AUX yap-6.0.6-DESTDIR.patch 881 RMD160 0b2343b96ecdb896481123645575919bc07f28b2 SHA1 7ef26e6b6146da4ce0184333a2a4546822eb14c1 SHA256 29d49482abb83fe5defc64c87ed96d5c02301719804d71e4c0a822c21fb7d772 -AUX yap-6.0.6-chr-sublist.patch 1343 RMD160 3c10944127f1121d91b9117fa98831d68c4ed355 SHA1 3782420b45427189ae949b1788657764a695666d SHA256 ccbc8d574f9d71f3f625b244a3024dc72527858fba555ec311e4adce6a57bc5d -AUX yap-6.0.6-itries.patch 412 RMD160 e6bd04129231fe2addefa0f3ae4ec9fcd7a70ea0 SHA1 774af8c06b6b1402f3e03bb06baab1526b96fcd9 SHA256 09192672bcd65ef56db430b41c6a287b49ad13111c8f6e1d6176392fd27191c2 -AUX yap-6.0.6-ldflags.patch 12983 RMD160 ce8de8e9e92452cd69f2f20f259d7afbb1ffd2f0 SHA1 8cd0014110301126b4461b422ff58a519ffc3862 SHA256 fe44792b9acf4b90f5550ea99e24a5f5ec41462e5d5c30d7876b4e0df2d85127 -AUX yap-6.0.6-runpath.patch 1366 RMD160 edd0076d1838d0d0986d09208a46804af36b86e9 SHA1 854474b7f0daf91e9368838c7f1d36eb968f5af7 SHA256 35f18f7f5cdf287f25332e722c3463eb75c8081711cd0ab61c4dd3f98838c216 -AUX yap-6.0.6-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d -AUX yap-6.2.0-chr-sublist.patch 1343 RMD160 f6f01ed7a4ca0cd065445c80234ce51274f0e6d2 SHA1 c541a5545fc1a9841b2e3b52ddf2e5e1ae8519b1 SHA256 8ba1b1b33476cd0fccd4d0324b0e08b69bf65809a17674f8261792af01a56b64 -AUX yap-6.2.0-have-config.patch 1701 RMD160 6e7b1f498a1c78e852bb6c23963dc1b1db9ab0a7 SHA1 269e76dd89caaf58cb1e19dfb0c84078347d81c6 SHA256 09bb71de1696686bdf08e95b36b50099ae7a87d57deb5c7a97d836bb7c16de7b -AUX yap-6.2.0-ld-library-path.patch 6191 RMD160 61ea0f065c038cbd975e162764fcf418d998164f SHA1 6263c6225cf29afc474679af3fe7578acabcb3be SHA256 387c864d70393357201fe25084cf004f4439ae51d40c1792774d7bf4fa1b823f -AUX yap-6.2.0-ldflags.patch 12983 RMD160 8e69d09a90fb82cb6ee01ebb227ceb1f40182841 SHA1 dd5169cf6396f511c058ae4aa8bc71fd16ed4761 SHA256 c0186dd2709a917cba30263eda6032ecd6c46bb5508e88974ed15e11336e69a8 -AUX yap-6.2.0-lib-soname.patch 5647 RMD160 5aba5aca5cabd0f082ed295f22d3c7ea51892fa4 SHA1 44010c5070cd2d1c3d21e21f226585e1dd74ab13 SHA256 965d89a5b7f37283452fc683e4a249bd7b1b0f995d764d04933f188e6cc0be10 -AUX yap-6.2.0-parallel-make.patch 1714 RMD160 5553cfa89f526ba4e9aa9d5dbf98efb529e0f5d2 SHA1 86c921f909533331485ea56e2020604f5ff0bd66 SHA256 88604835c33eef955a9ea26e223a09bfc05fd2dc52eb29155dbf40ac385968fa -AUX yap-6.2.0-yapsharedir.patch 512 RMD160 a62a5e09c5e124e6c04857918aba810ec32d9c1c SHA1 cbc9ecfbc61d9fccb459f8fa334492b02ab9e6ca SHA256 84365ed0540714abbc77f872195f3f7287ba912350debe322be556914a75e754 DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9 +DIST yap-6.0.1-gentoo-patchset-0.tar.gz 2406 RMD160 7038bb36e723a92f0e79210e15554e8e4f624c4c SHA1 11302a04301a0f03bb9f9aa178bfe0ce3f4d0fe0 SHA256 8c88c92c4fd7a56bf4cd08c3f5ddbcd0f62e8f0310c9d980854b47cb18af155a DIST yap-6.0.1.tar.gz 3816766 RMD160 cf113bbe1b8658530b464d40759b0a6320719142 SHA1 97eedc5ce82e87c48ae7c04d7c3364503528fa3d SHA256 91c95702ccb08ce13d9e34aa7d95eacafedb9c628482e91a4f003475036845b9 +DIST yap-6.0.2-gentoo-patchset-0.tar.gz 2376 RMD160 0cbaa782ab8895f463d20adcbfc9f686c7463c5e SHA1 3d00df1a6bde300e1543b45770b63d9d2469e4fc SHA256 6eb20f80716f88c269797cec42f682c94cf4944dbdb327cd4ad026205a0e368b DIST yap-6.0.2.tar.gz 3818019 RMD160 31df9a3377f4c9aa43b930ad912b397bf67e0d6c SHA1 0f1f5470466f7e32e25019941e394efaee746814 SHA256 5e05d4b7b9bb5d10943b7df46a4da619855cfb9a5e2bf9c771902a87f1129c58 +DIST yap-6.0.3-gentoo-patchset-0.tar.gz 602 RMD160 1933b43b396c9e6ce98c6765973a0561e58f0c6c SHA1 57ddd3656d7d727ded7c03eb67b3fcbef428aa0f SHA256 fdbeabb4200673b5daa00598e2fc27bb90075d980c55c3c61d9e87dd043bc700 DIST yap-6.0.3.tar.gz 3890926 RMD160 f24a386ff57589796c7d912f336ca79872967b03 SHA1 85b2be539657da3b5ea2f41ae9df80c7f9604a5e SHA256 f3445b9343ebfcc58175738d69e54029b13b89eef31ac94dc6a23e923e4394a5 +DIST yap-6.0.4-gentoo-patchset-0.tar.gz 1160 RMD160 872726862f9b60106c7f8698cc5adce0eda64144 SHA1 bcf14b35306e53b293b1300238610ada56af4106 SHA256 5e3a02cec0e51b237527eb50940df6f04b695de547d1462964e4789e7a99f760 DIST yap-6.0.4.tar.gz 3783868 RMD160 dbda49255d85abc1a3495e073fa2734e582b9de3 SHA1 4910061d282695e1c2175542648f0075d8c09497 SHA256 c45ddc9201b1284cd371b509c9eff1637b686c65b887737f755a2938bee31836 +DIST yap-6.0.5-gentoo-patchset-0.tar.gz 2669 RMD160 5b96645181ee0e9b1a73ed923659b22af02796c4 SHA1 976c0f1ee4714ebff63ccff80242b2aeece70710 SHA256 3a40d3b14efa400b374f276741c032d7cc260b1180cc08ceb9d96e2a3e4d7a00 DIST yap-6.0.5.tar.gz 3744819 RMD160 b35264a7911c73d095426fb3790a104d41d44157 SHA1 1084b1630b48a430d60d6aee8e31914ecc6d5369 SHA256 3c6f40b9c265a891430defd35b82534decc22413e6b2b2dc7e9b6fd601c9cc93 +DIST yap-6.0.6-gentoo-patchset-0.tar.gz 3320 RMD160 13702afe553b367b7adfc9849c607f1cbd09adec SHA1 897ec42dfa58085faa0587c8a9ec28d93684ec24 SHA256 6cbc93c1b73313c154af0175b8b5d298d85a13e19c5fbcb9115cbd3234519621 DIST yap-6.0.6.tar.gz 5099543 RMD160 9e3538933967257c59a441d10ddda0d6935a9d2e SHA1 8fa25cd70fde024c6fa0bc455b0e7b1aa117b6f3 SHA256 c546574609fee09231d4d37a4ef88a8d5fcf6026e507c725cd212577c2558f1f +DIST yap-6.2.0-gentoo-patchset-0.tar.gz 4556 RMD160 58acc5c18b68d571f529f1384cd1e6b5b945c3e6 SHA1 9b646dbc09e08ab42c9df0ccafa3b2b5222e2331 SHA256 cca5e3f1dadaa2fd566ceb69745c26b9d249f6930db485bda7b86a35b30faaec DIST yap-6.2.0.tar.gz 4990807 RMD160 af5bb81590105234644dc072f14c37f696e7db2a SHA1 884406c6a6333c796ab19d0f40529918be6cae97 SHA256 47cffa403099062c79e01ad19499fc5b3299c8e7a3c3bd3aadba26c91ae125c4 EBUILD yap-5.1.3-r2.ebuild 2484 RMD160 bf366226c2bb9443d67a6a75e8103ff4677b2d1a SHA1 25f4113498ae52c7ba7bbbdceed58f4b0f73f5e3 SHA256 2fc47953ca86da7ae4a0459df2356be3a2eb45b9efcb59a6686fdfea68c388a3 -EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA1 79f8a10f95a3253d48b67952faba87e00f9cc11e SHA256 66468e95ab2c7d6cacd97bc08a7a005eb4e75ff56227dac7c40138bb3012a12b -EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d -EBUILD yap-6.0.3.ebuild 2245 RMD160 797d6be7ec2451a20be613f17249914174d80531 SHA1 0112bf2a4d121a155041ea6d05bde7b005adfa0b SHA256 5bbdf1c9e6f958cd41b17c44c22eee59a743d51f98812ce37b1c59e736093a2c -EBUILD yap-6.0.4.ebuild 2282 RMD160 35eb1455778246bca7ded06d51768ca3fa654855 SHA1 c519d907246aff3e7b67fe806c4bb33b14afee78 SHA256 bd9f2c07540dae18b7b1047d588ef3e2cf0c13c62af59e62a43dc255a779d236 -EBUILD yap-6.0.5-r1.ebuild 2331 RMD160 48b9cda0634b56e4cbf3f9d3f467d5ed06b7c3d1 SHA1 b7cad92f8540ab827240e5c127cac28298876042 SHA256 1eab4cd6e5273a8ffce60bf816840d85df163719cb29a45d472cded395260e2c -EBUILD yap-6.0.5.ebuild 2287 RMD160 f4ce34ff3ab33544df90e6d68dc892f0e477b0ee SHA1 cf74f88eda55b569c4d5bc7a5746572013b5cd3d SHA256 bb70ba1c75a56ae607f7d17a108db0c70b79b6bc9245a984228a52812af6c01d -EBUILD yap-6.0.6.ebuild 2416 RMD160 22ea3b1c433dfd6f30ad1a3531cf82d0f9e68821 SHA1 2550d92d5403e5ad22cce00b66bb38baec0df9c8 SHA256 8a4917829e7f79113bd713828e97e3ee708f0d46e0b95de7031558fbf179dfb8 -EBUILD yap-6.2.0-r1.ebuild 2783 RMD160 fe4845183677192715a0c86170fa717fd4cd8c9f SHA1 52cc1af5bf2d954eb29eb1ad698e0c862d514ded SHA256 67f0309beadcff935ddb51a6824e70d5887676743e9b42b44d6810fdc4564831 -EBUILD yap-6.2.0.ebuild 2388 RMD160 17b05053b60ebd8214887455bc4a29e9a0c9416c SHA1 ce6158e2c7d85891bbfb4ee7533fc61448ae8952 SHA256 c6d6bf3cc79b7a0572d89988b39827d4c25e5e1edb00b952d3a2dd2870f654a7 -MISC ChangeLog 8856 RMD160 201923dfd369663e31e7d9d9e3468203d5399722 SHA1 cef99b3dd53818e56b860d45c60b4bbdd81c5cd9 SHA256 a85e3610baca000e813405bd079efcb7f040e550a06d8b9471ce94262e7fa33b +EBUILD yap-6.0.1.ebuild 2314 RMD160 2fcc32bcf93dad0b5bc0c3f7e9413ce8063f2382 SHA1 c91782be43e818e73d63d196e0005f64f2c8fbff SHA256 69cd1282ee822db3f61015c5360728b41af70f07ef3f9d4c528230e1f54377ea +EBUILD yap-6.0.2.ebuild 2297 RMD160 c1ae01ef1d9ae67c0c3d7b25592b73a5b269f79f SHA1 b05a75bae5b20beab2995c68ea953163ee0d2607 SHA256 bf4c6c06d10ede0f183ba7318da5f5895f10f6bdb85686788934f4a5ca05cec7 +EBUILD yap-6.0.3.ebuild 2297 RMD160 30fb9e51226787aa246ea0c49de7223b6efe39e3 SHA1 dbce72fe24b5a464b6ec4829f98da91bcb3852aa SHA256 ff713fed7f83533bcff692c81faa249160bbc2fd9572218c8d2d782876c40331 +EBUILD yap-6.0.4.ebuild 2297 RMD160 6ab3a7c7788fcfc8781df9286214721f89a0a8ea SHA1 bdf7c35bd9fb2a82e73df649f69786d5e090f740 SHA256 2f85ef6a6f7d579d1688ee5d81c6e6f9a4e610cd33bfb67897fd985a9b3adc5c +EBUILD yap-6.0.5-r1.ebuild 2300 RMD160 fd734d699cba34d5d71094c5df4536b6a141c5f8 SHA1 d8a7a6f9a13961d99ca2d1812561f01e41bd1921 SHA256 f62ec629f03c7123048d45d6e19246c58a56a8b5554da5834fc2ef0116777b6e +EBUILD yap-6.0.5.ebuild 2297 RMD160 664be1cd9ec69b32c247a9e18acb7c1582b00c5e SHA1 6f70e87327d5f1b4314542d183563cb64c1361bb SHA256 e1344f627957c677d601b76f0deedbb2e4c0bd3749d58132a927f04f851142d9 +EBUILD yap-6.0.6.ebuild 2308 RMD160 3335a542c2feb7124057f6c29e9b8c76e8327a6c SHA1 b1dd4afe951161e8fe7e7a47b4f4132e19585e3b SHA256 0b2c95e632fe864936cc15893aba40621544eef04e76268c0bbe9647f53ab48f +EBUILD yap-6.2.0-r1.ebuild 2612 RMD160 29f4941005ec9f9df419e49a12b3ac7acf46c468 SHA1 dfe3d225f5dd12c00723ba588a96c5260d484b21 SHA256 0941d09ec53325359a26394613e9e9ac864e850f5e27222535ffe6f902477a8e +EBUILD yap-6.2.0.ebuild 2357 RMD160 bff60f7fbfee10dfaeac51e6014aa57636447563 SHA1 2d5af7f87d8cf8c773e8347571016051b247b4d9 SHA256 dd3ebf61ec27cd1ff8455b4051e28b4f089c55320d4a0f505f197983526ae771 +MISC ChangeLog 10348 RMD160 441ba38e45e4afa6a69511d5899cc95d74b85f5d SHA1 9643dec56f5fab337f40d002d2fd90d68e78e12f SHA256 886ed35d138087bf76c09f17b86a7e4903094c2cd4191f4b30ca66a3bc89f1d5 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba diff --git a/dev-lang/yap/files/yap-6.0.1-bootfile.patch b/dev-lang/yap/files/yap-6.0.1-bootfile.patch deleted file mode 100644 index 72ffcdadf5a8..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-bootfile.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- yap-6.0.1.orig/C/c_interface.c 2010-03-01 21:59:16.000000000 +1300 -+++ yap-6.0.1/C/c_interface.c 2010-03-03 21:10:11.000000000 +1300 -@@ -2170,6 +2170,7 @@ - static int eof_found = FALSE; - static int yap_lineno = 0; - -+static char *BootFileDir = NULL; - static FILE *bootfile; - - static char InitFile[] = "init.yap"; -@@ -2489,11 +2490,21 @@ - - /* read the bootfile */ - if (!do_bootstrap) { -+ BootFileDir = getenv("YAPBOOTDIR"); -+ if (BootFileDir) { - #if HAVE_STRNCAT -- strncpy(boot_file, YAP_PL_SRCDIR, 256); -+ strncpy(boot_file, BootFileDir, 256); - #else -- strcpy(boot_file, YAP_PL_SRCDIR); -+ strcpy(boot_file, BootFileDir); - #endif -+ } -+ else { -+#if HAVE_STRNCAT -+ strncpy(boot_file, YAP_PL_SRCDIR, 256); -+#else -+ strcpy(boot_file, YAP_PL_SRCDIR); -+#endif -+ } - #if HAVE_STRNCAT - strncat(boot_file, "/", 255); - #else -@@ -2513,11 +2524,20 @@ - Atom atfile; - Functor fgoal; - YAP_Term goal, as[2]; -+ if (BootFileDir) { - #if HAVE_STRNCAT -- strncpy(init_file, YAP_PL_SRCDIR, 256); -+ strncpy(init_file, BootFileDir, 256); - #else -- strcpy(init_file, YAP_PL_SRCDIR); -+ strcpy(init_file, BootFileDir); - #endif -+ } -+ else { -+#if HAVE_STRNCAT -+ strncpy(init_file, YAP_PL_SRCDIR, 256); -+#else -+ strcpy(init_file, YAP_PL_SRCDIR); -+#endif -+ } - #if HAVE_STRNCAT - strncat(init_file, "/", 255); - #else diff --git a/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch b/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch deleted file mode 100644 index 853a77a0a0e4..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/Makefile.in 2010-03-03 20:04:45.000000000 +1300 -@@ -499,7 +499,7 @@ - $(RANLIB) libYap.a - - @DYNYAPLIB@: $(LIB_OBJECTS) -- @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) -+ @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) - - install: install_bin install_data - diff --git a/dev-lang/yap/files/yap-6.0.1-mpi-include.patch b/dev-lang/yap/files/yap-6.0.1-mpi-include.patch deleted file mode 100644 index 1cdd06a8c68c..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-mpi-include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- yap-6.0.1.orig/library/mpi/mpi.c 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/mpi/mpi.c 2010-03-02 20:57:43.000000000 +1300 -@@ -26,9 +26,6 @@ - #include "Yatom.h" - #include "yapio.h" - --/* for AtomEof */ --#include "Heap.h" -- - #include <stdlib.h> - #include <string.h> - #include <mpi.h> diff --git a/dev-lang/yap/files/yap-6.0.1-multilib.patch b/dev-lang/yap/files/yap-6.0.1-multilib.patch deleted file mode 100644 index 9c6282ac0adf..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-multilib.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff -ur yap-6.0.1.orig/CLPQR/Makefile.in yap-6.0.1/CLPQR/Makefile.in ---- yap-6.0.1.orig/CLPQR/Makefile.in 2010-03-01 21:59:16.000000000 +1300 -+++ yap-6.0.1/CLPQR/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/GPL/Makefile.in yap-6.0.1/GPL/Makefile.in ---- yap-6.0.1.orig/GPL/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/GPL/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/LGPL/Makefile.in yap-6.0.1/LGPL/Makefile.in ---- yap-6.0.1.orig/LGPL/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/LGPL/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/LGPL/clp/Makefile.in yap-6.0.1/LGPL/clp/Makefile.in ---- yap-6.0.1.orig/LGPL/clp/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/LGPL/clp/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/LGPL/swi_console/Makefile.in yap-6.0.1/LGPL/swi_console/Makefile.in ---- yap-6.0.1.orig/LGPL/swi_console/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/LGPL/swi_console/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -8,7 +8,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/Makefile.in yap-6.0.1/Makefile.in ---- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -12,8 +12,8 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/library/Makefile.in yap-6.0.1/library/Makefile.in ---- yap-6.0.1.orig/library/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/library/lammpi/Makefile.in yap-6.0.1/library/lammpi/Makefile.in ---- yap-6.0.1.orig/library/lammpi/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/lammpi/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -17,7 +17,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/matlab/Makefile.in yap-6.0.1/library/matlab/Makefile.in ---- yap-6.0.1.orig/library/matlab/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/matlab/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/matrices/Makefile.in yap-6.0.1/library/matrices/Makefile.in ---- yap-6.0.1.orig/library/matrices/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/matrices/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/matrix/Makefile.in yap-6.0.1/library/matrix/Makefile.in ---- yap-6.0.1.orig/library/matrix/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/matrix/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/mpi/Makefile.in yap-6.0.1/library/mpi/Makefile.in ---- yap-6.0.1.orig/library/mpi/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/mpi/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -21,8 +21,8 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/library/random/Makefile.in yap-6.0.1/library/random/Makefile.in ---- yap-6.0.1.orig/library/random/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/random/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/regex/Makefile.in yap-6.0.1/library/regex/Makefile.in ---- yap-6.0.1.orig/library/regex/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/regex/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/rltree/Makefile.in yap-6.0.1/library/rltree/Makefile.in ---- yap-6.0.1.orig/library/rltree/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/rltree/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -17,7 +17,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/system/Makefile.in yap-6.0.1/library/system/Makefile.in ---- yap-6.0.1.orig/library/system/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/system/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/tries/Makefile.in yap-6.0.1/library/tries/Makefile.in ---- yap-6.0.1.orig/library/tries/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/tries/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/library/yap2swi/Makefile.in yap-6.0.1/library/yap2swi/Makefile.in ---- yap-6.0.1.orig/library/yap2swi/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/library/yap2swi/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/packages/CLPBN/Makefile.in yap-6.0.1/packages/CLPBN/Makefile.in ---- yap-6.0.1.orig/packages/CLPBN/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/CLPBN/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/packages/PLStream/Makefile.in yap-6.0.1/packages/PLStream/Makefile.in ---- yap-6.0.1.orig/packages/PLStream/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/PLStream/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -14,7 +14,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/packages/ProbLog/Makefile.in yap-6.0.1/packages/ProbLog/Makefile.in ---- yap-6.0.1.orig/packages/ProbLog/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/ProbLog/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in ---- yap-6.0.1.orig/packages/ProbLog/simplecudd/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/packages/chr/Makefile.in yap-6.0.1/packages/chr/Makefile.in ---- yap-6.0.1.orig/packages/chr/Makefile.in 2010-03-01 21:59:37.000000000 +1300 -+++ yap-6.0.1/packages/chr/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -15,8 +15,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - - SHELL=@SHELL@ -diff -ur yap-6.0.1.orig/packages/clpqr/Makefile.in yap-6.0.1/packages/clpqr/Makefile.in ---- yap-6.0.1.orig/packages/clpqr/Makefile.in 2010-03-01 21:59:38.000000000 +1300 -+++ yap-6.0.1/packages/clpqr/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -18,8 +18,8 @@ - ROOTDIR = $(prefix) - EROOTDIR = @exec_prefix@ - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - CLPDIR=$(SHAREDIR) - else -diff -ur yap-6.0.1.orig/packages/cplint/Makefile.in yap-6.0.1/packages/cplint/Makefile.in ---- yap-6.0.1.orig/packages/cplint/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/cplint/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -12,7 +12,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.1.orig/packages/jpl/Makefile.in yap-6.0.1/packages/jpl/Makefile.in ---- yap-6.0.1.orig/packages/jpl/Makefile.in 2010-03-01 21:59:39.000000000 +1300 -+++ yap-6.0.1/packages/jpl/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -22,8 +22,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - SHLIB_CFLAGS=@SHLIB_CFLAGS@ - -diff -ur yap-6.0.1.orig/packages/plunit/Makefile.in yap-6.0.1/packages/plunit/Makefile.in ---- yap-6.0.1.orig/packages/plunit/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/plunit/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -17,9 +17,9 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib -+LIBDIR=@libdir@ - SHAREDIR=$(EROOTDIR)/share/Yap --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+YAPLIBDIR=@libdir@/Yap - - PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss - LN_S=@LN_S@ -diff -ur yap-6.0.1.orig/packages/sgml/Makefile.in yap-6.0.1/packages/sgml/Makefile.in ---- yap-6.0.1.orig/packages/sgml/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/sgml/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -16,8 +16,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - - SHELL=@SHELL@ -diff -ur yap-6.0.1.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.1/packages/swi-minisat2/C/Makefile.in ---- yap-6.0.1.orig/packages/swi-minisat2/C/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/swi-minisat2/C/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -14,7 +14,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.1.orig/packages/swi-minisat2/Makefile.in yap-6.0.1/packages/swi-minisat2/Makefile.in ---- yap-6.0.1.orig/packages/swi-minisat2/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/packages/swi-minisat2/Makefile.in 2010-03-03 19:58:06.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # diff --git a/dev-lang/yap/files/yap-6.0.1-myddas-include.patch b/dev-lang/yap/files/yap-6.0.1-myddas-include.patch deleted file mode 100644 index b85447479d4a..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-myddas-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.0.1.orig/Makefile.in 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/Makefile.in 2010-03-02 20:47:55.000000000 +1300 -@@ -59,7 +59,7 @@ - # - CC=@CC@ - MPI_CC=@MPI_CC@ --CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS -+CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) - C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include - C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) diff --git a/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch deleted file mode 100644 index a3fe0362af76..000000000000 --- a/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- yap-6.0.1.orig/pl/consult.yap 2010-03-01 21:59:17.000000000 +1300 -+++ yap-6.0.1/pl/consult.yap 2010-03-03 19:13:57.000000000 +1300 -@@ -853,12 +853,12 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(prolog_commons_directory,Dir). - diff --git a/dev-lang/yap/files/yap-6.0.2-bootfile.patch b/dev-lang/yap/files/yap-6.0.2-bootfile.patch deleted file mode 100644 index 84a041358d9f..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-bootfile.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- yap-6.0.2.orig/C/c_interface.c 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/C/c_interface.c 2010-03-05 21:41:19.000000000 +1300 -@@ -2170,6 +2170,7 @@ - static int eof_found = FALSE; - static int yap_lineno = 0; - -+static char *BootFileDir = NULL; - static FILE *bootfile; - - static char InitFile[] = "init.yap"; -@@ -2489,11 +2490,21 @@ - - /* read the bootfile */ - if (!do_bootstrap) { -+ BootFileDir = getenv("YAPBOOTDIR"); -+ if (BootFileDir) { - #if HAVE_STRNCAT -- strncpy(boot_file, YAP_PL_SRCDIR, 256); -+ strncpy(boot_file, BootFileDir, 256); - #else -- strcpy(boot_file, YAP_PL_SRCDIR); -+ strcpy(boot_file, BootFileDir); - #endif -+ } -+ else { -+#if HAVE_STRNCAT -+ strncpy(boot_file, YAP_PL_SRCDIR, 256); -+#else -+ strcpy(boot_file, YAP_PL_SRCDIR); -+#endif -+ } - #if HAVE_STRNCAT - strncat(boot_file, "/", 255); - #else -@@ -2513,11 +2524,20 @@ - Atom atfile; - Functor fgoal; - YAP_Term goal, as[2]; -+ if (BootFileDir) { - #if HAVE_STRNCAT -- strncpy(init_file, YAP_PL_SRCDIR, 256); -+ strncpy(init_file, BootFileDir, 256); - #else -- strcpy(init_file, YAP_PL_SRCDIR); -+ strcpy(init_file, BootFileDir); - #endif -+ } -+ else { -+#if HAVE_STRNCAT -+ strncpy(init_file, YAP_PL_SRCDIR, 256); -+#else -+ strcpy(init_file, YAP_PL_SRCDIR); -+#endif -+ } - #if HAVE_STRNCAT - strncat(init_file, "/", 255); - #else diff --git a/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch b/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch deleted file mode 100644 index 7efa74b3077a..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.0.2.orig/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/Makefile.in 2010-03-05 21:42:36.000000000 +1300 -@@ -499,7 +499,7 @@ - $(RANLIB) libYap.a - - @DYNYAPLIB@: $(LIB_OBJECTS) -- @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS) -+ @DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) - - install: install_bin install_data - diff --git a/dev-lang/yap/files/yap-6.0.2-mpi-include.patch b/dev-lang/yap/files/yap-6.0.2-mpi-include.patch deleted file mode 100644 index 60bcab738a0c..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-mpi-include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- yap-6.0.2.orig/library/mpi/mpi.c 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/mpi/mpi.c 2010-03-05 21:43:55.000000000 +1300 -@@ -26,9 +26,6 @@ - #include "Yatom.h" - #include "yapio.h" - --/* for AtomEof */ --#include "Heap.h" -- - #include <stdlib.h> - #include <string.h> - #include <mpi.h> diff --git a/dev-lang/yap/files/yap-6.0.2-multilib.patch b/dev-lang/yap/files/yap-6.0.2-multilib.patch deleted file mode 100644 index b6cd8aceb004..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-multilib.patch +++ /dev/null @@ -1,375 +0,0 @@ -diff -ur yap-6.0.2.orig/CLPQR/Makefile.in yap-6.0.2/CLPQR/Makefile.in ---- yap-6.0.2.orig/CLPQR/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/CLPQR/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/GPL/Makefile.in yap-6.0.2/GPL/Makefile.in ---- yap-6.0.2.orig/GPL/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/GPL/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/LGPL/Makefile.in yap-6.0.2/LGPL/Makefile.in ---- yap-6.0.2.orig/LGPL/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/LGPL/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/LGPL/clp/Makefile.in yap-6.0.2/LGPL/clp/Makefile.in ---- yap-6.0.2.orig/LGPL/clp/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/LGPL/clp/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/LGPL/swi_console/Makefile.in yap-6.0.2/LGPL/swi_console/Makefile.in ---- yap-6.0.2.orig/LGPL/swi_console/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/LGPL/swi_console/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -8,7 +8,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/Makefile.in yap-6.0.2/Makefile.in ---- yap-6.0.2.orig/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -12,8 +12,8 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/library/Makefile.in yap-6.0.2/library/Makefile.in ---- yap-6.0.2.orig/library/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/library/lammpi/Makefile.in yap-6.0.2/library/lammpi/Makefile.in ---- yap-6.0.2.orig/library/lammpi/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/lammpi/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -17,7 +17,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/matlab/Makefile.in yap-6.0.2/library/matlab/Makefile.in ---- yap-6.0.2.orig/library/matlab/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/matlab/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/matrices/Makefile.in yap-6.0.2/library/matrices/Makefile.in ---- yap-6.0.2.orig/library/matrices/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/matrices/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/matrix/Makefile.in yap-6.0.2/library/matrix/Makefile.in ---- yap-6.0.2.orig/library/matrix/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/matrix/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/mpi/Makefile.in yap-6.0.2/library/mpi/Makefile.in ---- yap-6.0.2.orig/library/mpi/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/mpi/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -21,8 +21,8 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/library/random/Makefile.in yap-6.0.2/library/random/Makefile.in ---- yap-6.0.2.orig/library/random/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/random/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/regex/Makefile.in yap-6.0.2/library/regex/Makefile.in ---- yap-6.0.2.orig/library/regex/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/regex/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/rltree/Makefile.in yap-6.0.2/library/rltree/Makefile.in ---- yap-6.0.2.orig/library/rltree/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/rltree/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -17,7 +17,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/system/Makefile.in yap-6.0.2/library/system/Makefile.in ---- yap-6.0.2.orig/library/system/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/system/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/tries/Makefile.in yap-6.0.2/library/tries/Makefile.in ---- yap-6.0.2.orig/library/tries/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/tries/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/library/yap2swi/Makefile.in yap-6.0.2/library/yap2swi/Makefile.in ---- yap-6.0.2.orig/library/yap2swi/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/library/yap2swi/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/packages/CLPBN/Makefile.in yap-6.0.2/packages/CLPBN/Makefile.in ---- yap-6.0.2.orig/packages/CLPBN/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/CLPBN/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/packages/PLStream/Makefile.in yap-6.0.2/packages/PLStream/Makefile.in ---- yap-6.0.2.orig/packages/PLStream/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/PLStream/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -14,7 +14,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/packages/ProbLog/Makefile.in yap-6.0.2/packages/ProbLog/Makefile.in ---- yap-6.0.2.orig/packages/ProbLog/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/ProbLog/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in ---- yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -13,7 +13,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/packages/chr/Makefile.in yap-6.0.2/packages/chr/Makefile.in ---- yap-6.0.2.orig/packages/chr/Makefile.in 2010-03-04 13:57:48.000000000 +1300 -+++ yap-6.0.2/packages/chr/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -15,8 +15,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - - SHELL=@SHELL@ -diff -ur yap-6.0.2.orig/packages/clpqr/Makefile.in yap-6.0.2/packages/clpqr/Makefile.in ---- yap-6.0.2.orig/packages/clpqr/Makefile.in 2010-03-04 13:57:49.000000000 +1300 -+++ yap-6.0.2/packages/clpqr/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -18,8 +18,8 @@ - ROOTDIR = $(prefix) - EROOTDIR = @exec_prefix@ - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - CLPDIR=$(SHAREDIR) - else -diff -ur yap-6.0.2.orig/packages/cplint/Makefile.in yap-6.0.2/packages/cplint/Makefile.in ---- yap-6.0.2.orig/packages/cplint/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/cplint/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -12,7 +12,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # -diff -ur yap-6.0.2.orig/packages/jpl/Makefile.in yap-6.0.2/packages/jpl/Makefile.in ---- yap-6.0.2.orig/packages/jpl/Makefile.in 2010-03-04 13:57:50.000000000 +1300 -+++ yap-6.0.2/packages/jpl/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -22,8 +22,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - SHLIB_CFLAGS=@SHLIB_CFLAGS@ - -diff -ur yap-6.0.2.orig/packages/plunit/Makefile.in yap-6.0.2/packages/plunit/Makefile.in ---- yap-6.0.2.orig/packages/plunit/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/plunit/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -17,9 +17,9 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib -+LIBDIR=@libdir@ - SHAREDIR=$(EROOTDIR)/share/Yap --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+YAPLIBDIR=@libdir@/Yap - - PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss - LN_S=@LN_S@ -diff -ur yap-6.0.2.orig/packages/sgml/Makefile.in yap-6.0.2/packages/sgml/Makefile.in ---- yap-6.0.2.orig/packages/sgml/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/sgml/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -16,8 +16,8 @@ - srcdir=@srcdir@ - - BINDIR = $(EROOTDIR)/bin --LIBDIR=$(EROOTDIR)/lib --YAPLIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@ -+YAPLIBDIR=@libdir@/Yap - SHAREDIR=$(ROOTDIR)/share/Yap - - SHELL=@SHELL@ -diff -ur yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.2/packages/swi-minisat2/C/Makefile.in ---- yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/swi-minisat2/C/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -14,7 +14,7 @@ - # - # where YAP should look for libraries - # --LIBDIR=$(EROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # - CC=@CC@ -diff -ur yap-6.0.2.orig/packages/swi-minisat2/Makefile.in yap-6.0.2/packages/swi-minisat2/Makefile.in ---- yap-6.0.2.orig/packages/swi-minisat2/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/packages/swi-minisat2/Makefile.in 2010-03-05 21:45:24.000000000 +1300 -@@ -9,7 +9,7 @@ - # - # where YAP should look for binary libraries - # --LIBDIR=$(ROOTDIR)/lib/Yap -+LIBDIR=@libdir@/Yap - # - # where YAP should look for architecture-independent Prolog libraries - # diff --git a/dev-lang/yap/files/yap-6.0.2-myddas-include.patch b/dev-lang/yap/files/yap-6.0.2-myddas-include.patch deleted file mode 100644 index 4da9df0042bb..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-myddas-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.0.2.orig/Makefile.in 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/Makefile.in 2010-03-05 21:51:44.000000000 +1300 -@@ -59,7 +59,7 @@ - # - CC=@CC@ - MPI_CC=@MPI_CC@ --CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS -+CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) - C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include - C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) diff --git a/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch deleted file mode 100644 index e900bd3d497e..000000000000 --- a/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- yap-6.0.2.orig/pl/consult.yap 2010-03-04 13:57:29.000000000 +1300 -+++ yap-6.0.2/pl/consult.yap 2010-03-05 21:46:18.000000000 +1300 -@@ -877,12 +877,12 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(prolog_commons_directory,Dir). - diff --git a/dev-lang/yap/files/yap-6.0.3-install-clause.patch b/dev-lang/yap/files/yap-6.0.3-install-clause.patch deleted file mode 100644 index 2e2c9e8ce5e0..000000000000 --- a/dev-lang/yap/files/yap-6.0.3-install-clause.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- yap-6.0.3.orig/C/index.c 2010-03-16 03:45:20.000000000 +1300 -+++ yap-6.0.3/C/index.c 2010-04-10 12:02:06.000000000 +1200 -@@ -3475,10 +3475,6 @@ - } else if (sp->pos) { - UInt argno = -sp->pos; - skip_to_arg(cls, ap, argno, FALSE); -- if (ArityOfFunctor((Functor)RepAppl(sp[-1].val)) -- != argno+1) { -- last_arg = FALSE; -- } - } - } - sp++; diff --git a/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch deleted file mode 100644 index d4fec59472d7..000000000000 --- a/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- yap-6.0.3.orig/pl/consult.yap 2010-03-16 03:45:21.000000000 +1300 -+++ yap-6.0.3/pl/consult.yap 2010-03-21 10:26:22.000000000 +1300 -@@ -877,9 +877,9 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/files/yap-6.0.4-JAVALIBPATH.patch b/dev-lang/yap/files/yap-6.0.4-JAVALIBPATH.patch deleted file mode 100644 index 25c9da06720f..000000000000 --- a/dev-lang/yap/files/yap-6.0.4-JAVALIBPATH.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- yap-6.0.4.orig/configure 2010-05-01 04:53:07.000000000 +1200 -+++ yap-6.0.4/configure 2010-05-16 08:58:27.000000000 +1200 -@@ -6504,7 +6504,7 @@ - LDFLAGS="-dynamic $LDFLAGS" - ;; - x86*) -- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" -+ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" - JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - if test "$CC" != "lcc" - then -@@ -6512,7 +6512,7 @@ - fi - ;; - *) -- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" -+ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" - JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - if test "$CC" != "lcc" - then diff --git a/dev-lang/yap/files/yap-6.0.4-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.4-chr-sublist.patch deleted file mode 100644 index 84795b4d18ba..000000000000 --- a/dev-lang/yap/files/yap-6.0.4-chr-sublist.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- yap-6.0.4.orig/library/dialect/hprolog.yap 2010-05-01 04:53:07.000000000 +1200 -+++ yap-6.0.4/library/dialect/hprolog.yap 2010-05-16 09:10:46.000000000 +1200 -@@ -38,7 +38,7 @@ - split_at/4, % +N, +List, -FirstElements, -LastElements - max_go_list/2, % +List, -Max - or_list/2, % +ListOfInts, -BitwiseOr -- sublist/2, % ?Sublist, +List -+ chr_sublist/2, % ?Sublist, +List - bounded_sublist/3, % ?Sublist, +List, +Bound - chr_delete/3, - init_store/2, -@@ -55,9 +55,9 @@ - % lookup_ht1/4 - ]). - --:- reexport('../lists',[sublist/2]). -+%:- reexport('../lists',[sublist/2]). - --%:- use_module(library(lists)). -+:- use_module(library(lists)). - :- use_module(library(assoc)). - - /** <module> hProlog compatibility library -@@ -213,15 +213,15 @@ - % - % True if all elements of Sub appear in List in the same order. - --%sublist(L, L). --%sublist(Sub, [H|T]) :- --% '$sublist1'(T, H, Sub). -- --%'$sublist1'(Sub, _, Sub). --%'$sublist1'([H|T], _, Sub) :- --% '$sublist1'(T, H, Sub). --%'$sublist1'([H|T], X, [X|Sub]) :- --% '$sublist1'(T, H, Sub). -+chr_sublist(L, L). -+chr_sublist(Sub, [H|T]) :- -+ '$sublist1'(T, H, Sub). -+ -+'$sublist1'(Sub, _, Sub). -+'$sublist1'([H|T], _, Sub) :- -+ '$sublist1'(T, H, Sub). -+'$sublist1'([H|T], X, [X|Sub]) :- -+ '$sublist1'(T, H, Sub). - - %% bounded_sublist(?Sub, +List, +Bound:integer) - % diff --git a/dev-lang/yap/files/yap-6.0.4-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.4-yapsharedir.patch deleted file mode 100644 index b600ff4b7b79..000000000000 --- a/dev-lang/yap/files/yap-6.0.4-yapsharedir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- yap-6.0.4.orig/pl/consult.yap 2010-05-01 04:53:07.000000000 +1200 -+++ yap-6.0.4/pl/consult.yap 2010-05-16 07:27:41.000000000 +1200 -@@ -875,9 +875,9 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch b/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch deleted file mode 100644 index acf5e0ae1945..000000000000 --- a/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- yap-6.orig/configure 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/configure 2010-05-16 09:24:44.000000000 +1200 -@@ -6590,7 +6590,7 @@ - LDFLAGS="-dynamic $LDFLAGS" - ;; - x86*) -- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" -+ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" - JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - if test "$CC" != "lcc" - then -@@ -6598,7 +6598,7 @@ - fi - ;; - *) -- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" -+ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" - JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" - if test "$CC" != "lcc" - then diff --git a/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch deleted file mode 100644 index 5ff93ccdd3c6..000000000000 --- a/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- yap-6.orig/library/dialect/hprolog.yap 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/dialect/hprolog.yap 2010-05-16 09:25:26.000000000 +1200 -@@ -38,7 +38,7 @@ - split_at/4, % +N, +List, -FirstElements, -LastElements - max_go_list/2, % +List, -Max - or_list/2, % +ListOfInts, -BitwiseOr -- sublist/2, % ?Sublist, +List -+ chr_sublist/2, % ?Sublist, +List - bounded_sublist/3, % ?Sublist, +List, +Bound - chr_delete/3, - init_store/2, -@@ -55,9 +55,9 @@ - % lookup_ht1/4 - ]). - --:- reexport('../lists',[sublist/2]). -+%:- reexport('../lists',[sublist/2]). - --%:- use_module(library(lists)). -+:- use_module(library(lists)). - :- use_module(library(assoc)). - - /** <module> hProlog compatibility library -@@ -213,15 +213,15 @@ - % - % True if all elements of Sub appear in List in the same order. - --%sublist(L, L). --%sublist(Sub, [H|T]) :- --% '$sublist1'(T, H, Sub). -- --%'$sublist1'(Sub, _, Sub). --%'$sublist1'([H|T], _, Sub) :- --% '$sublist1'(T, H, Sub). --%'$sublist1'([H|T], X, [X|Sub]) :- --% '$sublist1'(T, H, Sub). -+chr_sublist(L, L). -+chr_sublist(Sub, [H|T]) :- -+ '$sublist1'(T, H, Sub). -+ -+'$sublist1'(Sub, _, Sub). -+'$sublist1'([H|T], _, Sub) :- -+ '$sublist1'(T, H, Sub). -+'$sublist1'([H|T], X, [X|Sub]) :- -+ '$sublist1'(T, H, Sub). - - %% bounded_sublist(?Sub, +List, +Bound:integer) - % diff --git a/dev-lang/yap/files/yap-6.0.5-ldflags.patch b/dev-lang/yap/files/yap-6.0.5-ldflags.patch deleted file mode 100644 index d2142e6c75b5..000000000000 --- a/dev-lang/yap/files/yap-6.0.5-ldflags.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in ---- yap-6.orig/library/matrix/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/matrix/Makefile.in 2010-09-12 12:24:04.000000000 +1200 -@@ -19,6 +19,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o --@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in ---- yap-6.orig/library/random/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/random/Makefile.in 2010-09-12 12:22:00.000000000 +1200 -@@ -19,6 +19,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o --@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in ---- yap-6.orig/library/regex/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/regex/Makefile.in 2010-09-12 12:29:26.000000000 +1200 -@@ -19,6 +19,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -59,22 +60,22 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@regexp@SHLIB_SUFFIX@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o - - @DO_SECOND_LD@regcomp@SHLIB_SUFFIX@: regcomp.o @MERGE_DLL_OBJS@ regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o - - @DO_SECOND_LD@regerror@SHLIB_SUFFIX@: regerror.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o $(LDFLAGS) - - @DO_SECOND_LD@regfree@SHLIB_SUFFIX@: regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o $(LDFLAGS) - - @DO_SECOND_LD@regexec@SHLIB_SUFFIX@: regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in ---- yap-6.orig/library/rltree/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/rltree/Makefile.in 2010-09-12 12:26:05.000000000 +1200 -@@ -24,6 +24,7 @@ - CC=@CC@ - MPI_CC=mpicc - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -52,10 +53,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) -+@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS) - - install: all - @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR); fi -diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in ---- yap-6.orig/library/system/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/system/Makefile.in 2010-09-12 12:23:01.000000000 +1200 -@@ -19,6 +19,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o - - @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o --@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in ---- yap-6.orig/library/tries/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/tries/Makefile.in 2010-09-12 12:23:36.000000000 +1200 -@@ -19,6 +19,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -59,13 +60,13 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@tries@SHLIB_SUFFIX@: core_tries.o base_tries.o tries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o $(LDFLAGS) - - @DO_SECOND_LD@itries@SHLIB_SUFFIX@: core_tries.o base_itries.o itries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o -+@DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/library/yap2swi/Makefile.in yap-6/library/yap2swi/Makefile.in ---- yap-6.orig/library/yap2swi/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/yap2swi/Makefile.in 2010-09-12 12:22:37.000000000 +1200 -@@ -18,6 +18,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -48,10 +49,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap2swi.c -o yap2swi.o - - @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@yap2swi@SHLIB_SUFFIX@: yap2swi.o --@DO_SECOND_LD@ @SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @ -+@DO_SECOND_LD@ @SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @ $(LDFLAGS) - - install: - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in ---- yap-6.orig/packages/PLStream/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/packages/PLStream/Makefile.in 2010-09-12 12:25:31.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -77,10 +78,10 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $< -o $@ - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< -+@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS) - - @DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) -diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in ---- yap-6.orig/packages/jpl/Makefile.in 2010-05-12 01:53:40.000000000 +1200 -+++ yap-6/packages/jpl/Makefile.in 2010-09-12 12:44:26.000000000 +1200 -@@ -35,6 +35,7 @@ - # - CC=@CC@ - CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @JAVAINCPATH@ -+LDFLAGS=@LDFLAGS@ - MKINDEX=true - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) -@@ -97,7 +98,7 @@ - - - @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o -- @DO_SECOND_LD@ @SHLIB_LD@ @JAVALIBPATH@ -o $@ $< @JAVALIBS@ -+ @DO_SECOND_LD@ @SHLIB_LD@ @JAVALIBPATH@ $(LDFLAGS) -o $@ $< @JAVALIBS@ - if [ -r libjpl.dylib ]; then \ - rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \ - fi -diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in ---- yap-6.orig/packages/sgml/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/packages/sgml/Makefile.in 2010-09-12 12:10:18.000000000 +1200 -@@ -72,7 +72,7 @@ - CMFLAGS=@CMFLAGS@ - CIFLAGS=-I. -I@PLINCL@ - CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@ --LDFLAGS=$(COFLAGS) -+LDFLAGS=@LDFLAGS@ - - LDSOFLAGS=@LDSOFLAGS@ - -@@ -114,7 +114,7 @@ - $(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $< - - @DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ) --@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) -+@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) $(LDFLAGS) - - all: $(TARGETS) $(PROGRAMS) - -diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in ---- yap-6.orig/packages/swi-minisat2/C/Makefile.in 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-09-12 12:24:57.000000000 +1200 -@@ -21,6 +21,7 @@ - CC=@CC@ - CXX=@CXX@ - CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -69,7 +70,7 @@ - $(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o - - @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) -+@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS) - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR) diff --git a/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch deleted file mode 100644 index 487a939962e6..000000000000 --- a/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- yap-6.orig/pl/consult.yap 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/pl/consult.yap 2010-05-16 09:26:41.000000000 +1200 -@@ -872,9 +872,9 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch b/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch deleted file mode 100644 index 5460c7727a30..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- yap-6.orig/packages/http/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/http/Makefile.in 2010-08-08 10:00:13.000000000 +1200 -@@ -110,7 +110,7 @@ - $(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET) - mkdir -p $(PLTARGET) - mkdir -p $(PLTARGET)/web/icons -- mkdir -p $(LIBDIR)/web/css -+ mkdir -p $(DESTDIR)$(LIBDIR)/web/css - $(INSTALL_DATA) $(LIBPL) $(PLTARGET) - $(INSTALL_DATA) $(srcdir)/README $(PLTARGET) - $(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons ---- yap-6.orig/packages/zlib/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/zlib/Makefile.in 2010-08-08 10:06:17.000000000 +1200 -@@ -107,7 +107,7 @@ - $(LD) $(LDFLAGS) -o $@ $(ZOBJ) $(LIBS) - - install: $(TARGETS) $(LIBPL) -- mkdir -p $(DESTDIR)$(BINTARGET) -+ mkdir -p $(BINTARGET) - for f in $(TARGETS); do \ - $(INSTALL_PROGRAM) $$f $(BINTARGET); \ - done diff --git a/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch deleted file mode 100644 index 5ff93ccdd3c6..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- yap-6.orig/library/dialect/hprolog.yap 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/library/dialect/hprolog.yap 2010-05-16 09:25:26.000000000 +1200 -@@ -38,7 +38,7 @@ - split_at/4, % +N, +List, -FirstElements, -LastElements - max_go_list/2, % +List, -Max - or_list/2, % +ListOfInts, -BitwiseOr -- sublist/2, % ?Sublist, +List -+ chr_sublist/2, % ?Sublist, +List - bounded_sublist/3, % ?Sublist, +List, +Bound - chr_delete/3, - init_store/2, -@@ -55,9 +55,9 @@ - % lookup_ht1/4 - ]). - --:- reexport('../lists',[sublist/2]). -+%:- reexport('../lists',[sublist/2]). - --%:- use_module(library(lists)). -+:- use_module(library(lists)). - :- use_module(library(assoc)). - - /** <module> hProlog compatibility library -@@ -213,15 +213,15 @@ - % - % True if all elements of Sub appear in List in the same order. - --%sublist(L, L). --%sublist(Sub, [H|T]) :- --% '$sublist1'(T, H, Sub). -- --%'$sublist1'(Sub, _, Sub). --%'$sublist1'([H|T], _, Sub) :- --% '$sublist1'(T, H, Sub). --%'$sublist1'([H|T], X, [X|Sub]) :- --% '$sublist1'(T, H, Sub). -+chr_sublist(L, L). -+chr_sublist(Sub, [H|T]) :- -+ '$sublist1'(T, H, Sub). -+ -+'$sublist1'(Sub, _, Sub). -+'$sublist1'([H|T], _, Sub) :- -+ '$sublist1'(T, H, Sub). -+'$sublist1'([H|T], X, [X|Sub]) :- -+ '$sublist1'(T, H, Sub). - - %% bounded_sublist(?Sub, +List, +Bound:integer) - % diff --git a/dev-lang/yap/files/yap-6.0.6-itries.patch b/dev-lang/yap/files/yap-6.0.6-itries.patch deleted file mode 100644 index 023e11209250..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-itries.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yap-6.orig/library/tries/itries.c 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/tries/itries.c 2010-09-12 17:20:09.000000000 +1200 -@@ -620,7 +620,7 @@ - /* check args */ - if (!YAP_IsVarTerm(arg_itrie)) - return FALSE; -- if (!(file = (FILE*) Yap_FileDescriptorFromStream(arg_stream))) -+ if (!(file = (FILE*) YAP_FileDescriptorFromStream(arg_stream))) - return FALSE; - - /* load itrie */ diff --git a/dev-lang/yap/files/yap-6.0.6-ldflags.patch b/dev-lang/yap/files/yap-6.0.6-ldflags.patch deleted file mode 100644 index 4e70af50a3e7..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-ldflags.patch +++ /dev/null @@ -1,316 +0,0 @@ -diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in ---- yap-6.orig/library/matrix/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/matrix/Makefile.in 2010-09-12 17:50:42.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@matrix.@SO@: matrix.o --@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in ---- yap-6.orig/library/random/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/random/Makefile.in 2010-09-12 18:02:50.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@yap_random.@SO@: yap_random.o --@DO_SECOND_LD@ @SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in ---- yap-6.orig/library/regex/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/regex/Makefile.in 2010-09-12 18:02:16.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -59,22 +60,22 @@ - $(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o - - @DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regerror.@SO@: regerror.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regfree.@SO@: regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regexec.@SO@: regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in ---- yap-6.orig/library/rltree/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/rltree/Makefile.in 2010-09-12 18:01:14.000000000 +1200 -@@ -25,6 +25,7 @@ - CC=@CC@ - MPI_CC=mpicc - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -52,10 +53,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@yap_rl.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ - - install: all - @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi -diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in ---- yap-6.orig/library/system/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/system/Makefile.in 2010-09-12 17:51:44.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o - - @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@sys.@SO@: sys.o --@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in ---- yap-6.orig/library/tries/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/library/tries/Makefile.in 2010-09-12 17:50:07.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -60,13 +61,13 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in ---- yap-6.orig/packages/PLStream/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/PLStream/Makefile.in 2010-09-12 18:07:41.000000000 +1200 -@@ -21,6 +21,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -77,10 +78,10 @@ - $(CC) -c $(CFLAGS) $< -o $@ - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@libplstream.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in ---- yap-6.orig/packages/clib/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/clib/Makefile.in 2010-09-12 17:57:39.000000000 +1200 -@@ -37,7 +37,7 @@ - CRYPTLIBS=@CLIB_CRYPTLIBS@ - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) -diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in ---- yap-6.orig/packages/http/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/http/Makefile.in 2010-09-12 18:04:08.000000000 +1200 -@@ -38,7 +38,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR)/http -diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in ---- yap-6.orig/packages/jpl/Makefile.in 2010-08-05 05:36:46.000000000 +1200 -+++ yap-6/packages/jpl/Makefile.in 2010-09-12 17:54:10.000000000 +1200 -@@ -34,6 +34,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ @JAVAINCPATH@ -+LDFLAGS=@LDFLAGS@ - MKINDEX=true - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) -@@ -96,7 +97,7 @@ - - - @DO_SECOND_LD@%.@SO@: %.o -- @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@ -+ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@ - if [ -r libjpl.dylib ]; then \ - rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \ - fi -diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in ---- yap-6.orig/packages/semweb/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/semweb/Makefile.in 2010-09-12 18:07:04.000000000 +1200 -@@ -47,7 +47,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb -diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in ---- yap-6.orig/packages/sgml/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/sgml/Makefile.in 2010-09-12 17:53:23.000000000 +1200 -@@ -30,6 +30,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - MKINDEX=true - - LD=$(CC) -@@ -116,7 +117,7 @@ - $(CC) $(CFLAGS) -o $@ -c $< - - @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ) --@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ - - all: $(TARGETS) $(PROGRAMS) - -diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in ---- yap-6.orig/packages/swi-minisat2/C/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-09-12 18:10:07.000000000 +1200 -@@ -22,6 +22,7 @@ - CC=@CC@ - CXX=@CXX@ - CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -69,7 +70,7 @@ - $(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o - - @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in ---- yap-6.orig/packages/tai/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/tai/Makefile.in 2010-09-12 17:52:34.000000000 +1200 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -48,7 +49,7 @@ - $(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o - - @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o --@DO_SECOND_LD@ @SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in ---- yap-6.orig/packages/zlib/Makefile.in 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/packages/zlib/Makefile.in 2010-09-12 18:06:07.000000000 +1200 -@@ -45,7 +45,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) diff --git a/dev-lang/yap/files/yap-6.0.6-runpath.patch b/dev-lang/yap/files/yap-6.0.6-runpath.patch deleted file mode 100644 index 6201dc01cd94..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-runpath.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- yap-6.orig/configure 2010-08-05 05:36:28.000000000 +1200 -+++ yap-6/configure 2010-09-12 18:26:08.000000000 +1200 -@@ -6820,17 +6820,17 @@ - then - LIBS="$LIBS -lnsl" - fi -- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)" -+ LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" - DYNYAPLIB=libYap."$SO" - if test "$dynamic_loading" = "yes" - then - YAPLIB_LD="\$(CC) -shared" -- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" -+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" - else - YAPLIB_LD="\$(CC)" -- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)" -+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" - INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" - PRE_INSTALL_ENV="" - fi diff --git a/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch deleted file mode 100644 index 487a939962e6..000000000000 --- a/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- yap-6.orig/pl/consult.yap 2010-05-12 01:53:25.000000000 +1200 -+++ yap-6/pl/consult.yap 2010-05-16 09:26:41.000000000 +1200 -@@ -872,9 +872,9 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch b/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch deleted file mode 100644 index 06582131ad28..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- yap-6.orig/library/dialect/hprolog.yap 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/dialect/hprolog.yap 2010-10-19 19:38:17.000000000 +1300 -@@ -38,7 +38,7 @@ - split_at/4, % +N, +List, -FirstElements, -LastElements - max_go_list/2, % +List, -Max - or_list/2, % +ListOfInts, -BitwiseOr -- sublist/2, % ?Sublist, +List -+ chr_sublist/2, % ?Sublist, +List - bounded_sublist/3, % ?Sublist, +List, +Bound - chr_delete/3, - init_store/2, -@@ -55,9 +55,9 @@ - % lookup_ht1/4 - ]). - --:- reexport('../lists',[sublist/2]). -+%:- reexport('../lists',[sublist/2]). - --%:- use_module(library(lists)). -+:- use_module(library(lists)). - :- use_module(library(assoc)). - - /** <module> hProlog compatibility library -@@ -213,15 +213,15 @@ - % - % True if all elements of Sub appear in List in the same order. - --%sublist(L, L). --%sublist(Sub, [H|T]) :- --% '$sublist1'(T, H, Sub). -- --%'$sublist1'(Sub, _, Sub). --%'$sublist1'([H|T], _, Sub) :- --% '$sublist1'(T, H, Sub). --%'$sublist1'([H|T], X, [X|Sub]) :- --% '$sublist1'(T, H, Sub). -+chr_sublist(L, L). -+chr_sublist(Sub, [H|T]) :- -+ '$sublist1'(T, H, Sub). -+ -+'$sublist1'(Sub, _, Sub). -+'$sublist1'([H|T], _, Sub) :- -+ '$sublist1'(T, H, Sub). -+'$sublist1'([H|T], X, [X|Sub]) :- -+ '$sublist1'(T, H, Sub). - - %% bounded_sublist(?Sub, +List, +Bound:integer) - % diff --git a/dev-lang/yap/files/yap-6.2.0-have-config.patch b/dev-lang/yap/files/yap-6.2.0-have-config.patch deleted file mode 100644 index 56433d6bf551..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-have-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in ---- yap-6.orig/packages/PLStream/Makefile.in 2010-10-19 20:40:59.000000000 +1300 -+++ yap-6/packages/PLStream/Makefile.in 2010-10-19 20:40:04.000000000 +1300 -@@ -20,7 +20,7 @@ - # - # - CC=@CC@ --CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ - LDFLAGS=@LDFLAGS@ - # - # -diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in ---- yap-6.orig/packages/semweb/Makefile.in 2010-10-19 20:40:59.000000000 +1300 -+++ yap-6/packages/semweb/Makefile.in 2010-10-19 20:40:24.000000000 +1300 -@@ -37,7 +37,7 @@ - # - # - CC=@CC@ --CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ - MKINDEX=true - - -diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in ---- yap-6.orig/packages/sgml/Makefile.in 2010-10-19 20:40:59.000000000 +1300 -+++ yap-6/packages/sgml/Makefile.in 2010-10-19 20:40:45.000000000 +1300 -@@ -29,7 +29,7 @@ - # - # - CC=@CC@ --CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ - LDFLAGS=@LDFLAGS@ - MKINDEX=true - diff --git a/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch b/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch deleted file mode 100644 index be934296655a..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- yap-6.orig/configure.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/configure.in 2010-10-30 10:02:49.000000000 +1300 -@@ -924,7 +924,7 @@ - then
- YAPLIB_LD="\$(CC) -shared"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- else
- YAPLIB_LD="\$(CC)"
-@@ -946,7 +946,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *hpux*)
- #do not use the first memory quadrant
-@@ -985,7 +985,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *aix*)
- # To actually use dlls in AIX I'd need to build YAP as a DLL first.
-@@ -998,7 +998,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *osf*)
- if ${use_condor} = no
-@@ -1016,7 +1016,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *irix6*)
- SHLIB_CFLAGS="$CFLAGS"
-@@ -1030,7 +1030,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *darwin*)
- if test ${use_dlcompat} = yes
-@@ -1051,7 +1051,7 @@ - SHLIB_LD="$CC -dynamiclib"
- SHLIB_CXX_LD="$CXX -dynamiclib"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-install_name,\$(YAPLIBDIR)/\$@"
-- INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- else
- SHLIB_LD="$CC -dynamiclib -Wl,-undefined,dynamic_lookup"
- SHLIB_CXX_LD="$CXX -dynamiclib -Wl,-undefined,dynamic_lookup"
-@@ -1091,7 +1091,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- *solaris*)
- #an elf system
-@@ -1110,7 +1110,7 @@ - YAPLIB_LD="\$(CC)"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- else
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV=""
-@@ -1165,7 +1165,7 @@ - DYNYAPLIB=libYap."$SO"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-+ INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
- ;;
- esac
-
diff --git a/dev-lang/yap/files/yap-6.2.0-ldflags.patch b/dev-lang/yap/files/yap-6.2.0-ldflags.patch deleted file mode 100644 index 942e174d2d7b..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-ldflags.patch +++ /dev/null @@ -1,316 +0,0 @@ -diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in ---- yap-6.orig/library/matrix/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/matrix/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@matrix.@SO@: matrix.o --@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in ---- yap-6.orig/library/random/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/random/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@yap_random.@SO@: yap_random.o --@DO_SECOND_LD@ @SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in ---- yap-6.orig/library/regex/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/regex/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -59,22 +60,22 @@ - $(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o - - @DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regerror.@SO@: regerror.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regfree.@SO@: regfree.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@regexec.@SO@: regexec.o --@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in ---- yap-6.orig/library/rltree/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/rltree/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -25,6 +25,7 @@ - CC=@CC@ - MPI_CC=mpicc - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -52,10 +53,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@yap_rl.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ - - install: all - @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi -diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in ---- yap-6.orig/library/system/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/system/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -47,10 +48,10 @@ - $(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o - - @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@sys.@SO@: sys.o --@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in ---- yap-6.orig/library/tries/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/library/tries/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -60,13 +61,13 @@ - $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o --@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in ---- yap-6.orig/packages/PLStream/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/packages/PLStream/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -21,6 +21,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -77,10 +78,10 @@ - $(CC) -c $(CFLAGS) $< -o $@ - - @DO_SECOND_LD@%.@SO@: %.o --@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ - - @DO_SECOND_LD@libplstream.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in ---- yap-6.orig/packages/clib/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/packages/clib/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -37,7 +37,7 @@ - CRYPTLIBS=@CLIB_CRYPTLIBS@ - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) -diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in ---- yap-6.orig/packages/http/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/http/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -38,7 +38,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR)/http -diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in ---- yap-6.orig/packages/jpl/Makefile.in 2010-10-18 21:48:36.000000000 +1300 -+++ yap-6/packages/jpl/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -34,6 +34,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ @JAVAINCPATH@ -+LDFLAGS=@LDFLAGS@ - MKINDEX=true - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) -@@ -96,7 +97,7 @@ - - - @DO_SECOND_LD@%.@SO@: %.o -- @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@ -+ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@ - if [ -r libjpl.dylib ]; then \ - rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \ - fi -diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in ---- yap-6.orig/packages/semweb/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/semweb/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -47,7 +47,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb -diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in ---- yap-6.orig/packages/sgml/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/sgml/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -30,6 +30,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - MKINDEX=true - - LD=$(CC) -@@ -116,7 +117,7 @@ - $(CC) $(CFLAGS) -o $@ -c $< - - @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ) --@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@ - - all: $(TARGETS) $(PROGRAMS) - -diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in ---- yap-6.orig/packages/swi-minisat2/C/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -22,6 +22,7 @@ - CC=@CC@ - CXX=@CXX@ - CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@ -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -69,7 +70,7 @@ - $(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o - - @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS) --@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in ---- yap-6.orig/packages/tai/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/tai/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -20,6 +20,7 @@ - # - CC=@CC@ - CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream -+LDFLAGS=@LDFLAGS@ - # - # - # You shouldn't need to change what follows. -@@ -48,7 +49,7 @@ - $(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o - - @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o --@DO_SECOND_LD@ @SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ -+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@ - - install: all - $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) -diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in ---- yap-6.orig/packages/zlib/Makefile.in 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/packages/zlib/Makefile.in 2010-10-19 19:44:05.000000000 +1300 -@@ -45,7 +45,7 @@ - # - - LD=@DO_SECOND_LD@ @SHLIB_LD@ --LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ -+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@ - - BINTARGET=$(DESTDIR)$(YAPLIBDIR) - PLTARGET=$(DESTDIR)$(SHAREDIR) diff --git a/dev-lang/yap/files/yap-6.2.0-lib-soname.patch b/dev-lang/yap/files/yap-6.2.0-lib-soname.patch deleted file mode 100644 index c8d42198b976..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-lib-soname.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -ur yap-6.orig/Makefile.in yap-6/Makefile.in ---- yap-6.orig/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/Makefile.in 2010-10-30 21:27:55.000000000 +1300 -@@ -96,6 +96,7 @@ - TEXI2HTML=texi2html - TEXI2PDF=texi2pdf - YAPLIB=@YAPLIB@ -+SONAMEFLAG=@SONAMEFLAG@ - - #4.1VPATH=@srcdir@:@srcdir@/OPTYap - CWD=$(PWD) -@@ -531,7 +532,7 @@ - $(RANLIB) libYap.a - - @DYNYAPLIB@: $(LIB_OBJECTS) -- @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) -+ @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG) - - install: install_bin install_data - -diff -ur yap-6.orig/configure.in yap-6/configure.in ---- yap-6.orig/configure.in 2010-10-30 21:28:41.000000000 +1300 -+++ yap-6/configure.in 2010-10-30 21:27:06.000000000 +1300 -@@ -915,6 +915,7 @@ - fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG="-Wl,-soname=$DYNYAPLIB"
- fi
- if test "$have_nsl" = yes
- then
-@@ -944,6 +945,7 @@ - INSTALL_DLLS=""
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -983,6 +985,7 @@ - fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -996,6 +999,7 @@ - #INSTALL_DLLS=""
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -1014,6 +1018,7 @@ - fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -1028,6 +1033,7 @@ - INSTALL_DLLS=""
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -1066,6 +1072,7 @@ - fi
- CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"
- PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"
- ;;
-@@ -1089,6 +1096,7 @@ - fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -1105,6 +1113,7 @@ - INSTALL_DLLS=""
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"
- if test "$dynamic_loading" = "yes"
- then
- YAPLIB_LD="\$(CC)"
-@@ -1123,6 +1132,7 @@ - # and -fomit-frame-point -DBP_FREE
- YAPLIB="yap.dll"
- DYNYAPLIB="yap.dll"
-+ SONAMEFLAG=""
- SHLIB_CFLAGS="$CFLAGS"
- SHLIB_CXXFLAGS="$CXXFLAGS"
- if test "$target_win64" = no
-@@ -1163,6 +1173,7 @@ - fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
- DYNYAPLIB=libYap."$SO"
-+ SONAMEFLAG=""
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
- PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
- INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-@@ -1469,6 +1480,7 @@ - AC_SUBST(YAPLIB)
- AC_SUBST(DYNYAPLIB)
- AC_SUBST(LDFLAGS)
-+AC_SUBST(SONAMEFLAG)
- dnl install_info
- AC_SUBST(INSTALL_INFO)
- dnl let YAP_EXTRAS fall through configure, from the env into Makefile
diff --git a/dev-lang/yap/files/yap-6.2.0-parallel-make.patch b/dev-lang/yap/files/yap-6.2.0-parallel-make.patch deleted file mode 100644 index d7e09fb66738..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-parallel-make.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- yap-6.orig/Makefile.in 2010-10-18 21:48:20.000000000 +1300 -+++ yap-6/Makefile.in 2010-10-24 17:51:34.000000000 +1300 -@@ -517,6 +517,7 @@ all: startup.yss - @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) - @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) -+ @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) - - startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) - -rm -f startup.yss -@@ -568,7 +569,6 @@ install_unix: startup.yss libYap.a - @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) - @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) - @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) -- @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) - @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) - #@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) - mkdir -p $(DESTDIR)$(INCLUDEDIR) -@@ -619,6 +619,7 @@ install_win32: startup.yss - (cd packages/sgml; $(MAKE) install) - (cd packages/semweb; $(MAKE) install) - (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) -+ @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) - @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) - @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) - @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) -@@ -632,7 +633,6 @@ install_data: - (cd packages/swi-minisat2; $(MAKE) install) - (cd LGPL ; $(MAKE) install) - (cd GPL ; $(MAKE) install) -- @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) - $(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/ - $(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/ - @INSTALLCLP@(cd LGPL/clp ; $(MAKE) install) diff --git a/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch b/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch deleted file mode 100644 index 59f15c54d39f..000000000000 --- a/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- yap-6.orig/pl/consult.yap 2010-10-18 21:48:21.000000000 +1300 -+++ yap-6/pl/consult.yap 2010-10-19 19:40:31.000000000 +1300 -@@ -886,9 +886,9 @@ - atom_concat([Path,File],PFile). - - '$system_library_directories'(Dir) :- -- getenv('YAPSHAREDIR', Dir). -+ getenv('YAPSHAREDIR', Dir), !. - '$system_library_directories'(Dir) :- -- getenv('YAPCOMMONSDIR', Dir). -+ getenv('YAPCOMMONSDIR', Dir), !. - '$system_library_directories'(Dir) :- - get_value(system_library_directory,Dir). - '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/yap-6.0.1.ebuild b/dev-lang/yap/yap-6.0.1.ebuild index 2c3cb8ed4d72..8b94f1825911 100644 --- a/dev-lang/yap/yap-6.0.1.ebuild +++ b/dev-lang/yap/yap-6.0.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/yap/yap-6.0.1.ebuild,v 1.1 2010/03/03 08:23:05 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.1.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" MY_P="Yap-${PV}" DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.1.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.1.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -30,12 +32,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-bootfile.patch - epatch "${FILESDIR}"/${P}-dynamic-lib.patch - epatch "${FILESDIR}"/${P}-mpi-include.patch - epatch "${FILESDIR}"/${P}-myddas-include.patch - epatch "${FILESDIR}"/${P}-multilib.patch - epatch "${FILESDIR}"/${P}-yapsharedir.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.2.ebuild b/dev-lang/yap/yap-6.0.2.ebuild index 1f9888a12188..7bd91417bee3 100644 --- a/dev-lang/yap/yap-6.0.2.ebuild +++ b/dev-lang/yap/yap-6.0.2.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.2.ebuild,v 1.1 2010/03/05 08:58:04 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.2.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.2.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.2.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -28,12 +31,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-bootfile.patch - epatch "${FILESDIR}"/${P}-dynamic-lib.patch - epatch "${FILESDIR}"/${P}-mpi-include.patch - epatch "${FILESDIR}"/${P}-myddas-include.patch - epatch "${FILESDIR}"/${P}-multilib.patch - epatch "${FILESDIR}"/${P}-yapsharedir.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.3.ebuild b/dev-lang/yap/yap-6.0.3.ebuild index b0d362302520..631486c82373 100644 --- a/dev-lang/yap/yap-6.0.3.ebuild +++ b/dev-lang/yap/yap-6.0.3.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.3.ebuild,v 1.2 2010/04/10 00:10:30 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.3.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.3.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.3.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -28,8 +31,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-install-clause.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.4.ebuild b/dev-lang/yap/yap-6.0.4.ebuild index 73427bcb4e6c..741f5d6a99a0 100644 --- a/dev-lang/yap/yap-6.0.4.ebuild +++ b/dev-lang/yap/yap-6.0.4.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.4.ebuild,v 1.1 2010/05/15 21:18:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.4.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.4.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -28,9 +31,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.5-r1.ebuild b/dev-lang/yap/yap-6.0.5-r1.ebuild index 3a19429fac84..fcb7b3eaadcf 100644 --- a/dev-lang/yap/yap-6.0.5-r1.ebuild +++ b/dev-lang/yap/yap-6.0.5-r1.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5-r1.ebuild,v 1.1 2010/09/12 02:31:41 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5-r1.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -30,10 +33,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.5.ebuild b/dev-lang/yap/yap-6.0.5.ebuild index 9f354d382f64..b8f936a3aef9 100644 --- a/dev-lang/yap/yap-6.0.5.ebuild +++ b/dev-lang/yap/yap-6.0.5.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5.ebuild,v 1.2 2010/08/07 22:30:23 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -30,9 +33,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.0.6.ebuild b/dev-lang/yap/yap-6.0.6.ebuild index da113caacc5f..3a256a808ee7 100644 --- a/dev-lang/yap/yap-6.0.6.ebuild +++ b/dev-lang/yap/yap-6.0.6.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.6.ebuild,v 1.1 2010/09/12 06:43:40 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.6.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $ inherit eutils java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -31,12 +34,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-runpath.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch - epatch "${FILESDIR}"/${P}-itries.patch - epatch "${FILESDIR}"/${P}-DESTDIR.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { diff --git a/dev-lang/yap/yap-6.2.0-r1.ebuild b/dev-lang/yap/yap-6.2.0-r1.ebuild index f6e492f497dc..57039b0e6976 100644 --- a/dev-lang/yap/yap-6.2.0-r1.ebuild +++ b/dev-lang/yap/yap-6.2.0-r1.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.5 2010/10/30 08:34:24 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.6 2010/11/05 22:01:24 keri Exp $ inherit autotools eutils flag-o-matic java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -28,13 +31,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-parallel-make.patch - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-ld-library-path.patch - epatch "${FILESDIR}"/${P}-lib-soname.patch - epatch "${FILESDIR}"/${P}-have-config.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} eautoconf } diff --git a/dev-lang/yap/yap-6.2.0.ebuild b/dev-lang/yap/yap-6.2.0.ebuild index 95074786b5e9..a71d61b60b17 100644 --- a/dev-lang/yap/yap-6.2.0.ebuild +++ b/dev-lang/yap/yap-6.2.0.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.2 2010/10/23 20:55:08 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $ inherit eutils flag-o-matic java-pkg-opt-2 +PATCHSET_VER="0" + DESCRIPTION="YAP is a high-performance Prolog compiler." HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" -SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="Artistic LGPL-2" SLOT="0" @@ -31,10 +34,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-yapsharedir.patch - epatch "${FILESDIR}"/${P}-ldflags.patch - epatch "${FILESDIR}"/${P}-have-config.patch - epatch "${FILESDIR}"/${P}-chr-sublist.patch + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} } src_compile() { |