1--- src/man.conf.in.orig	2005-08-20 16:26:06.000000000 -0700
2+++ src/man.conf.in	2007-01-12 16:53:47.000000000 -0800
3@@ -36,11 +36,9 @@
4 #
5 # Every automatically generated MANPATH includes these fields
6 #
7-MANPATH	/usr/man
8 MANPATH	/usr/share/man
9-MANPATH	/usr/local/man
10 MANPATH	/usr/local/share/man
11-MANPATH	/usr/X11R6/man
12+MANPATH	/usr/X11/man
13 #
14 # Uncomment if you want to include one of these by default
15 #
16@@ -64,8 +62,8 @@
17 MANPATH_MAP	/usr/sbin		/usr/share/man
18 MANPATH_MAP	/usr/local/bin		/usr/local/share/man
19 MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
20-MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
21-MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
22+MANPATH_MAP	/usr/X11/bin		/usr/X11/man
23+MANPATH_MAP	/usr/bin/X11		/usr/X11/man
24 MANPATH_MAP	/usr/bin/mh		/usr/share/man
25 #
26 # NOAUTOPATH keeps man from automatically adding directories that look like
27