Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

13 files changed, 937 insertions, 2 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 2a93f0c7372f..cb8c73acc503 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.71 2010/02/20 08:08:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.72 2010/07/19 19:02:13 keri Exp $
+
+*mercury-extras-10.04 (19 Jul 2010)
+
+  19 Jul 2010; <keri@gentoo.org> +mercury-extras-10.04.ebuild,
+  +files/mercury-extras-10.04-curs.patch,
+  +files/mercury-extras-10.04-dynamic-linking.patch,
+  +files/mercury-extras-10.04-iodbc.patch,
+  +files/mercury-extras-10.04-lex.patch,
+  +files/mercury-extras-10.04-mercury_glut.patch,
+  +files/mercury-extras-10.04-mercury_opengl.patch,
+  +files/mercury-extras-10.04-mercury_tcltk.patch,
+  +files/mercury-extras-10.04-no-java-grade.patch,
+  +files/mercury-extras-10.04-odbc.patch,
+  +files/mercury-extras-10.04-posix.patch:
+  Version bump
 
   20 Feb 2010; <keri@gentoo.org> mercury-extras-10.04_beta1.ebuild,
   files/mercury-extras-10.04_beta1-lex.patch,
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 3fb9c176965f..a9c6029a8ebd 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -7,6 +7,16 @@ AUX mercury-extras-0.13.1-mercury_opengl.patch 4022 RMD160 b066b8e181cf7d0f21d61
 AUX mercury-extras-0.13.1-mercury_tcltk.patch 514 RMD160 017b0645322f622bbac569e8eefb4a58f2ff88e8 SHA1 91c6e32f27c14e07f6894745486fbf150adf3c48 SHA256 ad14d78321d44ecd5a8e36f4e8528c817c8ebf217e5223fcda52c5a01f4d4f6a
 AUX mercury-extras-0.13.1-odbc.patch 1253 RMD160 13fd607b42c4527ad7d05dcfeb3c59de9a7bf7c8 SHA1 0803073755587f993eea05c3276efe3c20589b73 SHA256 b9220a5f1774110ae2f4862448c246ec8728b43a19bd05e01cf01556232c549e
 AUX mercury-extras-0.13.1-posix.patch 354 RMD160 3d8b68c5efabda81ad117c6282f09b25741366ac SHA1 d66442038b7d93a5b4cdc6a0ab9cb666cdef9c07 SHA256 d47871298f94007173f6aee19e1597f57400654d9ece94ae94cf14fa0118efdf
+AUX mercury-extras-10.04-curs.patch 10224 RMD160 49370c7c209b49f2a17391c3777bf3e1ed272c86 SHA1 90384587099824590c8492cf43616db8c6f2565b SHA256 b64b46647cc42cbe40d1537a54d6b5c59a2dff5bccd2c9feaece1e4aad3eb740
+AUX mercury-extras-10.04-dynamic-linking.patch 534 RMD160 28f00b9492de35927b43dbeb34c22a15794c861d SHA1 ebfab09939ff22a9531f10bb326a1af4763fe891 SHA256 88a6af5cc7160323199c7f2a033fcd3f92044ed4aeb4bcb72434d754b108ae75
+AUX mercury-extras-10.04-iodbc.patch 2487 RMD160 43a32d11d025aa6edfe6ec1dd0cbbbeda1f71be9 SHA1 c237d5c237a972ea33c68b799c2a97886f92b530 SHA256 7b9112e18c1e861f2710ef04f8e14db2481896fb16074afdef535115dcdafccc
+AUX mercury-extras-10.04-lex.patch 674 RMD160 acd76c509e6cb0f27041fd42dff33edebecd22e0 SHA1 b389553a2aab1b4e5a467ce1a8e87e7616fd0004 SHA256 8cdeac1127338b5a89d5ff3d1f9754977d8c5b4b5215c3346d0a58bcada1acb5
+AUX mercury-extras-10.04-mercury_glut.patch 876 RMD160 4652646bf3d6066f6229910ec6281342e88386b1 SHA1 1fcee041f3e2fca8183f5cc789714fc17c0f7b09 SHA256 f9153154d0543deecebaaab895aa01f8ff443686470024ec6917117a3ee15281
+AUX mercury-extras-10.04-mercury_opengl.patch 1129 RMD160 17cd252daa579708f7019038b9b763fced302c05 SHA1 424223d596892c4c39e450b3c7ffc695ce8adc44 SHA256 7c21f79095666328b50e822515ccba13dfdda63ab22f3ef90a18b8856ce8173f
+AUX mercury-extras-10.04-mercury_tcltk.patch 1380 RMD160 59b610536c0c1335f932c337b2636a5f94415145 SHA1 8900634410abfb77863e6bdabd0df02c97f19fba SHA256 a946ff3f8e9fb5cff659bf97f04c5b0a9c54d7d6334362c6e94c9b7878e19945
+AUX mercury-extras-10.04-no-java-grade.patch 7149 RMD160 3f8484ec4f27b1ff899f83e1b2238b25ca17082d SHA1 f9cdb63d8c4570c13f701da26ede14fc8e2fa960 SHA256 3c634767a1d52208a51aac491347d6e66bfa9965a587c57c8206aa92c21c7b3a
+AUX mercury-extras-10.04-odbc.patch 2931 RMD160 a3cca01ac5185bd80d5274ce2ab1e09e4dbbad2f SHA1 bd2082d6f28d7a64c66f681f6506e1b765de5732 SHA256 2e519291fea7ec0714d1148ac00b4058a6e77059928865457f166df977b10504
+AUX mercury-extras-10.04-posix.patch 1366 RMD160 201e96d8eef523850a5feb7e30e1130722f28a07 SHA1 964f5ed5604e82373bf55791da9e7fac4de8fd7d SHA256 7a9b672f770fe7ae83821b8cb99a8a4e80c82ea44d6a6731b06ddfe2bb77b023
 AUX mercury-extras-10.04_beta1-curs.patch 10243 RMD160 0b1ece400baa1b754b0ad5b2669170b89f7da975 SHA1 9a90d957f27bbc0b0329859663ffdb919db9d2db SHA256 3aa05184dd72ae534bfb6fca6cbf60ff18f8da253dcb280c59ebc9b9ff844645
 AUX mercury-extras-10.04_beta1-dynamic-linking.patch 389 RMD160 a46c4805390c5d9914a952d96a0cb4867ba51378 SHA1 54a2c32f01372db644d756ddd47b1ff4c790c4ea SHA256 b4b170c62547ad91420f850c6307a3f594231be8893112915b17f016c636087c
 AUX mercury-extras-10.04_beta1-iodbc.patch 2417 RMD160 f33db752ff83805fc0f178f0b408d15b9c2aac0d SHA1 2b0cc49d3abc83e4e2c849d25f5cdbb2770b67a7 SHA256 6f0123261d319b651fef1d579c8795c585bebdf343a37f302052e84239b0f51d
