lang/mercury: move HTML documentation to share/doc/mercury/html

4 files changed, 13 insertions, 13 deletions

diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 20b69636615..b95a73419d7 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2018/01/01 18:16:37 rillig Exp $
+# $NetBSD: Makefile,v 1.62 2018/02/18 05:30:55 rillig Exp $
 
 DISTNAME=		mercury-srcdist-14.01.1
 PKGNAME=		mercury-14.01.1
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		lang
 MASTER_SITES=		http://dl.mercurylang.org/release/
 MASTER_SITES+=		ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 680b80a350c..04052c59134 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2015/01/04 19:37:02 asau Exp $
+@comment $NetBSD: PLIST,v 1.15 2018/02/18 05:30:55 rillig Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -4535,13 +4535,13 @@ man/man1/mmc.1
 man/man1/mprof.1
 man/man1/mprof_merge_runs.1
 man/man1/mtags.1
-share/doc/html/mercury/mercury.html
-share/doc/html/mercury/mercury_faq.html
-share/doc/html/mercury/mercury_library.html
-share/doc/html/mercury/mercury_ref.html
-share/doc/html/mercury/mercury_trans_guide.html
-share/doc/html/mercury/mercury_user_guide.html
 share/doc/mercury/faq.dvi
+share/doc/mercury/html/mercury.html
+share/doc/mercury/html/mercury_faq.html
+share/doc/mercury/html/mercury_library.html
+share/doc/mercury/html/mercury_ref.html
+share/doc/mercury/html/mercury_trans_guide.html
+share/doc/mercury/html/mercury_user_guide.html
 share/doc/mercury/library.dvi
 share/doc/mercury/reference_manual.dvi
 share/doc/mercury/transition_guide.dvi
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo
index 317214dcd2a..4947995f851 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2015/12/29 23:34:51 dholland Exp $
+$NetBSD: distinfo,v 1.18 2018/02/18 05:30:55 rillig Exp $
 
 SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf
 RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac
 SHA512 (mercury-srcdist-14.01.1.tar.gz) = a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
 Size (mercury-srcdist-14.01.1.tar.gz) = 52658945 bytes
-SHA1 (patch-ab) = b7746cf5a6722f30e46119ad355589551ad7b585
+SHA1 (patch-ab) = 098d94f56158e4195e99174e101c9bb67d0259c7
 SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681
 SHA1 (patch-ad) = 28fe58728d833fec9dc1cecb63e0e65ca5572c2f
 SHA1 (patch-an) = 7e518ce6bc3f1cf09b1308f86aa9344fccb15f77
diff --git a/lang/mercury/patches/patch-ab b/lang/mercury/patches/patch-ab
index c1dc46b6573..b0ce91e7c6b 100644
--- a/lang/mercury/patches/patch-ab
+++ b/lang/mercury/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2015/12/29 23:34:51 dholland Exp $
+$NetBSD: patch-ab,v 1.6 2018/02/18 05:30:55 rillig Exp $
 
 Install docs in the right place.
 
@@ -18,7 +18,7 @@ Install docs in the right place.
 +INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
  INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
 -INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/share/doc/html/mercury
++INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/share/doc/mercury/html
  INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
 -INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
 +INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/share/emacs/site-lisp/mercury