Re: X11R7 & man.conf

[Hubert Feyrer <hubert%feyrer.de@localhost>]

On Tue, 11 Nov 2008, Quentin Garnier wrote:
> > Does the patch below make any sense? Or should we handle X11R7 there?
>
> No.  It should be the reverse order, because people upgrading a system
> to X.Org won't get the XFree86 files obsoleted, so the X11R7 search
> paths must come before X11R6.

True, I've appended an update below.


> There are still many more such changes pending, but I have troubles with
> postinstall(8) itself.

You're probably right that there are many more places that need adjusting 
for X11R7, but we have to start somewhere, no? Is there some bigger plan 
for this? If not, I'll fix things as I come across them (see e.g. the fix 
for sshd to find xauth, which I've committed a few weeks ago).


 - Hubert

Index: man.conf
===================================================================
RCS file: /cvsroot/src/etc/man.conf,v
retrieving revision 1.22
diff -u -r1.22 man.conf
--- man.conf    30 May 2006 00:40:22 -0000      1.22
+++ man.conf    16 Nov 2008 19:52:15 -0000
@@ -5,6 +5,7 @@

 # The whatis/apropos database.
 _whatdb                /usr/share/man/whatis.db
+_whatdb                /usr/X11R7/man/whatis.db
 _whatdb                /usr/X11R6/man/whatis.db
 _whatdb                /usr/pkg/man/whatis.db
 _whatdb                /usr/local/man/whatis.db
@@ -33,9 +34,10 @@
 # directory with all of the subdirectories listed for the keyword _subdir.

 # default
-_default       /usr/{share,X11R6,pkg,local}/man/
+_default       /usr/{share,X11R7,X11R6,pkg,local}/man/

 # Other sections that represent complete man subdirectories.
+X11R7          /usr/X11R7/man/
 X11R6          /usr/X11R6/man/
 packages       /usr/pkg/man/
 local          /usr/local/man/