fixed man.conf

1 files changed, 40 insertions, 29 deletions

diff --git a/sys-apps/man/files/man.conf b/sys-apps/man/files/man.conf
index b48f0de33416..98fa5df46cba 100644
--- a/sys-apps/man/files/man.conf
+++ b/sys-apps/man/files/man.conf
@@ -2,7 +2,10 @@
 # Generated automatically from man.conf.in by the
 # configure script.
 #
-# man.conf from man-1.5h
+# man.conf from man-1.5i1
+#
+# For more information about this file, see the man pages man(1)
+# and man.conf(5).
 #
 # This file is read by man to configure the default manpath (also used
 # when MANPATH contains an empty substring), to find out where the cat
@@ -27,7 +30,7 @@
 # The keyword FHS will cause this behaviour (and overrides FSSTND).
 # Explicitly given catdirs override.
 #
-#FSSTND
+# FSSTND
 FHS
 #
 # This file is also read by man in order to find how to call nroff, less, etc.,
@@ -37,9 +40,11 @@ FHS
 #
 # Every automatically generated MANPATH includes these fields
 #
-MANPATH	/usr/share/man
-MANPATH	/usr/local/share/man
+MANPATH	/usr/man
+MANPATH /usr/share/man
+MANPATH	/usr/local/man
 MANPATH	/usr/X11R6/man
+MANPATH /usr/lib/perl5/man
 #
 # Set up PATH to MANPATH mapping
 #
@@ -47,41 +52,47 @@ MANPATH	/usr/X11R6/man
 # in the mandatory manpath already, but will keep man from statting
 # lots of other nearby files and directories)
 #
-MANPATH_MAP	/bin			/usr/share/man
-MANPATH_MAP	/sbin			/usr/share/man
-MANPATH_MAP	/usr/bin		/usr/share/man
-MANPATH_MAP	/usr/sbin		/usr/share/man
-MANPATH_MAP	/usr/local/bin		/usr/local/share/man
-MANPATH_MAP	/usr/local/sbin		/usr/local/share/man
+MANPATH_MAP	/bin			/usr/man
+MANPATH_MAP	/sbin			/usr/man
+MANPATH_MAP	/usr/bin		/usr/man
+MANPATH_MAP	/usr/sbin		/usr/man
+MANPATH_MAP	/usr/local/bin		/usr/local/man
+MANPATH_MAP	/usr/local/sbin		/usr/local/man
 MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
+MANPATH_MAP	/usr/bin/X11		/usr/X11R6/man
+MANPATH_MAP	/usr/bin/mh		/usr/man
+#
+# NOAUTOPATH keeps man from automatically adding directories that look like
+# manual page directories to the path.
+#NOAUTOPATH
 #
 # Useful paths - note that COL should not be defined when
 # NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
 # not only is it superfluous, but it actually damages the output.
 #
-TROFF		/usr/bin/groff -Tps -mandoc
-NROFF		/usr/bin/groff -Tlatin1 -mandoc
-EQN		/usr/bin/eqn -Tps
-NEQN		/usr/bin/eqn -Tlatin1
-TBL		/usr/bin/tbl
-#COL		/usr/bin/col
-REFER		/usr/bin/refer
-PIC		/usr/bin/pic
+TROFF		troff -mandoc
+NROFF		nroff -mandoc
+EQN		
+NEQN		
+TBL		
+# COL		
+REFER		
+PIC		
 VGRIND		
 GRAP		
-PAGER		/usr/bin/less
-CAT		/bin/cat
+PAGER		
+CAT		
 #
 # The command "man -a xyzzy" will show all man pages for xyzzy.
 # When CMP is defined man will try to avoid showing the same
 # text twice. (But compressed pages compare unequal.)
 #
-CMP		/usr/bin/cmp -s
+CMP		
 #
 # Compress cat pages
 #
-COMPRESS	/bin/gzip
-COMPRESS_EXT	.gz
+COMPRESS	 /usr/bin/gzip
+COMPRESS_EXT	.gz	
 #
 # Default manual sections (and order) to search if -S is not specified
 # and the MANSECT environment variable is not set.
@@ -97,9 +108,9 @@ MANSECT		1:8:2:3:4:5:6:7:9:tcl:n:l:p:o
 # Decompress with given decompressor when input file has given extension
 # The command given must act as a filter.
 #
-.gz		/bin/gunzip -c
-.bz2		/bin/bzip2 -c -d
-.z		
-.Z		/bin/zcat
-.F		
-.Y		
+.gz             gzip -c -d
+.bz2            bzip2 -c -d
+.z
+.Z              /usr/bin/zcat
+.F
+.Y