Subject: CVS commit: src/x11
To: None <source-changes@NetBSD.org>
From: Luke Mewburn <lukem@netbsd.org>
List: source-changes
Date: 09/13/2003 20:19:11
Module Name:	src
Committed By:	lukem
Date:		Sat Sep 13 20:19:10 UTC 2003

Modified Files:
	src/x11/Xserver: Makefile
	src/x11/bin/appres: Makefile
	src/x11/bin/bdftopcf: Makefile
	src/x11/bin/bdftruncate: Makefile
	src/x11/bin/beforelight: Makefile
	src/x11/bin/bitmap: Makefile
	src/x11/bin/bitmap/atobm: Makefile
	src/x11/bin/bitmap/bmtoa: Makefile
	src/x11/bin/cxpm: Makefile
	src/x11/bin/dpsexec: Makefile
	src/x11/bin/dpsinfo: Makefile
	src/x11/bin/editres: Makefile
	src/x11/bin/fc-cache: Makefile
	src/x11/bin/fc-list: Makefile
	src/x11/bin/fslsfonts: Makefile
	src/x11/bin/fstobdf: Makefile
	src/x11/bin/glxgears: Makefile
	src/x11/bin/glxinfo: Makefile
	src/x11/bin/iceauth: Makefile
	src/x11/bin/ico: Makefile
	src/x11/bin/imake: Makefile
	src/x11/bin/lbxproxy: Makefile
	src/x11/bin/listres: Makefile
	src/x11/bin/lndir: Makefile
	src/x11/bin/luit: Makefile
	src/x11/bin/makepsres: Makefile
	src/x11/bin/mkcfm: Makefile
	src/x11/bin/mkfontdir: Makefile
	src/x11/bin/mkfontscale: Makefile
	src/x11/bin/oclock: Makefile
	src/x11/bin/proxymngr: Makefile
	src/x11/bin/pswrap: Makefile
	src/x11/bin/rgb: Makefile
	src/x11/bin/rstart: Makefile
	src/x11/bin/rstart/commands: Makefile
	src/x11/bin/rstart/commands/x11r6: Makefile
	src/x11/bin/rstart/contexts: Makefile
	src/x11/bin/scripts: Makefile
	src/x11/bin/setxkbmap: Makefile
	src/x11/bin/showfont: Makefile
	src/x11/bin/smproxy: Makefile
	src/x11/bin/sxpm: Makefile
	src/x11/bin/texteroids: Makefile
	src/x11/bin/twm: Makefile
	src/x11/bin/ucs2any: Makefile
	src/x11/bin/viewres: Makefile
	src/x11/bin/x11perf: Makefile
	src/x11/bin/xauth: Makefile
	src/x11/bin/xbiff: Makefile
	src/x11/bin/xcalc: Makefile
	src/x11/bin/xclipboard: Makefile
	src/x11/bin/xclock: Makefile
	src/x11/bin/xcmsdb: Makefile
	src/x11/bin/xconsole: Makefile
	src/x11/bin/xcutsel: Makefile
	src/x11/bin/xditview: Makefile
	src/x11/bin/xdm: Makefile
	src/x11/bin/xdm/chooser: Makefile
	src/x11/bin/xdm/config: Makefile
	src/x11/bin/xdm/sessreg: Makefile
	src/x11/bin/xdm/xdmshell: Makefile
	src/x11/bin/xdpyinfo: Makefile
	src/x11/bin/xedit/lisp: Makefile
	src/x11/bin/xedit/modules: Makefile
	src/x11/bin/xedit/modules/progmodes: Makefile
	src/x11/bin/xedit/mp: Makefile
	src/x11/bin/xedit/re: Makefile
	src/x11/bin/xedit/xedit: Makefile
	src/x11/bin/xev: Makefile
	src/x11/bin/xeyes: Makefile
	src/x11/bin/xf86dga: Makefile
	src/x11/bin/xfd: Makefile
	src/x11/bin/xfindproxy: Makefile
	src/x11/bin/xfontsel: Makefile
	src/x11/bin/xfs: Makefile
	src/x11/bin/xfsinfo: Makefile
	src/x11/bin/xfwp: Makefile
	src/x11/bin/xgamma: Makefile
	src/x11/bin/xgc: Makefile
	src/x11/bin/xhost: Makefile
	src/x11/bin/xinit: Makefile
	src/x11/bin/xkbcomp: Makefile
	src/x11/bin/xkbcomp/compat: Makefile
	src/x11/bin/xkbcomp/compiled: Makefile
	src/x11/bin/xkbcomp/geometry: Makefile
	src/x11/bin/xkbcomp/geometry/digital: Makefile
	src/x11/bin/xkbcomp/geometry/sgi: Makefile
	src/x11/bin/xkbcomp/keycodes: Makefile
	src/x11/bin/xkbcomp/keycodes/digital: Makefile
	src/x11/bin/xkbcomp/keycodes/sgi: Makefile
	src/x11/bin/xkbcomp/keymap: Makefile
	src/x11/bin/xkbcomp/keymap/digital: Makefile
	src/x11/bin/xkbcomp/keymap/sgi: Makefile
	src/x11/bin/xkbcomp/keymap/sun: Makefile
	src/x11/bin/xkbcomp/rules: Makefile
	src/x11/bin/xkbcomp/semantics: Makefile
	src/x11/bin/xkbcomp/symbols: Makefile
	src/x11/bin/xkbcomp/symbols/digital: Makefile
	src/x11/bin/xkbcomp/symbols/fujitsu: Makefile
	src/x11/bin/xkbcomp/symbols/hp: Makefile
	src/x11/bin/xkbcomp/symbols/macintosh: Makefile
	src/x11/bin/xkbcomp/symbols/nec: Makefile
	src/x11/bin/xkbcomp/symbols/pc: Makefile
	src/x11/bin/xkbcomp/symbols/sgi: Makefile
	src/x11/bin/xkbcomp/symbols/sony: Makefile
	src/x11/bin/xkbcomp/symbols/sun: Makefile
	src/x11/bin/xkbcomp/symbols/xfree68: Makefile
	src/x11/bin/xkbcomp/types: Makefile
	src/x11/bin/xkbevd: Makefile
	src/x11/bin/xkbprint: Makefile
	src/x11/bin/xkbutils: Makefile.xkbutils
	src/x11/bin/xkill: Makefile
	src/x11/bin/xload: Makefile
	src/x11/bin/xlogo: Makefile
	src/x11/bin/xlsatoms: Makefile
	src/x11/bin/xlsclients: Makefile
	src/x11/bin/xlsfonts: Makefile
	src/x11/bin/xmag: Makefile
	src/x11/bin/xman: Makefile
	src/x11/bin/xmessage: Makefile
	src/x11/bin/xmh: Makefile
	src/x11/bin/xmkmf: Makefile
	src/x11/bin/xmodmap: Makefile
	src/x11/bin/xprop: Makefile
	src/x11/bin/xrandr: Makefile
	src/x11/bin/xrdb: Makefile
	src/x11/bin/xrefresh: Makefile
	src/x11/bin/xset: Makefile
	src/x11/bin/xsetmode: Makefile
	src/x11/bin/xsetpointer: Makefile
	src/x11/bin/xsetroot: Makefile
	src/x11/bin/xsm: Makefile
	src/x11/bin/xstdcmap: Makefile
	src/x11/bin/xterm: Makefile
	src/x11/bin/xterm/resize: Makefile
	src/x11/bin/xterm/uxterm: Makefile
	src/x11/bin/xtrap: Makefile Makefile.xtrap
	src/x11/bin/xvidtune: Makefile
	src/x11/bin/xvinfo: Makefile
	src/x11/bin/xwd: Makefile
	src/x11/bin/xwininfo: Makefile
	src/x11/bin/xwud: Makefile
	src/x11/include: Makefile
	src/x11/include/DPS: Makefile
	src/x11/include/GL: Makefile
	src/x11/include/bitmaps: Makefile
	src/x11/include/extensions: Makefile
	src/x11/include/fonts: Makefile
	src/x11/lib/FS: Makefile
	src/x11/lib/GL: Makefile
	src/x11/lib/GLU: Makefile
	src/x11/lib/GLw: Makefile
	src/x11/lib/ICE: Makefile
	src/x11/lib/OSmesa: Makefile
	src/x11/lib/SM: Makefile
	src/x11/lib/X11: Makefile
	src/x11/lib/XRes: Makefile
	src/x11/lib/XTrap: Makefile
	src/x11/lib/Xau: Makefile
	src/x11/lib/Xaw: Makefile
	src/x11/lib/Xaw6: Makefile
	src/x11/lib/Xcursor: Makefile
	src/x11/lib/Xdmcp: Makefile
	src/x11/lib/Xext: Makefile
	src/x11/lib/Xfontcache: Makefile
	src/x11/lib/Xft: Makefile
	src/x11/lib/Xft1: Makefile
	src/x11/lib/Xi: Makefile
	src/x11/lib/Xinerama: Makefile
	src/x11/lib/Xmu: Makefile
	src/x11/lib/Xmuu: Makefile
	src/x11/lib/Xp: Makefile
	src/x11/lib/Xpm: Makefile
	src/x11/lib/Xrandr: Makefile
	src/x11/lib/Xrender: Makefile
	src/x11/lib/Xss: Makefile
	src/x11/lib/Xt: Makefile
	src/x11/lib/Xtst: Makefile
	src/x11/lib/Xv: Makefile
	src/x11/lib/XvMC: Makefile
	src/x11/lib/Xxf86dga: Makefile
	src/x11/lib/Xxf86misc: Makefile
	src/x11/lib/Xxf86vm: Makefile
	src/x11/lib/dps: Makefile
	src/x11/lib/dpstk: Makefile
	src/x11/lib/expat: Makefile
	src/x11/lib/font: Makefile
	src/x11/lib/font/stubs: Makefile
	src/x11/lib/fontconfig: Makefile
	src/x11/lib/fontconfig/etc: Makefile
	src/x11/lib/fontconfig/fontconfig: Makefile
	src/x11/lib/fontconfig/src: Makefile
	src/x11/lib/fontenc: Makefile
	src/x11/lib/freetype2: Makefile
	src/x11/lib/freetype2/freetype: Makefile
	src/x11/lib/freetype2/freetype/cache: Makefile
	src/x11/lib/freetype2/freetype/config: Makefile
	src/x11/lib/freetype2/freetype/internal: Makefile
	src/x11/lib/lbxutil: Makefile
	src/x11/lib/oldX: Makefile
	src/x11/lib/psres: Makefile
	src/x11/lib/xkbfile: Makefile
	src/x11/lib/xkbui: Makefile
	src/x11/lib/xlibi18n: Makefile.xlibi18n
	src/x11/lib/xtrans: Makefile
	src/x11/share/fonts/bdf/100dpi: Makefile
	src/x11/share/fonts/bdf/75dpi: Makefile
	src/x11/share/fonts/bdf/cyrillic: Makefile
	src/x11/share/fonts/bdf/misc: Makefile
	src/x11/share/fonts/encodings: Makefile
	src/x11/share/fonts/encodings/large: Makefile
	src/x11/share/fonts/local: Makefile
	src/x11/share/fonts/scaled/CID: Makefile
	src/x11/share/fonts/scaled/Speedo: Makefile
	src/x11/share/fonts/scaled/TTF: Makefile
	src/x11/share/fonts/scaled/Type1: Makefile
	src/x11/share/fonts/util: Makefile
	src/x11/share/man/GL/gl: Makefile
	src/x11/share/man/GL/glx: Makefile
	src/x11/share/man/GLU: Makefile
	src/x11/share/man/GLw: Makefile
	src/x11/share/man/X11: Makefile
	src/x11/share/man/Xau: Makefile
	src/x11/share/man/Xext: Makefile
	src/x11/share/man/Xext/dbe: Makefile
	src/x11/share/man/Xi: Makefile
	src/x11/share/man/Xt: Makefile
	src/x11/share/man/Xv: Makefile
	src/x11/share/man/general: Makefile
	src/x11/share/nls: Makefile
	src/x11/share/nls/Compose: Makefile
	src/x11/share/nls/XI18N_OBJS: Makefile
	src/x11/share/nls/XLC_LOCALE: Makefile
	src/x11/tools/bdftopcf: Makefile
	src/x11/tools/fc-cache: Makefile
	src/x11/tools/makekeys: Makefile
	src/x11/tools/mkfontdir: Makefile
	src/x11/tools/pswrap: Makefile
	src/x11/tools/ucs2any: Makefile
	src/x11/tools/xkbcomp: Makefile
