[gentoo-commits] gentoo-x86 commit in dev-lang/mercury-extras/files: mercury-extras-10.04.1-odbc.patch mercury-extras-10.04.1-posix.patch mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch mercury-extras-10.04.1-mercury-glut.patch mercury-extras-10.04.1-dynamic-linking.patch mercury-extras-10.04.1-mercury-opengl.patch mercury-extras-10.04.1-iodbc.patch mercury-extras-10.04.1-mercury-tcltk.patch mercury-extras-10.04.1-curs.patch mercury-extras-10.04.1-lex.patch

[Keri Harris (keri)]

keri        10/09/06 08:07:08

  Added:                mercury-extras-10.04.1-odbc.patch
                        mercury-extras-10.04.1-posix.patch
                        mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch
                        mercury-extras-10.04.1-mercury-glut.patch
                        mercury-extras-10.04.1-dynamic-linking.patch
                        mercury-extras-10.04.1-mercury-opengl.patch
                        mercury-extras-10.04.1-iodbc.patch
                        mercury-extras-10.04.1-mercury-tcltk.patch
                        mercury-extras-10.04.1-curs.patch
                        mercury-extras-10.04.1-lex.patch
  Log:
  Version bump
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-odbc.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-odbc.patch
===================================================================
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, 



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-posix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-posix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-posix.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-posix.patch
===================================================================
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:



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-no-java-grade-no-erlang-grade.patch
===================================================================
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
 



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-glut.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-mercury-glut.patch
===================================================================
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
 



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-dynamic-linking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-dynamic-linking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-dynamic-linking.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-dynamic-linking.patch
===================================================================
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



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-opengl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-opengl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-opengl.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-mercury-opengl.patch
===================================================================
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)
 



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-iodbc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-iodbc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-iodbc.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-iodbc.patch
===================================================================
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, 



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-tcltk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-tcltk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-mercury-tcltk.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-mercury-tcltk.patch
===================================================================
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);
     }
     



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-curs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-curs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-curs.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-curs.patch
===================================================================
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.
-    %-------------------------------------------------------------------------%
-    %-------------------------------------------------------------------------%
-
-%-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%



1.1                  dev-lang/mercury-extras/files/mercury-extras-10.04.1-lex.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-lex.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury-extras/files/mercury-extras-10.04.1-lex.patch?rev=1.1&content-type=text/plain

Index: mercury-extras-10.04.1-lex.patch
===================================================================
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@×××××××××.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