From f7a4f98d4864ae15c610eb3b8b7d97672d8ce248 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Tue, 20 Jan 2015 19:17:28 +0000
Subject: [PATCH] Do not use /usr/ports/infrastructure/man/ by default because
 this directory is not contained in OpenBSD base, and because even people
 having the directory often don't understand that they need to run
 makewhatis(8) - and instead complain about the resulting warnings. This
 commit reverts revisions 1.17 and 1.21.

Requested by deraadt@ millert@ kettenis@ who argue that people
using /usr/ports/infrastructure/bin/ already need to set PATH,
so editing man.conf (or, though more fragile, setting MANPATH)
should not be a big deal for them.
---
 src/etc/man.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/etc/man.conf b/src/etc/man.conf
index 5dda4997..cfadb86c 100644
--- a/src/etc/man.conf
+++ b/src/etc/man.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: man.conf,v 1.21 2014/12/09 05:55:42 schwarze Exp $
+#	$OpenBSD: man.conf,v 1.22 2015/01/20 19:17:28 schwarze Exp $
 
 # Sheer, raging paranoia...
 _version	BSD.2
@@ -6,7 +6,6 @@ _version	BSD.2
 # The whatis/apropos database.
 _whatdb		/usr/share/man/whatis.db
 _whatdb		/usr/X11R6/man/whatis.db
-_whatdb		/usr/ports/infrastructure/man/whatis.db
 _whatdb		/usr/local/man/whatis.db
 
 # Subdirectories for paths ending in '/', IN SEARCH ORDER.
@@ -32,7 +31,7 @@ _build		.tbl.gz		/usr/bin/gzcat %s | /usr/bin/mandoc
 # directory with all of the subdirectories listed for the keyword _subdir.
 
 # default
-_default	/usr/{share,X11R6,local,ports/infrastructure}/man/
+_default	/usr/{share,X11R6,local}/man/
 
 # Other sections that represent complete man subdirectories.
 X11		/usr/X11R6/man/