Update mercury to version 0.11.0.

Changes to the Mercury language:
* Support for constrained polymorphic modes.
* Addition of state variable syntax.
* Improved support for higher-order functions.
* Predicate and function equivalence type and mode declarations.
* Support for defining predicates or functions
  using different clauses for different modes.
* Support for Haskell-like "@" expressions.
* Generalized foreign language interface.

Changes to the Mercury compiler:
* A new `--make' option, for simpler building of programs.
* A new `--smart-recompilation' option, for fine-grained dependency tracking.
* A new optional warning: `--warn-non-tail-recursion'.
* A new optimization: `--constraint-propagation'.
* A new optimization: `--loop-invariants'.
* Support for arbitrary mappings from module name to source file name.

Portability improvements:
* Mac OS X is now supported "out-of-the-box".
* On Windows we now support generating non-Cygwin executables.
* Better conformance to ANSI/ISO C.

Changes to the compiler back-ends:
* The native code Linux/x86 back-end is now "release quality".
* The .NET CLR back-end is much improved.

Major improvements to the Mercury debugger, including:
* Support for source-linked debugging using vim (rather than emacs).
* Command-line completion.
* Ability to display values of higher-order terms.
* Declarative debugging.
* Support for transparent retries across I/O.

A new profiler, which we call the Mercury deep profiler or mdprof:
* Supports both time and memory profiling.
* Gathers information about individual call sites as well as procedures.
* Eliminates the assumption that all calls to a procedure have equal cost.
* Allows users to explore the gathered data interactively with a web browser.

Numerous minor improvements to the Mercury standard library.

A new testing tool in the extras distribution.

12 files changed, 65 insertions, 369 deletions

diff --git a/lang/mercury/patches/patch-aa b/lang/mercury/patches/patch-aa
index 4920e26cb33..9ad561d8289 100644
--- a/lang/mercury/patches/patch-aa
+++ b/lang/mercury/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/15 21:09:55 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/02 17:48:29 jtb Exp $
 
---- Mmake.common.in.orig	Mon May 14 17:49:18 2001
-+++ Mmake.common.in
-@@ -125,7 +125,7 @@
- LIBRARY_DIR = $(MERCURY_DIR)/library
- TRACE_DIR = $(MERCURY_DIR)/trace
- BROWSER_DIR = $(MERCURY_DIR)/browser
--BOEHM_GC_DIR = $(MERCURY_DIR)/boehm_gc
-+BOEHM_GC_DIR = @BOEHM_GC_DIR@
- COMPILER_DIR = $(MERCURY_DIR)/compiler
- UTIL_DIR = $(MERCURY_DIR)/util
- 
+--- Mmake.workspace.orig
++++ Mmake.workspace
+@@ -110,7 +110,7 @@
+ #
+ # Work out the C include directories.
+ #
+-C_INCL_DIRS =	-I$(BOEHM_GC_DIR) -I$(BOEHM_GC_DIR)/include -I$(MPS_GC_DIR)
++C_INCL_DIRS =	-I$(BOEHM_GC_DIR) -I$(BOEHM_GC_DIR)/include -I$(MPS_GC_DIR) -I$(READLINE_PREFIX)/include
+ ifneq ($(LINK_BOEHM_GC_ONLY),yes)
+ C_INCL_DIRS +=	-I$(RUNTIME_DIR)
+ ifneq ($(LINK_RUNTIME_ONLY),yes)
diff --git a/lang/mercury/patches/patch-ab b/lang/mercury/patches/patch-ab
index acbb9586e3a..92590bfbb4b 100644
--- a/lang/mercury/patches/patch-ab
+++ b/lang/mercury/patches/patch-ab
@@ -1,19 +1,23 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/15 21:09:55 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/02 17:48:29 jtb Exp $
 
---- Makefile.orig	Mon May 14 17:49:40 2001
-+++ Makefile
-@@ -50,13 +50,12 @@
- 	-rm -f library/library.nu* library/library.sicstus*
- 	-rm -f library/sicstus_compile library/sicstus_saved_state
- 	-rm -f util/mdemangle util/mkinit
--	cd boehm_gc; $(MMAKE_SUBDIR) clean
+--- scripts/Mmake.vars.in.orig
++++ scripts/Mmake.vars.in
+@@ -692,13 +692,13 @@
+ INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
+ FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
+ INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
+-INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
++INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
++INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/share/doc/mercury
++INSTALL_PS_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
+ INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
+-INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
++INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/share/doc/html/mercury
+ INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
+-INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
++INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/share/emacs/site-lisp/mercury
+ INSTALL_CGI_DIR		= @CGIDIR@
  
- .PHONY: distclean
- distclean: clean
- 	cd scripts; for file in *.in; do rm -f `basename $file .in`; done
- 	-rm -f Mmake.common runtime/mercury_conf.h
--	-rm -f boehm_gc/mercury_boehm_gc_conf.h bindist/bindist.build_vars
-+	-rm -f bindist/bindist.build_vars
- 	-rm -f config.cache config.status config.log
- 
- .PHONY: maintainer-clean
+ # You should not need to override anything below here
diff --git a/lang/mercury/patches/patch-ac b/lang/mercury/patches/patch-ac
index 017261176e6..2d5a2fd8b1d 100644
--- a/lang/mercury/patches/patch-ac
+++ b/lang/mercury/patches/patch-ac
@@ -1,134 +1,21 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/15 21:09:56 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2003/05/02 17:48:29 jtb Exp $
 
---- Mmakefile.orig	Mon May 14 17:50:21 2001
-+++ Mmakefile
-@@ -25,7 +25,6 @@
- SUBDIRS = \
- 		scripts \
- 		util \
--		boehm_gc \
- 		runtime \
- 		library \
- 		trace \
-@@ -116,33 +115,28 @@
- scripts:
- 	cd scripts && $(SUBDIR_MMAKE)
- 
--.PHONY: boehm_gc
--boehm_gc: scripts
--	gc_grade=`scripts/ml --grade $(GRADE) --print-gc-grade`; \
--	cd boehm_gc && $(SUBDIR_MMAKE) GC_GRADE=$$gc_grade
--
- .PHONY: runtime
--runtime: scripts boehm_gc
-+runtime: scripts
- 	cd runtime && $(SUBDIR_MMAKE)
- 
- .PHONY: library
--library: dep_library scripts util boehm_gc runtime
-+library: dep_library scripts util runtime
- 	cd library && $(SUBDIR_MMAKE)
- 
- .PHONY: browser
--browser: dep_browser scripts util boehm_gc runtime library
-+browser: dep_browser scripts util runtime library
- 	cd browser && $(SUBDIR_MMAKE)
- 
- .PHONY: runtime
--trace: scripts boehm_gc runtime library browser
-+trace: scripts runtime library browser
- 	cd trace && $(SUBDIR_MMAKE)
- 
- .PHONY: compiler
--compiler: dep_compiler scripts util boehm_gc runtime library browser trace
-+compiler: dep_compiler scripts util runtime library browser trace
- 	cd compiler && $(SUBDIR_MMAKE)
- 
- .PHONY: libmmc
--libmmc: dep_compiler scripts util boehm_gc runtime library browser trace
-+libmmc: dep_compiler scripts util runtime library browser trace
- 	cd compiler && $(SUBDIR_MMAKE) libmmc
- 
- .PHONY: doc
-@@ -150,7 +144,7 @@
- 	cd doc && $(SUBDIR_MMAKE)
- 
- .PHONY: profiler
--profiler: dep_profiler scripts util boehm_gc runtime library browser trace
-+profiler: dep_profiler scripts util runtime library browser trace
- 	cd profiler && $(SUBDIR_MMAKE)
- 
- #-----------------------------------------------------------------------------#
-@@ -230,7 +224,7 @@
- 	cd doc && mmake distclean
- 	-rm -f errs errs2 update.log
- 	-rm -f config.status config.cache config.log configure.log a.out
--	-rm -f runtime/mercury_conf.h boehm_gc/mercury_boehm_gc_conf.h
-+	-rm -f runtime/mercury_conf.h
- 	-rm -f Mmake.common
- 	chmod -R a+r *
- 	# Package up the mercury directory with some subdirectories
-@@ -295,7 +289,7 @@
- 
- .PHONY: install_main
- install_main: all \
--		install_scripts install_util install_runtime install_boehm_gc \
-+		install_scripts install_util install_runtime \
-   		install_library install_browser install_trace \
- 		install_compiler install_profiler install_doc 
-  
-@@ -315,11 +309,6 @@
- install_trace: trace
- 	cd trace && $(SUBDIR_MMAKE) install
- 
--.PHONY: install_boehm_gc
--install_boehm_gc: boehm_gc
--	gc_grade=`scripts/ml --grade $(GRADE) --print-gc-grade`; \
--	cd boehm_gc && $(SUBDIR_MMAKE) install GC_GRADE=$$gc_grade
--
- .PHONY: install_library
- install_library: dep_library library
- 	cd library && $(SUBDIR_MMAKE) install
-@@ -342,8 +331,6 @@
- 
- .PHONY: install_grades
- install_grades: scripts
--	cd boehm_gc && rm -rf tmp_dir && mkdir tmp_dir && \
--		{ mv -f *.$O *.pic_o *.$A *.so tmp_dir || true; }
- 	cd runtime && rm -rf tmp_dir && mkdir tmp_dir && \
- 		{ mv -f *.$O *.pic_o *.$A *.so tmp_dir || true; }
- 	cd library && rm -rf tmp_dir && mkdir tmp_dir && \
-@@ -366,9 +353,6 @@
- 	for grade in x $(LIBGRADES); do \
- 	    if [ "$$grade" != "x" ]; then \
- 	    	gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \
--	        ( cd boehm_gc && \
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade GC_GRADE=$$gc_grade \
--		  	install_lib ) && \
- 		( cd runtime && \
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_lib ) && \
- 		( cd library && \
-@@ -380,7 +364,6 @@
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_library ) && \
- 		( cd trace && \
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_lib ) && \
--		( cd boehm_gc && rm -f *.$O *.pic_o *.$A *.so ) && \
- 		( cd runtime && rm -f *.$O *.pic_o *.$A *.so ) && \
- 		( cd library && rm -f *.dep *.h *.c *.$O *.pic_o *.$A *.so \
- 				Mercury/cs/*.c Mercury/os/*.$O ) && \
-@@ -391,7 +374,6 @@
- 		|| { scripts/mercury_cleanup_install; exit 1; }; \
- 	    fi; \
- 	done
--	cd boehm_gc && { mv tmp_dir/* . ; rmdir tmp_dir; true; }
- 	cd runtime  && { mv tmp_dir/* . ; rmdir tmp_dir; true; }
- 	cd library  && { [ -d Mercury/cs ] && mv tmp_dir/*.c Mercury/cs; \
- 			 [ -d Mercury/os ] && mv tmp_dir/*.$O Mercury/os; \
-@@ -456,7 +438,6 @@
- 	touch profiler/*.dep
- 	touch doc/*.texi configure
- 	sleep 1
--	touch boehm_gc/*.c
- 	touch runtime/*.c
- 	touch library/*.c
- 	touch browser/*.c
+--- runtime/mercury_bootstrap.h.orig
++++ runtime/mercury_bootstrap.h
+@@ -139,6 +139,7 @@
+ #define do_not_reached			MR_do_not_reached
+ #define exception_handler_do_fail	MR_exception_handler_do_fail
+ 
++#if !(defined(__NetBSD__) && defined(__powerpc__))
+ #define	r1				MR_r1
+ #define	r2				MR_r2
+ #define	r3				MR_r3
+@@ -175,6 +176,8 @@
+ #define	r(N)				MR_r(N)
+ 
+ #define	NUM_REAL_REGS			MR_NUM_REAL_REGS
++
++#endif
+ 
+ #define	progname			MR_progname
+ #define	program_entry_point		MR_program_entry_point
diff --git a/lang/mercury/patches/patch-ad b/lang/mercury/patches/patch-ad
index c546e96709a..de77d8cfc9e 100644
--- a/lang/mercury/patches/patch-ad
+++ b/lang/mercury/patches/patch-ad
@@ -1,37 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/15 21:09:56 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2003/05/02 17:48:30 jtb Exp $
 
---- configure.orig	Mon Apr  2 20:19:15 2001
-+++ configure
-@@ -1356,15 +1356,7 @@
- fi
- 
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
--    if test $ac_cv_prog_gcc_g = yes; then
--      CFLAGS="-g -O"
--    else
--      CFLAGS="-O"
--    fi
-   fi
--else
--  GCC=
--  test "${CFLAGS+set}" = set || CFLAGS="-g"
- fi
- 
- 
-@@ -1374,7 +1366,7 @@
- # the `-lc' and `-lg' libraries have different contents; specifically,
- # only the latter contains memalign().  We need to make sure that the
- # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
--CFLAGS="-O"
-+# CFLAGS="-O"
- 
- # we also need to add the appropriate `-I' options so that the test programs
- # can #include various Mercury runtime headers.
-@@ -6118,6 +6117,7 @@
- s%@FINAL_GRADE_OPTIONS@%%g
- /@CANONICAL_GRADE@/r $CANONICAL_GRADE
- s%@CANONICAL_GRADE@%%g
-+s%@BOEHM_GC_DIR@%$BOEHM_GC_DIR%g
- s%@SOCKET_LIBRARY@%$SOCKET_LIBRARY%g
- s%@NSL_LIBRARY@%$NSL_LIBRARY%g
- s%@DL_LIBRARY@%$DL_LIBRARY%g
+--- doc/Mmakefile.orig
++++ doc/Mmakefile
+@@ -271,7 +271,7 @@
+ 
+ .PHONY: install_info
+ install_info: $(INFOPAGES) install_dirs
+-	-cp *.info* $(INSTALL_INFO_DIR)
++	-cp *.info *.info-[0-9]* $(INSTALL_INFO_DIR)
+ 	# Update the .../info/dir file.
+ 	-if [ -x "$(INSTALL_INFO)" ]; then				\
+ 		$(INSTALL_INFO) $(INSTALL_INFO_DIR)/mercury.info;	\
diff --git a/lang/mercury/patches/patch-ae b/lang/mercury/patches/patch-ae
deleted file mode 100644
index d2fb6232006..00000000000
--- a/lang/mercury/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/05/15 21:09:56 jtb Exp $
-
---- browser/Mmakefile.orig	Mon Apr  2 15:50:21 2001
-+++ browser/Mmakefile
-@@ -39,7 +39,6 @@
- 			-I$(TRACE_DIR) \
- 			-I$(LIBRARY_DIR) \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 		"
- 
-@@ -53,7 +52,7 @@
- MCS	=	$(M_ENV) $(MC) --split-c-files -c --cflags "$(ALL_CFLAGS)"
- MGNUC	=	$(M_ENV) $(SCRIPTS_DIR)/mgnuc
- MGNUCFLAGS =	$(DLL_CFLAGS)
--LDFLAGS	=	-L$(LIBRARY_DIR) -L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)
-+LDFLAGS	=	-L$(LIBRARY_DIR) -L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)/lib
- LDLIBS	=	-l$(STD_LIB_NAME) -l$(RT_LIB_NAME) \
- 		` case "$(GRADE)" in 					\
- 		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
diff --git a/lang/mercury/patches/patch-af b/lang/mercury/patches/patch-af
deleted file mode 100644
index b9573444a45..00000000000
--- a/lang/mercury/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/03/10 04:09:04 jmc Exp $
-
---- compiler/Mmakefile.orig	Mon Feb 19 14:50:26 2001
-+++ compiler/Mmakefile	Mon Mar 10 03:04:14 2003
-@@ -40,7 +40,6 @@
- 			-I$(TRACE_DIR) \
- 			-I$(LIBRARY_DIR) \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 		"
- SMC	=	$(MC) --search-directory $(BROWSER_DIR)
-@@ -69,7 +68,7 @@
- 				echo $(BOEHM_GC_DIR)/libpar_gc_prof.$A ;; \
- 			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
- 			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
--			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
-+			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -Wl,${_OPSYS_RPATH_NAME}$(BOEHM_GC_DIR)/lib -lgc ;; \
- 		    esac \
- 		` \
- 		$(GCC_BACKEND_LIBS) \
diff --git a/lang/mercury/patches/patch-ag b/lang/mercury/patches/patch-ag
deleted file mode 100644
index 22d1376e575..00000000000
--- a/lang/mercury/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
-
---- runtime/Mmakefile.orig	Mon Apr  2 15:52:13 2001
-+++ runtime/Mmakefile
-@@ -17,7 +17,6 @@
- CFLAGS		= -g $(DLL_CFLAGS)
- MGNUC		= MERCURY_ALL_C_INCL_DIRS=" \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 			" \
- 		  $(SCRIPTS_DIR)/mgnuc 
-@@ -160,7 +159,7 @@
- OBJS		= $(CFILES:.c=.$O)
- PIC_OBJS	= $(CFILES:.c=.$(EXT_FOR_PIC_OBJECTS))
- 
--LDFLAGS		= -L$(BOEHM_GC_DIR)
-+LDFLAGS		= -L$(BOEHM_GC_DIR)/lib
- LDLIBS		= \
- 		` case "$(GRADE)" in 					\
- 		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
diff --git a/lang/mercury/patches/patch-ah b/lang/mercury/patches/patch-ah
deleted file mode 100644
index efe12831e22..00000000000
--- a/lang/mercury/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
-
---- library/Mmakefile.orig	Mon Apr  2 15:51:50 2001
-+++ library/Mmakefile
-@@ -66,7 +66,6 @@
- 		MERCURY_ALL_C_INCL_DIRS="\
- 			-I$(TRACE_DIR) \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 		"
- MCD	=	$(M_ENV) $(MC) --generate-dependencies $(INTERMODULE_OPTS)
-@@ -88,7 +87,7 @@
- MGNUCFLAGS =	$(DLL_CFLAGS)
- MS_CLFLAGS  =	-I$(RUNTIME_DIR) 
- MS_CL_NOASM=:noAssembly
--LDFLAGS	=	-L$(BOEHM_GC_DIR) -L$(RUNTIME_DIR)
-+LDFLAGS	=	-L$(BOEHM_GC_DIR)/lib -L$(RUNTIME_DIR)
- ALL_LDFLAGS =	$(LDFLAGS) $(EXTRA_LDFLAGS)
- LDLIBS	=	-l$(RT_LIB_NAME) \
- 		` case "$(GRADE)" in 					\
diff --git a/lang/mercury/patches/patch-ai b/lang/mercury/patches/patch-ai
deleted file mode 100644
index 1b9fdb5dd48..00000000000
--- a/lang/mercury/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/03/10 04:09:04 jmc Exp $
-
---- profiler/Mmakefile.orig	Mon Feb 19 14:51:41 2001
-+++ profiler/Mmakefile	Mon Mar 10 03:03:43 2003
-@@ -24,7 +24,6 @@
- 			-I$(TRACE_DIR) \
- 			-I$(LIBRARY_DIR) \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 		"
- MCD	=	$(M_ENV) $(MC) --generate-dependencies
-@@ -50,7 +49,7 @@
- 				echo $(BOEHM_GC_DIR)/libpar_gc_prof.$A ;; \
- 			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
- 			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
--			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
-+			*.gc*)		echo -L$(BOEHM_GC_DIR)/lib -Wl,${_OPSYS_RPATH_NAME}$(BOEHM_GC_DIR)/lib -lgc ;; \
- 		    esac \
- 		` $(MATH_LIB)
- MSL	=	MERCURY_SP_LIB_DIR=$(LIBRARY_DIR) $(SCRIPTS_DIR)/msl
diff --git a/lang/mercury/patches/patch-aj b/lang/mercury/patches/patch-aj
deleted file mode 100644
index e9c6ae77091..00000000000
--- a/lang/mercury/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
-
---- trace/Mmakefile.orig	Mon Apr  2 15:52:51 2001
-+++ trace/Mmakefile
-@@ -19,7 +19,6 @@
- 			-I$(BROWSER_DIR) \
- 			-I$(LIBRARY_DIR) \
- 			-I$(RUNTIME_DIR) \
--			-I$(BOEHM_GC_DIR) \
- 			-I$(BOEHM_GC_DIR)/include \
- 		  "
- CFLAGS		= -g $(DLL_CFLAGS)
-@@ -82,7 +81,7 @@
- OBJ_CHECKS	= $(OBJS:%=%.obj_check)
- 
- LDFLAGS		= -L$(BROWSER_DIR) -L$(LIBRARY_DIR) \
--			-L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)
-+			-L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)/lib
- LDLIBS		= -l$(BROWSER_LIB_NAME) -l$(STD_LIB_NAME) -l$(RT_LIB_NAME) \
- 		` case "$(GRADE)" in 					\
- 		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
diff --git a/lang/mercury/patches/patch-ak b/lang/mercury/patches/patch-ak
deleted file mode 100644
index 3ea9e68721b..00000000000
--- a/lang/mercury/patches/patch-ak
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/05/15 21:09:57 jtb Exp $
-
---- scripts/Mmake.vars.in.orig	Mon May 14 23:40:32 2001
-+++ scripts/Mmake.vars.in
-@@ -507,13 +512,13 @@
- INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
- FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
- INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
-+INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/share/doc/mercury
-+INSTALL_PS_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
- INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/share/doc/html/mercury
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/share/doc/mercury/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/share/examples/mercury/elisp
- 
- # You should not need to override anything below here
- 
diff --git a/lang/mercury/patches/patch-al b/lang/mercury/patches/patch-al
deleted file mode 100644
index 6ad911249d1..00000000000
--- a/lang/mercury/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/03/06 20:55:13 jmc Exp $
-
---- runtime/mercury_bootstrap.h.orig	Mon Apr  2 15:52:15 2001
-+++ runtime/mercury_bootstrap.h	Wed Mar  6 18:34:48 2002
-@@ -30,6 +30,7 @@
- 
- #ifndef MR_NO_BACKWARDS_COMPAT
- 
-+#if !(defined(__NetBSD__) && defined(__powerpc__))
- #define	r1				MR_r1
- #define	r2				MR_r2
- #define	r3				MR_r3
-@@ -66,6 +67,8 @@
- #define	r(N)				MR_r(N)
- 
- #define	NUM_REAL_REGS			MR_NUM_REAL_REGS
-+
-+#endif
- 
- #define	progname			MR_progname
- #define	program_entry_point		MR_program_entry_point