diff options
| author |   Keri Harris <keri@gentoo.org> | 2010-11-03 07:51:29 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2010-11-03 07:51:29 +0000 |
| commit | 18b76f87fba1c342215e3774f4f58175ef86ac2e (patch) | |
| tree | 41d37ce2036c3b97c82c3e8d8a061e74f69a81f9 /dev-lang | |
| parent | Bundle patches into distfiles tarball. (diff) | |
| download | gentoo-2-18b76f87fba1c342215e3774f4f58175ef86ac2e.tar.gz gentoo-2-18b76f87fba1c342215e3774f4f58175ef86ac2e.tar.bz2 gentoo-2-18b76f87fba1c342215e3774f4f58175ef86ac2e.zip | |
Bundle patches into distfiles tarball.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
36 files changed, 96 insertions, 2379 deletions
diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index ef7c32370865..4bf73a2b8a66 100644 --- a/dev-lang/mercury-extras/ChangeLog +++ b/dev-lang/mercury-extras/ChangeLog @@ -1,6 +1,41 @@ # 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.81 2010/11/03 07:19:08 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.82 2010/11/03 07:51:27 keri Exp $ + + 03 Nov 2010; <keri@gentoo.org> mercury-extras-10.04.ebuild, + mercury-extras-10.04-r1.ebuild, mercury-extras-10.04.1.ebuild, + -files/mercury-extras-10.04.1-curs.patch, + -files/mercury-extras-10.04.1-dynamic-linking.patch, + -files/mercury-extras-10.04.1-iodbc.patch, + -files/mercury-extras-10.04.1-lex.patch, + -files/mercury-extras-10.04.1-mercury-glut.patch, + -files/mercury-extras-10.04.1-mercury-opengl.patch, + -files/mercury-extras-10.04.1-mercury-tcltk.patch, + -files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch, + -files/mercury-extras-10.04.1-odbc.patch, + -files/mercury-extras-10.04.1-posix.patch, mercury-extras-10.04.2.ebuild, + mercury-extras-10.04.2-r1.ebuild, + -files/mercury-extras-10.04.2-curs.patch, + -files/mercury-extras-10.04.2-dynamic-linking.patch, + -files/mercury-extras-10.04.2-iodbc.patch, + -files/mercury-extras-10.04.2-lex.patch, + -files/mercury-extras-10.04.2-mercury-glut.patch, + -files/mercury-extras-10.04.2-mercury-opengl.patch, + -files/mercury-extras-10.04.2-mercury-tcltk.patch, + -files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch, + -files/mercury-extras-10.04.2-odbc.patch, + -files/mercury-extras-10.04.2-posix.patch, + -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-no-erlang-grade.patch, + -files/mercury-extras-10.04-odbc.patch, + -files/mercury-extras-10.04-posix.patch: + Bundle patches into distfiles tarball. 03 Nov 2010; <keri@gentoo.org> -mercury-extras-10.04_beta1.ebuild, -files/mercury-extras-10.04_beta1-curs.patch, 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 deleted file mode 100644 index 2ed3f150883e..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-curs.patch +++ /dev/null @@ -1,314 +0,0 @@ -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 deleted file mode 100644 index 5e3f89aafddd..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-dynamic-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 204ab661153d..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-iodbc.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 39dcfad46ac3..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-lex.patch +++ /dev/null @@ -1,34 +0,0 @@ -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,29 @@ -+# 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)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ -+.PHONEY: all depend install -+ -+all: liblex libregex -+ -+depend: lex.depend regex.depend -+ -+install: -+ $(MMAKE) liblex.install -+ $(MMAKE) libregex.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 deleted file mode 100644 index d65ee7d90d97..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_glut.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 2b4e4ac43096..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_opengl.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index 58069b50b22f..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-mercury_tcltk.patch +++ /dev/null @@ -1,29 +0,0 @@ -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-no-erlang-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04-no-java-grade-no-erlang-grade.patch deleted file mode 100644 index 6f498616bedd..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-no-java-grade-no-erlang-grade.patch +++ /dev/null @@ -1,180 +0,0 @@ -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,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,8 @@ - # 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)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - # this line to include the appropriate curses library for your OS. - MLLIBS = -lncurses - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - CFLAGS = -g - MLFLAGS += --no-strip - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - - MAIN_TARGET = libmercury_glut - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - # The following libraries are for X on Linux (Debian) using Mesa. - - # Libaries required by X windows. -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,9 @@ - - MAIN_TARGET = libmercury_opengl - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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 -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,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - depend: mercury_tcltk.depend - - install: libmercury_tcltk.install -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,9 @@ - # Public License - see the file COPYING.LIB in the Mercury distribution. - #-----------------------------------------------------------------------------# - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,8 @@ - - # GRADE = asm_fast.gc.debug - # GRADE = asm_fast.gc.prof -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,8 @@ - - #-----------------------------------------------------------------------------# - # Configuration -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - - -include ../Mmake.params - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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,9 @@ - - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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 deleted file mode 100644 index edc7139cc2d8..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-odbc.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 deleted file mode 100644 index 5739fa83d100..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04-posix.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/mercury-extras-10.04.1-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-curs.patch deleted file mode 100644 index 34d91bee3d50..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-curs.patch +++ /dev/null @@ -1,314 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/curs/curs.m mercury-extras-10.04.1/curs/curs.m ---- mercury-extras-10.04.1.orig/curs/curs.m 2006-04-21 15:37:10.000000000 +1200 -+++ mercury-extras-10.04.1/curs/curs.m 2010-09-06 19:34:04.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.1-dynamic-linking.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-dynamic-linking.patch deleted file mode 100644 index e6f8dc65e566..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-dynamic-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile ---- mercury-extras-10.04.1.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 -+++ mercury-extras-10.04.1/dynamic_linking/Mmakefile 2010-09-06 19:35:05.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.1-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-iodbc.patch deleted file mode 100644 index df25b5bc9528..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-iodbc.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile ---- mercury-extras-10.04.1.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.1/odbc/Mmakefile 2010-09-06 19:44:01.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 -urN mercury-extras-10.04.1.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m ---- mercury-extras-10.04.1.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 -+++ mercury-extras-10.04.1/odbc/odbc.m 2010-09-06 19:44:01.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.1-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-lex.patch deleted file mode 100644 index b0d7dabf1d73..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-lex.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN lex/Mmakefile lex/Mmakefile ---- lex/Mmakefile 1970-01-01 12:00:00.000000000 +1200 -+++ lex/Mmakefile 2010-09-06 19:36:37.000000000 +1200 -@@ -0,0 +1,29 @@ -+# 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)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ -+.PHONEY: all depend install -+ -+all: liblex libregex -+ -+depend: lex.depend regex.depend -+ -+install: -+ $(MMAKE) liblex.install diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch deleted file mode 100644 index cf27cb576aa0..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile 2010-09-06 19:38:06.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.1-mercury-opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-opengl.patch deleted file mode 100644 index 222d13cc5417..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-opengl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 -+++ mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile 2010-09-06 19:40:05.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.1-mercury-tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-tcltk.patch deleted file mode 100644 index 32102bedf2c5..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-tcltk.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 -+++ mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:39:01.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 -urN mercury-extras-10.04.1.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m ---- mercury-extras-10.04.1.orig/graphics/mercury_tcltk/mtcltk.m 2007-08-21 14:47:37.000000000 +1200 -+++ mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m 2010-09-06 19:39:01.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.1-no-java-grade-no-erlang-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch deleted file mode 100644 index 93f3a7a08e75..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/cgi/Mmakefile mercury-extras-10.04.1/cgi/Mmakefile ---- mercury-extras-10.04.1.orig/cgi/Mmakefile 2004-07-30 19:01:07.000000000 +1200 -+++ mercury-extras-10.04.1/cgi/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -12,6 +12,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - MCFLAGS-mercury_www = --no-warn-nothing-exported - - depend: mercury_www.depend -diff -urN mercury-extras-10.04.1.orig/complex_numbers/Mmakefile mercury-extras-10.04.1/complex_numbers/Mmakefile ---- mercury-extras-10.04.1.orig/complex_numbers/Mmakefile 2003-01-16 23:44:11.000000000 +1300 -+++ mercury-extras-10.04.1/complex_numbers/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - all: libcomplex_numbers - - depend: complex_numbers.depend -diff -urN mercury-extras-10.04.1.orig/curs/Mmakefile mercury-extras-10.04.1/curs/Mmakefile ---- mercury-extras-10.04.1.orig/curs/Mmakefile 2003-01-16 23:44:14.000000000 +1300 -+++ mercury-extras-10.04.1/curs/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -26,7 +26,8 @@ - # 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)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) - - # The following standard libraries must be linked against in any - # application using the curs library (i.e. MLLIBS must include -diff -urN mercury-extras-10.04.1.orig/curses/Mmakefile mercury-extras-10.04.1/curses/Mmakefile ---- mercury-extras-10.04.1.orig/curses/Mmakefile 2003-01-16 23:44:15.000000000 +1300 -+++ mercury-extras-10.04.1/curses/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -13,6 +13,9 @@ - # this line to include the appropriate curses library for your OS. - MLLIBS = -lncurses - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - - default_target: libmcurses -diff -urN mercury-extras-10.04.1.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile ---- mercury-extras-10.04.1.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 -+++ mercury-extras-10.04.1/dynamic_linking/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -17,6 +17,9 @@ - CFLAGS = -g - MLFLAGS += --no-strip - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - - main_target: libdl -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = libmercury_glut - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - # The following libraries are for X on Linux (Debian) using Mesa. - - # Libaries required by X windows. -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 -+++ mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -15,6 +15,9 @@ - - MAIN_TARGET = libmercury_opengl - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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 -diff -urN mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile ---- mercury-extras-10.04.1.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 -+++ mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -21,6 +21,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - depend: mercury_tcltk.depend - - install: libmercury_tcltk.install -diff -urN mercury-extras-10.04.1.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.1/lazy_evaluation/Mmakefile ---- mercury-extras-10.04.1.orig/lazy_evaluation/Mmakefile 2003-01-16 23:44:17.000000000 +1300 -+++ mercury-extras-10.04.1/lazy_evaluation/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -4,6 +4,9 @@ - # Public License - see the file COPYING.LIB in the Mercury distribution. - #-----------------------------------------------------------------------------# - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - default_target: all - depend: lazy_list.depend lazy_list_test.depend -diff -urN mercury-extras-10.04.1.orig/moose/Mmakefile mercury-extras-10.04.1/moose/Mmakefile ---- mercury-extras-10.04.1.orig/moose/Mmakefile 2003-01-16 23:44:20.000000000 +1300 -+++ mercury-extras-10.04.1/moose/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -6,6 +6,8 @@ - - # GRADE = asm_fast.gc.debug - # GRADE = asm_fast.gc.prof -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) - - # MCFLAGS = -O6 - # MCFLAGS = --intermodule-optimization -O6 -diff -urN mercury-extras-10.04.1.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile ---- mercury-extras-10.04.1.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.1/odbc/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -8,6 +8,8 @@ - - #-----------------------------------------------------------------------------# - # Configuration -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) - - # The driver manager. - # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS. -diff -urN mercury-extras-10.04.1.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile ---- mercury-extras-10.04.1.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 -+++ mercury-extras-10.04.1/posix/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -8,6 +8,9 @@ - - -include ../Mmake.params - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - # The following is needed (on some systems) to enable declarations of - # Posix functions in standard C header files. - MGNUCFLAGS = --no-ansi -diff -urN mercury-extras-10.04.1.orig/quickcheck/Mmakefile mercury-extras-10.04.1/quickcheck/Mmakefile ---- mercury-extras-10.04.1.orig/quickcheck/Mmakefile 2003-01-16 23:44:24.000000000 +1300 -+++ mercury-extras-10.04.1/quickcheck/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - .PHONY: depend - depend: qcheck.depend test_qcheck.depend - -diff -urN mercury-extras-10.04.1.orig/xml/Mmakefile mercury-extras-10.04.1/xml/Mmakefile ---- mercury-extras-10.04.1.orig/xml/Mmakefile 2002-03-06 23:10:31.000000000 +1300 -+++ mercury-extras-10.04.1/xml/Mmakefile 2010-09-06 19:41:29.000000000 +1200 -@@ -8,6 +8,9 @@ - - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - .PHONY: default_target - default_target: tryit libxml - diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch deleted file mode 100644 index 3216b037220e..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile ---- mercury-extras-10.04.1.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.1/odbc/Mmakefile 2010-09-06 19:42:52.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) - - #-----------------------------------------------------------------------------# - #-----------------------------------------------------------------------------# -diff -urN mercury-extras-10.04.1.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m ---- mercury-extras-10.04.1.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 -+++ mercury-extras-10.04.1/odbc/odbc.m 2010-09-06 19:42:52.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.1-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.1-posix.patch deleted file mode 100644 index abfecf913d2f..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.1-posix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN mercury-extras-10.04.1.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile ---- mercury-extras-10.04.1.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 -+++ mercury-extras-10.04.1/posix/Mmakefile 2010-09-06 19:40:40.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: diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch deleted file mode 100644 index af2f6177939b..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-curs.patch +++ /dev/null @@ -1,314 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/curs/curs.m mercury-extras-10.04.1/curs/curs.m ---- mercury-extras-10.04.2.orig/curs/curs.m 2006-04-21 15:37:10.000000000 +1200 -+++ mercury-extras-10.04.2/curs/curs.m 2010-09-06 19:34:04.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.2-dynamic-linking.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-dynamic-linking.patch deleted file mode 100644 index 69df48eafc9c..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-dynamic-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile ---- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 -+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile 2010-09-06 19:35:05.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.2-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-iodbc.patch deleted file mode 100644 index 1a441f9572dd..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-iodbc.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile ---- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-09-06 19:44:01.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 -urN mercury-extras-10.04.2.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m ---- mercury-extras-10.04.2.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 -+++ mercury-extras-10.04.2/odbc/odbc.m 2010-09-06 19:44:01.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.2-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-lex.patch deleted file mode 100644 index b0d7dabf1d73..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-lex.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN lex/Mmakefile lex/Mmakefile ---- lex/Mmakefile 1970-01-01 12:00:00.000000000 +1200 -+++ lex/Mmakefile 2010-09-06 19:36:37.000000000 +1200 -@@ -0,0 +1,29 @@ -+# 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)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ -+.PHONEY: all depend install -+ -+all: liblex libregex -+ -+depend: lex.depend regex.depend -+ -+install: -+ $(MMAKE) liblex.install diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch deleted file mode 100644 index 69479b7f317d..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-glut.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile 2010-09-06 19:38:06.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.2-mercury-opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-opengl.patch deleted file mode 100644 index 6d1233f17210..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-opengl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 -+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile 2010-09-06 19:40:05.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.2-mercury-tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-tcltk.patch deleted file mode 100644 index edf9e658562d..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-mercury-tcltk.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 -+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile 2010-09-06 19:39:01.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 -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04.1/graphics/mercury_tcltk/mtcltk.m ---- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/mtcltk.m 2007-08-21 14:47:37.000000000 +1200 -+++ mercury-extras-10.04.2/graphics/mercury_tcltk/mtcltk.m 2010-09-06 19:39:01.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.2-no-java-grade-no-erlang-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch deleted file mode 100644 index bcae7a09b4ea..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff -ur mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.2/cgi/Mmakefile ---- mercury-extras-10.04.2.orig/cgi/Mmakefile 2004-07-30 19:01:07.000000000 +1200 -+++ mercury-extras-10.04.2/cgi/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -12,6 +12,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - MCFLAGS-mercury_www = --no-warn-nothing-exported - - depend: mercury_www.depend -diff -ur mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-10.04.2/complex_numbers/Mmakefile ---- mercury-extras-10.04.2.orig/complex_numbers/Mmakefile 2003-01-16 23:44:11.000000000 +1300 -+++ mercury-extras-10.04.2/complex_numbers/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - all: libcomplex_numbers - - depend: complex_numbers.depend -diff -ur mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.2/curs/Mmakefile ---- mercury-extras-10.04.2.orig/curs/Mmakefile 2003-01-16 23:44:14.000000000 +1300 -+++ mercury-extras-10.04.2/curs/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -26,7 +26,8 @@ - # 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)) -+LIBGRADES := $(filter-out erlang,$(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.2.orig/curses/Mmakefile mercury-extras-10.04.2/curses/Mmakefile ---- mercury-extras-10.04.2.orig/curses/Mmakefile 2003-01-16 23:44:15.000000000 +1300 -+++ mercury-extras-10.04.2/curses/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -13,6 +13,9 @@ - # this line to include the appropriate curses library for your OS. - MLLIBS = -lncurses - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - - default_target: libmcurses -diff -ur mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.2/dynamic_linking/Mmakefile ---- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile 2005-01-25 20:49:05.000000000 +1300 -+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -17,6 +17,9 @@ - CFLAGS = -g - MLFLAGS += --no-strip - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - - main_target: libdl -diff -ur mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile 2006-03-30 14:52:44.000000000 +1200 -+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = libmercury_glut - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - # The following libraries are for X on Linux (Debian) using Mesa. - - # Libaries required by X windows. -diff -ur mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile 2007-10-11 19:21:31.000000000 +1300 -+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -15,6 +15,9 @@ - - MAIN_TARGET = libmercury_opengl - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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 -diff -ur mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile ---- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile 2005-08-15 16:11:42.000000000 +1200 -+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -21,6 +21,9 @@ - - MAIN_TARGET = $(LIBRARY) - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - depend: mercury_tcltk.depend - - install: libmercury_tcltk.install -diff -ur mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.2/lazy_evaluation/Mmakefile ---- mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile 2003-01-16 23:44:17.000000000 +1300 -+++ mercury-extras-10.04.2/lazy_evaluation/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -4,6 +4,9 @@ - # Public License - see the file COPYING.LIB in the Mercury distribution. - #-----------------------------------------------------------------------------# - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - -include ../Mmake.params - default_target: all - depend: lazy_list.depend lazy_list_test.depend -diff -ur mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.2/moose/Mmakefile ---- mercury-extras-10.04.2.orig/moose/Mmakefile 2003-01-16 23:44:20.000000000 +1300 -+++ mercury-extras-10.04.2/moose/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -6,6 +6,8 @@ - - # GRADE = asm_fast.gc.debug - # GRADE = asm_fast.gc.prof -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) - - # MCFLAGS = -O6 - # MCFLAGS = --intermodule-optimization -O6 -diff -ur mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.2/odbc/Mmakefile ---- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -8,6 +8,8 @@ - - #-----------------------------------------------------------------------------# - # Configuration -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) - - # The driver manager. - # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS. -diff -ur mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.2/posix/Mmakefile ---- mercury-extras-10.04.2.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 -+++ mercury-extras-10.04.2/posix/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -8,6 +8,9 @@ - - -include ../Mmake.params - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(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.2.orig/quickcheck/Mmakefile mercury-extras-10.04.2/quickcheck/Mmakefile ---- mercury-extras-10.04.2.orig/quickcheck/Mmakefile 2003-01-16 23:44:24.000000000 +1300 -+++ mercury-extras-10.04.2/quickcheck/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -10,6 +10,9 @@ - - MAIN_TARGET = all - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - .PHONY: depend - depend: qcheck.depend test_qcheck.depend - -diff -ur mercury-extras-10.04.2.orig/solver_types/library/Mmakefile mercury-extras-10.04.2/solver_types/library/Mmakefile ---- mercury-extras-10.04.2.orig/solver_types/library/Mmakefile 2006-09-18 13:36:36.000000000 +1200 -+++ mercury-extras-10.04.2/solver_types/library/Mmakefile 2010-10-23 15:39:10.000000000 +1300 -@@ -16,6 +16,9 @@ - - install: libany.install - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - MCFLAGS-any= --no-warn-nothing-exported --no-warn-interface-imports - - .PHONY: check -diff -ur mercury-extras-10.04.2.orig/xml/Mmakefile mercury-extras-10.04.2/xml/Mmakefile ---- mercury-extras-10.04.2.orig/xml/Mmakefile 2002-03-06 23:10:31.000000000 +1300 -+++ mercury-extras-10.04.2/xml/Mmakefile 2010-10-23 15:38:16.000000000 +1300 -@@ -8,6 +8,9 @@ - - INSTALL_PREFIX := $(INSTALL_PREFIX)/extras - -+LIBGRADES := $(filter-out java,$(LIBGRADES)) -+LIBGRADES := $(filter-out erlang,$(LIBGRADES)) -+ - .PHONY: default_target - default_target: tryit libxml - diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch deleted file mode 100644 index 2dced72ec4e8..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-odbc.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile ---- mercury-extras-10.04.2.orig/odbc/Mmakefile 2006-04-03 18:19:54.000000000 +1200 -+++ mercury-extras-10.04.2/odbc/Mmakefile 2010-09-06 19:42:52.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) - - #-----------------------------------------------------------------------------# - #-----------------------------------------------------------------------------# -diff -urN mercury-extras-10.04.2.orig/odbc/odbc.m mercury-extras-10.04.1/odbc/odbc.m ---- mercury-extras-10.04.2.orig/odbc/odbc.m 2006-08-31 23:09:50.000000000 +1200 -+++ mercury-extras-10.04.2/odbc/odbc.m 2010-09-06 19:42:52.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.2-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-posix.patch deleted file mode 100644 index 75fb8e4c956b..000000000000 --- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-posix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile ---- mercury-extras-10.04.2.orig/posix/Mmakefile 2008-09-02 21:45:54.000000000 +1200 -+++ mercury-extras-10.04.2/posix/Mmakefile 2010-09-06 19:40:40.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: diff --git a/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild index 0414de097e21..18e2029b5329 100644 --- a/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-10.04-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/mercury-extras/mercury-extras-10.04-r1.ebuild,v 1.2 2010/09/16 16:39:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild,v 1.3 2010/11/03 07:51:27 keri Exp $ inherit eutils +PATCHSET_VER="0" + 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" +SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -28,22 +31,18 @@ DEPEND="~dev-lang/mercury-${PV} 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-no-erlang-grade.patch + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} if use odbc; then - epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch elif use iodbc; then - epatch "${FILESDIR}"/${P}-iodbc.patch + epatch "${FILESDIR}"/${PV}-odbc/${P}-iodbc.patch fi + cd "${S}" sed -i -e "s:posix:posix quickcheck:" \ -e "s:references::" \ -e "s:windows_installer_generator ::" Mmakefile diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild index 598146f6f7c3..5f3d6466e948 100644 --- a/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-10.04.1.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/mercury-extras/mercury-extras-10.04.1.ebuild,v 1.2 2010/09/16 16:39:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild,v 1.3 2010/11/03 07:51:27 keri Exp $ inherit eutils +PATCHSET_VER="0" + 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" +SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -28,22 +31,18 @@ DEPEND="~dev-lang/mercury-${PV} 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-no-erlang-grade.patch + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} if use odbc; then - epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch elif use iodbc; then - epatch "${FILESDIR}"/${P}-iodbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch fi + cd "${S}" sed -i -e "s:posix:posix quickcheck:" \ -e "s:references::" \ -e "s:windows_installer_generator ::" Mmakefile diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild index 4a435c03001c..c5836713989a 100644 --- a/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-10.04.2-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/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.2 2010/10/30 04:40:34 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2-r1.ebuild,v 1.3 2010/11/03 07:51:27 keri Exp $ inherit eutils +PATCHSET_VER="0" + 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" +SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -28,22 +31,18 @@ DEPEND="~dev-lang/mercury-${PV} 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-no-erlang-grade.patch + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} if use odbc; then - epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch elif use iodbc; then - epatch "${FILESDIR}"/${P}-iodbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch fi + cd "${S}" sed -i -e "s:posix:posix quickcheck:" \ -e "s:references:solver_types/library:" \ -e "s:windows_installer_generator ::" \ diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.2.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.2.ebuild index 3df558ac2a04..14a95b381f6f 100644 --- a/dev-lang/mercury-extras/mercury-extras-10.04.2.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-10.04.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/mercury-extras/mercury-extras-10.04.2.ebuild,v 1.1 2010/10/10 05:32:54 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.2.ebuild,v 1.2 2010/11/03 07:51:27 keri Exp $ inherit eutils +PATCHSET_VER="0" + 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" +SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -28,22 +31,18 @@ DEPEND="~dev-lang/mercury-${PV} 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-no-erlang-grade.patch + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} if use odbc; then - epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch elif use iodbc; then - epatch "${FILESDIR}"/${P}-iodbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch fi + cd "${S}" sed -i -e "s:posix:posix quickcheck:" \ -e "s:references::" \ -e "s:windows_installer_generator ::" Mmakefile diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.ebuild index 87845299c97c..f5c924c7059e 100644 --- a/dev-lang/mercury-extras/mercury-extras-10.04.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-10.04.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/mercury-extras/mercury-extras-10.04.ebuild,v 1.3 2010/09/16 16:39:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.ebuild,v 1.4 2010/11/03 07:51:27 keri Exp $ inherit eutils +PATCHSET_VER="0" + 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" +SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -28,22 +31,18 @@ DEPEND="~dev-lang/mercury-${PV} 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-no-erlang-grade.patch + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} if use odbc; then - epatch "${FILESDIR}"/${P}-odbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch elif use iodbc; then - epatch "${FILESDIR}"/${P}-iodbc.patch + epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch fi + cd "${S}" sed -i -e "s:posix:posix quickcheck:" \ -e "s:references::" \ -e "s:windows_installer_generator ::" Mmakefile |