@@ -19,7 +29,9 @@ AUX mercury-extras-10.04_beta1-odbc.patch 2107 RMD160 856ce0c442a77dcdbcca7f5cb8
 AUX mercury-extras-10.04_beta1-posix.patch 477 RMD160 dbe0a1f1d117a2a90a4aa588f9dea92e7a915fd1 SHA1 8fea62228a711694e869924fb20eae69b5177f70 SHA256 4ea5d325f6d36fee58ec87f1b2ea6d57959eb8dcc5693ab935a0486e12d47173
 DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c
 DIST mercury-extras-10.04-beta.tar.gz 713626 RMD160 d4a4e04e6fef80af430006ad3d20e94d3fc82e61 SHA1 a9efcc59ffc0104d6ceb821daa1dfca08fb83e1a SHA256 34040ca9eb85acee4409a15d3e11d5a6b2ad12f9ef8cb41776754aaf49a8abcd
+DIST mercury-extras-10.04.tar.gz 706376 RMD160 988e17736ace555916b452a5f22b3d8f67ad6b4e SHA1 22cb6eb10bd6a4d17605217fe97f8718b8dfbbb4 SHA256 408d0a428b8d15934d5b7f5bd3e2139807fb2eb0a7f58d125c8490456445814b
 EBUILD mercury-extras-0.13.1-r1.ebuild 3342 RMD160 9d7e9b6d40140fc59f5c7dfa25ebc091f7193ca8 SHA1 81ece0b057f2b72ae90c4f158d7ee19c3d6141c4 SHA256 d7088f207671007417e25319d31860883331b0243041d159a5da44fbc62c028b
+EBUILD mercury-extras-10.04.ebuild 3447 RMD160 8aa14aa91d08a857050a83a559bda0dadc135b8e SHA1 77dd467322d4aac341e4252795e458e655dbd1b4 SHA256 3da6a35d20de4d421cd00be452802c570ad955f20144558bb7cde0a4432787a4
 EBUILD mercury-extras-10.04_beta1.ebuild 3564 RMD160 52cad5cc67e98fbbd7f4fba943f70598d816467a SHA1 019089411cbc73fa5ebc14fbb2975e18752806c9 SHA256 dda1b4340cf873f160c50b9b979bf9f5ba4dee138e23eb921d6445b9bfa1e861
