Re: CVS commit: [netbsd-5] src/distrib/sets/lists/base

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

> Module Name:  src
> Committed By: snj
> Date:         Tue Oct  6 23:57:56 UTC 2009
> 
> Modified Files:
>       src/distrib/sets/lists/base [netbsd-5]: mi
> 
> Log Message:
> Apply patch (requested by mrg in ticket #1062):
> Fix build for non-xorg ports.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.780.2.11 -r1.780.2.12 src/distrib/sets/lists/base/mi

>  ./usr/X11R7/lib/X11/xkb/compat               base-x11-root
> -./usr/X11R7/lib/X11/xkb/compiled             base-x11-root
> +./usr/X11R7/lib/X11/xkb/compiled             base-x11-root   xorg
>  ./usr/X11R7/lib/X11/xkb/geometry             base-x11-root

It looks build with MKX11="no" still fails.

---
======  1 missing files in DESTDIR  ========
Files in flist but missing from DESTDIR.
File wasn't installed ?
------------------------------------------
./usr/X11R7/lib/X11/xkb/compiled
========  end of 1 missing files  ==========
---

The actual problem is that src/distrib/sets/sets.subr doesn't set MKXORG
in case of MKX11=no (so "xorg" keyword in src/distrib/sets/lists/base/mi
won't work),
---
.if \${MKX11} != "no"
. if \${X11FLAVOUR} == "Xorg"
MKXORG:=yes
MKX11:=no
. else
MKXORG:=no
. endif
.endif
---
but I think ./usr/X11R7/lib/X11/xkb/compiled should be moved into
xbase anyway since it's not created by mtree and non-X sets shouldn't
have "xorg" keyword.

---
Izumi Tsutsui