From 2a43838fedadb22f6d0488b9189c3439ad71e06b Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Sun, 13 Jul 2014 09:58:52 +0000
Subject: [PATCH] Install the manuals of the web interface below the same
 directory as manpath.conf, such that we do not need to mix our own
 documentation into the documentation we are serving, which may not even be
 possible if the latter is updated automatically.

Based on an idea by beck@.
---
 usr.bin/mandoc/Makefile  |  8 ++++++--
 usr.bin/mandoc/cgi.c     | 10 +++++-----
 usr.bin/mandoc/man.cgi.8 |  6 +++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index ab1b1c80e9a..648a25f59d5 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.79 2014/07/12 18:05:50 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.80 2014/07/13 09:58:52 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -60,7 +60,11 @@ installcgi: man.cgi
 	${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
 	    -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    man.cgi ${DESTDIR}/var/www/cgi-bin/man.cgi
+	${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}/var/www/man/mandoc/man1
+	${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}/var/www/man/mandoc/man8
 	${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-	    ${.CURDIR}/man.cgi.8 ${DESTDIR}${MANDIR}8/man.cgi.8
+	    ${.CURDIR}/apropos.1 ${DESTDIR}/var/www/man/mandoc/man1/apropos.1
+	${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
+	    ${.CURDIR}/man.cgi.8 ${DESTDIR}/var/www/man/mandoc/man8/man.cgi.8
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index b00bb55dfdd..f68977e75cc 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.8 2014/07/12 23:40:44 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.9 2014/07/13 09:58:52 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -459,10 +459,10 @@ resp_index(const struct req *req)
 	resp_searchform(req);
 	printf("<P>\n"
 	       "This web interface is documented in the "
-	       "<A HREF=\"%s?query=man.cgi&amp;sec=8\">"
-	       "man.cgi</A> manual, and the "
-	       "<A HREF=\"%s?query=apropos&amp;sec=1\">"
-	       "apropos</A> manual explains the query syntax.\n"
+	       "<A HREF=\"%s/mandoc/man8/man.cgi.8\">man.cgi</A> "
+	       "manual, and the "
+	       "<A HREF=\"%s/mandoc/man1/apropos.1\">apropos</A> "
+	       "manual explains the query syntax.\n"
 	       "</P>\n",
 	       scriptname, scriptname);
 	resp_end_html();
diff --git a/usr.bin/mandoc/man.cgi.8 b/usr.bin/mandoc/man.cgi.8
index bf31d849fa9..6d642c06462 100644
--- a/usr.bin/mandoc/man.cgi.8
+++ b/usr.bin/mandoc/man.cgi.8
@@ -1,4 +1,4 @@
-.\"     $Id: man.cgi.8,v 1.2 2014/07/13 00:16:03 schwarze Exp $
+.\"     $Id: man.cgi.8,v 1.3 2014/07/13 09:58:52 schwarze Exp $
 .\"
 .\" Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -270,6 +270,10 @@ Default
 data directory containing all the manual trees.
 Can be overridden by
 .Ev MAN_DIR .
+.It Pa /man/mandoc/man1/apropos.1 , /man/mandoc/man8/man.cgi.8
+Manual pages documenting
+.Nm
+itself, linked from the index page.
 .It Pa /man/manpath.conf
 The list of available manpaths, one per line.
 .It Pa /man/OpenBSD-current/man1/mandoc.1
-- 
2.20.1