-MISC ChangeLog 19275 RMD160 0e4daf255c74448d59552440f2876666f6edb834 SHA1 587a3d29eef0b86f3ae6835078d3f211b293f9ea SHA256 0f1927884daf00faa523e7ce25e9ae27cfe6cf2c8cc1935dec66c433dedbf900
+MISC ChangeLog 19859 RMD160 cd4a8f3b5dc8117439524a55b278c080dab31e8e SHA1 b507d69205debc0f270d2099c44fabaa800490bc SHA256 6fda02935500d90ee0f584b5282dc1ecbcb2724b3d36473a62092a1292c62011
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-curs.patch
new file mode 100644
index 000000000000..2ed3f150883e
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-curs.patch
@@ -0,0 +1,314 @@
+diff -ur mercury-extras-10.04.orig/curs/curs.m mercury-extras-10.04/curs/curs.m
+--- mercury-extras-10.04.orig/curs/curs.m	2006-04-21 15:37:10.000000000 +1200
++++ mercury-extras-10.04/curs/curs.m	2010-07-19 21:34:59.000000000 +1200
+@@ -31,6 +31,8 @@
+ :- import_module io.
+ :- import_module string.
+ 
++:- include_module curs__panel.
++
+ %-----------------------------------------------------------------------------%
+ 
+     % Start a curses session (colour, unbuffered input, no echoing, 
+@@ -210,90 +212,6 @@
+ :- func cyan = colour.
+ :- func white = colour.
+ 
+-    %-------------------------------------------------------------------------%
+-    %-------------------------------------------------------------------------%
+-
+-        % Panels are windows over the main display; they may be
+-        % stacked, moved, ordered and hidden.  Contents of panels
+-        % closer to the top of the stack obscure the parts of panels
+-        % they overlap that are lower in the stack.
+-        %
+-    :- module panel.
+-    :- interface.
+-    
+-    :- type panel.
+-
+-        % new(Rows, Cols, Row, Col, Attr, Panel) creates a new panel
+-        % Panel whose size is given by (Rows, Cols) and whose position
+-        % on the display is given by (Row, Col).  The new panel starts
+-        % visible and at the top of the stack.  The default attributes
+-        % for the panel are set to Attr.
+-        %
+-    :- pred new(int::in, int::in, int::in, int::in, attr::in, panel::out,
+-        io::di, io::uo) is det.
+-
+-        % Destroy a panel.
+-        %
+-    :- pred delete(panel::in, io::di, io::uo) is det.
+-
+-        % Raise/lower a panel to the top/bottom of the stack.
+-        %
+-    :- pred raise(panel::in, io::di, io::uo) is det.
+-    :- pred lower(panel::in, io::di, io::uo) is det.
+-
+-        % Hide/reveal a panel (revealing places it at the top of the stack).
+-        %
+-    :- pred hide(panel::in, io::di, io::uo) is det.
+-    :- pred reveal(panel::in, io::di, io::uo) is det.
+-
+-        % Move a panel to (Row, Col) on the display.
+-        %
+-    :- pred relocate(panel::in, int::in, int::in, io::di, io::uo) is det.
+-
+-        % Clear a panel.
+-        %
+-    :- pred clear(panel::in, io::di, io::uo) is det.
+-
+-        % Move the virtual cursor to given row and column; (0, 0) are the
+-        % coordinates for the upper left hand corner of the panel.
+-        %
+-    :- pred move(panel::in, int::in, int::in, io::di, io::uo) is det.
+-
+-        % Add a char/string to a panel with the given attributes.
+-        % Note that char codes are passed rather than plain chars.
+-        %
+-    :- pred addch(panel::in, attr::in, int::in, io::di, io::uo) is det.
+-    :- pred addstr(panel::in, attr::in, string::in, io::di, io::uo) is det.
+-
+-        % Turn on/off or set attributes that will be applied by default.
+-        %
+-    :- pred attr_on(panel::in, attr::in, io::di, io::uo) is det.
+-    :- pred attr_off(panel::in, attr::in, io::di, io::uo) is det.
+-    :- pred attr_set(panel::in, attr::in, io::di, io::uo) is det.
+-
+-        % Update the display (also calls doupdate).
+-        % NOTE: doupdate does not call update_panels.
+-        %
+-    :- pred update_panels(io::di, io::uo) is det.
+-
+-        % Draws a border around the inside edge of the display.
+-        %
+-    :- pred border(panel::in, io::di, io::uo) is det.
+-
+-        % Draws an horizontal line of length N moving to the right.
+-        %
+-    :- pred hline(panel::in, int::in, int::in, io::di, io::uo) is det.
+-
+-        % Draws a vertical line of length N moving down.
+-        %
+-    :- pred vline(panel::in, int::in, int::in, io::di, io::uo) is det.
+-
+-    :- end_module panel.
+-
+-    %-------------------------------------------------------------------------%
+-    %-------------------------------------------------------------------------%
+-
+-%-----------------------------------------------------------------------------%
+ %-----------------------------------------------------------------------------%
+ 
+ :- implementation.
+@@ -1044,210 +962,4 @@
+     IO = IO0;
+ ").
+ 
+-    %-------------------------------------------------------------------------%
+-    %-------------------------------------------------------------------------%
+-
+-    :- module panel.
+-
+-    :- implementation.
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_decl("C", "
+-
+-        #include <ncurses.h>
+-        #include <panel.h>
+-
+-    ").
+-    
+-    :- pragma foreign_type("C", panel, "PANEL *").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        new(Rows::in, Cols::in, Row::in, Col::in, Attr::in, Panel::out,
+-            IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-            WINDOW *w = newwin(Rows, Cols, Row, Col);
+-            scrollok(w, TRUE);
+-            wattrset(w, Attr);
+-            wcolor_set(w, Attr, NULL);
+-            wclear(w);
+-            Panel = new_panel(w);
+-
+-            IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        delete(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        delwin(panel_window(Panel));
+-        del_panel(Panel);
+-
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        raise(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        top_panel(Panel);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        lower(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        bottom_panel(Panel);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        hide(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        hide_panel(Panel);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        reveal(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        show_panel(Panel);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        relocate(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        move_panel(Panel, Row, Col);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        clear(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wclear(panel_window(Panel));
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        move(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wmove(panel_window(Panel), Row, Col);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        addch(Panel::in, Attr::in, CharCode::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        waddch(panel_window(Panel), (chtype)Attr | (chtype)CharCode);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    addstr(Panel, Attr, Str, !IO) :-
+-        string.foldl(
+-            ( pred(Char::in, !.IO::di, !:IO::uo) is det :-
+-                addch(Panel, Attr, char.to_int(Char), !IO)
+-            ),
+-            Str, !IO
+-        ).
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        attr_on(Panel::in, Attr::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wattron(panel_window(Panel), Attr);
+-        IO = IO0;
+-    ").
+-    
+-    :- pragma foreign_proc("C",
+-        attr_off(Panel::in, Attr::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wattroff(panel_window(Panel), Attr);
+-        IO = IO0;
+-    ").
+-
+-    :- pragma foreign_proc("C",
+-        attr_set(Panel::in, Attr::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wattrset(panel_window(Panel), Attr);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        update_panels(IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        update_panels();
+-        doupdate();
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-
+-    :- pragma foreign_proc("C",
+-        border(Panel::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wborder(panel_window(Panel), 0, 0, 0, 0, 0, 0, 0, 0);
+-        IO = IO0;
+-    ").
+-
+-    :- pragma foreign_proc("C",
+-        hline(Panel::in, C::in, N::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        whline(panel_window(Panel), C, N);
+-        IO = IO0;
+-    ").
+-
+-    :- pragma foreign_proc("C",
+-        vline(Panel::in, C::in, N::in, IO0::di, IO::uo),
+-        [will_not_call_mercury, promise_pure],
+-    "
+-        wvline(panel_window(Panel), C, N);
+-        IO = IO0;
+-    ").
+-
+-    %-------------------------------------------------------------------------%
+-    :- end_module panel.
+-    %-------------------------------------------------------------------------%
+-    %-------------------------------------------------------------------------%
+-
+-%-----------------------------------------------------------------------------%
+ %-----------------------------------------------------------------------------%
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-dynamic-linking.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-dynamic-linking.patch
new file mode 100644
index 000000000000..5e3f89aafddd
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-dynamic-linking.patch
@@ -0,0 +1,13 @@
+Only in mercury-extras-10.04/curs: curs.m.orig
+diff -ur mercury-extras-10.04.orig/dynamic_linking/Mmakefile mercury-extras-10.04/dynamic_linking/Mmakefile
+--- mercury-extras-10.04.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
++++ mercury-extras-10.04/dynamic_linking/Mmakefile	2010-07-19 21:35:53.000000000 +1200
+@@ -11,7 +11,7 @@
+ MLFLAGS = --shared
+ 
+ # Link in the `-ldl' library (this may not be needed on some systems)
+-MLLIBS = -ldl
++MLLIBS = -L/usr/@libdir@ -ldl
+ 
+ # enable C-level debugging
+ CFLAGS = -g
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-iodbc.patch
new file mode 100644
index 000000000000..204ab661153d
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-iodbc.patch
@@ -0,0 +1,71 @@
+Only in mercury-extras-10.04/curs: curs.m.orig
+Only in mercury-extras-10.04/dynamic_linking: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/odbc/Mmakefile mercury-extras-10.04/odbc/Mmakefile
+--- mercury-extras-10.04.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
++++ mercury-extras-10.04/odbc/Mmakefile	2010-07-19 21:36:16.000000000 +1200
+@@ -12,7 +12,7 @@
+ # The driver manager.
+ # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
+ # Feel free to add more (and handle them in odbc.m).
+-MODBC_DRIVER=MODBC_UNIX
++MODBC_DRIVER=MODBC_IODBC
+ 
+ # The database.
+ # Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER.
+@@ -41,17 +41,20 @@
+ 	# The following are for Debian.
+ 
+ 	# for unixODBC
+-	MLLIBS=-lodbc -lpthread -lltdl -ldl
+-
++	MLLIBS=`iodbc-config --libs`
++	ODBC_CFLAGS=`iodbc-config --cflags`
+ 	# for iODBC
+ 	# MLLIBS=-liodbc l-pthread -ldl
+ 	# note: on a DEC Alpha using OSF1 remove the -ldl.
+ endif
+ 
+-MAIN_TARGET=odbc_test
++MAIN_TARGET=libodbc
+ 
+ .PHONY: depend
+-depend: odbc_test.depend
++depend: odbc.depend
++
++.PHONY: install
++install: libodbc.install
+ 
+ .PHONY: check
+ check:
+@@ -62,7 +65,7 @@
+ # `--no-ansi' is needed because the ODBC header files include C++-style
+ # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
+ # presuming you have gcc version 2.7.1 or greater.
+-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
++MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
+ 
+ #-----------------------------------------------------------------------------#
+ #-----------------------------------------------------------------------------#
+diff -ur mercury-extras-10.04.orig/odbc/odbc.m mercury-extras-10.04/odbc/odbc.m
+--- mercury-extras-10.04.orig/odbc/odbc.m	2006-08-31 23:09:50.000000000 +1200
++++ mercury-extras-10.04/odbc/odbc.m	2010-07-19 21:36:16.000000000 +1200
+@@ -2000,8 +2000,8 @@
+             ** Arbitrary size, only needs to hold a 
+             ** descriptive string like ""SQL Server"".
+             */
+-    String new_dsn;
+-    String new_desc;
++    LPSTR new_dsn;
++    LPSTR new_desc;
+     SWORD dsn_len;
+     SWORD desc_len;
+     SQLRETURN rc;
+@@ -2335,7 +2335,7 @@
+     SQLSMALLINT msg_len;
+     UCHAR       message[SQL_MAX_MESSAGE_LENGTH];
+     UCHAR       sql_state[SQL_SQLSTATE_SIZE + 1];
+-    String      mercury_message;
++    LPSTR       mercury_message;
+     MR_Word     new_message;
+ 
+     MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-lex.patch
new file mode 100644
index 000000000000..e92e4e4a053f
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-lex.patch
@@ -0,0 +1,31 @@
+diff -urN lex/Mmakefile lex/Mmakefile
+--- lex/Mmakefile	1970-01-01 12:00:00.000000000 +1200
++++ lex/Mmakefile	2010-07-19 21:37:59.000000000 +1200
+@@ -0,0 +1,27 @@
++# Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
++# Copyright (C) 2002 The University of Melbourne
++
++# To build, do the following:
++#
++# $ mmake depend
++# $ mmake all
++# $ mmake install
++#
++# If you have problems, try the following instead:
++#
++# $ mmake depend
++# $ mmake all
++# $ mmake liblex.install
++# $ mmake libregex.install
++
++MAIN_TARGET = all
++
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
++.PHONEY: all depend install
++
++all: liblex libregex
++
++depend: lex.depend regex.depend
++
++install:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_glut.patch
new file mode 100644
index 000000000000..d65ee7d90d97
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_glut.patch
@@ -0,0 +1,25 @@
+diff -ur mercury-extras-10.04.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04/graphics/mercury_glut/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-10.04/graphics/mercury_glut/Mmakefile	2010-07-20 06:47:23.000000000 +1200
+@@ -13,10 +13,10 @@
+ # The following libraries are for X on Linux (Debian) using Mesa.
+ 	
+ # Libaries required by X windows.
+-X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
++#X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
+ 
+ # Libraries required by OpenGL.
+-GL_LIBS = -lGL -LGL
++#GL_LIBS = -lGL -LGL
+ 
+ MCFLAGS-mercury_glut+=--no-warn-nothing-exported --no-warn-interface-imports
+ 
+@@ -26,7 +26,7 @@
+ MGNUCFLAGS = --pic-reg
+ EXTRA_MLFLAGS = -shared
+ 
+-MLLIBS = -lglut $(X_LIBS) $(GL_LIBS)
++MLLIBS = -lglut
+ 
+ depend: mercury_glut.depend
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_opengl.patch
new file mode 100644
index 000000000000..2b4e4ac43096
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_opengl.patch
@@ -0,0 +1,23 @@
+Only in mercury-extras-10.04/graphics/mercury_glut: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04/graphics/mercury_opengl/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
++++ mercury-extras-10.04/graphics/mercury_opengl/Mmakefile	2010-07-20 06:48:47.000000000 +1200
+@@ -17,7 +17,8 @@
+ 
+ # Specify what libraries we need to link against for OpenGL on this system.
+ # (The following works on Debian with mesa as the OpenGL implementation).
+-GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM
++GL_LIBS = `pkg-config --libs gl` `pkg-config --libs glu`
++GL_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu`
+ 
+ # Don't issue a warning because mercury_opengl doesn't export anything.
+ MCFLAGS-mercury_opengl = --no-warn-nothing-exported
+@@ -26,7 +27,7 @@
+ # implemented completely.
+ MCFLAGS-mogl = --no-warn-inferred-erroneous
+ 
+-MCFLAGS = --halt-at-warn --intermodule-optimization
++MCFLAGS = --halt-at-warn --intermodule-optimization $(GL_CFLAGS)
+ 
+ MLLIBS 	= $(GL_LIBS) $(EXTRA_MLLIBS)
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_tcltk.patch
new file mode 100644
index 000000000000..58069b50b22f
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_tcltk.patch
@@ -0,0 +1,29 @@
+Only in mercury-extras-10.04/graphics/mercury_glut: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_opengl: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04/graphics/mercury_tcltk/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
++++ mercury-extras-10.04/graphics/mercury_tcltk/Mmakefile	2010-07-20 06:49:11.000000000 +1200
+@@ -8,10 +8,7 @@
+ 
+ # You may need to modify the line below
+ 
+-MLLIBS    = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \
+-   	    -lXt -lICE -lSM
+-
+-MLFLAGS	  = -R/usr/X11R6/lib
++MLLIBS    = -ltk -ltcl
+ 
+ # On some Linux machines you may need to let mgnuc know where the 
+ # tcl/tk header files are. 
+diff -ur mercury-extras-10.04.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04/graphics/mercury_tcltk/mtcltk.m
+--- mercury-extras-10.04.orig/graphics/mercury_tcltk/mtcltk.m	2007-08-21 14:47:37.000000000 +1200
++++ mercury-extras-10.04/graphics/mercury_tcltk/mtcltk.m	2010-07-20 06:49:11.000000000 +1200
+@@ -154,7 +154,7 @@
+     MR_incr_hp(argv_word, argc + 1);
+     argv = (char **) argv_word;
+ 
+-    for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
++    for (i = 0, l = Args; l != MR_list_empty(); l = MR_list_tail(l), i++) {
+         argv[i] = (char *) MR_list_head(l);
+     }
+     
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-no-java-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-no-java-grade.patch
new file mode 100644
index 000000000000..ba1af0f90726
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-no-java-grade.patch
@@ -0,0 +1,170 @@
+diff -ur mercury-extras-10.04.orig/cgi/Mmakefile mercury-extras-10.04/cgi/Mmakefile
+--- mercury-extras-10.04.orig/cgi/Mmakefile	2004-07-30 19:01:07.000000000 +1200
++++ mercury-extras-10.04/cgi/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -12,6 +12,8 @@
+ 
+ MAIN_TARGET = $(LIBRARY)
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ MCFLAGS-mercury_www = --no-warn-nothing-exported
+ 
+ depend: mercury_www.depend
+diff -ur mercury-extras-10.04.orig/complex_numbers/Mmakefile mercury-extras-10.04/complex_numbers/Mmakefile
+--- mercury-extras-10.04.orig/complex_numbers/Mmakefile	2003-01-16 23:44:11.000000000 +1300
++++ mercury-extras-10.04/complex_numbers/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = all
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ all:	libcomplex_numbers
+ 
+ depend:	complex_numbers.depend
+diff -ur mercury-extras-10.04.orig/curs/Mmakefile mercury-extras-10.04/curs/Mmakefile
+--- mercury-extras-10.04.orig/curs/Mmakefile	2003-01-16 23:44:14.000000000 +1300
++++ mercury-extras-10.04/curs/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -26,7 +26,7 @@
+ # Omit this line if you want to install the default grades.
+ # Edit this line if you want to install with different grades.
+ #
+-#LIBGRADES = asm_fast.gc hlc.gc
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # The following standard libraries must be linked against in any
+ # application using the curs library (i.e. MLLIBS must include
+diff -ur mercury-extras-10.04.orig/curses/Mmakefile mercury-extras-10.04/curses/Mmakefile
+--- mercury-extras-10.04.orig/curses/Mmakefile	2003-01-16 23:44:15.000000000 +1300
++++ mercury-extras-10.04/curses/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -13,6 +13,8 @@
+ # this line to include the appropriate curses library for your OS. 
+ MLLIBS = -lncurses
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ 
+ default_target:	libmcurses
+diff -ur mercury-extras-10.04.orig/dynamic_linking/Mmakefile mercury-extras-10.04/dynamic_linking/Mmakefile
+--- mercury-extras-10.04.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
++++ mercury-extras-10.04/dynamic_linking/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -17,6 +17,8 @@
+ CFLAGS = -g
+ MLFLAGS += --no-strip
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ 
+ main_target: libdl
+diff -ur mercury-extras-10.04.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04/graphics/mercury_glut/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-10.04/graphics/mercury_glut/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = libmercury_glut
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # The following libraries are for X on Linux (Debian) using Mesa.
+ 	
+ # Libaries required by X windows.
+Only in mercury-extras-10.04/graphics/mercury_glut: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04/graphics/mercury_opengl/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
++++ mercury-extras-10.04/graphics/mercury_opengl/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -15,6 +15,8 @@
+ 
+ MAIN_TARGET = libmercury_opengl
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # Specify what libraries we need to link against for OpenGL on this system.
+ # (The following works on Debian with mesa as the OpenGL implementation).
+ GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM
+Only in mercury-extras-10.04/graphics/mercury_opengl: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04/graphics/mercury_tcltk/Mmakefile
+--- mercury-extras-10.04.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
++++ mercury-extras-10.04/graphics/mercury_tcltk/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -21,6 +21,8 @@
+ 
+ MAIN_TARGET = $(LIBRARY)
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ depend: mercury_tcltk.depend
+ 
+ install: libmercury_tcltk.install
+Only in mercury-extras-10.04/graphics/mercury_tcltk: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_tcltk: mtcltk.m.orig
+diff -ur mercury-extras-10.04.orig/lazy_evaluation/Mmakefile mercury-extras-10.04/lazy_evaluation/Mmakefile
+--- mercury-extras-10.04.orig/lazy_evaluation/Mmakefile	2003-01-16 23:44:17.000000000 +1300
++++ mercury-extras-10.04/lazy_evaluation/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -4,6 +4,8 @@
+ # Public License - see the file COPYING.LIB in the Mercury distribution.
+ #-----------------------------------------------------------------------------#
+ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ default_target: all
+ depend: lazy_list.depend lazy_list_test.depend
+diff -ur mercury-extras-10.04.orig/moose/Mmakefile mercury-extras-10.04/moose/Mmakefile
+--- mercury-extras-10.04.orig/moose/Mmakefile	2003-01-16 23:44:20.000000000 +1300
++++ mercury-extras-10.04/moose/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -6,6 +6,7 @@
+ 
+ # GRADE = asm_fast.gc.debug
+ # GRADE = asm_fast.gc.prof
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # MCFLAGS = -O6
+ # MCFLAGS = --intermodule-optimization -O6
+diff -ur mercury-extras-10.04.orig/odbc/Mmakefile mercury-extras-10.04/odbc/Mmakefile
+--- mercury-extras-10.04.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
++++ mercury-extras-10.04/odbc/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -8,6 +8,7 @@
+ 
+ #-----------------------------------------------------------------------------#
+ # Configuration
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # The driver manager.
+ # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
+diff -ur mercury-extras-10.04.orig/posix/Mmakefile mercury-extras-10.04/posix/Mmakefile
+--- mercury-extras-10.04.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
++++ mercury-extras-10.04/posix/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -8,6 +8,8 @@
+ 
+ -include ../Mmake.params
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # The following is needed (on some systems) to enable declarations of
+ # Posix functions in standard C header files.
+ MGNUCFLAGS = --no-ansi
+diff -ur mercury-extras-10.04.orig/quickcheck/Mmakefile mercury-extras-10.04/quickcheck/Mmakefile
+--- mercury-extras-10.04.orig/quickcheck/Mmakefile	2003-01-16 23:44:24.000000000 +1300
++++ mercury-extras-10.04/quickcheck/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = all
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ .PHONY: depend
+ depend:	qcheck.depend test_qcheck.depend
+ 
+diff -ur mercury-extras-10.04.orig/xml/Mmakefile mercury-extras-10.04/xml/Mmakefile
+--- mercury-extras-10.04.orig/xml/Mmakefile	2002-03-06 23:10:31.000000000 +1300
++++ mercury-extras-10.04/xml/Mmakefile	2010-07-20 06:49:40.000000000 +1200
+@@ -8,6 +8,8 @@
+ 
+ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ .PHONY: default_target
+ default_target: tryit libxml
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-odbc.patch
new file mode 100644
index 000000000000..edc7139cc2d8
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-odbc.patch
@@ -0,0 +1,75 @@
+Only in mercury-extras-10.04/cgi: Mmakefile.orig
+Only in mercury-extras-10.04/complex_numbers: Mmakefile.orig
+Only in mercury-extras-10.04/curs: Mmakefile.orig
+Only in mercury-extras-10.04/curses: Mmakefile.orig
+Only in mercury-extras-10.04/dynamic_linking: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_glut: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_opengl: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_tcltk: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_tcltk: mtcltk.m.orig
+Only in mercury-extras-10.04/lazy_evaluation: Mmakefile.orig
+Only in mercury-extras-10.04/moose: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/odbc/Mmakefile mercury-extras-10.04/odbc/Mmakefile
+--- mercury-extras-10.04.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
++++ mercury-extras-10.04/odbc/Mmakefile	2010-07-20 06:50:22.000000000 +1200
+@@ -41,17 +41,20 @@
+ 	# The following are for Debian.
+ 
+ 	# for unixODBC
+-	MLLIBS=-lodbc -lpthread -lltdl -ldl
+-
++	MLLIBS=`odbc_config --libs`
++	ODBC_CFLAGS=`odbc_config --cflags`
+ 	# for iODBC
+ 	# MLLIBS=-liodbc l-pthread -ldl
+ 	# note: on a DEC Alpha using OSF1 remove the -ldl.
+ endif
+ 
+-MAIN_TARGET=odbc_test
++MAIN_TARGET=libodbc
+ 
+ .PHONY: depend
+-depend: odbc_test.depend
++depend: odbc.depend
++
++.PHONY: install
++install: libodbc.install
+ 
+ .PHONY: check
+ check:
+@@ -62,7 +65,7 @@
+ # `--no-ansi' is needed because the ODBC header files include C++-style
+ # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
+ # presuming you have gcc version 2.7.1 or greater.
+-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
++MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
+ 
+ #-----------------------------------------------------------------------------#
+ #-----------------------------------------------------------------------------#
+Only in mercury-extras-10.04/odbc: Mmakefile.orig
+diff -ur mercury-extras-10.04.orig/odbc/odbc.m mercury-extras-10.04/odbc/odbc.m
+--- mercury-extras-10.04.orig/odbc/odbc.m	2006-08-31 23:09:50.000000000 +1200
++++ mercury-extras-10.04/odbc/odbc.m	2010-07-20 06:50:22.000000000 +1200
+@@ -2000,8 +2000,8 @@
+             ** Arbitrary size, only needs to hold a 
+             ** descriptive string like ""SQL Server"".
+             */
+-    String new_dsn;
+-    String new_desc;
++    LPSTR new_dsn;
++    LPSTR new_desc;
+     SWORD dsn_len;
+     SWORD desc_len;
+     SQLRETURN rc;
+@@ -2335,7 +2335,7 @@
+     SQLSMALLINT msg_len;
+     UCHAR       message[SQL_MAX_MESSAGE_LENGTH];
+     UCHAR       sql_state[SQL_SQLSTATE_SIZE + 1];
+-    String      mercury_message;
++    LPSTR       mercury_message;
+     MR_Word     new_message;
+ 
+     MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, 
+Only in mercury-extras-10.04/posix: Mmakefile.orig
+Only in mercury-extras-10.04/quickcheck: Mmakefile.orig
+Only in mercury-extras-10.04/xml: Mmakefile.orig
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-posix.patch
new file mode 100644
index 000000000000..5739fa83d100
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04-posix.patch
@@ -0,0 +1,28 @@
+Only in mercury-extras-10.04/cgi: Mmakefile.orig
+Only in mercury-extras-10.04/complex_numbers: Mmakefile.orig
+Only in mercury-extras-10.04/curs: Mmakefile.orig
+Only in mercury-extras-10.04/curses: Mmakefile.orig
+Only in mercury-extras-10.04/dynamic_linking: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_glut: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_opengl: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_tcltk: Mmakefile.orig
+Only in mercury-extras-10.04/graphics/mercury_tcltk: mtcltk.m.orig
+Only in mercury-extras-10.04/lazy_evaluation: Mmakefile.orig
+Only in mercury-extras-10.04/moose: Mmakefile.orig
+Only in mercury-extras-10.04/odbc: Mmakefile.orig
+Only in mercury-extras-10.04/odbc: odbc.m.orig
+diff -ur mercury-extras-10.04.orig/posix/Mmakefile mercury-extras-10.04/posix/Mmakefile
+--- mercury-extras-10.04.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
++++ mercury-extras-10.04/posix/Mmakefile	2010-07-20 06:50:41.000000000 +1200
+@@ -34,7 +34,7 @@
+ 
+ .PHONY: install
+ install: libposix.install
+-	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
++	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/@libdir@/mercury/inc
+ 
+ .PHONY: clean
+ clean:
+Only in mercury-extras-10.04/posix: Mmakefile.orig
+Only in mercury-extras-10.04/quickcheck: Mmakefile.orig
+Only in mercury-extras-10.04/xml: Mmakefile.orig
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.ebuild
new file mode 100644
index 000000000000..a4a83f80c479
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-10.04.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.ebuild,v 1.1 2010/07/19 19:02:13 keri Exp $
+
+inherit eutils
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="X examples glut iodbc ncurses odbc opengl tcl tk xml"
+
+DEPEND="~dev-lang/mercury-${PV}
+	glut? ( virtual/glut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( !odbc? ( dev-db/libiodbc ) )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	tcl? ( tk? (
+			dev-lang/tcl
+			dev-lang/tk
+			x11-libs/libX11
+			x11-libs/libXmu ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-curs.patch
+	epatch "${FILESDIR}"/${P}-dynamic-linking.patch
+	epatch "${FILESDIR}"/${P}-lex.patch
+	epatch "${FILESDIR}"/${P}-mercury_glut.patch
+	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
+	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
+	epatch "${FILESDIR}"/${P}-posix.patch
+	epatch "${FILESDIR}"/${P}-no-java-grade.patch
+
+	if use odbc; then
+		epatch "${FILESDIR}"/${P}-odbc.patch
+	elif use iodbc; then
+		epatch "${FILESDIR}"/${P}-iodbc.patch
+	fi
+
+	sed -i	-e "s:posix:posix quickcheck:" \
+		-e "s:references::" \
+		-e "s:windows_installer_generator ::" Mmakefile
+
+	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
+	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
+	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
+
+	if use odbc || use iodbc; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile
+	fi
+
+	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
+	! use xml && sed -i -e "s:xml::" Mmakefile
+
+	sed -i -e "s:@libdir@:$(get_libdir):" \
+		dynamic_linking/Mmakefile posix/Mmakefile
+
+	# disable broken packages
+	sed -i  -e "s:lazy_evaluation ::" \
+		-e "s:quickcheck::" Mmakefile
+}
+
+src_compile() {
+	mmake \
+		-j1 depend || die "mmake depend failed"
+
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "mmake failed"
+}
+
+src_install() {
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		INSTALL_PREFIX="${D}"/usr \
+		install || die "mmake install failed"
+
+	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
+
+	cd "${S}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples/complex_numbers
+		doins complex_numbers/samples/*.m
+
+		if use ncurses; then
+			insinto /usr/share/doc/${PF}/samples/curs
+			doins curs/samples/*.m
+
+			insinto /usr/share/doc/${PF}/samples/curses
+			doins curses/sample/*.m
+		fi
+
+		if use X; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/easyx/samples/*.m
+		fi
+
+		if use glut && use opengl; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/calc/*.m
+			doins graphics/samples/gears/*.m
+			doins graphics/samples/maze/*.m
+		fi
+
+		if use opengl && use tck && use tk; then
+			insinto /usr/share/doc/${PF}/samples/graphics
+			doins graphics/samples/pent/*.m
+		fi
+
+		insinto /usr/share/doc/${PF}/samples/dynamic_linking
+		doins dynamic_linking/hello.m
+
+		insinto /usr/share/doc/${PF}/samples/lex
+		doins lex/samples/*.m
+
+		insinto /usr/share/doc/${PF}/samples/moose
+		doins moose/samples/*.m moose/samples/*.moo
+	fi
+
+	dodoc README
+}