HEADS UP: xorg 7.2 ready for testing

[Kris Kennaway]

On Fri, May 11, 2007 at 05:11:05PM -0400, Andrew Partan wrote:
> Seven other things I spotted:
> 
> portsclean -L from portupgrade-devel-2.3.0_5 checks in both /usr/X11R6
> and /usr/local leading to lots of output like this:
> ** /usr/local/lib/libruby18.so.18 is shadowed by /usr/X11R6/lib/libruby18.so.18
>         /usr/X11R6/lib/libruby18.so.18  <- ruby-1.8.6,1
> 	/usr/local/lib/libruby18.so.18  <- ruby-1.8.6,1
>  --> Two packages install the same library in different directories!
> 
> libchk-1.9 also checks in both /usr/X11R6 and /usr/local.
> 
> xorg-printserver-1.2.0,1 installs 2 symlinks that link to themselves:
> lrwxr-xr-x  1 root  wheel  89 May 11 01:25 /usr/local/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-BoldItalic.pmf -> /usr/local/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
> lrwxr-xr-x  1 root  wheel  89 May 11 01:25 /usr/local/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-BoldItalic.pmf -> /usr/local/lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf

These appear to be different paths.

> /etc/ttys mentions /usr/X11R6/bin/xdm.  This is not really a problem
> (due to the symlink) but maybe Tools/scripts/mergebase.sh should
> fix this.
> 
> The default path in /etc/login.conf should be updated to remove
> /usr/X11R6/bin.  This is not really a problem, but maybe
> Tools/scripts/mergebase.sh should fix this.

I think these two are best fixed by the usual mergemaster procedure
once src is updated.  There will be a gradual process of improvement
of ports (and src) to remove remaining references to /usr/X11R6 (but
note that we can probably never remove the symlink because of third
party binaries that hardcode it).

> There are more mentions of X11 in /etc/defaults/rc.conf that perhaps
> Tools/scripts/mergebase.sh should take care of like it takes care
> of local_startup.  See settings for these:
> 	ldconfig_paths
> 	ldconfig_paths_aout
> 	ldconfig_local_dirs
> 	ldconfig_local32_dirs
> It could be that these settings that are causing the above problems
> I spotted with libchk and portsclean -L.

Yes, it could be.  I am not sure how important it is to fix these in
mergebase though.

> Tools/scripts/mergebase.sh correctly disabled local_startup but it
> didn't correctly disable local_periodic.

This one probably should be fixed in mergebase.

Kris