7 files changed, 75 insertions, 7 deletions
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 5ee5669a3eb..8f8b5878b6e 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:18:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/07/05 21:16:36 seb Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -15,7 +15,9 @@ GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_GNU_READLINE=	yes	# rl_prep_term_function
 
-INFO_FILES=		mercury.info
+USE_NEW_TEXINFO=	YES
+INFO_FILES=		mercury.info mercury_faq.info mercury_library.info
+INFO_FILES+=		mercury_ref.info mercury_trans_guide.info
 
 # Some of the scripts test CC and use special settings for gcc.
 CONFIGURE_ENV+=		CC=gcc
@@ -37,5 +39,4 @@ do-install:
 
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 63be0193b44..26d712ed514 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/02 17:48:28 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/05 21:16:36 seb Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -17,7 +17,6 @@ bin/mprof
 bin/mprof_merge_runs
 bin/mtags
 bin/vpath_find
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mercury.info
 info/mercury.info
 info/mercury_faq.info
 info/mercury_library.info
@@ -50,7 +49,6 @@ info/mercury_user_guide.info-3
 info/mercury_user_guide.info-4
 info/mercury_user_guide.info-5
 info/mercury_user_guide.info-6
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mercury.info
 lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile
 lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_profile
 lib/mercury/inc/array.mh
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo
index 16b02d4f0ba..6cde3da7d38 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/05/02 17:48:29 jtb Exp $
+$NetBSD: distinfo,v 1.5 2003/07/05 21:16:37 seb Exp $
 
 SHA1 (mercury-compiler-0.11.0.tar.gz) = 17feadfa8e8783738fc18428c6ab59b61c1e8a73
 Size (mercury-compiler-0.11.0.tar.gz) = 15598754 bytes
@@ -6,3 +6,7 @@ SHA1 (patch-aa) = 4cfe2e7cc82d98f7338e8e3e4b753f6bdec0472f
 SHA1 (patch-ab) = b253e9a8da66e44b94d621a8b212d4229e269e8f
 SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681
 SHA1 (patch-ad) = 890e8330e7d1d668a8d67668ed805b61274c2ae5
+SHA1 (patch-ae) = 0d9105492d30e915da33d1679ce65ab615866875
+SHA1 (patch-af) = 2ed2b8d098c01ad1b79a8308885ba0af9b5bf05f
+SHA1 (patch-ag) = cb846e04ad686ebafbd1826235f9c5cbea619eed
+SHA1 (patch-ah) = 460ff322fda6ad3dcde3de459a15cdb2a35d3946
diff --git a/lang/mercury/patches/patch-ae b/lang/mercury/patches/patch-ae
new file mode 100644
index 00000000000..de1882e12ab
--- /dev/null
+++ b/lang/mercury/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.3 2003/07/05 21:16:38 seb Exp $
+
+--- doc/mercury_ref.info.orig	2002-12-23 18:32:55.000000000 +0000
++++ doc/mercury_ref.info
+@@ -1,6 +1,11 @@
+ This is mercury_ref.info, produced by makeinfo version 4.1 from
+ reference_manual.texi_pp.
+ 
++INFO-DIR-SECTION The Mercury Programming Language
++START-INFO-DIR-ENTRY
++* Mercury Language: (mercury_ref).  The Mercury Language Reference Manual.
++END-INFO-DIR-ENTRY
++
+    This file documents the Mercury programming language, version 0.11.0.
+ 
+    Copyright (C) 1995-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-af b/lang/mercury/patches/patch-af
new file mode 100644
index 00000000000..e6c0e34f19a
--- /dev/null
+++ b/lang/mercury/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.4 2003/07/05 21:16:38 seb Exp $
+
+--- doc/mercury_trans_guide.info.orig	2002-12-23 18:32:56.000000000 +0000
++++ doc/mercury_trans_guide.info
+@@ -1,6 +1,12 @@
+ This is mercury_trans_guide.info, produced by makeinfo version 4.1 from
+ transition_guide.texi_pp.
+ 
++INFO-DIR-SECTION The Mercury Programming Language
++START-INFO-DIR-ENTRY
++* Mercury Transition Guide: (mercury_trans_guide). The Prolog to Mercury
++                                                   Transition Guide.
++END-INFO-DIR-ENTRY
++
+    This file is an aid for people porting Prolog programs to Mercury.
+ 
+    Copyright (C) 1995-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-ag b/lang/mercury/patches/patch-ag
new file mode 100644
index 00000000000..9a9fcd4ab66
--- /dev/null
+++ b/lang/mercury/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.3 2003/07/05 21:16:38 seb Exp $
+
+--- doc/mercury_faq.info.orig	2002-12-23 18:32:56.000000000 +0000
++++ doc/mercury_faq.info
+@@ -1,6 +1,11 @@
+ This is mercury_faq.info, produced by makeinfo version 4.1 from
+ faq.texi_pp.
+ 
++INFO-DIR-SECTION The Mercury Programming Language
++START-INFO-DIR-ENTRY
++* Mercury FAQ: (mercury_faq). The Mercury Frequently Asked Questions list.
++END-INFO-DIR-ENTRY
++
+    This file is the Mercury Frequently Asked Questions List, version
+ 0.11.0.  It contains a list of frequently asked questions about
+ Mercury, with answers.
diff --git a/lang/mercury/patches/patch-ah b/lang/mercury/patches/patch-ah
new file mode 100644
index 00000000000..68171172289
--- /dev/null
+++ b/lang/mercury/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.3 2003/07/05 21:16:38 seb Exp $
+
+--- doc/mercury_library.info.orig	2002-12-23 18:32:56.000000000 +0000
++++ doc/mercury_library.info
+@@ -1,6 +1,11 @@
+ This is mercury_library.info, produced by makeinfo version 4.1 from
+ library.texi_pp.
+ 
++INFO-DIR-SECTION The Mercury Programming Language
++START-INFO-DIR-ENTRY
++* Mercury Library: (mercury_library).  The Mercury Library Reference Manual.
++END-INFO-DIR-ENTRY
++
+    This file documents the Mercury standard library, version 0.11.0.
+ 
+    Copyright (C) 1995-1997,1999-2002 The University of Melbourne.