Removed Files:
	src/x11: Makefile.inc
	src/x11/Xserver/GL: Makefile.inc
	src/x11/Xserver/Xext: Makefile.inc
	src/x11/Xserver/dix: Makefile.inc
	src/x11/Xserver/hw: Makefile.inc
	src/x11/Xserver/printer: Makefile.inc
	src/x11/bin: Makefile.inc
	src/x11/lib: Makefile.inc
	src/x11/lib/font: Makefile.inc
	src/x11/lib/fontconfig: Makefile.inc

Log Message:
Rework to include <bsd.x11.mk> before all other <bsd.*.mk> _except_
<bsd.own.mk>, as we now set BINDIR,LIBDIR,MANDIR in <bsd.x11.mk>
rather than using a hierarchy of Makefile.inc files just to include
x11/Makefile.inc to get those variables.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/x11/Makefile.inc
cvs rdiff -r1.1.1.1 -r1.2 src/x11/Xserver/Makefile
cvs rdiff -r1.1.1.1 -r0 src/x11/Xserver/GL/Makefile.inc
cvs rdiff -r1.1.1.1 -r0 src/x11/Xserver/Xext/Makefile.inc
cvs rdiff -r1.1.1.1 -r0 src/x11/Xserver/dix/Makefile.inc
cvs rdiff -r1.1.1.1 -r0 src/x11/Xserver/hw/Makefile.inc
cvs rdiff -r1.1.1.1 -r0 src/x11/Xserver/printer/Makefile.inc
cvs rdiff -r1.1.1.1 -r0 src/x11/bin/Makefile.inc
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/appres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/bdftopcf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/bdftruncate/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/beforelight/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/bitmap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/bitmap/atobm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/bitmap/bmtoa/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/cxpm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/dpsexec/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/dpsinfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/editres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/fc-cache/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/fc-list/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/fslsfonts/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/fstobdf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/glxgears/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/glxinfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/iceauth/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/ico/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/imake/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/lbxproxy/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/listres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/lndir/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/luit/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/makepsres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/mkcfm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/mkfontdir/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/mkfontscale/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/oclock/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/proxymngr/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/pswrap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/rgb/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/rstart/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/rstart/commands/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/rstart/commands/x11r6/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/rstart/contexts/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/scripts/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/setxkbmap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/showfont/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/smproxy/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/sxpm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/texteroids/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/twm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/ucs2any/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/viewres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/x11perf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xauth/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xbiff/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xcalc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xclipboard/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xclock/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xcmsdb/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xconsole/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xcutsel/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xditview/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdm/chooser/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdm/config/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdm/sessreg/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdm/xdmshell/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xdpyinfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/lisp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/modules/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/modules/progmodes/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/mp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/re/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xedit/xedit/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xev/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xeyes/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xf86dga/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfd/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfindproxy/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfontsel/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfs/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfsinfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xfwp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xgamma/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xgc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xhost/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xinit/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/compat/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/compiled/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/geometry/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/geometry/digital/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/geometry/sgi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keycodes/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keycodes/digital/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keycodes/sgi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keymap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keymap/digital/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keymap/sgi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/keymap/sun/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/rules/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/semantics/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/digital/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/fujitsu/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/hp/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/macintosh/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/nec/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/pc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/sgi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/sony/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/sun/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/symbols/xfree68/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbcomp/types/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbevd/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbprint/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkbutils/Makefile.xkbutils
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xkill/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xload/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xlogo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xlsatoms/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xlsclients/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xlsfonts/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xmag/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xman/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xmessage/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xmh/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xmkmf/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xmodmap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xprop/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xrandr/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xrdb/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xrefresh/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xset/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xsetmode/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xsetpointer/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xsetroot/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xsm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xstdcmap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xterm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xterm/resize/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xterm/uxterm/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xtrap/Makefile \
    src/x11/bin/xtrap/Makefile.xtrap
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xvidtune/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xvinfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xwd/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xwininfo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/bin/xwud/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/DPS/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/GL/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/bitmaps/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/extensions/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/include/fonts/Makefile
cvs rdiff -r1.1.1.1 -r0 src/x11/lib/Makefile.inc
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/FS/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/GL/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/GLU/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/GLw/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/ICE/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/OSmesa/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/SM/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/X11/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/XRes/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/XTrap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xau/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xaw/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xaw6/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xcursor/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xdmcp/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xext/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xfontcache/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xft/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xft1/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xinerama/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xmu/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xmuu/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xp/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xpm/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xrandr/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xrender/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xss/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xt/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xtst/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/Xv/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/XvMC/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xxf86dga/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xxf86misc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/Xxf86vm/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/dps/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/dpstk/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/expat/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/font/Makefile
cvs rdiff -r1.1.1.1 -r0 src/x11/lib/font/Makefile.inc
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/font/stubs/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/fontconfig/Makefile
cvs rdiff -r1.1.1.1 -r0 src/x11/lib/fontconfig/Makefile.inc
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/fontconfig/etc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/fontconfig/fontconfig/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/fontconfig/src/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/fontenc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/freetype2/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/freetype2/freetype/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/freetype2/freetype/cache/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/freetype2/freetype/config/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/freetype2/freetype/internal/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/lbxutil/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/oldX/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/psres/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/xkbfile/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/xkbui/Makefile
cvs rdiff -r1.2 -r1.3 src/x11/lib/xlibi18n/Makefile.xlibi18n
cvs rdiff -r1.1.1.1 -r1.2 src/x11/lib/xtrans/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/bdf/100dpi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/bdf/75dpi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/bdf/cyrillic/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/bdf/misc/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/encodings/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/encodings/large/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/local/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/scaled/CID/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/scaled/Speedo/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/scaled/TTF/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/scaled/Type1/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/fonts/util/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/GL/gl/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/GL/glx/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/GLU/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/GLw/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/X11/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xau/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xext/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xext/dbe/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xi/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xt/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/Xv/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/man/general/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/nls/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/nls/Compose/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/nls/XI18N_OBJS/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/share/nls/XLC_LOCALE/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/bdftopcf/Makefile
cvs rdiff -r1.1 -r1.2 src/x11/tools/fc-cache/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/makekeys/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/mkfontdir/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/pswrap/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/ucs2any/Makefile
cvs rdiff -r1.1.1.1 -r1.2 src/x11/tools/xkbcomp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.