Remove info files entries from PLIST.

While here add missing info file from INFO_FILES and patch it
so it has an info dir entry.

4 files changed, 22 insertions, 35 deletions

diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 1e26d9cdf80..799cecd4291 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 03:04:31 kristerw Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/07 00:19:29 seb Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -18,6 +18,7 @@ USE_GNU_READLINE=	yes	# rl_prep_term_function
 
 INFO_FILES=		mercury.info mercury_faq.info mercury_library.info
 INFO_FILES+=		mercury_ref.info mercury_trans_guide.info
+INFO_FILES+=		mercury_user_guide.info
 
 # Some of the scripts test CC and use special settings for gcc.
 CONFIGURE_ENV+=		CC=gcc
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 26d712ed514..14ac5d1cffe 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/05 21:16:36 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/07 00:19:29 seb Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -17,38 +17,6 @@ bin/mprof
 bin/mprof_merge_runs
 bin/mtags
 bin/vpath_find
-info/mercury.info
-info/mercury_faq.info
-info/mercury_library.info
-info/mercury_library.info-1
-info/mercury_library.info-10
-info/mercury_library.info-11
-info/mercury_library.info-12
-info/mercury_library.info-13
-info/mercury_library.info-2
-info/mercury_library.info-3
-info/mercury_library.info-4
-info/mercury_library.info-5
-info/mercury_library.info-6
-info/mercury_library.info-7
-info/mercury_library.info-8
-info/mercury_library.info-9
-info/mercury_ref.info
-info/mercury_ref.info-1
-info/mercury_ref.info-2
-info/mercury_ref.info-3
-info/mercury_ref.info-4
-info/mercury_ref.info-5
-info/mercury_ref.info-6
-info/mercury_ref.info-7
-info/mercury_trans_guide.info
-info/mercury_user_guide.info
-info/mercury_user_guide.info-1
-info/mercury_user_guide.info-2
-info/mercury_user_guide.info-3
-info/mercury_user_guide.info-4
-info/mercury_user_guide.info-5
-info/mercury_user_guide.info-6
 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 7f0d4026297..b575b80e22f 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/02/14 03:04:31 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2004/03/07 00:19:29 seb Exp $
 
 SHA1 (mercury-compiler-0.11.0.tar.gz) = 17feadfa8e8783738fc18428c6ab59b61c1e8a73
 Size (mercury-compiler-0.11.0.tar.gz) = 15598754 bytes
@@ -14,3 +14,4 @@ SHA1 (patch-ai) = 4f1df99df946118a0c2eb4a5e2481036d5c44177
 SHA1 (patch-aj) = fb0df25aeb55a1c466fa0def40b7096269ba8d6c
 SHA1 (patch-ak) = 20223ebfa573659d2217b6177bf2e2b523eb248d
 SHA1 (patch-al) = 5eb7f071049b163807f7a0c833eeecd941e7cbfb
+SHA1 (patch-am) = d0d3211c8d3e55beaba5a73b39f6bb3853e1602d
diff --git a/lang/mercury/patches/patch-am b/lang/mercury/patches/patch-am
new file mode 100644
index 00000000000..b9aa382030e
--- /dev/null
+++ b/lang/mercury/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1 2004/03/07 00:19:29 seb Exp $
+
+--- doc/mercury_user_guide.info.orig	2002-12-23 18:32:55.000000000 +0000
++++ doc/mercury_user_guide.info
+@@ -1,6 +1,12 @@
+ This is mercury_user_guide.info, produced by makeinfo version 4.1 from
+ user_guide.texi_pp.
+ 
++INFO-DIR-SECTION The Mercury Programming Language
++START-INFO-DIR-ENTRY
++* Mercury User Guide: (mercury_user_guide).  The Mercury compilation
++                                             environment.
++END-INFO-DIR-ENTRY
++
+    This file documents the Mercury implementation, version 0.11.0.
+ 
+    Copyright (C) 1995-2002 The University of Melbourne.