From e60953593e7e71cee41b5995b9d22d02a6e62ef9 Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Fri, 18 May 2007 15:41:17 +0000
Subject: [PATCH] - remove /usr/{X11,contrib,gnu} and /usr/*/man/old from the
 _default path man(1) searches, as well as from the numerical sections list,
 as they do not exist

- remove the {contrib,new,old} sections, as they point to directories
that do not exist

- make the X11 section an alias for the X11R6 section (instead of
pointing to a non-existent directory)

ok millert
---
 src/etc/man.conf | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/etc/man.conf b/src/etc/man.conf
index d4ba3aae..380e898f 100644
--- a/src/etc/man.conf
+++ b/src/etc/man.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: man.conf,v 1.10 2007/05/17 06:44:11 jmc Exp $
+#	$OpenBSD: man.conf,v 1.11 2007/05/18 15:41:17 jmc Exp $
 
 # Sheer, raging paranoia...
 _version	BSD.2
@@ -33,27 +33,24 @@ _build		.ms		/usr/bin/nroff -ms %s 2>/dev/null | cat -s
 # directory with all of the subdirectories listed for the keyword _subdir.
 
 # default
-_default	/usr/{share,X11R6,X11,contrib,gnu,local}/{man,man/old}/
+_default	/usr/{share,X11R6,local}/man/
 
 # Other sections that represent complete man subdirectories.
-X11		/usr/X11/man/
+X11		/usr/X11R6/man/
 X11R6		/usr/X11R6/man/
-contrib		/usr/contrib/man/
 local		/usr/local/man/
-new		/usr/contrib/man/
-old		/usr/share/man/old/
 
 # Specific section/directory combinations.
-1		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}1
-2		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}2
-3		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}3
+1		/usr/{share,X11R6,local}/man/{cat,man}1
+2		/usr/{share,X11R6,local}/man/{cat,man}2
+3		/usr/{share,X11R6,local}/man/{cat,man}3
 3F		/usr/share/man/cat3f
 3f		/usr/share/man/cat3f
 3P		/usr/share/man/cat3p
 3p		/usr/share/man/cat3p
-4		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}4
-5		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}5
-6		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}6
-7		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}7
-8		/usr/{share,X11R6,X11,contrib,local}/{man/,man/old/}{cat,man}8
+4		/usr/{share,X11R6,local}/man/{cat,man}4
+5		/usr/{share,X11R6,local}/man/{cat,man}5
+6		/usr/{share,X11R6,local}/man/{cat,man}6
+7		/usr/{share,X11R6,local}/man/{cat,man}7
+8		/usr/{share,X11R6,local}/man/{cat,man}8
 9		/usr/share/man/{cat,man}9