Remove old versions

(Portage version: 2.1.4.5)

29 files changed, 0 insertions, 2916 deletions

diff --git a/dev-lang/mercury/files/mercury-0.12.2-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.12.2-CFLAGS.patch
deleted file mode 100644
index 74bce21ce0af..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-CFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mercury-compiler-0.12.2.orig/scripts/mgnuc.in	2005-08-18 17:45:26.000000000 +1200
-+++ mercury-compiler-0.12.2/scripts/mgnuc.in	2006-03-11 19:26:54.000000000 +1300
-@@ -52,7 +52,7 @@
- # -Wenum-clash 		is for C++ only
- # -Wunused		causes various spurious warnings
- 
--	OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
-+	OPT_OPTS="@CFLAGS_FOR_OPT@"
- 	DEBUG_OPT="-g"
- 	COMPILER=gcc
- 	;;
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-03-11 19:18:59.000000000 +1300
-@@ -3620,7 +3620,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.
-@@ -9808,7 +9808,7 @@
- 		# enable, and why, see scripts/mgnuc.in.
- 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
- 
--		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
-+		CFLAGS_FOR_OPT="$CFLAGS"
- 		CFLAGS_FOR_DEBUG="-g"
- 		MCFLAGS_FOR_CC=
- 		;;
diff --git a/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
deleted file mode 100644
index 3ae10194664b..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-MAKEOPTS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mercury-compiler-0.12.2.orig/Makefile	2004-11-01 17:46:18.000000000 +1300
-+++ mercury-compiler-0.12.2/Makefile	2006-09-11 20:50:59.000000000 +1200
-@@ -15,7 +15,7 @@
- #
- #-----------------------------------------------------------------------------#
- 
--
-+PARALLEL=	$(MAKEOPTS)
- SHELL=		/bin/sh
- MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
- MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
-@@ -69,6 +69,6 @@
- 	$(MMAKE) uninstall
- 
- .DEFAULT:
--	$(MMAKE) $@
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
- 
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch
deleted file mode 100644
index 32a2e6fbd921..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-07-24 20:11:45.000000000 +1200
-@@ -7232,21 +7232,21 @@
- 
- echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
- echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
--if test "$mercury_cv_unboxed_floats" = yes; then
--	if test "$BOOTSTRAP_MC" = ""; then
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&2;}
--		mercury_cv_unboxed_floats=no
--	fi
--fi
-+#if test "$mercury_cv_unboxed_floats" = yes; then
-+#	if test "$BOOTSTRAP_MC" = ""; then
-+#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&5
-+#echo "$as_me: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&2;}
-+#		mercury_cv_unboxed_floats=no
-+#	fi
-+#fi
- if test "$mercury_cv_unboxed_floats" = yes; then
- 	HAVE_BOXED_FLOATS="--unboxed-float"
- else
-@@ -8790,34 +8790,34 @@
- 
- if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then
- 	if test "$BOOTSTRAP_MC" = ""; then
--		GRADE="$BOOTSTRAP_GRADE"
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&2;}
--
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE="$BOOTSTRAP_GRADE"
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+			find -name \*.o -o -name \*.pic_o -o \
-+				-name \*.a -o -name \*.so | \
-+				xargs rm > /dev/null 2>&1
-+			rm -f compiler/mercury_compile profiler/mercury_profile
-+		fi
- 	else
--		GRADE=$BEST_GRADE_FOR_COMPILER
--		echo "using grade \`$GRADE' to compile the compiler
--	compiler and library will be rebuilt with new grade
--	installation may take a long time" 1>&6
--		find library compiler browser mdbcomp analysis \
--			profiler deep_profiler \
--			-name \*.c -o -name \*.c_date | \
--			xargs rm > /dev/null 2>&1
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+		fi
- 	fi
- else
- 	GRADE=$BEST_GRADE_FOR_COMPILER
--	echo "using grade \`$GRADE' to compile the compiler" 1>&6
- fi
-+echo "using grade \`$GRADE' to compile the compiler" 1>&6
- 
- 
- #-----------------------------------------------------------------------------#
-@@ -9980,10 +9980,10 @@
- 
- fi
- #-----------------------------------------------------------------------------#
--if test "$BOOTSTRAP_MC" = ""; then
--	BOOTSTRAP_MC=mmc
--fi
--BOOTSTRAP_MC="$BOOTSTRAP_MC $HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
-+#if test "$BOOTSTRAP_MC" = ""; then
-+#	BOOTSTRAP_MC=mmc
-+#fi
-+#BOOTSTRAP_MC="$BOOTSTRAP_MC $HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
- 
- #-----------------------------------------------------------------------------#
- 
-@@ -12010,6 +12010,11 @@
-     rm -f confscratch $to_delete
- fi
- #-----------------------------------------------------------------------------#
-+if test "$BOOTSTRAP_MC" = ""; then
-+	BOOTSTRAP_MC=mmc
-+fi
-+BOOTSTRAP_MC="$BOOTSTRAP_MC $HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
-+#-----------------------------------------------------------------------------#
- 
- echo "$as_me:$LINENO: checking for C shell executable" >&5
- echo $ECHO_N "checking for C shell executable... $ECHO_C" >&6
diff --git a/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch b/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch
deleted file mode 100644
index 3d55902e08a1..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-deep_profiler.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-09-17 21:17:26.000000000 +1200
-@@ -8482,14 +8482,14 @@
- esac
- 
- case $enable_deep_profiler in
--	default)
--		if test -d $mercury_cv_default_cgi_dir; then
--			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
--			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
--		else
--			mercury_cv_enable_deep_profiler=no
--		fi
--		;;
-+#	default)
-+#		if test -d $mercury_cv_default_cgi_dir; then
-+#			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
-+#			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
-+#		else
-+#			mercury_cv_enable_deep_profiler=no
-+#		fi
-+#		;;
- 	no)
- 		mercury_cv_enable_deep_profiler=no
- 		;;
-@@ -8514,17 +8514,17 @@
- 		;;
- esac
- 
--if test $mercury_cv_enable_deep_profiler = yes; then
--	if test -d $mercury_cv_cgi_dir; then
--		true
--	else
--		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
--echo "${ECHO_T}$enable_deep_profiler" >&6
--		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
--echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
--   { (exit 1); exit 1; }; }
--	fi
--fi
-+#if test $mercury_cv_enable_deep_profiler = yes; then
-+#	if test -d $mercury_cv_cgi_dir; then
-+#		true
-+#	else
-+#		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
-+#echo "${ECHO_T}$enable_deep_profiler" >&6
-+#		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
-+#echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
-+#   { (exit 1); exit 1; }; }
-+#	fi
-+#fi
- 
- echo "$as_me:$LINENO: result: $mercury_cv_enable_deep_profiler" >&5
- echo "${ECHO_T}$mercury_cv_enable_deep_profiler" >&6
---- mercury-compiler-0.12.2.orig/deep_profiler/Mmakefile	2005-01-14 18:53:29.000000000 +1300
-+++ mercury-compiler-0.12.2/deep_profiler/Mmakefile	2006-09-17 21:04:34.000000000 +1200
-@@ -140,12 +140,12 @@
- 	# executed when we do the install. The mv is of course expected to
- 	# fail during a first-time installation. The rm is before the move
- 	# in case this is the third or later installation.
--	-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
--		rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
--		mv $(INSTALL_CGI_DIR)/mdprof_cgi \
--			$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
--		cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
--	fi
-+	#-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
-+	#	rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
-+	#	mv $(INSTALL_CGI_DIR)/mdprof_cgi \
-+	#		$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
-+	#	cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
-+	#fi
- 	# We also install mdprof_cgi in $(INSTALL_MERC_BIN_DIR).
- 	# This is done just so that it can easily get put in the
- 	# binary distribution (even if the step above failed).
diff --git a/dev-lang/mercury/files/mercury-0.12.2-docs.patch b/dev-lang/mercury/files/mercury-0.12.2-docs.patch
deleted file mode 100644
index 0e77167c4339..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mercury-compiler-0.12.2.orig/doc/Mmakefile	2005-08-17 03:57:40.000000000 +1200
-+++ mercury-compiler-0.12.2/doc/Mmakefile	2006-03-12 18:41:32.000000000 +1300
-@@ -120,7 +120,7 @@
- 	# formatted versions of the man pages.
- 	# But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -327,7 +327,7 @@
- 	# versions of the documentation.  If they are added they should
- 	# be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
- 	install_mdb_doc
- 	# install_text install_ps
- 
diff --git a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch b/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch
deleted file mode 100644
index e9cc8caa3ace..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-libgrades.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- mercury-compiler-0.12.2.orig/Mmakefile	2005-01-28 20:11:29.000000000 +1300
-+++ mercury-compiler-0.12.2/Mmakefile	2006-08-12 09:45:55.000000000 +1200
-@@ -233,6 +233,54 @@
- 		mdbcomp browser trace
- 	+cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+libgrades:
-+	+for grade in x $(LIBGRADES); do				\
-+	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
-+		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
-+		TWS=`/bin/pwd`/libgrades/$$grade;			\
-+		/bin/rm -fr libgrades/$$grade;				\
-+		mkdir -p libgrades/$$grade;				\
-+		( scripts/prepare_tmp_dir_fixed_part $$grade &&		\
-+		  scripts/prepare_tmp_dir_grade_part $$grade ) &&	\
-+	        ( cd libgrades/$$grade/boehm_gc &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
-+			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/runtime &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/library &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/mdbcomp &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/browser &&			\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			depend &&					\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		( cd libgrades/$$grade/trace &&				\
-+		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
-+			MERCURY_COMPILER=$$TWS/compiler/mercury_compile	\
-+			libgrade ) &&					\
-+		true ||							\
-+		  exit 1;						\
-+	    fi;								\
-+	done
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-@@ -429,28 +477,13 @@
- 	@echo
- 	@echo "-- Installation complete."
- 	@echo
--	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
--	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
--	@echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
--	@if test $(ENABLE_DEEP_PROFILER) != yes || \
--		cmp -s deep_profiler/mdprof_cgi \
--			$(INSTALL_CGI_DIR)/mdprof_cgi; \
--	then true ; else \
--		echo "-- to copy deep_profiler/mdprof_cgi" \
--			"to $(INSTALL_CGI_DIR),"; \
--	fi
--	@echo "-- and to add the following lines to the \`.emacs' file"
--	@echo "-- in your home directory:"
--	@echo "	(setq load-path (cons (expand-file-name "
--	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
--	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
- 
- .PHONY: install_main
- install_main: all \
- 		install_scripts install_util install_runtime install_boehm_gc \
- 		install_library install_mdbcomp install_browser install_trace \
- 		install_compiler install_profiler install_deep_profiler \
--		install_doc install_config
-+		install_doc
- 
- .PHONY: install_scripts
- install_scripts: scripts
-@@ -511,7 +544,7 @@
- #	.trans_opt .trans_opt_date .d .mh .mih .c_date  .c .o .pic_o
- 
- .PHONY: install_grades
--install_grades: all
-+install_grades: all libgrades
- 	#
- 	# Use the newly installed compiler to build the libraries
- 	# in various different grades.  We need to override MC=mmc
-@@ -519,44 +552,33 @@
- 	# runs the newly installed compiler, rather than using the
- 	# bootstrap compiler.
- 	#
--	/bin/rm -fr tmp_dir
--	scripts/prepare_tmp_dir_fixed_part
- 	+for grade in x $(LIBGRADES); do				\
- 	    if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then	\
- 		gc_grade=`scripts/ml --grade $$grade --print-gc-grade`;	\
--		TWS=`/bin/pwd`/tmp_dir;					\
--		scripts/prepare_tmp_dir_grade_part;			\
--	        ( cd tmp_dir/boehm_gc &&				\
-+		TWS=`/bin/pwd`/libgrades/$$grade;			\
-+	        ( cd libgrades/$$grade/boehm_gc &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade			\
- 			WORKSPACE=$$TWS GC_GRADE=$$gc_grade		\
- 			install_lib ) &&				\
--		( cd tmp_dir/runtime &&					\
-+		( cd libgrades/$$grade/runtime &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_lib ) &&				\
--		( cd tmp_dir/library &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/library &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/mdbcomp &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/mdbcomp &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/browser &&					\
--		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
--			depend &&					\
-+		( cd libgrades/$$grade/browser &&			\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_library ) &&				\
--		( cd tmp_dir/trace &&					\
-+		( cd libgrades/$$grade/trace &&				\
- 		  $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS	\
- 			install_lib ) &&				\
- 		true ||							\
--		{ echo "To clean up from failed install, remove tmp_dir"; \
--		  exit 1; };						\
-+		  exit 1;						\
- 	    fi;								\
- 	done
--	if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi
- 
- .PHONY: install_split_library
- install_split_library: scripts dep_library
---- mercury-compiler-0.12.2.orig/boehm_gc/Mmakefile	2004-10-19 19:01:36.000000000 +1300
-+++ mercury-compiler-0.12.2/boehm_gc/Mmakefile	2006-07-29 09:07:33.000000000 +1200
-@@ -90,6 +90,9 @@
- .PHONY: force
- force:
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.12.2.orig/browser/Mmakefile	2005-01-28 20:11:37.000000000 +1300
-+++ mercury-compiler-0.12.2/browser/Mmakefile	2006-07-29 09:19:39.000000000 +1200
-@@ -180,6 +180,11 @@
- .PHONY: int3s 
- int3s:	$(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+		lib$(BROWSER_LIB_NAME).$A \
-+		lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(BROWSER_LIB_NAME).ms)
---- mercury-compiler-0.12.2.orig/library/Mmakefile	2005-05-06 20:01:58.000000000 +1200
-+++ mercury-compiler-0.12.2/library/Mmakefile	2006-07-29 10:31:06.000000000 +1200
-@@ -194,6 +194,9 @@
- trans_opts: $(STD_LIB_NAME).trans_opts
- $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(STD_LIB_NAME).ms)
---- mercury-compiler-0.12.2.orig/mdbcomp/Mmakefile	2005-02-17 19:39:24.000000000 +1300
-+++ mercury-compiler-0.12.2/mdbcomp/Mmakefile	2006-07-29 09:18:15.000000000 +1200
-@@ -147,6 +147,13 @@
- .PHONY: int3s 
- int3s:	$(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+		$(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \
-+		lib$(MDBCOMP_LIB_NAME).$A \
-+		lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+		all-ints
-+
- #-----------------------------------------------------------------------------#
- 
- tags:	$(MTAGS) $($(MDBCOMP_LIB_NAME).ms)
---- mercury-compiler-0.12.2.orig/runtime/Mmakefile	2005-12-05 16:34:46.000000000 +1300
-+++ mercury-compiler-0.12.2/runtime/Mmakefile	2006-07-29 09:11:09.000000000 +1200
-@@ -376,6 +376,9 @@
- 	@if test ! -f tags; then echo making tags; \
- 	ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.12.2.orig/scripts/prepare_tmp_dir_fixed_part.in	2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.12.2/scripts/prepare_tmp_dir_fixed_part.in	2006-08-11 21:20:06.000000000 +1200
-@@ -12,18 +12,20 @@
- fi
- wd=`/bin/pwd`
- 
--mkdir tmp_dir
--cp Mmake* tmp_dir
--cp Mercury.* tmp_dir
--cp VERSION tmp_dir
--cp config* tmp_dir
--cp aclocal.m4 tmp_dir
--mkdir tmp_dir/scripts
--cp scripts/* tmp_dir/scripts
--mkdir tmp_dir/tools
--cp tools/* tmp_dir/tools
--$ln_s $wd/compiler tmp_dir
--$ln_s $wd/analysis tmp_dir
--$ln_s $wd/robdd tmp_dir
--$ln_s $wd/util tmp_dir
-+libgrade_dir=libgrades/$1
-+
-+mkdir -p $libgrade_dir
-+cp Mmake* $libgrade_dir
-+cp Mercury.* $libgrade_dir
-+cp VERSION $libgrade_dir
-+cp config* $libgrade_dir
-+cp aclocal.m4 $libgrade_dir
-+mkdir $libgrade_dir/scripts
-+cp scripts/* $libgrade_dir/scripts
-+mkdir $libgrade_dir/tools
-+cp tools/* $libgrade_dir/tools
-+$ln_s $wd/compiler $libgrade_dir
-+$ln_s $wd/analysis $libgrade_dir
-+$ln_s $wd/robdd $libgrade_dir
-+$ln_s $wd/util $libgrade_dir
- exit 0
---- mercury-compiler-0.12.2.orig/scripts/prepare_tmp_dir_grade_part	2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.12.2/scripts/prepare_tmp_dir_grade_part	2006-07-29 09:01:18.000000000 +1200
-@@ -5,47 +5,49 @@
- # Public License - see the file COPYING in the Mercury distribution.
- #---------------------------------------------------------------------------#
- 
--rm -fr tmp_dir/boehm_gc
--rm -fr tmp_dir/runtime
--rm -fr tmp_dir/trace
--rm -fr tmp_dir/library
--rm -fr tmp_dir/mdbcomp
--rm -fr tmp_dir/browser
--mkdir tmp_dir/boehm_gc
--mkdir tmp_dir/boehm_gc/Mac_files
--mkdir tmp_dir/boehm_gc/cord
--mkdir tmp_dir/boehm_gc/include
--mkdir tmp_dir/boehm_gc/include/private
--cp boehm_gc/Makefile* tmp_dir/boehm_gc
--cp boehm_gc/Mmake* tmp_dir/boehm_gc
--cp boehm_gc/ac* tmp_dir/boehm_gc
--cp boehm_gc/*.[chsS] tmp_dir/boehm_gc
--cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files
--cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord
--cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include
--cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private
--mkdir tmp_dir/runtime
--mkdir tmp_dir/runtime/machdeps
--cp runtime/Mmake* tmp_dir/runtime
--cp runtime/*.in tmp_dir/runtime
--cp runtime/*.[ch] tmp_dir/runtime
--cp runtime/*.il tmp_dir/runtime
--cp runtime/machdeps/*.h tmp_dir/runtime/machdeps
--mkdir tmp_dir/trace
--cp trace/Mmake* tmp_dir/trace
--cp trace/*.[ch] tmp_dir/trace
--mkdir tmp_dir/library
--cp library/Mmake* tmp_dir/library
--cp library/Mercury.* tmp_dir/library
--cp library/print_extra_inits tmp_dir/library
--cp library/library_strong_name.sn tmp_dir/library
--cp library/*.m tmp_dir/library
--mkdir tmp_dir/mdbcomp
--cp mdbcomp/Mmake* tmp_dir/mdbcomp
--cp mdbcomp/Mercury.* tmp_dir/mdbcomp
--cp mdbcomp/*.m tmp_dir/mdbcomp
--mkdir tmp_dir/browser
--cp browser/Mmake* tmp_dir/browser
--cp browser/Mercury.* tmp_dir/browser
--cp browser/*.m tmp_dir/browser
-+libgrade_dir=libgrades/$1
-+
-+rm -fr $libgrade_dir/boehm_gc
-+rm -fr $libgrade_dir/runtime
-+rm -fr $libgrade_dir/trace
-+rm -fr $libgrade_dir/library
-+rm -fr $libgrade_dir/mdbcomp
-+rm -fr $libgrade_dir/browser
-+mkdir $libgrade_dir/boehm_gc
-+mkdir $libgrade_dir/boehm_gc/Mac_files
-+mkdir $libgrade_dir/boehm_gc/cord
-+mkdir $libgrade_dir/boehm_gc/include
-+mkdir $libgrade_dir/boehm_gc/include/private
-+cp boehm_gc/Makefile* $libgrade_dir/boehm_gc
-+cp boehm_gc/Mmake* $libgrade_dir/boehm_gc
-+cp boehm_gc/ac* $libgrade_dir/boehm_gc
-+cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc
-+cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files
-+cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord
-+cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include
-+cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private
-+mkdir $libgrade_dir/runtime
-+mkdir $libgrade_dir/runtime/machdeps
-+cp runtime/Mmake* $libgrade_dir/runtime
-+cp runtime/*.in $libgrade_dir/runtime
-+cp runtime/*.[ch] $libgrade_dir/runtime
-+cp runtime/*.il $libgrade_dir/runtime
-+cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps
-+mkdir $libgrade_dir/trace
-+cp trace/Mmake* $libgrade_dir/trace
-+cp trace/*.[ch] $libgrade_dir/trace
-+mkdir $libgrade_dir/library
-+cp library/Mmake* $libgrade_dir/library
-+cp library/Mercury.* $libgrade_dir/library
-+cp library/print_extra_inits $libgrade_dir/library
-+cp library/library_strong_name.sn $libgrade_dir/library
-+cp library/*.m $libgrade_dir/library
-+mkdir $libgrade_dir/mdbcomp
-+cp mdbcomp/Mmake* $libgrade_dir/mdbcomp
-+cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp
-+cp mdbcomp/*.m $libgrade_dir/mdbcomp
-+mkdir $libgrade_dir/browser
-+cp browser/Mmake* $libgrade_dir/browser
-+cp browser/Mercury.* $libgrade_dir/browser
-+cp browser/*.m $libgrade_dir/browser
- exit 0
---- mercury-compiler-0.12.2.orig/trace/Mmakefile	2005-01-28 20:12:05.000000000 +1300
-+++ mercury-compiler-0.12.2/trace/Mmakefile	2006-07-29 09:22:09.000000000 +1200
-@@ -179,6 +179,9 @@
- 	@if test ! -f tags; then echo making tags; \
- 	ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
diff --git a/dev-lang/mercury/files/mercury-0.12.2-multilib.patch b/dev-lang/mercury/files/mercury-0.12.2-multilib.patch
deleted file mode 100644
index 9b8444d3bb7d..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-multilib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- mercury-compiler-0.12.2.orig/Mmake.common.in	2006-01-18 18:37:34.000000000 +1300
-+++ mercury-compiler-0.12.2/Mmake.common.in	2007-01-13 12:56:45.000000000 +1300
-@@ -118,8 +118,8 @@
- # Set the installation prefix. This is done here as well as
- # in scripts/Mmake.vars to avoid accidentally overwriting an
- # existing installation when using an installed mmake.
--INSTALL_PREFIX		= @prefix@
--FINAL_INSTALL_PREFIX	= @prefix@
-+INSTALL_PREFIX		=
-+FINAL_INSTALL_PREFIX	=
- 
- #-----------------------------------------------------------------------------#
- 
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-06-06 20:57:45.000000000 +1200
-@@ -1599,7 +1599,7 @@
- 
- 
- PREFIX="`$CYGPATH $PREFIX`"
--LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
-+LIBDIR="`$CYGPATH $libdir/mercury-$PACKAGE_VERSION`"
- NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
- 
- 
---- mercury-compiler-0.12.2.orig/scripts/Mmake.vars.in	2005-08-17 03:57:40.000000000 +1200
-+++ mercury-compiler-0.12.2/scripts/Mmake.vars.in	2007-01-13 12:58:12.000000000 +1300
-@@ -713,21 +713,21 @@
- # script (e.g. in the shell scripts mmc, ml, mmake, etc) that will not
- # be updated simply by overriding INSTALL_PREFIX.
- 
--INSTALL_PREFIX		= @prefix@
--FINAL_INSTALL_PREFIX	= @prefix@
--INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
--INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
--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_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--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_PREFIX		=
-+FINAL_INSTALL_PREFIX	=
-+INSTALL_BINDIR		= $(INSTALL_PREFIX)/@prefix@/bin
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
-+INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/@prefix@/info
-+INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
-+INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
-+INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
-+INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/@prefix@/man
-+INSTALL_HTML_DIR	= $(INSTALL_LIBDIR)/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch b/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch
deleted file mode 100644
index b2d3f0e181fa..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-parallel-install_grades.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mercury-compiler-0.12.2.orig/scripts/Mmake.rules	2005-01-28 20:11:58.000000000 +1300
-+++ mercury-compiler-0.12.2/scripts/Mmake.rules	2006-10-23 15:56:28.000000000 +1300
-@@ -509,9 +509,9 @@
- 		*.a *.so tmp_dir || true; } && \
- 	for grade in $(ALL_LIBGRADES); do \
- 		if [ "$$grade" != "$(GRADE)" ]; then \
--			$(MMAKE) GRADE=$$grade $*.depend || \
-+			$(MMAKE) $(MMAKEFLAGS) GRADE=$$grade $*.depend || \
- 				exit 1; \
--			$(MMAKE) GRADE=$$grade lib$*.install_library || \
-+			$(MMAKE) $(MMAKEFLAGS) GRADE=$$grade lib$*.install_library || \
- 				exit 1; \
- 			for file in x $$grade_files; do \
- 				if [ "$$file" != "x" ]; then \
diff --git a/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch b/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch
deleted file mode 100644
index 81f9e90ac765..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-pic_o-dependencies.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- mercury-compiler-0.12.2.orig/compiler/modules.m	2006-01-18 18:37:38.000000000 +1300
-+++ mercury-compiler-0.12.2/compiler/modules.m	2006-11-23 20:26:45.000000000 +1300
-@@ -3326,27 +3326,32 @@
-             ForeignImportedModules = [_ | _],
-             (
-                 Target = il,
--                ForeignImportTarget = DllFileName,
-+                ForeignImportTargets = [DllFileName],
-                 ForeignImportExt = ".dll"
-             ;
-                 Target = java,
--                ForeignImportTarget = ClassFileName,
-+                ForeignImportTargets = [ClassFileName],
-                 ForeignImportExt = ".java"
-             ;
-                 Target = c,
--                ForeignImportTarget = ObjFileName,
-+                ForeignImportTargets = [ObjFileName, PicObjFileName],
-                 ForeignImportExt = ".mh"
-             ;
-                 Target = asm,
--                ForeignImportTarget = ObjFileName,
-+                ForeignImportTargets = [ObjFileName, PicObjFileName],
-                 ForeignImportExt = ".mh"
-             ),
--            io__write_string(DepStream, "\n\n", !IO),
--            io__write_string(DepStream, ForeignImportTarget, !IO),
--            io__write_string(DepStream, " : ", !IO),
--            write_dependencies_list(ForeignImportedModules, ForeignImportExt,
--                DepStream, !IO),
--            io__write_string(DepStream, "\n\n", !IO)
-+            WriteForeignImportTarget = (pred(ForeignImportTarget::in,
-+                    !.IO::di, !:IO::uo) is det :-
-+                io__write_string(DepStream, "\n\n", !IO),
-+                io__write_string(DepStream, ForeignImportTarget, !IO),
-+                io__write_string(DepStream, " : ", !IO),
-+                write_dependencies_list(ForeignImportedModules,
-+                    ForeignImportExt, DepStream, !IO),
-+                io__write_string(DepStream, "\n\n", !IO)
-+            ),
-+            list.foldl(WriteForeignImportTarget, ForeignImportTargets,
-+                !IO)
-         ),
- 
-         (
diff --git a/dev-lang/mercury/files/mercury-0.12.2-portage-r3.patch b/dev-lang/mercury/files/mercury-0.12.2-portage-r3.patch
deleted file mode 100644
index d6dca2cea4ca..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-portage-r3.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- mercury-compiler-0.12.2.orig/Makefile	2004-11-01 17:46:18.000000000 +1300
-+++ mercury-compiler-0.12.2/Makefile	2006-03-18 12:54:23.000000000 +1300
-@@ -26,7 +26,7 @@
- 
- .PHONY: all
- all:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 | tee make_all.log
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all 2>&1 || exit 1
- 
- .PHONY: libmmc
- libmmc:
-@@ -34,7 +34,7 @@
- 
- .PHONY: install
- install:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 | tee make_install.log
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install 2>&1 || exit 1
- 
- # `mmake clean' has a different meaning to the usual GNU standard `make clean':
- # it removes the .c files, which makes bootstrapping impossible unless you
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-06-08 19:31:53.000000000 +1200
-@@ -8861,7 +8861,7 @@
- # Check whether --enable-debug-grades or --disable-debug-grades was given.
- if test "${enable_debug_grades+set}" = set; then
-   enableval="$enable_debug_grades"
--  enable_debug_grades="enableval"
-+  enable_debug_grades="$enableval"
- else
-   enable_debug_grades=yes
- fi;
-@@ -8948,7 +8948,6 @@
- 	enable_trail_grades=no
- 	enable_mm_grades=no
- 	enable_hlc_prof_grades=no
--	enable_par_grades=no
- 	enable_dotnet_grades=no
- 	enable_java_grade=no
- fi
---- mercury-compiler-0.12.2.orig/runtime/Mmakefile	2005-12-05 16:34:46.000000000 +1300
-+++ mercury-compiler-0.12.2/runtime/Mmakefile	2006-06-14 20:52:31.000000000 +1200
-@@ -390,8 +390,6 @@
- 	-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifeq ($(findstring java,$(GRADE)),java)        
- 
-@@ -437,7 +435,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
---- mercury-compiler-0.12.2.orig/scripts/Mmakefile	2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.12.2/scripts/Mmakefile	2006-06-14 20:51:21.000000000 +1200
-@@ -16,8 +16,7 @@
- 
- SCRIPTS = mmake mmc mdb c2init mgnuc ml mprof mprof_merge_runs \
- 	  mtags vpath_find mercury_update_interface \
--	  mkfifo_using_mknod mercury_cleanup_install canonical_grade \
--	  mercury_config mercury.bat prepare_tmp_dir_fixed_part
-+	  mercury_cleanup_install canonical_grade
- DEBUGGER_SCRIPTS = mdbrc xul_tree.xsl
- EMACS_SCRIPTS = gud.el
- 
-@@ -58,8 +57,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -77,7 +74,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch b/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch
deleted file mode 100644
index adb5d69e45c7..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-profdeep-builtin_throw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-0.12.2.orig/library/exception.m	2005-01-25 12:16:37.000000000 +1300
-+++ mercury-compiler-0.12.2/library/exception.m	2006-12-30 11:59:15.000000000 +1300
-@@ -1939,7 +1939,7 @@
- 
- MR_proc_static_user_no_site(exception, builtin_throw, 1, 0,
- 	""exception.m"", MR_DUMMY_LINE, MR_TRUE);
--MR_STATIC_USER_PROC_STATIC_PROC_LAYOUT(
-+MR_EXTERN_USER_PROC_STATIC_PROC_LAYOUT(
-         MR_DETISM_DET, 1, MR_LONG_LVAL_STACKVAR(1),
-         MR_PREDICATE, exception, builtin_throw, 1, 0);
- MR_MAKE_USER_INTERNAL_LAYOUT(exception, builtin_throw, 1, 0, 1);
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-dir_test.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-dir_test.patch
deleted file mode 100644
index 203968d8d99b..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-dir_test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2/hard_coded/dir_test.exp
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp	2007-01-07 15:12:25.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".

- "foo/"/"bar/baz" = "foo\bar\baz".

- checking whether `unwritable' is readable...ok

--unwritable file found to be unwritable

- make_directory succeeded

- make_directory succeeded

- dir.make_single_directory with non-existent parent failed as expected.

-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.2/hard_coded/dir_test.exp2
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp2	2007-01-07 15:12:25.000000000 +1300
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.2/hard_coded/dir_test.exp3
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp3	2007-01-07 15:12:25.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/hard_coded/dir_test.m
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.m	2003-08-05 22:50:33.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.m	2007-01-07 15:12:25.000000000 +1300
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	{ Dir1 = "test_dir"/"d1" },
- 	test0("make_directory", dir__make_directory(Dir1)),
- 	% Test making a directory that already exists.
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch
deleted file mode 100644
index c35a5764472f..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-foreign_decl_line_number.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3 mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3
---- mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+foreign_decl_line_number.m:19:2: error: #error Error in foreign decl
-+foreign_decl_line_number.m:23:2: error: #error Error in foreign code
-+foreign_decl_line_number.m:37:2: error: #error Error in foreign proc
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch
deleted file mode 100644
index 7aab4522df81..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-ho_and_type_spec_bug.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/valid/Mmakefile mercury-tests-0.12.2/valid/Mmakefile
---- mercury-tests-0.12.2.orig/valid/Mmakefile	2005-08-17 16:44:17.000000000 +1200
-+++ mercury-tests-0.12.2/valid/Mmakefile	2007-01-07 15:12:25.000000000 +1300
-@@ -376,3 +376,5 @@
- 	rm -f *.err *.h
- 
- #-----------------------------------------------------------------------------#
-+
-+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch
deleted file mode 100644
index 2b9754449446..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-mdbrc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
---- mercury-tests-0.12.2.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/mdbrc	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,19 @@
-+source MDB_DOC
-+alias	s	step
-+alias	g	goto
-+alias	f	finish
-+alias	r	retry
-+alias	v	vars
-+alias	p	print
-+alias	P	print *
-+alias	d	stack
-+alias	c	continue
-+alias	b	break
-+alias	h	help
-+alias	?	help
-+alias	excp	exception
-+alias	e	exception
-+alias	EMPTY	step
-+alias	NUMBER	step
-+set xml_browser_cmd ''
-+set xml_tmp_filename ''
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch
deleted file mode 100644
index e5ef3794274b..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-string_format.patch
+++ /dev/null
@@ -1,753 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/general/string_format/Mmakefile mercury-tests-0.12.2/general/string_format/Mmakefile
---- mercury-tests-0.12.2.orig/general/string_format/Mmakefile	2004-12-11 05:23:46.000000000 +1300
-+++ mercury-tests-0.12.2/general/string_format/Mmakefile	2007-01-07 15:12:25.000000000 +1300
-@@ -89,22 +89,22 @@
- 		echo "Matched $*.sorted_exp" && \
- 		cp $*.res1 $@; } || \
- 	{ test -f $*.exp2 && \
--		@sort $*.exp2 > $*.sorted_exp2 \
-+		sort $*.exp2 > $*.sorted_exp2 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp2 $*.sorted_out > $*.res2 && \
- 		echo "Matched $*.sorted_exp2" && \
- 		cp $*.res2 $@; } || \
- 	{ test -f $*.exp3 && \
--		@sort $*.exp3 > $*.sorted_exp3 \
-+		sort $*.exp3 > $*.sorted_exp3 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp3 $*.sorted_out > $*.res3 && \
- 		echo "Matched $*.sorted_exp3" && \
- 		cp $*.res3 $@; } || \
- 	{ test -f $*.exp4 && \
--		@sort $*.exp4 > $*.sorted_exp4 \
-+		sort $*.exp4 > $*.sorted_exp4 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp4 $*.sorted_out > $*.res4 && \
- 		echo "Matched $*.sorted_exp4" && \
- 		cp $*.res4 $@; } || \
- 	{ test -f $*.exp5 && \
--		@sort $*.exp5 > $*.sorted_exp5 \
-+		sort $*.exp5 > $*.sorted_exp5 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp5 $*.sorted_out > $*.res5 && \
- 		echo "Matched $*.sorted_exp5" && \
- 		cp $*.res5 $@; } || \
-diff -urN mercury-tests-0.12.2.orig/general/string_format/string_format_o.exp2 mercury-tests-0.12.2/general/string_format/string_format_o.exp2
---- mercury-tests-0.12.2.orig/general/string_format/string_format_o.exp2	2002-11-23 03:09:31.000000000 +1300
-+++ mercury-tests-0.12.2/general/string_format/string_format_o.exp2	2007-01-07 15:38:58.000000000 +1300
-@@ -308,7 +308,7 @@
-      %#-5o:'012  '
-      %#-5o:'0144 '
-      %#-5o:'0777777777777777777777'
--     %#.0o:''
-+     %#.0o:'0'
-      %#.0o:'01'
-      %#.0o:'012'
-      %#.0o:'0144'
-@@ -703,7 +703,7 @@
-     % 5.5o:'00012'
-     % 5.5o:'00144'
-     % 5.5o:'777777777777777777777'
--    %# .0o:''
-+    %# .0o:'0'
-     %# .0o:'01'
-     %# .0o:'012'
-     %# .0o:'0144'
-@@ -743,7 +743,7 @@
-     %#+ 5o:'  012'
-     %#+ 5o:' 0144'
-     %#+ 5o:'0777777777777777777777'
--    %#+.0o:''
-+    %#+.0o:'0'
-     %#+.0o:'01'
-     %#+.0o:'012'
-     %#+.0o:'0144'
-@@ -808,7 +808,7 @@
-     %#-+5o:'012  '
-     %#-+5o:'0144 '
-     %#-+5o:'0777777777777777777777'
--    %#-.0o:''
-+    %#-.0o:'0'
-     %#-.0o:'01'
-     %#-.0o:'012'
-     %#-.0o:'0144'
-@@ -828,7 +828,7 @@
-     %#-.5o:'00012'
-     %#-.5o:'00144'
-     %#-.5o:'0777777777777777777777'
--    %#0.0o:''
-+    %#0.0o:'0'
-     %#0.0o:'01'
-     %#0.0o:'012'
-     %#0.0o:'0144'
-@@ -848,7 +848,7 @@
-     %#0.5o:'00012'
-     %#0.5o:'00144'
-     %#0.5o:'0777777777777777777777'
--    %#1.0o:' '
-+    %#1.0o:'0'
-     %#1.0o:'01'
-     %#1.0o:'012'
-     %#1.0o:'0144'
-@@ -868,7 +868,7 @@
-     %#1.5o:'00012'
-     %#1.5o:'00144'
-     %#1.5o:'0777777777777777777777'
--    %#2.0o:'  '
-+    %#2.0o:' 0'
-     %#2.0o:'01'
-     %#2.0o:'012'
-     %#2.0o:'0144'
-@@ -888,7 +888,7 @@
-     %#2.5o:'00012'
-     %#2.5o:'00144'
-     %#2.5o:'0777777777777777777777'
--    %#5.0o:'     '
-+    %#5.0o:'    0'
-     %#5.0o:'   01'
-     %#5.0o:'  012'
-     %#5.0o:' 0144'
-@@ -1243,7 +1243,7 @@
-     %0#-5o:'012  '
-     %0#-5o:'0144 '
-     %0#-5o:'0777777777777777777777'
--    %0#.0o:''
-+    %0#.0o:'0'
-     %0#.0o:'01'
-     %0#.0o:'012'
-     %0#.0o:'0144'
-@@ -1448,7 +1448,7 @@
-     %05.5o:'00012'
-     %05.5o:'00144'
-     %05.5o:'777777777777777777777'
--   %# 0.0o:''
-+   %# 0.0o:'0'
-    %# 0.0o:'01'
-    %# 0.0o:'012'
-    %# 0.0o:'0144'
-@@ -1468,7 +1468,7 @@
-    %# 0.5o:'00012'
-    %# 0.5o:'00144'
-    %# 0.5o:'0777777777777777777777'
--   %# 1.0o:' '
-+   %# 1.0o:'0'
-    %# 1.0o:'01'
-    %# 1.0o:'012'
-    %# 1.0o:'0144'
-@@ -1488,7 +1488,7 @@
-    %# 1.5o:'00012'
-    %# 1.5o:'00144'
-    %# 1.5o:'0777777777777777777777'
--   %# 2.0o:'  '
-+   %# 2.0o:' 0'
-    %# 2.0o:'01'
-    %# 2.0o:'012'
-    %# 2.0o:'0144'
-@@ -1508,7 +1508,7 @@
-    %# 2.5o:'00012'
-    %# 2.5o:'00144'
-    %# 2.5o:'0777777777777777777777'
--   %# 5.0o:'     '
-+   %# 5.0o:'    0'
-    %# 5.0o:'   01'
-    %# 5.0o:'  012'
-    %# 5.0o:' 0144'
-@@ -1528,7 +1528,7 @@
-    %# 5.5o:'00012'
-    %# 5.5o:'00144'
-    %# 5.5o:'0777777777777777777777'
--   %#+ .0o:''
-+   %#+ .0o:'0'
-    %#+ .0o:'01'
-    %#+ .0o:'012'
-    %#+ .0o:'0144'
-@@ -1548,7 +1548,7 @@
-    %#+ .5o:'00012'
-    %#+ .5o:'00144'
-    %#+ .5o:'0777777777777777777777'
--   %#+0.0o:''
-+   %#+0.0o:'0'
-    %#+0.0o:'01'
-    %#+0.0o:'012'
-    %#+0.0o:'0144'
-@@ -1568,7 +1568,7 @@
-    %#+0.5o:'00012'
-    %#+0.5o:'00144'
-    %#+0.5o:'0777777777777777777777'
--   %#+1.0o:' '
-+   %#+1.0o:'0'
-    %#+1.0o:'01'
-    %#+1.0o:'012'
-    %#+1.0o:'0144'
-@@ -1588,7 +1588,7 @@
-    %#+1.5o:'00012'
-    %#+1.5o:'00144'
-    %#+1.5o:'0777777777777777777777'
--   %#+2.0o:'  '
-+   %#+2.0o:' 0'
-    %#+2.0o:'01'
-    %#+2.0o:'012'
-    %#+2.0o:'0144'
-@@ -1608,7 +1608,7 @@
-    %#+2.5o:'00012'
-    %#+2.5o:'00144'
-    %#+2.5o:'0777777777777777777777'
--   %#+5.0o:'     '
-+   %#+5.0o:'    0'
-    %#+5.0o:'   01'
-    %#+5.0o:'  012'
-    %#+5.0o:' 0144'
-@@ -1628,7 +1628,7 @@
-    %#+5.5o:'00012'
-    %#+5.5o:'00144'
-    %#+5.5o:'0777777777777777777777'
--   %#- .0o:''
-+   %#- .0o:'0'
-    %#- .0o:'01'
-    %#- .0o:'012'
-    %#- .0o:'0144'
-@@ -1668,7 +1668,7 @@
-    %#-+ 5o:'012  '
-    %#-+ 5o:'0144 '
-    %#-+ 5o:'0777777777777777777777'
--   %#-+.0o:''
-+   %#-+.0o:'0'
-    %#-+.0o:'01'
-    %#-+.0o:'012'
-    %#-+.0o:'0144'
-@@ -1688,7 +1688,7 @@
-    %#-+.5o:'00012'
-    %#-+.5o:'00144'
-    %#-+.5o:'0777777777777777777777'
--   %#-0.0o:''
-+   %#-0.0o:'0'
-    %#-0.0o:'01'
-    %#-0.0o:'012'
-    %#-0.0o:'0144'
-@@ -1708,7 +1708,7 @@
-    %#-0.5o:'00012'
-    %#-0.5o:'00144'
-    %#-0.5o:'0777777777777777777777'
--   %#-1.0o:' '
-+   %#-1.0o:'0'
-    %#-1.0o:'01'
-    %#-1.0o:'012'
-    %#-1.0o:'0144'
-@@ -1728,7 +1728,7 @@
-    %#-1.5o:'00012'
-    %#-1.5o:'00144'
-    %#-1.5o:'0777777777777777777777'
--   %#-2.0o:'  '
-+   %#-2.0o:'0 '
-    %#-2.0o:'01'
-    %#-2.0o:'012'
-    %#-2.0o:'0144'
-@@ -1748,7 +1748,7 @@
-    %#-2.5o:'00012'
-    %#-2.5o:'00144'
-    %#-2.5o:'0777777777777777777777'
--   %#-5.0o:'     '
-+   %#-5.0o:'0    '
-    %#-5.0o:'01   '
-    %#-5.0o:'012  '
-    %#-5.0o:'0144 '
-@@ -2108,7 +2108,7 @@
-    %0 5.5o:'00012'
-    %0 5.5o:'00144'
-    %0 5.5o:'777777777777777777777'
--   %0# .0o:''
-+   %0# .0o:'0'
-    %0# .0o:'01'
-    %0# .0o:'012'
-    %0# .0o:'0144'
-@@ -2148,7 +2148,7 @@
-    %0#+ 5o:'00012'
-    %0#+ 5o:'00144'
-    %0#+ 5o:'0777777777777777777777'
--   %0#+.0o:''
-+   %0#+.0o:'0'
-    %0#+.0o:'01'
-    %0#+.0o:'012'
-    %0#+.0o:'0144'
-@@ -2213,7 +2213,7 @@
-    %0#-+5o:'012  '
-    %0#-+5o:'0144 '
-    %0#-+5o:'0777777777777777777777'
--   %0#-.0o:''
-+   %0#-.0o:'0'
-    %0#-.0o:'01'
-    %0#-.0o:'012'
-    %0#-.0o:'0144'
-@@ -2233,7 +2233,7 @@
-    %0#-.5o:'00012'
-    %0#-.5o:'00144'
-    %0#-.5o:'0777777777777777777777'
--   %0#0.0o:''
-+   %0#0.0o:'0'
-    %0#0.0o:'01'
-    %0#0.0o:'012'
-    %0#0.0o:'0144'
-@@ -2253,7 +2253,7 @@
-    %0#0.5o:'00012'
-    %0#0.5o:'00144'
-    %0#0.5o:'0777777777777777777777'
--   %0#1.0o:' '
-+   %0#1.0o:'0'
-    %0#1.0o:'01'
-    %0#1.0o:'012'
-    %0#1.0o:'0144'
-@@ -2273,7 +2273,7 @@
-    %0#1.5o:'00012'
-    %0#1.5o:'00144'
-    %0#1.5o:'0777777777777777777777'
--   %0#2.0o:'  '
-+   %0#2.0o:' 0'
-    %0#2.0o:'01'
-    %0#2.0o:'012'
-    %0#2.0o:'0144'
-@@ -2293,7 +2293,7 @@
-    %0#2.5o:'00012'
-    %0#2.5o:'00144'
-    %0#2.5o:'0777777777777777777777'
--   %0#5.0o:'     '
-+   %0#5.0o:'    0'
-    %0#5.0o:'   01'
-    %0#5.0o:'  012'
-    %0#5.0o:' 0144'
-@@ -2553,7 +2553,7 @@
-    %0-5.5o:'00012'
-    %0-5.5o:'00144'
-    %0-5.5o:'777777777777777777777'
--  %#+ 0.0o:''
-+  %#+ 0.0o:'0'
-   %#+ 0.0o:'01'
-   %#+ 0.0o:'012'
-   %#+ 0.0o:'0144'
-@@ -2573,7 +2573,7 @@
-   %#+ 0.5o:'00012'
-   %#+ 0.5o:'00144'
-   %#+ 0.5o:'0777777777777777777777'
--  %#+ 1.0o:' '
-+  %#+ 1.0o:'0'
-   %#+ 1.0o:'01'
-   %#+ 1.0o:'012'
-   %#+ 1.0o:'0144'
-@@ -2593,7 +2593,7 @@
-   %#+ 1.5o:'00012'
-   %#+ 1.5o:'00144'
-   %#+ 1.5o:'0777777777777777777777'
--  %#+ 2.0o:'  '
-+  %#+ 2.0o:' 0'
-   %#+ 2.0o:'01'
-   %#+ 2.0o:'012'
-   %#+ 2.0o:'0144'
-@@ -2613,7 +2613,7 @@
-   %#+ 2.5o:'00012'
-   %#+ 2.5o:'00144'
-   %#+ 2.5o:'0777777777777777777777'
--  %#+ 5.0o:'     '
-+  %#+ 5.0o:'    0'
-   %#+ 5.0o:'   01'
-   %#+ 5.0o:'  012'
-   %#+ 5.0o:' 0144'
-@@ -2633,7 +2633,7 @@
-   %#+ 5.5o:'00012'
-   %#+ 5.5o:'00144'
-   %#+ 5.5o:'0777777777777777777777'
--  %#- 0.0o:''
-+  %#- 0.0o:'0'
-   %#- 0.0o:'01'
-   %#- 0.0o:'012'
-   %#- 0.0o:'0144'
-@@ -2653,7 +2653,7 @@
-   %#- 0.5o:'00012'
-   %#- 0.5o:'00144'
-   %#- 0.5o:'0777777777777777777777'
--  %#- 1.0o:' '
-+  %#- 1.0o:'0'
-   %#- 1.0o:'01'
-   %#- 1.0o:'012'
-   %#- 1.0o:'0144'
-@@ -2673,7 +2673,7 @@
-   %#- 1.5o:'00012'
-   %#- 1.5o:'00144'
-   %#- 1.5o:'0777777777777777777777'
--  %#- 2.0o:'  '
-+  %#- 2.0o:'0 '
-   %#- 2.0o:'01'
-   %#- 2.0o:'012'
-   %#- 2.0o:'0144'
-@@ -2693,7 +2693,7 @@
-   %#- 2.5o:'00012'
-   %#- 2.5o:'00144'
-   %#- 2.5o:'0777777777777777777777'
--  %#- 5.0o:'     '
-+  %#- 5.0o:'0    '
-   %#- 5.0o:'01   '
-   %#- 5.0o:'012  '
-   %#- 5.0o:'0144 '
-@@ -2713,7 +2713,7 @@
-   %#- 5.5o:'00012'
-   %#- 5.5o:'00144'
-   %#- 5.5o:'0777777777777777777777'
--  %#-+ .0o:''
-+  %#-+ .0o:'0'
-   %#-+ .0o:'01'
-   %#-+ .0o:'012'
-   %#-+ .0o:'0144'
-@@ -2733,7 +2733,7 @@
-   %#-+ .5o:'00012'
-   %#-+ .5o:'00144'
-   %#-+ .5o:'0777777777777777777777'
--  %#-+0.0o:''
-+  %#-+0.0o:'0'
-   %#-+0.0o:'01'
-   %#-+0.0o:'012'
-   %#-+0.0o:'0144'
-@@ -2753,7 +2753,7 @@
-   %#-+0.5o:'00012'
-   %#-+0.5o:'00144'
-   %#-+0.5o:'0777777777777777777777'
--  %#-+1.0o:' '
-+  %#-+1.0o:'0'
-   %#-+1.0o:'01'
-   %#-+1.0o:'012'
-   %#-+1.0o:'0144'
-@@ -2773,7 +2773,7 @@
-   %#-+1.5o:'00012'
-   %#-+1.5o:'00144'
-   %#-+1.5o:'0777777777777777777777'
--  %#-+2.0o:'  '
-+  %#-+2.0o:'0 '
-   %#-+2.0o:'01'
-   %#-+2.0o:'012'
-   %#-+2.0o:'0144'
-@@ -2793,7 +2793,7 @@
-   %#-+2.5o:'00012'
-   %#-+2.5o:'00144'
-   %#-+2.5o:'0777777777777777777777'
--  %#-+5.0o:'     '
-+  %#-+5.0o:'0    '
-   %#-+5.0o:'01   '
-   %#-+5.0o:'012  '
-   %#-+5.0o:'0144 '
-@@ -2893,7 +2893,7 @@
-   %-+ 5.5o:'00012'
-   %-+ 5.5o:'00144'
-   %-+ 5.5o:'777777777777777777777'
--  %0# 0.0o:''
-+  %0# 0.0o:'0'
-   %0# 0.0o:'01'
-   %0# 0.0o:'012'
-   %0# 0.0o:'0144'
-@@ -2913,7 +2913,7 @@
-   %0# 0.5o:'00012'
-   %0# 0.5o:'00144'
-   %0# 0.5o:'0777777777777777777777'
--  %0# 1.0o:' '
-+  %0# 1.0o:'0'
-   %0# 1.0o:'01'
-   %0# 1.0o:'012'
-   %0# 1.0o:'0144'
-@@ -2933,7 +2933,7 @@
-   %0# 1.5o:'00012'
-   %0# 1.5o:'00144'
-   %0# 1.5o:'0777777777777777777777'
--  %0# 2.0o:'  '
-+  %0# 2.0o:' 0'
-   %0# 2.0o:'01'
-   %0# 2.0o:'012'
-   %0# 2.0o:'0144'
-@@ -2953,7 +2953,7 @@
-   %0# 2.5o:'00012'
-   %0# 2.5o:'00144'
-   %0# 2.5o:'0777777777777777777777'
--  %0# 5.0o:'     '
-+  %0# 5.0o:'    0'
-   %0# 5.0o:'   01'
-   %0# 5.0o:'  012'
-   %0# 5.0o:' 0144'
-@@ -2973,7 +2973,7 @@
-   %0# 5.5o:'00012'
-   %0# 5.5o:'00144'
-   %0# 5.5o:'0777777777777777777777'
--  %0#+ .0o:''
-+  %0#+ .0o:'0'
-   %0#+ .0o:'01'
-   %0#+ .0o:'012'
-   %0#+ .0o:'0144'
-@@ -2993,7 +2993,7 @@
-   %0#+ .5o:'00012'
-   %0#+ .5o:'00144'
-   %0#+ .5o:'0777777777777777777777'
--  %0#+0.0o:''
-+  %0#+0.0o:'0'
-   %0#+0.0o:'01'
-   %0#+0.0o:'012'
-   %0#+0.0o:'0144'
-@@ -3013,7 +3013,7 @@
-   %0#+0.5o:'00012'
-   %0#+0.5o:'00144'
-   %0#+0.5o:'0777777777777777777777'
--  %0#+1.0o:' '
-+  %0#+1.0o:'0'
-   %0#+1.0o:'01'
-   %0#+1.0o:'012'
-   %0#+1.0o:'0144'
-@@ -3033,7 +3033,7 @@
-   %0#+1.5o:'00012'
-   %0#+1.5o:'00144'
-   %0#+1.5o:'0777777777777777777777'
--  %0#+2.0o:'  '
-+  %0#+2.0o:' 0'
-   %0#+2.0o:'01'
-   %0#+2.0o:'012'
-   %0#+2.0o:'0144'
-@@ -3053,7 +3053,7 @@
-   %0#+2.5o:'00012'
-   %0#+2.5o:'00144'
-   %0#+2.5o:'0777777777777777777777'
--  %0#+5.0o:'     '
-+  %0#+5.0o:'    0'
-   %0#+5.0o:'   01'
-   %0#+5.0o:'  012'
-   %0#+5.0o:' 0144'
-@@ -3073,7 +3073,7 @@
-   %0#+5.5o:'00012'
-   %0#+5.5o:'00144'
-   %0#+5.5o:'0777777777777777777777'
--  %0#- .0o:''
-+  %0#- .0o:'0'
-   %0#- .0o:'01'
-   %0#- .0o:'012'
-   %0#- .0o:'0144'
-@@ -3113,7 +3113,7 @@
-   %0#-+ 5o:'012  '
-   %0#-+ 5o:'0144 '
-   %0#-+ 5o:'0777777777777777777777'
--  %0#-+.0o:''
-+  %0#-+.0o:'0'
-   %0#-+.0o:'01'
-   %0#-+.0o:'012'
-   %0#-+.0o:'0144'
-@@ -3133,7 +3133,7 @@
-   %0#-+.5o:'00012'
-   %0#-+.5o:'00144'
-   %0#-+.5o:'0777777777777777777777'
--  %0#-0.0o:''
-+  %0#-0.0o:'0'
-   %0#-0.0o:'01'
-   %0#-0.0o:'012'
-   %0#-0.0o:'0144'
-@@ -3153,7 +3153,7 @@
-   %0#-0.5o:'00012'
-   %0#-0.5o:'00144'
-   %0#-0.5o:'0777777777777777777777'
--  %0#-1.0o:' '
-+  %0#-1.0o:'0'
-   %0#-1.0o:'01'
-   %0#-1.0o:'012'
-   %0#-1.0o:'0144'
-@@ -3173,7 +3173,7 @@
-   %0#-1.5o:'00012'
-   %0#-1.5o:'00144'
-   %0#-1.5o:'0777777777777777777777'
--  %0#-2.0o:'  '
-+  %0#-2.0o:'0 '
-   %0#-2.0o:'01'
-   %0#-2.0o:'012'
-   %0#-2.0o:'0144'
-@@ -3193,7 +3193,7 @@
-   %0#-2.5o:'00012'
-   %0#-2.5o:'00144'
-   %0#-2.5o:'0777777777777777777777'
--  %0#-5.0o:'     '
-+  %0#-5.0o:'0    '
-   %0#-5.0o:'01   '
-   %0#-5.0o:'012  '
-   %0#-5.0o:'0144 '
-@@ -3473,7 +3473,7 @@
-   %0-+5.5o:'00012'
-   %0-+5.5o:'00144'
-   %0-+5.5o:'777777777777777777777'
-- %#-+ 0.0o:''
-+ %#-+ 0.0o:'0'
-  %#-+ 0.0o:'01'
-  %#-+ 0.0o:'012'
-  %#-+ 0.0o:'0144'
-@@ -3493,7 +3493,7 @@
-  %#-+ 0.5o:'00012'
-  %#-+ 0.5o:'00144'
-  %#-+ 0.5o:'0777777777777777777777'
-- %#-+ 1.0o:' '
-+ %#-+ 1.0o:'0'
-  %#-+ 1.0o:'01'
-  %#-+ 1.0o:'012'
-  %#-+ 1.0o:'0144'
-@@ -3513,7 +3513,7 @@
-  %#-+ 1.5o:'00012'
-  %#-+ 1.5o:'00144'
-  %#-+ 1.5o:'0777777777777777777777'
-- %#-+ 2.0o:'  '
-+ %#-+ 2.0o:'0 '
-  %#-+ 2.0o:'01'
-  %#-+ 2.0o:'012'
-  %#-+ 2.0o:'0144'
-@@ -3533,7 +3533,7 @@
-  %#-+ 2.5o:'00012'
-  %#-+ 2.5o:'00144'
-  %#-+ 2.5o:'0777777777777777777777'
-- %#-+ 5.0o:'     '
-+ %#-+ 5.0o:'0    '
-  %#-+ 5.0o:'01   '
-  %#-+ 5.0o:'012  '
-  %#-+ 5.0o:'0144 '
-@@ -3553,7 +3553,7 @@
-  %#-+ 5.5o:'00012'
-  %#-+ 5.5o:'00144'
-  %#-+ 5.5o:'0777777777777777777777'
-- %0#+ 0.0o:''
-+ %0#+ 0.0o:'0'
-  %0#+ 0.0o:'01'
-  %0#+ 0.0o:'012'
-  %0#+ 0.0o:'0144'
-@@ -3573,7 +3573,7 @@
-  %0#+ 0.5o:'00012'
-  %0#+ 0.5o:'00144'
-  %0#+ 0.5o:'0777777777777777777777'
-- %0#+ 1.0o:' '
-+ %0#+ 1.0o:'0'
-  %0#+ 1.0o:'01'
-  %0#+ 1.0o:'012'
-  %0#+ 1.0o:'0144'
-@@ -3593,7 +3593,7 @@
-  %0#+ 1.5o:'00012'
-  %0#+ 1.5o:'00144'
-  %0#+ 1.5o:'0777777777777777777777'
-- %0#+ 2.0o:'  '
-+ %0#+ 2.0o:' 0'
-  %0#+ 2.0o:'01'
-  %0#+ 2.0o:'012'
-  %0#+ 2.0o:'0144'
-@@ -3613,7 +3613,7 @@
-  %0#+ 2.5o:'00012'
-  %0#+ 2.5o:'00144'
-  %0#+ 2.5o:'0777777777777777777777'
-- %0#+ 5.0o:'     '
-+ %0#+ 5.0o:'    0'
-  %0#+ 5.0o:'   01'
-  %0#+ 5.0o:'  012'
-  %0#+ 5.0o:' 0144'
-@@ -3633,7 +3633,7 @@
-  %0#+ 5.5o:'00012'
-  %0#+ 5.5o:'00144'
-  %0#+ 5.5o:'0777777777777777777777'
-- %0#- 0.0o:''
-+ %0#- 0.0o:'0'
-  %0#- 0.0o:'01'
-  %0#- 0.0o:'012'
-  %0#- 0.0o:'0144'
-@@ -3653,7 +3653,7 @@
-  %0#- 0.5o:'00012'
-  %0#- 0.5o:'00144'
-  %0#- 0.5o:'0777777777777777777777'
-- %0#- 1.0o:' '
-+ %0#- 1.0o:'0'
-  %0#- 1.0o:'01'
-  %0#- 1.0o:'012'
-  %0#- 1.0o:'0144'
-@@ -3673,7 +3673,7 @@
-  %0#- 1.5o:'00012'
-  %0#- 1.5o:'00144'
-  %0#- 1.5o:'0777777777777777777777'
-- %0#- 2.0o:'  '
-+ %0#- 2.0o:'0 '
-  %0#- 2.0o:'01'
-  %0#- 2.0o:'012'
-  %0#- 2.0o:'0144'
-@@ -3693,7 +3693,7 @@
-  %0#- 2.5o:'00012'
-  %0#- 2.5o:'00144'
-  %0#- 2.5o:'0777777777777777777777'
-- %0#- 5.0o:'     '
-+ %0#- 5.0o:'0    '
-  %0#- 5.0o:'01   '
-  %0#- 5.0o:'012  '
-  %0#- 5.0o:'0144 '
-@@ -3713,7 +3713,7 @@
-  %0#- 5.5o:'00012'
-  %0#- 5.5o:'00144'
-  %0#- 5.5o:'0777777777777777777777'
-- %0#-+ .0o:''
-+ %0#-+ .0o:'0'
-  %0#-+ .0o:'01'
-  %0#-+ .0o:'012'
-  %0#-+ .0o:'0144'
-@@ -3733,7 +3733,7 @@
-  %0#-+ .5o:'00012'
-  %0#-+ .5o:'00144'
-  %0#-+ .5o:'0777777777777777777777'
-- %0#-+0.0o:''
-+ %0#-+0.0o:'0'
-  %0#-+0.0o:'01'
-  %0#-+0.0o:'012'
-  %0#-+0.0o:'0144'
-@@ -3753,7 +3753,7 @@
-  %0#-+0.5o:'00012'
-  %0#-+0.5o:'00144'
-  %0#-+0.5o:'0777777777777777777777'
-- %0#-+1.0o:' '
-+ %0#-+1.0o:'0'
-  %0#-+1.0o:'01'
-  %0#-+1.0o:'012'
-  %0#-+1.0o:'0144'
-@@ -3773,7 +3773,7 @@
-  %0#-+1.5o:'00012'
-  %0#-+1.5o:'00144'
-  %0#-+1.5o:'0777777777777777777777'
-- %0#-+2.0o:'  '
-+ %0#-+2.0o:'0 '
-  %0#-+2.0o:'01'
-  %0#-+2.0o:'012'
-  %0#-+2.0o:'0144'
-@@ -3793,7 +3793,7 @@
-  %0#-+2.5o:'00012'
-  %0#-+2.5o:'00144'
-  %0#-+2.5o:'0777777777777777777777'
-- %0#-+5.0o:'     '
-+ %0#-+5.0o:'0    '
-  %0#-+5.0o:'01   '
-  %0#-+5.0o:'012  '
-  %0#-+5.0o:'0144 '
-@@ -3893,7 +3893,7 @@
-  %0-+ 5.5o:'00012'
-  %0-+ 5.5o:'00144'
-  %0-+ 5.5o:'777777777777777777777'
--%0#-+ 0.0o:''
-+%0#-+ 0.0o:'0'
- %0#-+ 0.0o:'01'
- %0#-+ 0.0o:'012'
- %0#-+ 0.0o:'0144'
-@@ -3913,7 +3913,7 @@
- %0#-+ 0.5o:'00012'
- %0#-+ 0.5o:'00144'
- %0#-+ 0.5o:'0777777777777777777777'
--%0#-+ 1.0o:' '
-+%0#-+ 1.0o:'0'
- %0#-+ 1.0o:'01'
- %0#-+ 1.0o:'012'
- %0#-+ 1.0o:'0144'
-@@ -3933,7 +3933,7 @@
- %0#-+ 1.5o:'00012'
- %0#-+ 1.5o:'00144'
- %0#-+ 1.5o:'0777777777777777777777'
--%0#-+ 2.0o:'  '
-+%0#-+ 2.0o:'0 '
- %0#-+ 2.0o:'01'
- %0#-+ 2.0o:'012'
- %0#-+ 2.0o:'0144'
-@@ -3953,7 +3953,7 @@
- %0#-+ 2.5o:'00012'
- %0#-+ 2.5o:'00144'
- %0#-+ 2.5o:'0777777777777777777777'
--%0#-+ 5.0o:'     '
-+%0#-+ 5.0o:'0    '
- %0#-+ 5.0o:'01   '
- %0#-+ 5.0o:'012  '
- %0#-+ 5.0o:'0144 '
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch b/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch
deleted file mode 100644
index 4d3917ad9ffc..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests-tabling_inf_recursion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 mercury-tests-0.12.2/tabling/loopcheck.exp5
---- mercury-tests-0.12.2.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck.exp5	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck.loop/1
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2
---- mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_loop.exp3 mercury-tests-0.12.2/tabling/tc_loop.exp3
---- mercury-tests-0.12.2.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_loop.exp3	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_loop.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo.exp2 mercury-tests-0.12.2/tabling/tc_memo.exp2
---- mercury-tests-0.12.2.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo.exp2	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_memo.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2 mercury-tests-0.12.2/tabling/tc_memo2.exp2
---- mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo2.exp2	2007-01-07 15:12:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected need for minimal model in pred tc_memo2.tc/2
-+Stack dump not available in this grade.
diff --git a/dev-lang/mercury/files/mercury-0.12.2-tests.patch b/dev-lang/mercury/files/mercury-0.12.2-tests.patch
deleted file mode 100644
index d65ff295a014..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-tests.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -urN mercury-tests-0.12.2.orig/general/string_format/Mmakefile mercury-tests-0.12.2/general/string_format/Mmakefile
---- mercury-tests-0.12.2.orig/general/string_format/Mmakefile	2004-12-11 05:23:46.000000000 +1300
-+++ mercury-tests-0.12.2/general/string_format/Mmakefile	2006-10-03 20:46:24.000000000 +1300
-@@ -89,22 +89,22 @@
- 		echo "Matched $*.sorted_exp" && \
- 		cp $*.res1 $@; } || \
- 	{ test -f $*.exp2 && \
--		@sort $*.exp2 > $*.sorted_exp2 \
-+		sort $*.exp2 > $*.sorted_exp2 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp2 $*.sorted_out > $*.res2 && \
- 		echo "Matched $*.sorted_exp2" && \
- 		cp $*.res2 $@; } || \
- 	{ test -f $*.exp3 && \
--		@sort $*.exp3 > $*.sorted_exp3 \
-+		sort $*.exp3 > $*.sorted_exp3 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp3 $*.sorted_out > $*.res3 && \
- 		echo "Matched $*.sorted_exp3" && \
- 		cp $*.res3 $@; } || \
- 	{ test -f $*.exp4 && \
--		@sort $*.exp4 > $*.sorted_exp4 \
-+		sort $*.exp4 > $*.sorted_exp4 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp4 $*.sorted_out > $*.res4 && \
- 		echo "Matched $*.sorted_exp4" && \
- 		cp $*.res4 $@; } || \
- 	{ test -f $*.exp5 && \
--		@sort $*.exp5 > $*.sorted_exp5 \
-+		sort $*.exp5 > $*.sorted_exp5 && \
- 		diff $(DIFF_OPTS) $*.sorted_exp5 $*.sorted_out > $*.res5 && \
- 		echo "Matched $*.sorted_exp5" && \
- 		cp $*.res5 $@; } || \
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp mercury-tests-0.12.2/hard_coded/dir_test.exp
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp	2006-10-03 20:55:25.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".

- "foo/"/"bar/baz" = "foo\bar\baz".

- checking whether `unwritable' is readable...ok

--unwritable file found to be unwritable

- make_directory succeeded

- make_directory succeeded

- dir.make_single_directory with non-existent parent failed as expected.

-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2 mercury-tests-0.12.2/hard_coded/dir_test.exp2
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp2	2006-10-03 20:55:25.000000000 +1300
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3 mercury-tests-0.12.2/hard_coded/dir_test.exp3
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.exp3	2006-10-03 20:55:25.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.12.2.orig/hard_coded/dir_test.m mercury-tests-0.12.2/hard_coded/dir_test.m
---- mercury-tests-0.12.2.orig/hard_coded/dir_test.m	2003-08-05 22:50:33.000000000 +1200
-+++ mercury-tests-0.12.2/hard_coded/dir_test.m	2006-10-03 20:55:25.000000000 +1300
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	{ Dir1 = "test_dir"/"d1" },
- 	test0("make_directory", dir__make_directory(Dir1)),
- 	% Test making a directory that already exists.
-diff -urN mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3 mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3
---- mercury-tests-0.12.2.orig/invalid/foreign_decl_line_number.err_exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/invalid/foreign_decl_line_number.err_exp3	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+foreign_decl_line_number.m:19:2: error: #error Error in foreign decl
-+foreign_decl_line_number.m:23:2: error: #error Error in foreign code
-+foreign_decl_line_number.m:37:2: error: #error Error in foreign proc
-diff -urN mercury-tests-0.12.2.orig/mdbrc mercury-tests-0.12.2/mdbrc
---- mercury-tests-0.12.2.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/mdbrc	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,19 @@
-+source MDB_DOC
-+alias	s	step
-+alias	g	goto
-+alias	f	finish
-+alias	r	retry
-+alias	v	vars
-+alias	p	print
-+alias	P	print *
-+alias	d	stack
-+alias	c	continue
-+alias	b	break
-+alias	h	help
-+alias	?	help
-+alias	excp	exception
-+alias	e	exception
-+alias	EMPTY	step
-+alias	NUMBER	step
-+set xml_browser_cmd ''
-+set xml_tmp_filename ''
-diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck.exp5 mercury-tests-0.12.2/tabling/loopcheck.exp5
---- mercury-tests-0.12.2.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck.exp5	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck.loop/1
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2
---- mercury-tests-0.12.2.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/loopcheck_nondet.exp2	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_loop.exp3 mercury-tests-0.12.2/tabling/tc_loop.exp3
---- mercury-tests-0.12.2.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_loop.exp3	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_loop.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo.exp2 mercury-tests-0.12.2/tabling/tc_memo.exp2
---- mercury-tests-0.12.2.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo.exp2	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_memo.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2 mercury-tests-0.12.2/tabling/tc_memo2.exp2
---- mercury-tests-0.12.2.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.12.2/tabling/tc_memo2.exp2	2006-10-03 20:55:25.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected need for minimal model in pred tc_memo2.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.12.2.orig/valid/Mmakefile mercury-tests-0.12.2/valid/Mmakefile
---- mercury-tests-0.12.2.orig/valid/Mmakefile	2005-08-17 16:44:17.000000000 +1200
-+++ mercury-tests-0.12.2/valid/Mmakefile	2006-10-03 20:55:25.000000000 +1300
-@@ -376,3 +376,5 @@
- 	rm -f *.err *.h
- 
- #-----------------------------------------------------------------------------#
-+
-+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order
diff --git a/dev-lang/mercury/files/mercury-0.13.1-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.13.1-CFLAGS.patch
deleted file mode 100644
index 333e5d84a951..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-CFLAGS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mercury-compiler-0.13.1.orig/scripts/mgnuc.in	2006-08-03 00:56:05.000000000 +1200
-+++ mercury-compiler-0.13.1/scripts/mgnuc.in	2006-12-04 20:55:47.000000000 +1300
-@@ -53,7 +53,7 @@
- # -Wenum-clash          is for C++ only
- # -Wunused              causes various spurious warnings
- 
--        OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
-+        OPT_OPTS="@CFLAGS_FOR_OPT@"
-         DEBUG_OPT="-g"
-         COMPILER=gcc
-         ;;
---- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2006-12-04 20:55:47.000000000 +1300
-@@ -3741,7 +3741,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.
-@@ -10050,7 +10050,7 @@
- 		# enable, and why, see scripts/mgnuc.in.
- 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
- 
--		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
-+		CFLAGS_FOR_OPT="$CFLAGS"
- 		CFLAGS_FOR_DEBUG="-g"
- 		MCFLAGS_FOR_CC=
- 		;;
diff --git a/dev-lang/mercury/files/mercury-0.13.1-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.1-LIBDIR.patch
deleted file mode 100644
index 29beddb76813..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-LIBDIR.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2006-12-04 21:11:49.000000000 +1300
-@@ -1609,7 +1609,7 @@
- 
- 
- PREFIX="`$CYGPATH $PREFIX`"
--LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
-+LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`"
- NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
- 
- 
---- mercury-compiler-0.13.1.orig/scripts/Mmake.vars.in	2006-11-03 18:42:28.000000000 +1300
-+++ mercury-compiler-0.13.1/scripts/Mmake.vars.in	2006-12-04 21:11:49.000000000 +1300
-@@ -717,18 +717,18 @@
- INSTALL_PREFIX		= @prefix@
- FINAL_INSTALL_PREFIX	= @prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
--INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
- 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_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_LIBDIR)/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_LIBDIR)/doc
-+INSTALL_PS_DIR		= $(INSTALL_LIBDIR)/doc
-+INSTALL_PDF_DIR		= $(INSTALL_LIBDIR)/doc
- 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_LIBDIR)/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_LIBDIR)/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_LIBDIR)/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
---- mercury-compiler-0.13.1.orig/scripts/mercury_config.in	2005-10-27 14:48:24.000000000 +1300
-+++ mercury-compiler-0.13.1/scripts/mercury_config.in	2006-12-04 21:11:49.000000000 +1300
-@@ -90,8 +90,8 @@
- 	shift
- done
- 
--input_libdir="$input_prefix/lib/mercury"
--output_libdir="$output_prefix/lib/mercury"
-+input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@"
-+output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@"
- 
- # mercury_config regenerates itself, so we can't just execute it in place.
- case $recursive in
diff --git a/dev-lang/mercury/files/mercury-0.13.1-MAKEOPTS.patch b/dev-lang/mercury/files/mercury-0.13.1-MAKEOPTS.patch
deleted file mode 100644
index 8b0b53ff453a..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-MAKEOPTS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mercury-compiler-0.13.1.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
-+++ mercury-compiler-0.13.1/Makefile	2006-12-04 21:26:37.000000000 +1300
-@@ -15,7 +15,7 @@
- #
- #-----------------------------------------------------------------------------#
- 
--
-+PARALLEL=	$(MAKEOPTS)
- SHELL=		/bin/sh
- MMAKE=		MMAKE_DIR=`pwd`/scripts scripts/mmake 
- MMAKE_SUBDIR=	MMAKE_DIR=`pwd`/../scripts ../scripts/mmake $(PARALLEL)
-@@ -69,6 +69,6 @@
- 	$(MMAKE) uninstall
- 
- .DEFAULT:
--	$(MMAKE) $@
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) $@
- 
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury/files/mercury-0.13.1-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.1-bootstrap.patch
deleted file mode 100644
index dcd74371de14..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-bootstrap.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2006-12-04 20:50:57.000000000 +1300
-@@ -7410,21 +7410,21 @@
- 
- echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
- echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
--if test "$mercury_cv_unboxed_floats" = yes; then
--	if test "$BOOTSTRAP_MC" = ""; then
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&2;}
--		mercury_cv_unboxed_floats=no
--	fi
--fi
-+#if test "$mercury_cv_unboxed_floats" = yes; then
-+#	if test "$BOOTSTRAP_MC" = ""; then
-+#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&5
-+#echo "$as_me: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&2;}
-+#		mercury_cv_unboxed_floats=no
-+#	fi
-+#fi
- if test "$mercury_cv_unboxed_floats" = yes; then
- 	HAVE_BOXED_FLOATS="--unboxed-float"
- else
-@@ -8980,34 +8980,34 @@
- 
- if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then
- 	if test "$BOOTSTRAP_MC" = ""; then
--		GRADE="$BOOTSTRAP_GRADE"
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed
--****	cannot use grade \`$BEST_GRADE_FOR_COMPILER'
--****	using grade \`$GRADE' to compile the compiler
--****	after installation is complete you should reinstall
--****	from scratch so you can use the more efficient
--****	grade \`$BEST_GRADE_FOR_COMPILER'." >&2;}
--
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE="$BOOTSTRAP_GRADE"
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler slice \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+			find -name \*.o -o -name \*.pic_o -o \
-+				-name \*.a -o -name \*.so | \
-+				xargs rm > /dev/null 2>&1
-+			rm -f compiler/mercury_compile profiler/mercury_profile
-+		fi
- 	else
--		GRADE=$BEST_GRADE_FOR_COMPILER
--		echo "using grade \`$GRADE' to compile the compiler
--	compiler and library will be rebuilt with new grade
--	installation may take a long time" 1>&6
--		find library compiler browser mdbcomp analysis \
--			profiler deep_profiler \
--			-name \*.c -o -name \*.c_date | \
--			xargs rm > /dev/null 2>&1
-+		if test "$BOOTSTRAP_STAGE" = "1"; then
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+			find library compiler browser mdbcomp analysis \
-+				profiler deep_profiler slice \
-+				-name \*.c -o -name \*.c_date | \
-+				xargs rm > /dev/null 2>&1
-+		else
-+			GRADE=$BEST_GRADE_FOR_COMPILER
-+		fi
- 	fi
- else
- 	GRADE=$BEST_GRADE_FOR_COMPILER
--	echo "using grade \`$GRADE' to compile the compiler" 1>&6
- fi
-+echo "using grade \`$GRADE' to compile the compiler" 1>&6
- 
- 
- #-----------------------------------------------------------------------------#
-@@ -10222,12 +10222,12 @@
- 
- fi
- #-----------------------------------------------------------------------------#
--if test "$BOOTSTRAP_MC" = ""; then
--	BOOTSTRAP_MC=mmc
--fi
--BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
--BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
--BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
-+#if test "$BOOTSTRAP_MC" = ""; then
-+#	BOOTSTRAP_MC=mmc
-+#fi
-+#BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
-+#BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
-+#BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
- 
- 
- 
-@@ -12260,6 +12260,13 @@
-     rm -f confscratch $to_delete
- fi
- #-----------------------------------------------------------------------------#
-+if test "$BOOTSTRAP_MC" = ""; then
-+	BOOTSTRAP_MC=mmc
-+fi
-+BOOTSTRAP_MC_COMPILER="$BOOTSTRAP_MC"
-+BOOTSTRAP_MC_ARGS="$HAVE_BOXED_FLOATS --conf-low-tag-bits $LOW_TAG_BITS --bits-per-word $BITS_PER_WORD --bytes-per-word $BYTES_PER_WORD"
-+BOOTSTRAP_MC="$BOOTSTRAP_MC_COMPILER $BOOTSTRAP_MC_ARGS"
-+#-----------------------------------------------------------------------------#
- 
- echo "$as_me:$LINENO: checking for C shell executable" >&5
- echo $ECHO_N "checking for C shell executable... $ECHO_C" >&6
diff --git a/dev-lang/mercury/files/mercury-0.13.1-deep_profiler.patch b/dev-lang/mercury/files/mercury-0.13.1-deep_profiler.patch
deleted file mode 100644
index 09113aadd824..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-deep_profiler.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2006-12-04 21:00:23.000000000 +1300
-@@ -8666,14 +8666,14 @@
- esac
- 
- case $enable_deep_profiler in
--	default)
--		if test -d $mercury_cv_default_cgi_dir; then
--			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
--			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
--		else
--			mercury_cv_enable_deep_profiler=no
--		fi
--		;;
-+#	default)
-+#		if test -d $mercury_cv_default_cgi_dir; then
-+#			mercury_cv_enable_deep_profiler=$mercury_cv_can_enable_deep_profiler
-+#			mercury_cv_cgi_dir=$mercury_cv_default_cgi_dir
-+#		else
-+#			mercury_cv_enable_deep_profiler=no
-+#		fi
-+#		;;
- 	no)
- 		mercury_cv_enable_deep_profiler=no
- 		;;
-@@ -8698,17 +8698,17 @@
- 		;;
- esac
- 
--if test $mercury_cv_enable_deep_profiler = yes; then
--	if test -d $mercury_cv_cgi_dir; then
--		true
--	else
--		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
--echo "${ECHO_T}$enable_deep_profiler" >&6
--		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
--echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
--   { (exit 1); exit 1; }; }
--	fi
--fi
-+#if test $mercury_cv_enable_deep_profiler = yes; then
-+#	if test -d $mercury_cv_cgi_dir; then
-+#		true
-+#	else
-+#		echo "$as_me:$LINENO: result: $enable_deep_profiler" >&5
-+#echo "${ECHO_T}$enable_deep_profiler" >&6
-+#		{ { echo "$as_me:$LINENO: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&5
-+#echo "$as_me: error: CGI script directory $mercury_cv_cgi_dir does not exist" >&2;}
-+#   { (exit 1); exit 1; }; }
-+#	fi
-+#fi
- 
- echo "$as_me:$LINENO: result: $mercury_cv_enable_deep_profiler" >&5
- echo "${ECHO_T}$mercury_cv_enable_deep_profiler" >&6
---- mercury-compiler-0.13.1.orig/deep_profiler/Mmakefile	2005-12-16 18:49:39.000000000 +1300
-+++ mercury-compiler-0.13.1/deep_profiler/Mmakefile	2006-12-04 21:00:35.000000000 +1300
-@@ -155,12 +155,12 @@
- 	# executed when we do the install. The mv is of course expected to
- 	# fail during a first-time installation. The rm is before the move
- 	# in case this is the third or later installation.
--	-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
--		rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
--		mv $(INSTALL_CGI_DIR)/mdprof_cgi \
--			$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
--		cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
--	fi
-+	#-if test $(ENABLE_DEEP_PROFILER) = yes ; then \
-+	#	rm $(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
-+	#	mv $(INSTALL_CGI_DIR)/mdprof_cgi \
-+	#		$(INSTALL_CGI_DIR)/mdprof_cgi.was ; \
-+	#	cp mdprof_cgi $(INSTALL_CGI_DIR) ; \
-+	#fi
- 	# We also install mdprof_cgi in $(INSTALL_MERC_BIN_DIR).
- 	# This is done just so that it can easily get put in the
- 	# binary distribution (even if the step above failed).
diff --git a/dev-lang/mercury/files/mercury-0.13.1-parallel-install_grades.patch b/dev-lang/mercury/files/mercury-0.13.1-parallel-install_grades.patch
deleted file mode 100644
index 0c6570df9c98..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-parallel-install_grades.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mercury-compiler-0.13.1.orig/scripts/Mmake.rules	2006-11-03 18:42:28.000000000 +1300
-+++ mercury-compiler-0.13.1/scripts/Mmake.rules	2006-12-04 21:35:40.000000000 +1300
-@@ -505,9 +505,9 @@
- 		*.a *.so tmp_dir || true; } && \
- 	for grade in $(ALL_LIBGRADES); do \
- 		if [ "$$grade" != "$(GRADE)" ]; then \
--			$(MMAKE) GRADE=$$grade $*.depend || \
-+			$(MMAKE) $(MMAKEFLAGS) GRADE=$$grade $*.depend || \
- 				exit 1; \
--			$(MMAKE) GRADE=$$grade lib$*.install_library || \
-+			$(MMAKE) $(MMAKEFLAGS) GRADE=$$grade lib$*.install_library || \
- 				exit 1; \
- 			for file in x $$grade_files; do \
- 				if [ "$$file" != "x" ]; then \
diff --git a/dev-lang/mercury/files/mercury-0.13.1-portage.patch b/dev-lang/mercury/files/mercury-0.13.1-portage.patch
deleted file mode 100644
index 412152252c74..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-portage.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- mercury-compiler-0.13.1.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
-+++ mercury-compiler-0.13.1/Makefile	2006-12-04 21:37:11.000000000 +1300
-@@ -26,7 +26,7 @@
- 
- .PHONY: all
- all:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all || exit 1
- 
- .PHONY: libmmc
- libmmc:
-@@ -34,7 +34,7 @@
- 
- .PHONY: install
- install:
--	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install
-+	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install || exit 1
- 
- # `mmake clean' has a different meaning to the usual GNU standard `make clean':
- # it removes the .c files, which makes bootstrapping impossible unless you
---- mercury-compiler-0.13.1.orig/configure	2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2006-12-04 21:37:11.000000000 +1300
-@@ -9151,11 +9151,11 @@
- 	enable_mm_grades=no
- 	enable_dmm_grades=no
- 	enable_hlc_prof_grades=no
--	enable_par_grades=no
- 	enable_dotnet_grades=no
- 	enable_java_grade=no
- fi
- 
-+
- #-----------------------------------------------------------------------------#
- 
- #
---- mercury-compiler-0.13.1.orig/runtime/Mmakefile	2006-11-15 03:09:20.000000000 +1300
-+++ mercury-compiler-0.13.1/runtime/Mmakefile	2006-12-04 21:37:11.000000000 +1300
-@@ -434,8 +437,6 @@
- 	-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifeq ($(findstring java,$(GRADE)),java)
- 
-@@ -481,7 +482,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
---- mercury-compiler-0.13.1.orig/scripts/Mmakefile	2006-04-04 19:41:49.000000000 +1200
-+++ mercury-compiler-0.13.1/scripts/Mmakefile	2006-12-04 21:37:11.000000000 +1300
-@@ -26,16 +26,12 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
--	mprof \
--	prepare_tmp_dir_fixed_part
-+	mprof
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -103,8 +99,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -122,7 +116,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch b/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch
deleted file mode 100644
index 05da6498e79f..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-profdeep-builtin_throw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-0.13.1.orig/library/exception.m	2006-07-31 18:01:49.000000000 +1200
-+++ mercury-compiler-0.13.1/library/exception.m	2006-12-30 14:46:21.000000000 +1300
-@@ -1970,7 +1970,7 @@
- 
- MR_proc_static_user_no_site(exception, builtin_throw, 1, 0,
-     ""exception.m"", MR_DUMMY_LINE, MR_TRUE);
--MR_STATIC_USER_PROC_STATIC_PROC_LAYOUT(
-+MR_EXTERN_USER_PROC_STATIC_PROC_LAYOUT(
-         MR_DETISM_DET, 1, MR_LONG_LVAL_STACKVAR(1),
-         MR_PREDICATE, exception, builtin_throw, 1, 0);
- MR_MAKE_USER_INTERNAL_LAYOUT(exception, builtin_throw, 1, 0, 1);
diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-declarative-throw.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-declarative-throw.patch
deleted file mode 100644
index 0a78c5ef8a4b..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-declarative-throw.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/debugger/declarative/throw.exp4 mercury-tests-0.13.1/debugger/declarative/throw.exp4
---- mercury-tests-0.13.1.orig/debugger/declarative/throw.exp4	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/debugger/declarative/throw.exp4	2007-10-20 14:56:07.000000000 +1300
-@@ -0,0 +1,53 @@
-+      E1:     C1 CALL pred throw.main/2-0 (cc_multi) throw.m:10
-+mdb> echo on
-+Command echo enabled.
-+mdb> register --quiet
-+mdb> break p
-+ 0: + stop  interface pred throw.p/1-0 (cc_nondet)
-+mdb> break q
-+ 1: + stop  interface pred throw.q/1-0 (semidet)
-+mdb> continue
-+      E2:     C2 CALL pred throw.p/1-0 (cc_nondet) throw.m:20
-+mdb> finish
-+      E3:     C2 EXCP pred throw.p/1-0 (cc_nondet)
-+mdb> dd -d 3 -n 7
-+Call p(_)
-+Throws "Too big"
-+Expected? no
-+a(3)
-+Valid? yes
-+Call b(3, _)
-+Throws "Too big"
-+Expected? yes
-+Found unhandled or incorrect exception:
-+p(_)
-+"Too big"
-+Is this a bug? yes
-+      E3:     C2 EXCP pred throw.p/1-0 (cc_nondet)
-+mdb> continue
-+mdb: warning: reached unknown label
-+This may result in some exception events
-+being omitted from the trace.
-+exception(univ_cons("Too big"))
-+      E4:     C3 CALL pred throw.q/1-0 (semidet) throw.m:48
-+mdb> finish
-+      E5:     C3 EXCP pred throw.q/1-0 (semidet)
-+mdb> dd -d 3 -n 7
-+Call q(_)
-+Throws "Too big"
-+Expected? no
-+a2(3)
-+Valid? yes
-+Call b2(3, _)
-+Throws "Too big"
-+Expected? yes
-+Found unhandled or incorrect exception:
-+q(_)
-+"Too big"
-+Is this a bug? yes
-+      E5:     C3 EXCP pred throw.q/1-0 (semidet)
-+mdb> continue
-+mdb: warning: reached unknown label
-+This may result in some exception events
-+being omitted from the trace.
-+exception(univ_cons("Too big"))
diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-mdbrc.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-mdbrc.patch
deleted file mode 100644
index 64ad9c6b1ed6..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-mdbrc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mercury-tests-0.13.1.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/mdbrc	2007-01-07 15:51:35.000000000 +1300
-@@ -0,0 +1,19 @@
-+source MDB_DOC
-+alias	s	step
-+alias	g	goto
-+alias	f	finish
-+alias	r	retry
-+alias	v	vars
-+alias	p	print
-+alias	P	print *
-+alias	d	stack
-+alias	c	continue
-+alias	b	break
-+alias	h	help
-+alias	?	help
-+alias	excp	exception
-+alias	e	exception
-+alias	EMPTY	step
-+alias	NUMBER	step
-+xml_browser_cmd ''
-+xml_tmp_filename ''
diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests.patch b/dev-lang/mercury/files/mercury-0.13.1-tests.patch
deleted file mode 100644
index b20e58449f42..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests.patch
+++ /dev/null
@@ -1,526 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp mercury-tests-0.13.1/hard_coded/dir_test.exp
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp	2006-12-04 21:44:54.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".

- "foo/"/"bar/baz" = "foo\bar\baz".

- checking whether `unwritable' is readable...ok

--unwritable file found to be unwritable

- make_directory succeeded

- make_directory succeeded

- dir.make_single_directory with non-existent parent failed as expected.

-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.1/hard_coded/dir_test.exp2
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp2	2006-12-04 21:44:54.000000000 +1300
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.1/hard_coded/dir_test.exp3
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3	2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp3	2006-12-04 21:44:54.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.m mercury-tests-0.13.1/hard_coded/dir_test.m
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.m	2006-03-29 20:08:00.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.m	2006-12-04 21:44:54.000000000 +1300
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	{ Dir1 = "test_dir"/"d1" },
- 	test0("make_directory", dir__make_directory(Dir1)),
- 	% Test making a directory that already exists.
-diff -urN mercury-tests-0.13.1.orig/mdbrc mercury-tests-0.13.1/mdbrc
---- mercury-tests-0.13.1.orig/mdbrc	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/mdbrc	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,19 @@
-+source MDB_DOC
-+alias	s	step
-+alias	g	goto
-+alias	f	finish
-+alias	r	retry
-+alias	v	vars
-+alias	p	print
-+alias	P	print *
-+alias	d	stack
-+alias	c	continue
-+alias	b	break
-+alias	h	help
-+alias	?	help
-+alias	excp	exception
-+alias	e	exception
-+alias	EMPTY	step
-+alias	NUMBER	step
-+xml_browser_cmd ''
-+xml_tmp_filename ''
-diff -urN mercury-tests-0.13.1.orig/tabling/loopcheck.exp5 mercury-tests-0.13.1/tabling/loopcheck.exp5
---- mercury-tests-0.13.1.orig/tabling/loopcheck.exp5	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/loopcheck.exp5	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck.loop/1
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/loopcheck_nondet.exp2 mercury-tests-0.13.1/tabling/loopcheck_nondet.exp2
---- mercury-tests-0.13.1.orig/tabling/loopcheck_nondet.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/loopcheck_nondet.exp2	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred loopcheck_nondet.loop/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_loop.exp3 mercury-tests-0.13.1/tabling/tc_loop.exp3
---- mercury-tests-0.13.1.orig/tabling/tc_loop.exp3	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_loop.exp3	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_loop.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_memo.exp2 mercury-tests-0.13.1/tabling/tc_memo.exp2
---- mercury-tests-0.13.1.orig/tabling/tc_memo.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_memo.exp2	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected infinite recursion in pred tc_memo.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/tabling/tc_memo2.exp2 mercury-tests-0.13.1/tabling/tc_memo2.exp2
---- mercury-tests-0.13.1.orig/tabling/tc_memo2.exp2	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/tabling/tc_memo2.exp2	2006-12-04 21:44:54.000000000 +1300
-@@ -0,0 +1,3 @@
-+Uncaught Mercury exception:
-+Software Error: detected need for minimal model in pred tc_memo2.tc/2
-+Stack dump not available in this grade.
-diff -urN mercury-tests-0.13.1.orig/valid/Mmakefile mercury-tests-0.13.1/valid/Mmakefile
---- mercury-tests-0.13.1.orig/valid/Mmakefile	2006-11-08 14:36:30.000000000 +1300
-+++ mercury-tests-0.13.1/valid/Mmakefile	2006-12-04 21:44:54.000000000 +1300
-@@ -400,3 +400,5 @@
- 	rm -f *.err *.h
- 
- #-----------------------------------------------------------------------------#
-+
-+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order
-diff -urN mercury-tests-0.13.1.orig/valid/Mmakefile.orig mercury-tests-0.13.1/valid/Mmakefile.orig
---- mercury-tests-0.13.1.orig/valid/Mmakefile.orig	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-tests-0.13.1/valid/Mmakefile.orig	2006-11-08 14:36:30.000000000 +1300
-@@ -0,0 +1,402 @@
-+#-----------------------------------------------------------------------------#
-+
-+THIS_DIR = valid
-+
-+#-----------------------------------------------------------------------------#
-+
-+# please keep these lists sorted
-+AGC_PROGS= \
-+	agc_graph \
-+	agc_ho_pred \
-+	agc_ite \
-+	agc_unbound_typevars \
-+	agc_unbound_typevars2 \
-+	agc_unused_in
-+
-+TRAIL_PROGS= \
-+	complex_failure \
-+	semi_fail_in_non_ite
-+
-+TYPECLASS_PROGS= \
-+	abstract_typeclass \
-+	complex_constraint \
-+	constraint_proof_bug \
-+	exists_bug \
-+	exists_fundeps \
-+	exists_fundeps_2 \
-+	exists_fundeps_3 \
-+	flatten_conj_bug \
-+	func_class \
-+	func_method \
-+	fundeps \
-+	instance_superclass \
-+	instance_unconstrained_tvar \
-+	mpj2 \
-+	mpj5 \
-+	mpj6 \
-+	mpj7 \
-+	repeated_class_constraint \
-+	superclass_bug \
-+	superclass_improvement \
-+	tc_map_lookup \
-+	typeclass_constraint_no_var \
-+	typeclass_constraint_nonvar_bug \
-+	typeclass_det_warning
-+
-+	# This test is compiled with --no-special-preds,
-+	# which doesn't work in jump.* and fast.* grades.
-+NO_SPECIAL_PREDS_PROGS= \
-+	unify_typeinfo_bug
-+
-+	# Tests for which we should only produce a `.il' file.
-+IL_PROGS = \
-+	csharp_hello \
-+	foreign_type_spec
-+
-+OTHER_PROGS= \
-+	any_inst_merge \
-+	any_matches_bound \
-+	big_foreign_type \
-+	builtin_false \
-+	common_struct_bug \
-+	complicated_unify \
-+	compl_unify_bug \
-+	constrained_poly_bound_arg \
-+	constrained_poly_insts \
-+	constraint_prop_bug \
-+	constructor_arg_names \
-+	dcg_test \
-+	deforest_bug \
-+	deforest_loop \
-+	deforest_rerun_det \
-+	det_condition \
-+	det_inference \
-+	det_switch \
-+	double_vn \
-+	easy_nondet_test \
-+	easy_nondet_test_2 \
-+	empty_bound_inst_list \
-+	empty_switch \
-+	error \
-+	eval \
-+	existential_cons \
-+	explicit_quant \
-+	export_before_func \
-+	exported_foreign_type \
-+	fail_ite \
-+	followcode_det_problem \
-+	foreign_underscore_var \
-+	func_default_modes \
-+	func_in_head \
-+	func_int_bug_main \
-+	hawkins_switch_bug \
-+	headvar_not_found \
-+	higher_order \
-+	higher_order2 \
-+	higher_order3 \
-+	higher_order4 \
-+	higher_order5 \
-+	higher_order_implied_mode \
-+	ho_and_type_spec_bug \
-+	ho_func_call \
-+	ho_inst \
-+	ho_unify \
-+	id_type_bug \
-+	implied_mode \
-+	impure_lambda_bug \
-+	indexing \
-+	inhibit_warn_test \
-+	inlining_bug \
-+	inst_perf_bug_1 \
-+	int64 \
-+	intermod_bug_nested \
-+	intermod_dcg_bug \
-+	intermod_impure \
-+	intermod_lambda \
-+	intermod_nested \
-+	intermod_nested_module \
-+	intermod_nested_module_bug \
-+	intermod_nested_uniq \
-+	intermod_pragma_import \
-+	intermod_quote \
-+	intermod_record \
-+	intermod_test \
-+	intermod_typeclass \
-+	intermod_type_spec \
-+	intermod_user_equality \
-+	intermod_user_equality_nested \
-+	lambda_inference\
-+	lambda_instmap_bug \
-+	lambda_output \
-+	lambda_quant \
-+	lambda_quant_bug \
-+	lambda_recompute \
-+	lambda_struct_bug \
-+	lambda_switch \
-+	lambda_type \
-+	lazy_list \
-+	liveness_nonlocals \
-+	livevals_seq \
-+	loop \
-+	loop_in_disj \
-+	loop_inv_bug \
-+	mc_bag \
-+	mc_extra_nonlocals \
-+	mc_graph \
-+	mc_hhf_nonlocals_bug \
-+	mc_implied_modes \
-+	merge_ground_any \
-+	middle_rec_labels \
-+	modes_bug \
-+	mode_syntax \
-+	module_a \
-+	module_b \
-+	module_c \
-+	module_d \
-+	module_e \
-+	mostly_uniq_bug \
-+	mostly_uniq_mode_inf \
-+	mostly_uniq_neg \
-+	multidet_prune1 \
-+	multidet_test \
-+	nasty_func_test \
-+	nested_mod_type_bug \
-+	nested_module_bug \
-+	no_warn_obsolete \
-+	nondet_live \
-+	overloading \
-+	param_mode_bug \
-+	parsing_bug_main \
-+	pred_with_no_modes \
-+	qualified_cons_id \
-+	quantifier_warning \
-+	record_syntax_bug \
-+	record_syntax_bug_2 \
-+	record_syntax_bug_3 \
-+	record_syntax_bug_4 \
-+	record_syntax_bug_5 \
-+	recursive_no_tag_type \
-+	reg_bug \
-+	same_length_2 \
-+	semidet_disj \
-+	shape_type \
-+	simplify_bug \
-+	simplify_bug2 \
-+	size_prof_ho_bug \
-+	soln_context \
-+	solv \
-+	solver_type_bug \
-+	solver_type_bug_2 \
-+	solver_type_mutable_bug \
-+	some_switch \
-+	spurious_purity_warning \
-+	stack_alloc \
-+	stack_opt_simplify \
-+	state_var_bug \
-+	state_var_mode_bug \
-+	state_var_mode_bug2 \
-+	static \
-+	subtype_switch \
-+	switch_detection_bug \
-+	switch_detection_bug2 \
-+	switches \
-+	tabled_for_io \
-+	tabled_io \
-+	transitive_instance \
-+	tricky_assert2 \
-+	tricky_ite \
-+	tuple_eqv \
-+	two_pragma_c_codes \
-+	two_way_unif \
-+	typeclass_inlining_bug \
-+	type_inf_ambig_test \
-+	unbound_inst_var \
-+	unbound_tvar_in_lambda \
-+	undead_proc \
-+	uniq_mode_inf_bug \
-+	uniq_unify \
-+	unreachable_code \
-+	unused_args_test2 \
-+	vn_float \
-+	zero_arity
-+
-+DEEP_PROF_CAPABLE_PROGS = \
-+	impure_detism
-+
-+# These tests require debugging, which hasn't been implemented for
-+# the MLDS backend.
-+#
-+LLDS_PROGS= \
-+	exists_cast_bug \
-+	untuple_bug
-+
-+# These tests only work in grades that support parallel conjunction.
-+#
-+PAR_CONJ_PROGS = \
-+	par_dummy \
-+	par_dupelim \
-+	par_saved_const
-+
-+# The following programs require that num_tag_bits >= 1
-+RESERVE_TAG_PROGS = \
-+	reserve_tag
-+
-+# XXX The mode system can't handle the following test cases yet:
-+#	assoc_list_bug
-+#	determinism
-+#	inst_perf_bug_2
-+#	mode_merge_insts
-+#	unify_inst_bug
-+#
-+# XXX We also don't pass this one (see the comments in it for details):
-+#	mode_selection
-+#
-+# XXX The following test is not valid under the current Mercury
-+# language rules:
-+#	field_detism
-+
-+# The agc.* tests don't work in --high-level-code grades,
-+# except hl*.agc*, because they require grade-specific header
-+# files to be installed.
-+ifeq "$(findstring hl,$(GRADE))$(findstring .agc,$(GRADE))" "hl"
-+	PROGS0 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
-+else
-+	# The agc.* tests don't work in the il grades, as the CLR has
-+	# its own builtin GC.
-+	# The agc.* tests also don't work in minimal model grades,
-+	# because the collector doesn't scan the copied areas of the stacks.
-+	ifneq "$(findstring il,$(GRADE))$(findstring mm,$(GRADE))" ""
-+		PROGS0 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
-+	else
-+		PROGS0 = $(AGC_PROGS) $(TYPECLASS_PROGS) $(OTHER_PROGS)
-+	endif
-+endif
-+
-+# Base grades `jump' and `fast'
-+# cannot be used with `--no-special-preds'
-+
-+ifneq "$(findstring asm_,$(GRADE))" ""
-+	PROGS1=$(NO_SPECIAL_PREDS_PROGS) $(PROGS0)
-+else
-+	ifneq "$(findstring jump,$(GRADE))" ""
-+		PROGS1=$(PROGS0)
-+	else
-+		ifneq "$(findstring fast,$(GRADE))" ""
-+			PROGS1=$(PROGS0)
-+		else
-+			PROGS1=$(NO_SPECIAL_PREDS_PROGS) $(PROGS0)
-+		endif
-+	endif
-+endif
-+
-+ifneq "$(findstring mm,$(GRADE))" ""
-+	PROGS2=$(PROGS1)
-+else
-+	PROGS2=$(PROGS1) $(TRAIL_PROGS)
-+endif
-+
-+ifneq "$(filter java% il%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
-+	# We currently don't do any testing in grade java on this directory.
-+	ifneq "$(findstring java,$(GRADE))$" ""
-+		PROGS3 =
-+	else
-+		PROGS3 = $(PROGS2)
-+	endif
-+else
-+	PROGS3 = $(PROGS2)
-+endif
-+
-+ifeq "$(filter hl% java% il%,$(GRADE))" ""
-+	PROGS4 = $(PROGS3) $(DEEP_PROF_CAPABLE_PROGS) $(LLDS_PROGS)
-+else
-+	PROGS4 = $(PROGS3)
-+endif
-+
-+ifneq "$(findstring decldebug,$(GRADE))" ""
-+	PROGS5 = $(PROGS4)
-+else
-+	PROGS5 = $(PROGS4) $(PAR_CONJ_PROGS)
-+endif
-+
-+ifeq "$(filter java% il%,$(GRADE))" ""
-+	OBJ_PROGS = $(PROGS5) $(RESERVE_TAG_PROGS)
-+else
-+	OBJ_PROGS = $(PROGS5)
-+endif
-+
-+ifneq "$(findstring tsw,$(GRADE))$(findstring tsc,$(GRADE))" ""
-+	PROGS = $(OBJ_PROGS)
-+else
-+	PROGS = $(OBJ_PROGS) $(IL_PROGS)
-+endif
-+
-+# `mmc --make' doesn't expect subdirectories to appear in targets.
-+ifeq ($(MMAKE_USE_MMC_MAKE),yes)
-+OS_SUBDIR=
-+ILS_SUBDIR=
-+DLLS_SUBDIR=
-+else
-+OS_SUBDIR=$(os_subdir)
-+ILS_SUBDIR=$(ils_subdir)
-+DLLS_SUBDIR=$(dlls_subdir)
-+endif
-+
-+
-+ifeq ($(findstring il,$(GRADE)),il)
-+	TARGET_OBJ_EXT=dll
-+	TARGET_OBJ_SUBDIR=$(DLLS_SUBDIR)
-+else
-+	TARGET_OBJ_EXT=$(O)
-+	TARGET_OBJ_SUBDIR=$(OS_SUBDIR)
-+endif
-+OBJS =	$(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT)) \
-+		$(IL_PROGS:%=$(ILS_SUBDIR)%.il)
-+
-+#-----------------------------------------------------------------------------#
-+
-+TESTS = $(PROGS)
-+SUBDIRS=
-+TESTS_DIR=..
-+include $(TESTS_DIR)/Mmake.common
-+
-+# When compiling using the installed libraries, setting GRADEFLAGS may
-+# may cause mgnuc to look for the `.mih' files for a non-installed grade.
-+# test_mercury runs the tests using the installed libraries, so GRADEFLAGS
-+# won't be set, but test_mercury runs the tests in at least one `.tr' grade
-+# on all machines, so it isn't a problem.
-+ifneq ($(origin WORKSPACE),undefined)
-+GRADEFLAGS_TRAIL = --use-trail
-+else
-+GRADEFLAGS_TRAIL =
-+endif
-+# Make sure GRADEFLAGS_TRAIL is passed to `mmc --make'.
-+export GRADEFLAGS_TRAIL
-+
-+# Module-specific options should go in Mercury.options so they
-+# can be found by `mmc --make'.
-+include Mercury.options
-+
-+$(OBJ_PROGS:%=%.runtest): %.runtest: %.$(TARGET_OBJ_EXT) ;
-+
-+$(IL_PROGS:%=%.runtest): %.runtest: %.il ;
-+
-+#-----------------------------------------------------------------------------#
-+
-+# XXX mmake should automatically handle these two dependencies.
-+$(dates_subdir)intermod_nested_module2.date: \
-+	$(date0s_subdir)intermod_nested_module2.date0
-+$(dates_subdir)intermod_user_equality_nested2.date: \
-+	$(date0s_subdir)intermod_user_equality_nested2.date0
-+
-+objs:	$(OBJS)
-+
-+printtests:
-+	@echo $(PROGS)
-+
-+printobjs:
-+	@echo $(OBJS)
-+
-+clean_local:
-+	rm -f *.err *.h
-+
-+#-----------------------------------------------------------------------------#