CVS commit: src

Thu, 23 Jul 2015 01:04:35 -0700 

Module Name:    src
Committed By:   mrg
Date:           Thu Jul 23 08:04:05 UTC 2015

Modified Files:
        src: BUILDING Makefile
        src/compat: compatsubdir.mk
        src/crypto/external/bsd/openssh: Makefile.inc
        src/distrib/sets: mkvars.mk sets.subr
        src/doc: BUILDING.mdoc HACKS
        src/etc: Makefile Makefile.params
        src/etc/mtree: Makefile
        src/external/mit: Makefile
        src/external/mit/xorg/bin/xedit/lisp: Makefile
        src/external/mit/xorg/lib/libX11: Makefile.libx11
        src/external/mit/xorg/lib/libXrender: Makefile
        src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
        src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
        src/external/mit/xorg/server/xorg-server/os: Makefile
        src/external/mit/xorg/tools/mkfontscale: Makefile
        src/share/man/man5: mk.conf.5
        src/share/mk: bsd.README bsd.own.mk bsd.x11.mk
        src/tools: Makefile
Removed Files:
        src/etc/mtree: NetBSD.dist.XFree86
        src/x11: Makefile TODO
        src/x11/Xserver: Makefile Makefile.common Makefile.serverlib
        src/x11/Xserver/GL: Makefile
        src/x11/Xserver/GL/GLcore: Makefile Makefile.GLcore
        src/x11/Xserver/GL/GLcore/module: Makefile
        src/x11/Xserver/GL/dri: Makefile
        src/x11/Xserver/GL/dri/mga_dri: Makefile shlib_version
        src/x11/Xserver/GL/dri/radeon_dri: Makefile shlib_version
        src/x11/Xserver/GL/glx: Makefile Makefile.glx
        src/x11/Xserver/GL/glx/module: Makefile
        src/x11/Xserver/Xext: Makefile Makefile.ext
        src/x11/Xserver/Xext/ext: Makefile
        src/x11/Xserver/Xext/extmod: Makefile
        src/x11/Xserver/Xext/exts: Makefile
        src/x11/Xserver/Xfont: Makefile
        src/x11/Xserver/Xfont/bitmap: Makefile
        src/x11/Xserver/Xfont/freetype: Makefile
        src/x11/Xserver/Xfont/speedo: Makefile
        src/x11/Xserver/Xfont/type1: Makefile
        src/x11/Xserver/Xfont/xtt: Makefile
        src/x11/Xserver/Xserver: Makefile Makefile.Xserver
        src/x11/Xserver/Xserver/X68k: Makefile X68k.c
        src/x11/Xserver/Xserver/XF68_FBDev: XF68_FBDev.c
        src/x11/Xserver/Xserver/XF68_SVGA: XF68_SVGA.c
        src/x11/Xserver/Xserver/XF68_W32: XF68_W32.c
        src/x11/Xserver/Xserver/XFree86: Makefile XFree86.c
        src/x11/Xserver/Xserver/XalphaNetBSD: Makefile XalphaNetBSD.c
        src/x11/Xserver/Xserver/Xamiga: Makefile Xamiga.c
        src/x11/Xserver/Xserver/Xarm32VIDC: Makefile Xarm32VIDC.c
        src/x11/Xserver/Xserver/XdecNetBSD: Makefile XdecNetBSD.c
        src/x11/Xserver/Xserver/Xdmx: Makefile Xdmx.c
        src/x11/Xserver/Xserver/Xdreamcast: Makefile Xdreamcast.c
        src/x11/Xserver/Xserver/Xews4800mips: Makefile Xews4800mips.c
        src/x11/Xserver/Xserver/Xhpc: Makefile Xhpc.c
        src/x11/Xserver/Xserver/Xmac68k: Makefile Xmac68k.c
        src/x11/Xserver/Xserver/Xmacppc: Makefile Xmacppc.c
        src/x11/Xserver/Xserver/Xnest: Makefile Xnest.c
        src/x11/Xserver/Xserver/Xnewsmips: Makefile Xnewsmips.c
        src/x11/Xserver/Xserver/Xprt: Makefile Xprt.c
        src/x11/Xserver/Xserver/Xsun: Makefile Xsun.c
        src/x11/Xserver/Xserver/Xsun24: Makefile Xsun24.c
        src/x11/Xserver/Xserver/XsunMono: Makefile XsunMono.c
        src/x11/Xserver/Xserver/Xvfb: Makefile Xvfb.c
        src/x11/Xserver/afb: Makefile Makefile.afb
        src/x11/Xserver/afb/afb: Makefile
        src/x11/Xserver/afb/afbmod: Makefile
        src/x11/Xserver/cfb: Makefile Makefile.cfb
        src/x11/Xserver/cfb/module: Makefile
        src/x11/Xserver/cfb16: Makefile
        src/x11/Xserver/cfb16/module: Makefile
        src/x11/Xserver/cfb24: Makefile
        src/x11/Xserver/cfb24/module: Makefile
        src/x11/Xserver/cfb32: Makefile
        src/x11/Xserver/cfb32/module: Makefile
        src/x11/Xserver/dbe: Makefile Makefile.dbe
        src/x11/Xserver/dbe/module: Makefile
        src/x11/Xserver/dix: Makefile
        src/x11/Xserver/dix/xpstubs: Makefile
        src/x11/Xserver/fb: Makefile Makefile.fb
        src/x11/Xserver/fb/module: Makefile
        src/x11/Xserver/fontbase: Makefile
        src/x11/Xserver/hw: Makefile
        src/x11/Xserver/hw/dmx: Makefile
        src/x11/Xserver/hw/dmx/bin: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxaddinput: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxaddscreen: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxreconfig: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxresize: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxrminput: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxrmscreen: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxtodmx: Makefile
        src/x11/Xserver/hw/dmx/bin/dmxwininfo: Makefile
        src/x11/Xserver/hw/dmx/bin/evi: Makefile
        src/x11/Xserver/hw/dmx/bin/res: Makefile
        src/x11/Xserver/hw/dmx/bin/vdltodmx: Makefile
        src/x11/Xserver/hw/dmx/bin/xbell: Makefile
        src/x11/Xserver/hw/dmx/bin/xdmx: Makefile
        src/x11/Xserver/hw/dmx/bin/xdmxconfig: Makefile
        src/x11/Xserver/hw/dmx/bin/xinput: Makefile
        src/x11/Xserver/hw/dmx/bin/xled: Makefile
        src/x11/Xserver/hw/dmx/bin/xtest: Makefile
        src/x11/Xserver/hw/dmx/dmxconfig: Makefile
        src/x11/Xserver/hw/dmx/dmxinput: Makefile
        src/x11/Xserver/hw/netbsd/alpha: Makefile
        src/x11/Xserver/hw/netbsd/amiga: Makefile
        src/x11/Xserver/hw/netbsd/arm32vidc: Makefile
        src/x11/Xserver/hw/netbsd/dec: Makefile
        src/x11/Xserver/hw/netbsd/dreamcast: Makefile
        src/x11/Xserver/hw/netbsd/ews4800mips: Makefile
        src/x11/Xserver/hw/netbsd/hpc: Makefile
        src/x11/Xserver/hw/netbsd/mac68k: Makefile
        src/x11/Xserver/hw/netbsd/macppc: Makefile
        src/x11/Xserver/hw/netbsd/newsmips: Makefile
        src/x11/Xserver/hw/netbsd/pmax: Makefile
        src/x11/Xserver/hw/netbsd/x68k: Makefile
        src/x11/Xserver/hw/sun: Makefile
        src/x11/Xserver/hw/sun/bin/constype: Makefile
        src/x11/Xserver/hw/sun/bin/kbd_mode: Makefile
        src/x11/Xserver/hw/vfb: Makefile
        src/x11/Xserver/hw/xfree68: Makefile
        src/x11/Xserver/hw/xfree68/FBDev: Makefile fbdev_netbsd.c
        src/x11/Xserver/hw/xfree86: Makefile Makefile.drivermod
        src/x11/Xserver/hw/xfree86/bin: Makefile
        src/x11/Xserver/hw/xfree86/bin/getconfig: Makefile
        src/x11/Xserver/hw/xfree86/bin/gtf: Makefile
        src/x11/Xserver/hw/xfree86/bin/ioport: Makefile
        src/x11/Xserver/hw/xfree86/bin/kbd_mode: Makefile
        src/x11/Xserver/hw/xfree86/bin/mmapr: Makefile
        src/x11/Xserver/hw/xfree86/bin/mmapw: Makefile
        src/x11/Xserver/hw/xfree86/bin/pcitweak: Makefile
        src/x11/Xserver/hw/xfree86/bin/scanpci: Makefile
        src/x11/Xserver/hw/xfree86/bin/xf86cfg: Makefile
        src/x11/Xserver/hw/xfree86/bin/xf86config: Makefile
        src/x11/Xserver/hw/xfree86/ddc: Makefile
        src/x11/Xserver/hw/xfree86/doc: Makefile
        src/x11/Xserver/hw/xfree86/drivers: Makefile
        src/x11/Xserver/hw/xfree86/drivers/ag10e: Makefile
        src/x11/Xserver/hw/xfree86/drivers/apm: Makefile
        src/x11/Xserver/hw/xfree86/drivers/ark: Makefile
        src/x11/Xserver/hw/xfree86/drivers/ati: Makefile
        src/x11/Xserver/hw/xfree86/drivers/atimisc: Makefile
        src/x11/Xserver/hw/xfree86/drivers/chips: Makefile
        src/x11/Xserver/hw/xfree86/drivers/cirrus: Makefile
        src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine: Makefile
        src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna: Makefile
        src/x11/Xserver/hw/xfree86/drivers/cyrix: Makefile
        src/x11/Xserver/hw/xfree86/drivers/dummy: Makefile
        src/x11/Xserver/hw/xfree86/drivers/fbdev: Makefile
        src/x11/Xserver/hw/xfree86/drivers/glint: Makefile
        src/x11/Xserver/hw/xfree86/drivers/i128: Makefile
        src/x11/Xserver/hw/xfree86/drivers/i740: Makefile
        src/x11/Xserver/hw/xfree86/drivers/i810: Makefile
        src/x11/Xserver/hw/xfree86/drivers/imstt: Makefile
        src/x11/Xserver/hw/xfree86/drivers/mga: Makefile
        src/x11/Xserver/hw/xfree86/drivers/neomagic: Makefile
        src/x11/Xserver/hw/xfree86/drivers/newport: Makefile
        src/x11/Xserver/hw/xfree86/drivers/nsc: Makefile
        src/x11/Xserver/hw/xfree86/drivers/nv: Makefile
        src/x11/Xserver/hw/xfree86/drivers/nv/riva128: Makefile
        src/x11/Xserver/hw/xfree86/drivers/pnozz: Makefile
        src/x11/Xserver/hw/xfree86/drivers/r128: Makefile
        src/x11/Xserver/hw/xfree86/drivers/radeon: Makefile
        src/x11/Xserver/hw/xfree86/drivers/rendition: Makefile
        src/x11/Xserver/hw/xfree86/drivers/s3: Makefile
        src/x11/Xserver/hw/xfree86/drivers/s3virge: Makefile
        src/x11/Xserver/hw/xfree86/drivers/savage: Makefile
        src/x11/Xserver/hw/xfree86/drivers/siliconmotion: Makefile
        src/x11/Xserver/hw/xfree86/drivers/sis: Makefile
        src/x11/Xserver/hw/xfree86/drivers/sunbw2: Makefile
        src/x11/Xserver/hw/xfree86/drivers/suncg14: Makefile
        src/x11/Xserver/hw/xfree86/drivers/suncg3: Makefile
        src/x11/Xserver/hw/xfree86/drivers/suncg6: Makefile
        src/x11/Xserver/hw/xfree86/drivers/sunffb: Makefile
        src/x11/Xserver/hw/xfree86/drivers/sunleo: Makefile
        src/x11/Xserver/hw/xfree86/drivers/suntcx: Makefile
        src/x11/Xserver/hw/xfree86/drivers/tdfx: Makefile
        src/x11/Xserver/hw/xfree86/drivers/tga: Makefile
        src/x11/Xserver/hw/xfree86/drivers/trident: Makefile
        src/x11/Xserver/hw/xfree86/drivers/tseng: Makefile
        src/x11/Xserver/hw/xfree86/drivers/vesa: Makefile
        src/x11/Xserver/hw/xfree86/drivers/vga: Makefile
        src/x11/Xserver/hw/xfree86/drivers/via: Makefile
        src/x11/Xserver/hw/xfree86/drivers/vmware: Makefile
        src/x11/Xserver/hw/xfree86/drivers/wsfb: Makefile
        src/x11/Xserver/hw/xfree86/drm: Makefile
        src/x11/Xserver/hw/xfree86/drm/mga: Makefile
        src/x11/Xserver/hw/xfree86/drm/radeon: Makefile
        src/x11/Xserver/hw/xfree86/dummy: Makefile
        src/x11/Xserver/hw/xfree86/etc: Makefile
        src/x11/Xserver/hw/xfree86/fbdevhw: Makefile
        src/x11/Xserver/hw/xfree86/i2c: Makefile
        src/x11/Xserver/hw/xfree86/input: Makefile
        src/x11/Xserver/hw/xfree86/input/acecad: Makefile
        src/x11/Xserver/hw/xfree86/input/calcomp: Makefile
        src/x11/Xserver/hw/xfree86/input/citron: Makefile
        src/x11/Xserver/hw/xfree86/input/digitaledge: Makefile
        src/x11/Xserver/hw/xfree86/input/dmc: Makefile
        src/x11/Xserver/hw/xfree86/input/dynapro: Makefile
        src/x11/Xserver/hw/xfree86/input/elographics: Makefile
        src/x11/Xserver/hw/xfree86/input/fpit: Makefile
        src/x11/Xserver/hw/xfree86/input/hyperpen: Makefile
        src/x11/Xserver/hw/xfree86/input/js_x: Makefile
        src/x11/Xserver/hw/xfree86/input/kbd: Makefile
        src/x11/Xserver/hw/xfree86/input/magellan: Makefile
        src/x11/Xserver/hw/xfree86/input/microtouch: Makefile
        src/x11/Xserver/hw/xfree86/input/mouse: Makefile
        src/x11/Xserver/hw/xfree86/input/mutouch: Makefile
        src/x11/Xserver/hw/xfree86/input/palmax: Makefile
        src/x11/Xserver/hw/xfree86/input/penmount: Makefile
        src/x11/Xserver/hw/xfree86/input/spaceorb: Makefile
        src/x11/Xserver/hw/xfree86/input/summa: Makefile
        src/x11/Xserver/hw/xfree86/input/tek4957: Makefile
        src/x11/Xserver/hw/xfree86/input/usbtablet: Makefile
        src/x11/Xserver/hw/xfree86/input/void: Makefile
        src/x11/Xserver/hw/xfree86/input/wacom: Makefile
        src/x11/Xserver/hw/xfree86/int10: Makefile
        src/x11/Xserver/hw/xfree86/loader: Makefile
        src/x11/Xserver/hw/xfree86/pcidata: Makefile
        src/x11/Xserver/hw/xfree86/rac: Makefile
        src/x11/Xserver/hw/xfree86/ramdac: Makefile
        src/x11/Xserver/hw/xfree86/scanpci: Makefile
        src/x11/Xserver/hw/xfree86/shadowfb: Makefile
        src/x11/Xserver/hw/xfree86/vbe: Makefile
        src/x11/Xserver/hw/xfree86/vgahw: Makefile
        src/x11/Xserver/hw/xfree86/xaa: Makefile
        src/x11/Xserver/hw/xfree86/xf1bpp: Makefile
        src/x11/Xserver/hw/xfree86/xf24_32bpp: Makefile
        src/x11/Xserver/hw/xfree86/xf4bpp: Makefile
        src/x11/Xserver/hw/xfree86/xf86: Makefile
        src/x11/Xserver/hw/xfree86/xf86_os: Makefile
        src/x11/Xserver/hw/xfree86/xf86config: Makefile
        src/x11/Xserver/hw/xfree86/xf8_16bpp: Makefile
        src/x11/Xserver/hw/xfree86/xf8_32bpp: Makefile
        src/x11/Xserver/hw/xfree86/xf8_32wid: Makefile
        src/x11/Xserver/hw/xfree86/xloader: Makefile
        src/x11/Xserver/hw/xnest: Makefile
        src/x11/Xserver/include: Makefile
        src/x11/Xserver/iplan2p2: Makefile
        src/x11/Xserver/iplan2p4: Makefile Makefile.iplan
        src/x11/Xserver/iplan2p8: Makefile
        src/x11/Xserver/lbx: Makefile
        src/x11/Xserver/mfb: Makefile Makefile.mfb
        src/x11/Xserver/mfb/module: Makefile
        src/x11/Xserver/mi: Makefile
        src/x11/Xserver/miext: Makefile
        src/x11/Xserver/miext/layer: Makefile Makefile.layer
        src/x11/Xserver/miext/layer/module: Makefile
        src/x11/Xserver/miext/shadow: Makefile Makefile.shadow
        src/x11/Xserver/miext/shadow/module: Makefile
        src/x11/Xserver/os: Makefile
        src/x11/Xserver/printer: Makefile
        src/x11/Xserver/printer/pcl: Makefile
        src/x11/Xserver/printer/ps: Makefile
        src/x11/Xserver/printer/raster: Makefile
        src/x11/Xserver/randr: Makefile
        src/x11/Xserver/record: Makefile Makefile.record
        src/x11/Xserver/record/module: Makefile
        src/x11/Xserver/render: Makefile
        src/x11/Xserver/xinput: Makefile
        src/x11/Xserver/xkb: Makefile
        src/x11/Xserver/xtrap: Makefile Makefile.xtrap
        src/x11/Xserver/xtrap/module: Makefile
        src/x11/bin: 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/ccmakedep: Makefile
        src/x11/bin/cleanlinks: 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/fonttosfnt: Makefile
        src/x11/bin/fslsfonts: Makefile
        src/x11/bin/fstobdf: Makefile
        src/x11/bin/gccmakedep: 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/makedepend: Makefile
        src/x11/bin/makeg: Makefile
        src/x11/bin/makepsres: Makefile
        src/x11/bin/makestrs: Makefile
        src/x11/bin/mergelib: Makefile
        src/x11/bin/mkcfm: Makefile
        src/x11/bin/mkdirhier: Makefile
        src/x11/bin/mkfontdir: Makefile
        src/x11/bin/mkfontscale: Makefile
        src/x11/bin/mkhtmlindex: Makefile
        src/x11/bin/oclock: Makefile
        src/x11/bin/proxymngr: Makefile
        src/x11/bin/pswrap: Makefile
        src/x11/bin/revpath: Makefile
        src/x11/bin/rgb: Makefile rgb_mkdb.sh
        src/x11/bin/rman: Makefile
        src/x11/bin/rstart: Makefile Makefile.rstart
        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/showrgb: Makefile
        src/x11/bin/smproxy: Makefile
        src/x11/bin/ssh-askpass: 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 Makefile.xdm
        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: 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 Makefile.xkbcomp
        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/ibm: 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/sharp: 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 Makefile.xkbutils
        src/x11/bin/xkbutils/xkbbell: Makefile
        src/x11/bin/xkbutils/xkbvleds: Makefile
        src/x11/bin/xkbutils/xkbwatch: Makefile
        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/xtrap/xtrapchar: Makefile
        src/x11/bin/xtrap/xtrapin: Makefile
        src/x11/bin/xtrap/xtrapinfo: Makefile
        src/x11/bin/xtrap/xtrapout: Makefile
        src/x11/bin/xtrap/xtrapproto: Makefile
        src/x11/bin/xtrap/xtrapreset: Makefile
        src/x11/bin/xtrap/xtrapstats: Makefile
        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: Makefile
        src/x11/lib/FS: Makefile shlib_version
        src/x11/lib/GL: Makefile shlib_version
        src/x11/lib/GLU: Makefile shlib_version
        src/x11/lib/GLw: Makefile shlib_version
        src/x11/lib/ICE: Makefile shlib_version
        src/x11/lib/OSmesa: Makefile shlib_version
        src/x11/lib/SM: Makefile shlib_version
        src/x11/lib/X11: Makefile Makefile.libx11
        src/x11/lib/X11/dynamic: Makefile shlib_version
        src/x11/lib/X11/static: Makefile
        src/x11/lib/XRes: Makefile shlib_version
        src/x11/lib/XTrap: Makefile shlib_version
        src/x11/lib/Xau: Makefile shlib_version
        src/x11/lib/Xaw: Makefile shlib_version
        src/x11/lib/Xaw6: Makefile shlib_version
        src/x11/lib/Xcursor: Makefile shlib_version
        src/x11/lib/Xdmcp: Makefile shlib_version
        src/x11/lib/Xext: Makefile shlib_version
        src/x11/lib/Xfontcache: Makefile shlib_version
        src/x11/lib/Xft: Makefile shlib_version
        src/x11/lib/Xft1: Makefile shlib_version
        src/x11/lib/Xi: Makefile shlib_version
        src/x11/lib/Xinerama: Makefile shlib_version
        src/x11/lib/Xmu: Makefile shlib_version
        src/x11/lib/Xmuu: Makefile shlib_version
        src/x11/lib/Xp: Makefile shlib_version
        src/x11/lib/Xpm: Makefile shlib_version
        src/x11/lib/Xrandr: Makefile shlib_version
        src/x11/lib/Xrender: Makefile shlib_version
        src/x11/lib/Xss: Makefile shlib_version
        src/x11/lib/Xt: Makefile shlib_version
        src/x11/lib/Xtst: Makefile shlib_version
        src/x11/lib/Xv: Makefile shlib_version
        src/x11/lib/XvMC: Makefile shlib_version
        src/x11/lib/Xxf86dga: Makefile shlib_version
        src/x11/lib/Xxf86misc: Makefile shlib_version
        src/x11/lib/Xxf86vm: Makefile shlib_version
        src/x11/lib/dmx: Makefile shlib_version
        src/x11/lib/dps: Makefile shlib_version
        src/x11/lib/dpstk: Makefile shlib_version
        src/x11/lib/font: Makefile shlib_version
        src/x11/lib/font/stubs: Makefile
        src/x11/lib/font/xtt: Makefile
        src/x11/lib/fontconfig: Makefile
        src/x11/lib/fontconfig/etc: Makefile fonts.conf
        src/x11/lib/fontconfig/fontconfig: Makefile
        src/x11/lib/fontconfig/src: Makefile shlib_version
        src/x11/lib/fontenc: Makefile shlib_version
        src/x11/lib/freetype2: Makefile shlib_version
        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/freetype2/freetype/internal/services: Makefile
        src/x11/lib/lbxutil: Makefile
        src/x11/lib/oldX: Makefile shlib_version
        src/x11/lib/psres: Makefile shlib_version
        src/x11/lib/xkbfile: Makefile shlib_version
        src/x11/lib/xkbui: Makefile shlib_version
        src/x11/lib/xlibi18n: Makefile Makefile.xlibi18n
        src/x11/lib/xlibi18n/im: Makefile
        src/x11/lib/xlibi18n/lc: Makefile
        src/x11/lib/xlibi18n/lc/Utf8: Makefile
        src/x11/lib/xlibi18n/lc/def: Makefile
        src/x11/lib/xlibi18n/lc/gen: Makefile
        src/x11/lib/xlibi18n/lc/xlocale: Makefile
        src/x11/lib/xlibi18n/om: Makefile
        src/x11/lib/xtrans: Makefile
        src/x11/share: Makefile
        src/x11/share/cf: Makefile host.def
        src/x11/share/fonts: Makefile Makefile.mkfontscale
        src/x11/share/fonts/bdf: Makefile Makefile.bdf Makefile.nnndpi
        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 Makefile.enc
        src/x11/share/fonts/encodings/large: Makefile
        src/x11/share/fonts/local: Makefile
        src/x11/share/fonts/scaled: Makefile Makefile.scaled
        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: Makefile
        src/x11/share/man/GL: 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: Makefile
        src/x11/tools/bdftopcf: Makefile Makefile.bdftopcf
        src/x11/tools/fc-cache: Makefile Makefile.fc-cache
        src/x11/tools/gen_matypes: Makefile Makefile.gen_matypes
        src/x11/tools/makekeys: Makefile Makefile.makekeys
        src/x11/tools/makestrs: Makefile Makefile.makestrs
        src/x11/tools/mkfontscale: Makefile
        src/x11/tools/mkg3states: Makefile Makefile.mkg3states
        src/x11/tools/pswrap: Makefile Makefile.pswrap
        src/x11/tools/ucs2any: Makefile Makefile.ucs2any
        src/x11/tools/xkbcomp: Makefile Makefile.xkbcomp xkbcomp-KeyBind.c
            xkbcomp-stubs.c xkbfile-xkbmisc.c

Log Message:
remove the xfree86 reachover makefiles and the vast majority of
the support in the rest of the source tree.

X11 sets could use some cleaning up perhaps (just deletion, as
we've never really marked the old X11R6 as obsolete for native
xorg using platforms so far either.)


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/BUILDING
cvs rdiff -u -r1.315 -r1.316 src/Makefile
cvs rdiff -u -r1.12 -r1.13 src/compat/compatsubdir.mk
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/sets.subr
cvs rdiff -u -r1.113 -r1.114 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.160 -r1.161 src/doc/HACKS
cvs rdiff -u -r1.422 -r1.423 src/etc/Makefile
cvs rdiff -u -r1.12 -r1.13 src/etc/Makefile.params
cvs rdiff -u -r1.28 -r1.29 src/etc/mtree/Makefile
cvs rdiff -u -r1.2 -r0 src/etc/mtree/NetBSD.dist.XFree86
cvs rdiff -u -r1.3 -r1.4 src/external/mit/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xedit/lisp/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXrender/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.36 -r1.37 \
    src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.10 -r1.11 \
    src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs rdiff -u -r1.70 -r1.71 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.345 -r1.346 src/share/mk/bsd.README
cvs rdiff -u -r1.861 -r1.862 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.116 -r1.117 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.181 -r1.182 src/tools/Makefile
cvs rdiff -u -r1.13 -r0 src/x11/Makefile src/x11/TODO
cvs rdiff -u -r1.13 -r0 src/x11/Xserver/Makefile
cvs rdiff -u -r1.36 -r0 src/x11/Xserver/Makefile.common
cvs rdiff -u -r1.8 -r0 src/x11/Xserver/Makefile.serverlib
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/GL/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/GL/GLcore/Makefile
cvs rdiff -u -r1.10 -r0 src/x11/Xserver/GL/GLcore/Makefile.GLcore
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/GL/GLcore/module/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/GL/dri/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/GL/dri/mga_dri/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/GL/dri/mga_dri/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/GL/dri/radeon_dri/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/GL/dri/radeon_dri/shlib_version
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/GL/glx/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/GL/glx/Makefile.glx
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/GL/glx/module/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/Xext/Makefile
cvs rdiff -u -r1.10 -r0 src/x11/Xserver/Xext/Makefile.ext
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/Xext/ext/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xext/extmod/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xext/exts/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/Xfont/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xfont/bitmap/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/Xfont/freetype/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xfont/speedo/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xfont/type1/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/Xfont/xtt/Makefile
cvs rdiff -u -r1.19 -r0 src/x11/Xserver/Xserver/Makefile
cvs rdiff -u -r1.23 -r0 src/x11/Xserver/Xserver/Makefile.Xserver
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/Xserver/X68k/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/X68k/X68k.c
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XF68_FBDev/XF68_FBDev.c
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XF68_SVGA/XF68_SVGA.c
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XF68_W32/XF68_W32.c
cvs rdiff -u -r1.14 -r0 src/x11/Xserver/Xserver/XFree86/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XFree86/XFree86.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/XalphaNetBSD/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XalphaNetBSD/XalphaNetBSD.c
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xserver/Xamiga/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xamiga/Xamiga.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/Xarm32VIDC/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xarm32VIDC/Xarm32VIDC.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/XdecNetBSD/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XdecNetBSD/XdecNetBSD.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/Xdmx/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xdmx/Xdmx.c
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/Xserver/Xdreamcast/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xdreamcast/Xdreamcast.c
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xews4800mips/Makefile \
    src/x11/Xserver/Xserver/Xews4800mips/Xews4800mips.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/Xhpc/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xhpc/Xhpc.c
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/Xserver/Xmac68k/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xmac68k/Xmac68k.c
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/Xserver/Xmacppc/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xmacppc/Xmacppc.c
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/Xserver/Xnest/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xnest/Xnest.c
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xnewsmips/Makefile \
    src/x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/Xserver/Xprt/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xprt/Xprt.c
cvs rdiff -u -r1.10 -r0 src/x11/Xserver/Xserver/Xsun/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xsun/Xsun.c
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/Xserver/Xsun24/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xsun24/Xsun24.c
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/Xserver/XsunMono/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/XsunMono/XsunMono.c
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/Xserver/Xvfb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/Xserver/Xvfb/Xvfb.c
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/afb/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/afb/Makefile.afb
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/afb/afb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/afb/afbmod/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/cfb/Makefile
cvs rdiff -u -r1.11 -r0 src/x11/Xserver/cfb/Makefile.cfb
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb/module/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb16/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb16/module/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb24/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb24/module/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb32/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/cfb32/module/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/dbe/Makefile \
    src/x11/Xserver/dbe/Makefile.dbe
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/dbe/module/Makefile
cvs rdiff -u -r1.11 -r0 src/x11/Xserver/dix/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/dix/xpstubs/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/fb/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/fb/Makefile.fb
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/fb/module/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/fontbase/Makefile
cvs rdiff -u -r1.15 -r0 src/x11/Xserver/hw/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/dmx/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/bin/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxaddinput/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxaddscreen/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxreconfig/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxresize/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxrminput/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxrmscreen/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/bin/dmxtodmx/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/dmxwininfo/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/evi/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/res/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/bin/vdltodmx/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/xbell/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/dmx/bin/xdmx/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/bin/xdmxconfig/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/xinput/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/xled/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/dmx/bin/xtest/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/dmxconfig/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/dmx/dmxinput/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/netbsd/alpha/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/netbsd/amiga/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/netbsd/arm32vidc/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/netbsd/dec/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/netbsd/dreamcast/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/netbsd/ews4800mips/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/netbsd/hpc/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/netbsd/mac68k/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/netbsd/macppc/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/netbsd/newsmips/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/netbsd/pmax/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/sun/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/sun/bin/constype/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/sun/bin/kbd_mode/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/vfb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree68/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree68/FBDev/Makefile \
    src/x11/Xserver/hw/xfree68/FBDev/fbdev_netbsd.c
cvs rdiff -u -r1.16 -r0 src/x11/Xserver/hw/xfree86/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/Makefile.drivermod
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/bin/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/bin/getconfig/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/bin/gtf/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xfree86/bin/ioport/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/bin/kbd_mode/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/bin/mmapr/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/bin/mmapw/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/bin/pcitweak/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/bin/scanpci/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xfree86/bin/xf86config/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.23 -r0 src/x11/Xserver/hw/xfree86/drivers/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/ag10e/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/apm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drivers/ark/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/hw/xfree86/drivers/ati/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xfree86/drivers/atimisc/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/drivers/chips/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/cirrus/Makefile
cvs rdiff -u -r1.2 -r0 \
    src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile
cvs rdiff -u -r1.2 -r0 \
    src/x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/cyrix/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/dummy/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/fbdev/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/drivers/glint/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/i128/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/i740/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/i810/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drivers/imstt/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/drivers/mga/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/neomagic/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/newport/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/nsc/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/hw/xfree86/drivers/nv/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/nv/riva128/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/pnozz/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/Xserver/hw/xfree86/drivers/r128/Makefile
cvs rdiff -u -r1.9 -r0 src/x11/Xserver/hw/xfree86/drivers/radeon/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/rendition/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drivers/s3/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/s3virge/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/savage/Makefile
cvs rdiff -u -r1.3 -r0 \
    src/x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/sis/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/sunbw2/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/suncg14/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/suncg3/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drivers/suncg6/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xfree86/drivers/sunffb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/sunleo/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/suntcx/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/tdfx/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drivers/tga/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/trident/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/tseng/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/vesa/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drivers/vga/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drivers/via/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/vmware/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/drivers/wsfb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/drm/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/drm/mga/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/drm/radeon/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/dummy/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/etc/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/fbdevhw/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/i2c/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/input/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/input/acecad/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/calcomp/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/citron/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/digitaledge/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/dmc/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/dynapro/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/elographics/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/fpit/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/hyperpen/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/js_x/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/input/kbd/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/magellan/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/microtouch/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/hw/xfree86/input/mouse/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/mutouch/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/palmax/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/penmount/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/spaceorb/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/input/summa/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/tek4957/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/input/usbtablet/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/void/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/input/wacom/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/int10/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/pcidata/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/rac/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/scanpci/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/shadowfb/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/vbe/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/vgahw/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/xaa/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/hw/xfree86/xf1bpp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/xf24_32bpp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/xf4bpp/Makefile
cvs rdiff -u -r1.12 -r0 src/x11/Xserver/hw/xfree86/xf86/Makefile
cvs rdiff -u -r1.21 -r0 src/x11/Xserver/hw/xfree86/xf86_os/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/hw/xfree86/xf86config/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/xf8_16bpp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/xf8_32bpp/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/hw/xfree86/xf8_32wid/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/hw/xfree86/xloader/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/hw/xnest/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/include/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/iplan2p2/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/iplan2p4/Makefile \
    src/x11/Xserver/iplan2p4/Makefile.iplan
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/iplan2p8/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/lbx/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/mfb/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/mfb/Makefile.mfb
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/mfb/module/Makefile
cvs rdiff -u -r1.9 -r0 src/x11/Xserver/mi/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/Xserver/miext/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/miext/layer/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/miext/layer/Makefile.layer
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/miext/layer/module/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/miext/shadow/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/miext/shadow/Makefile.shadow
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/miext/shadow/module/Makefile
cvs rdiff -u -r1.18 -r0 src/x11/Xserver/os/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/Xserver/printer/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/printer/pcl/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/printer/ps/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/printer/raster/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/Xserver/randr/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/record/Makefile \
    src/x11/Xserver/record/Makefile.record
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/record/module/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/Xserver/render/Makefile
cvs rdiff -u -r1.12 -r0 src/x11/Xserver/xinput/Makefile
cvs rdiff -u -r1.8 -r0 src/x11/Xserver/xkb/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/Xserver/xtrap/Makefile \
    src/x11/Xserver/xtrap/Makefile.xtrap
cvs rdiff -u -r1.1 -r0 src/x11/Xserver/xtrap/module/Makefile
cvs rdiff -u -r1.9 -r0 src/x11/bin/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/appres/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/bdftopcf/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/bdftruncate/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/beforelight/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/bitmap/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/bitmap/atobm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/bitmap/bmtoa/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/ccmakedep/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/cleanlinks/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/cxpm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/dpsexec/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/dpsinfo/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/editres/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/fc-cache/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/fc-list/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/fonttosfnt/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/fslsfonts/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/fstobdf/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/gccmakedep/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/glxgears/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/glxinfo/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/iceauth/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/ico/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/imake/Makefile
cvs rdiff -u -r1.8 -r0 src/x11/bin/lbxproxy/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/listres/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/lndir/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/luit/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/makedepend/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/makeg/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/makepsres/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/makestrs/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/mergelib/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/mkcfm/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/mkdirhier/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/mkfontdir/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/mkfontscale/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/mkhtmlindex/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/oclock/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/proxymngr/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/pswrap/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/revpath/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/rgb/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/rgb/rgb_mkdb.sh
cvs rdiff -u -r1.1 -r0 src/x11/bin/rman/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/bin/rstart/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/rstart/Makefile.rstart
cvs rdiff -u -r1.3 -r0 src/x11/bin/rstart/commands/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/rstart/commands/x11r6/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/rstart/contexts/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/scripts/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/setxkbmap/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/showfont/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/showrgb/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/smproxy/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/bin/ssh-askpass/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/sxpm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/texteroids/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/bin/twm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/ucs2any/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/viewres/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/bin/x11perf/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xauth/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xbiff/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xcalc/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xclipboard/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xclock/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xcmsdb/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xconsole/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xcutsel/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/bin/xditview/Makefile
cvs rdiff -u -r1.10 -r0 src/x11/bin/xdm/Makefile
cvs rdiff -u -r1.12 -r0 src/x11/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.4 -r0 src/x11/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.12 -r0 src/x11/bin/xdm/config/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xdm/sessreg/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xdm/xdmshell/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xedit/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/bin/xedit/lisp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xedit/modules/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xedit/modules/progmodes/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xedit/mp/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xedit/re/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xev/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xeyes/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xf86dga/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/xfd/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xfindproxy/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xfontsel/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/bin/xfs/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xfsinfo/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xfwp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xgamma/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/xgc/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/xhost/Makefile
cvs rdiff -u -r1.8 -r0 src/x11/bin/xinit/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbcomp/Makefile \
    src/x11/bin/xkbcomp/Makefile.xkbcomp
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/compat/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/compiled/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/xkbcomp/geometry/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/geometry/digital/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/xkbcomp/geometry/ibm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/geometry/sgi/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbcomp/keycodes/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/keycodes/digital/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/keycodes/sgi/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbcomp/keymap/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/keymap/digital/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/keymap/sgi/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/keymap/sun/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/rules/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/semantics/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/bin/xkbcomp/symbols/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/digital/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/fujitsu/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/hp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/macintosh/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/nec/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xkbcomp/symbols/pc/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/sgi/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/bin/xkbcomp/symbols/sharp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/sony/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbcomp/symbols/sun/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbcomp/symbols/xfree68/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbcomp/types/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkbevd/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbprint/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xkbutils/Makefile \
    src/x11/bin/xkbutils/Makefile.xkbutils
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xkbutils/xkbbell/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xkbutils/xkbvleds/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xkbutils/xkbwatch/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xkill/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xload/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/bin/xlogo/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xlsatoms/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/bin/xlsclients/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xlsfonts/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xmag/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xman/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xmessage/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xmh/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xmkmf/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xmodmap/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xprop/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xrandr/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xrdb/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xrefresh/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xset/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xsetmode/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xsetpointer/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xsetroot/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xsm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xstdcmap/Makefile
cvs rdiff -u -r1.11 -r0 src/x11/bin/xterm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xterm/resize/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xterm/uxterm/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xtrap/Makefile \
    src/x11/bin/xtrap/Makefile.xtrap
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapchar/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapin/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapout/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapproto/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapreset/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/bin/xtrap/xtrapstats/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xvidtune/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xvinfo/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xwd/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/bin/xwininfo/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/bin/xwud/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/include/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/include/DPS/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/include/GL/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/include/bitmaps/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/include/extensions/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/include/fonts/Makefile
cvs rdiff -u -r1.11 -r0 src/x11/lib/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/lib/FS/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/FS/shlib_version
cvs rdiff -u -r1.15 -r0 src/x11/lib/GL/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/GL/shlib_version
cvs rdiff -u -r1.11 -r0 src/x11/lib/GLU/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/GLU/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/GLw/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/GLw/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/lib/ICE/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/ICE/shlib_version
cvs rdiff -u -r1.20 -r0 src/x11/lib/OSmesa/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/OSmesa/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/SM/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/SM/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/X11/Makefile
cvs rdiff -u -r1.5 -r0 src/x11/lib/X11/Makefile.libx11
cvs rdiff -u -r1.1 -r0 src/x11/lib/X11/dynamic/Makefile \
    src/x11/lib/X11/dynamic/shlib_version
cvs rdiff -u -r1.1 -r0 src/x11/lib/X11/static/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/lib/XRes/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/XRes/shlib_version
cvs rdiff -u -r1.8 -r0 src/x11/lib/XTrap/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/XTrap/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/Xau/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/Xau/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xaw/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xaw/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xaw6/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xaw6/shlib_version
cvs rdiff -u -r1.11 -r0 src/x11/lib/Xcursor/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xcursor/shlib_version
cvs rdiff -u -r1.5 -r0 src/x11/lib/Xdmcp/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/Xdmcp/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xext/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xext/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xfontcache/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/Xfontcache/shlib_version
cvs rdiff -u -r1.10 -r0 src/x11/lib/Xft/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xft/shlib_version
cvs rdiff -u -r1.8 -r0 src/x11/lib/Xft1/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xft1/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xi/shlib_version
cvs rdiff -u -r1.5 -r0 src/x11/lib/Xinerama/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/Xinerama/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xmu/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xmu/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xmuu/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xmuu/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xp/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xp/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xpm/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xpm/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xrandr/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xrandr/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xrender/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xrender/shlib_version
cvs rdiff -u -r1.8 -r0 src/x11/lib/Xss/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/Xss/shlib_version
cvs rdiff -u -r1.13 -r0 src/x11/lib/Xt/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xt/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xtst/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xtst/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/Xv/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/Xv/shlib_version
cvs rdiff -u -r1.5 -r0 src/x11/lib/XvMC/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/XvMC/shlib_version
cvs rdiff -u -r1.7 -r0 src/x11/lib/Xxf86dga/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/Xxf86dga/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/Xxf86misc/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/Xxf86misc/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/Xxf86vm/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/Xxf86vm/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/lib/dmx/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/dmx/shlib_version
cvs rdiff -u -r1.10 -r0 src/x11/lib/dps/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/dps/shlib_version
cvs rdiff -u -r1.6 -r0 src/x11/lib/dpstk/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/dpstk/shlib_version
cvs rdiff -u -r1.11 -r0 src/x11/lib/font/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/font/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/lib/font/stubs/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/font/xtt/Makefile
cvs rdiff -u -r1.8 -r0 src/x11/lib/fontconfig/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/lib/fontconfig/etc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/fontconfig/etc/fonts.conf
cvs rdiff -u -r1.3 -r0 src/x11/lib/fontconfig/fontconfig/Makefile
cvs rdiff -u -r1.11 -r0 src/x11/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/fontconfig/src/shlib_version
cvs rdiff -u -r1.5 -r0 src/x11/lib/fontenc/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/fontenc/shlib_version
cvs rdiff -u -r1.11 -r0 src/x11/lib/freetype2/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/freetype2/shlib_version
cvs rdiff -u -r1.9 -r0 src/x11/lib/freetype2/freetype/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/lib/freetype2/freetype/cache/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/freetype2/freetype/config/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/lib/freetype2/freetype/internal/Makefile
cvs rdiff -u -r1.2 -r0 \
    src/x11/lib/freetype2/freetype/internal/services/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/lib/lbxutil/Makefile
cvs rdiff -u -r1.6 -r0 src/x11/lib/oldX/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/oldX/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/lib/psres/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/psres/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/xkbfile/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/xkbfile/shlib_version
cvs rdiff -u -r1.4 -r0 src/x11/lib/xkbui/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/lib/xkbui/shlib_version
cvs rdiff -u -r1.2 -r0 src/x11/lib/xlibi18n/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/lib/xlibi18n/Makefile.xlibi18n
cvs rdiff -u -r1.2 -r0 src/x11/lib/xlibi18n/im/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/xlibi18n/lc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/xlibi18n/lc/Utf8/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/xlibi18n/lc/def/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/xlibi18n/lc/gen/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/xlibi18n/lc/xlocale/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/lib/xlibi18n/om/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/lib/xtrans/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/cf/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/share/cf/host.def
cvs rdiff -u -r1.7 -r0 src/x11/share/fonts/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/fonts/Makefile.mkfontscale
cvs rdiff -u -r1.1.1.1 -r0 src/x11/share/fonts/bdf/Makefile \
    src/x11/share/fonts/bdf/Makefile.nnndpi
cvs rdiff -u -r1.9 -r0 src/x11/share/fonts/bdf/Makefile.bdf
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/bdf/100dpi/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/bdf/75dpi/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/bdf/cyrillic/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/bdf/misc/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/fonts/encodings/Makefile
cvs rdiff -u -r1.10 -r0 src/x11/share/fonts/encodings/Makefile.enc
cvs rdiff -u -r1.4 -r0 src/x11/share/fonts/encodings/large/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/fonts/local/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/scaled/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/fonts/scaled/Makefile.scaled
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/scaled/CID/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/fonts/scaled/Speedo/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/fonts/scaled/TTF/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/fonts/scaled/Type1/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/fonts/util/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/share/man/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/x11/share/man/GL/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/man/GL/gl/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/GL/glx/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/GLU/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/GLw/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/X11/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/man/Xau/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/Xext/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/Xext/dbe/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/man/Xi/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/man/Xt/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/share/man/Xv/Makefile
cvs rdiff -u -r1.7 -r0 src/x11/share/man/general/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/nls/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/nls/Compose/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/share/nls/XI18N_OBJS/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/share/nls/XLC_LOCALE/Makefile
cvs rdiff -u -r1.10 -r0 src/x11/tools/Makefile
cvs rdiff -u -r1.3 -r0 src/x11/tools/bdftopcf/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/bdftopcf/Makefile.bdftopcf
cvs rdiff -u -r1.9 -r0 src/x11/tools/fc-cache/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/fc-cache/Makefile.fc-cache
cvs rdiff -u -r1.2 -r0 src/x11/tools/gen_matypes/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/gen_matypes/Makefile.gen_matypes
cvs rdiff -u -r1.3 -r0 src/x11/tools/makekeys/Makefile
cvs rdiff -u -r1.2 -r0 src/x11/tools/makekeys/Makefile.makekeys
cvs rdiff -u -r1.2 -r0 src/x11/tools/makestrs/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/makestrs/Makefile.makestrs
cvs rdiff -u -r1.5 -r0 src/x11/tools/mkfontscale/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/mkg3states/Makefile \
    src/x11/tools/mkg3states/Makefile.mkg3states
cvs rdiff -u -r1.5 -r0 src/x11/tools/pswrap/Makefile
cvs rdiff -u -r1.4 -r0 src/x11/tools/pswrap/Makefile.pswrap
cvs rdiff -u -r1.2 -r0 src/x11/tools/ucs2any/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/ucs2any/Makefile.ucs2any
cvs rdiff -u -r1.5 -r0 src/x11/tools/xkbcomp/Makefile
cvs rdiff -u -r1.1 -r0 src/x11/tools/xkbcomp/Makefile.xkbcomp \
    src/x11/tools/xkbcomp/xkbfile-xkbmisc.c
cvs rdiff -u -r1.1.1.1 -r0 src/x11/tools/xkbcomp/xkbcomp-KeyBind.c
cvs rdiff -u -r1.3 -r0 src/x11/tools/xkbcomp/xkbcomp-stubs.c

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


Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.120 src/BUILDING:1.121
--- src/BUILDING:1.120	Sun Jun  7 05:32:38 2015
+++ src/BUILDING	Thu Jul 23 08:03:24 2015
@@ -77,8 +77,9 @@ FILES
                     any of these directories are missing, they will be skipped
                     during the build.
 
-     x11/           ``Reachover'' build structure for X11R6; the source is in
-                    X11SRCDIR.
+     external/mit/xorg/
+                    ``Reachover'' build structure for modular Xorg; the source
+                    is in X11SRCDIR.
 
      extsrc/        ``Reachover'' build structure for externally added
                     programs and libraries; the source is in EXTSRCSRCDIR.
@@ -442,19 +443,13 @@ CONFIGURATION
                  USETOOLS is also set to ``no'' when using <bsd.*.mk> outside
                  the NetBSD source tree.
 
-     X11SRCDIR   Directory containing the X11R6 source.  If specified, must be
-                 an absolute path.  The main X11R6 source is found in
-                 X11SRCDIR/xfree/xc.
+     X11SRCDIR   Directory containing the modular Xorg source.  If specified,
+                 must be an absolute path.  The main modular Xorg source is
+                 found in X11SRCDIR/external/mit.
 
                  Default: NETBSDRCDIR/../xsrc, if that exists; otherwise
                  /usr/xsrc.
 
-     X11FLAVOUR  The style of X11 cross-built, set to either ``Xorg'' or
-                 ``XFree86''.
-
-                 Default: ``XFree86'' on acorn32, alpha, amiga, mac68k, pmax,
-                 and sun3 platforms, ``Xorg'' on everything else.
-
    "make" variables for full builds
      These variables only affect the top level ``Makefile'' and do not affect
      manually building subtrees of the NetBSD source code.

Index: src/Makefile
diff -u src/Makefile:1.315 src/Makefile:1.316
--- src/Makefile:1.315	Sat Jun 27 16:21:07 2015
+++ src/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.315 2015/06/27 16:21:07 matt Exp $
+#	$NetBSD: Makefile,v 1.316 2015/07/23 08:03:25 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -98,8 +98,7 @@
 #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
-#                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
-#                    or X11R6 from src/x11
+#                    X11R7 from src/external/mit/xorg 
 #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #
@@ -482,16 +481,12 @@ do-build: .PHONY .MAKE
 
 do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"
-.if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} external/mit/xorg/tools all
 	${MAKEDIRTARGET} external/mit/xorg/lib build_install
 .if ${MKCOMPATX11} != "no"
 	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
 .endif
 .else
-	${MAKEDIRTARGET} x11 build
-.endif
-.else
 	@echo "MKX11 is not enabled"
 	@false
 .endif

Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.12 src/compat/compatsubdir.mk:1.13
--- src/compat/compatsubdir.mk:1.12	Sat Jun 27 16:21:07 2015
+++ src/compat/compatsubdir.mk	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: compatsubdir.mk,v 1.12 2015/06/27 16:21:07 matt Exp $
+#	$NetBSD: compatsubdir.mk,v 1.13 2015/07/23 08:03:25 mrg Exp $
 
 # Build netbsd libraries.
 
@@ -30,7 +30,7 @@ SUBDIR+= ../../../tests
 SUBDIR+= ../../../tests/share		# because MKSHARE=no above
 SUBDIR+= ../../../external/bsd/atf/tests
 .endif
-.if ${MKCOMPATX11} != no && ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj)
+.if ${MKCOMPATX11} != no && ${MKX11} != no && make(obj)
 SUBDIR+= ../../../external/mit/xorg/lib
 .endif # } MKX11
 .endif # } BOOTSTRAP_SUBDIRS

Index: src/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.8 src/crypto/external/bsd/openssh/Makefile.inc:1.9
--- src/crypto/external/bsd/openssh/Makefile.inc:1.8	Sun Mar  1 21:00:40 2015
+++ src/crypto/external/bsd/openssh/Makefile.inc	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.8 2015/03/01 21:00:40 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2015/07/23 08:03:25 mrg Exp $
 
 WARNS?=	4
 
@@ -39,9 +39,7 @@ CPPFLAGS+=-DKRB5 -DHEIMDAL
 CPPFLAGS+=-DWITH_LDAP_PUBKEY
 .endif
 
-.if ${X11FLAVOUR} == "Xorg"
 CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
-.endif
 
 CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
 CPPFLAGS+=-DLIBWRAP

Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.23 src/distrib/sets/mkvars.mk:1.24
--- src/distrib/sets/mkvars.mk:1.23	Wed Jul  8 01:06:01 2015
+++ src/distrib/sets/mkvars.mk	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.23 2015/07/08 01:06:01 matt Exp $
+# $NetBSD: mkvars.mk,v 1.24 2015/07/23 08:03:25 mrg Exp $
 
 MKEXTRAVARS= \
 	MACHINE \
@@ -23,7 +23,6 @@ MKEXTRAVARS= \
 	MKXORG \
 	MKXORG_SERVER \
 	MKRADEONFIRMWARE \
-	X11FLAVOR \
 	USE_INET6 \
 	USE_KERBEROS \
 	USE_LDAP \
@@ -58,12 +57,10 @@ KMODARCHDIRS:=${ARCHDIR_SUBDIR:T}
 .endif
 
 .if ${MKX11} != "no"
-. if ${X11FLAVOUR} == "Xorg"
 MKXORG:=yes
+# We have to force this off, because "MKX11" is still an option
+# that is in _MKVARS.
 MKX11:=no
-. else
-MKXORG:=no
-. endif
 .endif
 
 .if (!empty(MACHINE_ARCH:Mearm*))

Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.172 src/distrib/sets/sets.subr:1.173
--- src/distrib/sets/sets.subr:1.172	Thu Jul  9 18:19:34 2015
+++ src/distrib/sets/sets.subr	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
+#	$NetBSD: sets.subr,v 1.173 2015/07/23 08:03:25 mrg Exp $
 #
 
 #
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.172 2015/07/09 18:19:34 matt Exp $
+# 	# $NetBSD: sets.subr,v 1.173 2015/07/23 08:03:25 mrg Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -262,8 +262,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 #	solaris			${MKDTRACE} != no or ${MKZFS} != no
 #	ssp			${HAVE_SSP} != no
 #	tpm			${MKTPM} != no
-#	x11			${MKX11} != no && ${X11FLAVOUR} != "Xorg"
-#	xorg			${MKX11} != no && ${X11FLAVOUR} == "Xorg"
+#	xorg			${MKX11} != no
 #	xorg_server		${MKXORG_SERVER} != no
 #	yp			${MKYP} != no
 #	zfs			${MKZFS} != no

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.113 src/doc/BUILDING.mdoc:1.114
--- src/doc/BUILDING.mdoc:1.113	Sun Jun  7 05:30:18 2015
+++ src/doc/BUILDING.mdoc	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.113 2015/06/07 05:30:18 pgoyette Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.114 2015/07/23 08:03:25 mrg Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -151,9 +151,9 @@ Sources to the
 .Nx
 userland (non-kernel) programs.
 If any of these directories are missing, they will be skipped during the build.
-.It Pa x11/
+.It Pa external/mit/xorg/
 .Dq Reachover
-build structure for X11R6; the source is in
+build structure for modular Xorg; the source is in
 .Sy X11SRCDIR .
 .It Pa extsrc/
 .Dq Reachover
@@ -768,26 +768,15 @@ outside the
 source tree.
 .
 .It Sy X11SRCDIR
-Directory containing the X11R6 source.
+Directory containing the modular Xorg source.
 If specified, must be an absolute path.
-The main X11R6 source is found in
-.Sy X11SRCDIR Ns Pa /xfree/xc .
+The main modular Xorg source is found in
+.Sy X11SRCDIR Ns Pa /external/mit .
 .DFLT
 .Sy NETBSDRCDIR Ns Pa /../xsrc ,
 if that exists; otherwise
 .Pa /usr/xsrc .
 .
-.It Sy X11FLAVOUR
-The style of X11 cross-built, set to either
-.Dq Xorg
-or
-.Dq XFree86 .
-.DFLT
-.Dq XFree86
-on acorn32, alpha, amiga, mac68k, pmax, and sun3 platforms,
-.Dq Xorg
-on everything else.
-.
 .El
 .
 .Ss \*qmake\*q variables for full builds

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.160 src/doc/HACKS:1.161
--- src/doc/HACKS:1.160	Fri Jun 26 10:25:41 2015
+++ src/doc/HACKS	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.160 2015/06/26 10:25:41 pooka Exp $
+# $NetBSD: HACKS,v 1.161 2015/07/23 08:03:25 mrg Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -967,7 +967,6 @@ port	x68k
 	who	christos
 	file	src/external/gpl3/gcc/usr.bin/bakend/Makefile: 1.17
 		xsrc/external/mit/xorg/lib/libGLU/Makefile: 1.11
-		src/x11/lib/GLU/Makefile: 1.9
 	descr
 		workaround for:
 		internal compiler error: in cselib_record_set, at cselib.c:1999

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.422 src/etc/Makefile:1.423
--- src/etc/Makefile:1.422	Sun Nov 30 15:53:29 2014
+++ src/etc/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.422 2014/11/30 15:53:29 uebayasi Exp $
+#	$NetBSD: Makefile,v 1.423 2015/07/23 08:03:25 mrg Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -147,11 +147,7 @@ distribution: .PHONY .MAKE check_DESTDIR
 .endif	# !INSTALL_DONE
 	${MAKEDIRTARGET} . install-etc-files
 . if ${MKX11} != "no"
-.  if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/mit/xorg distribution
-.  else
-	${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
-.  endif
 . endif
 . if ${MKEXTSRC} != "no"
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/extsrc distribution

Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.12 src/etc/Makefile.params:1.13
--- src/etc/Makefile.params:1.12	Sun Aug  3 09:19:34 2014
+++ src/etc/Makefile.params	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.params,v 1.12 2014/08/03 09:19:34 apb Exp $
+#	$NetBSD: Makefile.params,v 1.13 2015/07/23 08:03:25 mrg Exp $
 #
 # Makefile fragment for printing build parameters.
 #
@@ -61,7 +61,7 @@ RELEASEVARS=	BSDOBJDIR BSDSRCDIR BUILDID
 		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
 		USE_PAM USE_SKEY USE_YP \
 		USETOOLS USR_OBJMACHINE \
-		X11SRCDIR X11FLAVOUR
+		X11SRCDIR
 
 
 #

Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.28 src/etc/mtree/Makefile:1.29
--- src/etc/mtree/Makefile:1.28	Sun Jun 28 09:28:46 2015
+++ src/etc/mtree/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,13 +1,9 @@
-#	$NetBSD: Makefile,v 1.28 2015/06/28 09:28:46 martin Exp $
+#	$NetBSD: Makefile,v 1.29 2015/07/23 08:03:25 mrg Exp $
 
 .include <bsd.own.mk>
 
 .if ${MKX11} != "no"
-. if ${X11FLAVOUR} == "Xorg"
 EXTRA_DIST_FILES=	${.CURDIR}/NetBSD.dist.Xorg
-. else
-EXTRA_DIST_FILES=	${.CURDIR}/NetBSD.dist.XFree86
-. endif
 .endif
 
 # XXX these are only used by compat currently, but they could be used
@@ -20,8 +16,7 @@ EXTRA_DIST_FILES+=	${.CURDIR}/NetBSD.dis
 EXTRA_DIST_FILES+=	${.CURDIR}/NetBSD.dist.earm
 .endif
 EXTRA_DIST_FILES+=	NetBSD.dist.compat	# autogenerated
-.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no" \
-	&& ${X11FLAVOUR} == "Xorg"
+.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no"
 EXTRA_DIST_FILES+=	NetBSD.dist.xcompat	# autogenerated
 .endif
 .endif

Index: src/external/mit/Makefile
diff -u src/external/mit/Makefile:1.3 src/external/mit/Makefile:1.4
--- src/external/mit/Makefile:1.3	Wed Jan  7 20:42:01 2015
+++ src/external/mit/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.3 2015/01/07 20:42:01 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2015/07/23 08:03:25 mrg Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR+=	expat lua
 
-.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+.if ${MKX11} != "no"
 SUBDIR+=	xorg
 .endif
 

Index: src/external/mit/xorg/bin/xedit/lisp/Makefile
diff -u src/external/mit/xorg/bin/xedit/lisp/Makefile:1.5 src/external/mit/xorg/bin/xedit/lisp/Makefile:1.6
--- src/external/mit/xorg/bin/xedit/lisp/Makefile:1.5	Sun Jul 19 19:49:18 2015
+++ src/external/mit/xorg/bin/xedit/lisp/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2015/07/23 08:03:25 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -13,8 +13,7 @@ SRCS=		bytecode.c core.c debugger.c form
 CPPFLAGS+=	-DLISP  -DLISPDIR=\"${X11LIBDIR}/xedit/lisp\" \
 		-I${X11SRCDIR.xedit}/lisp/mp \
 		-I${X11SRCDIR.xedit}/lisp/re \
-		-I${X11SRCDIR.xedit} \
-		-I${X11SRCDIR.xc}/programs
+		-I${X11SRCDIR.xedit}
 
 .if defined(HAVE_PCC)
 # code uses gcc-specific "label as values" feature

Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.14 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.15
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.14	Mon Aug 25 11:48:01 2014
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.14 2014/08/25 11:48:01 christos Exp $
+#	$NetBSD: Makefile.libx11,v 1.15 2015/07/23 08:03:25 mrg Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -417,7 +417,7 @@ POLL_DEFINES=		-DUSE_POLL
 SETID_DEFINES=		-DHASSETUGID
 SHM_DEFINES=		-DHAS_SHM
 SOCK_DEFINES=		-DBSD44SOCKETS
-TRANS_INCLUDES=		-I${X11SRCDIR.xc}/lib/xtrans
+TRANS_INCLUDES=		-I${X11SRCDIR.xtrans}
 XCURSOR_DEFINES=	-DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\"
 XDMAUTHDEFS=		-DHASXDMAUTH
 XF86BIGFONT_DEFINES=	-DXF86BIGFONT

Index: src/external/mit/xorg/lib/libXrender/Makefile
diff -u src/external/mit/xorg/lib/libXrender/Makefile:1.2 src/external/mit/xorg/lib/libXrender/Makefile:1.3
--- src/external/mit/xorg/lib/libXrender/Makefile:1.2	Sat Sep 13 04:32:31 2008
+++ src/external/mit/xorg/lib/libXrender/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $
+#	$NetBSD: Makefile,v 1.3 2015/07/23 08:03:25 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -17,7 +17,6 @@ INCSDIR=${X11INCDIR}/X11/extensions
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/extensions
 CPPFLAGS+=	-I${XRENDERDIR}/../include
-#CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/X11
 
 LIBDPLIBS=\
 	Xext	${.CURDIR}/../libXext \

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.6	Thu Apr  3 02:40:45 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/04/03 02:40:45 riastradh Exp $
+#	$NetBSD: Makefile,v 1.7 2015/07/23 08:03:25 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,6 @@ BINMODE=	4711
 SRCS=		xorg.c libxorg.c
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/fonts \
 		-I${X11SRCDIR.xorg-server}/fb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/include \

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.36 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.37
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.36	Wed Nov 27 02:04:48 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2013/11/27 02:04:48 macallan Exp $
+#	$NetBSD: Makefile,v 1.37 2015/07/23 08:03:25 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -160,8 +160,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/Xext \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared \
-		-I${X11SRCDIR.xc}/extras/drm/shared
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/shared
 .if ${X11DRI} != "no"
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.10 src/external/mit/xorg/server/xorg-server/os/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.10	Sun Aug 10 14:43:03 2014
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Thu Jul 23 08:03:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/08/10 14:43:03 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.11 2015/07/23 08:03:25 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -53,7 +53,7 @@ CPPFLAGS.io.c=		${X11FLAGS.EXTENSION}
 CPPFLAGS.lbxio.c=	${X11FLAGS.EXTENSION}
 CPPFLAGS.oscolor.c=	-DNDBM
 CPPFLAGS.osinit.c=	-DADMPATH=\"/var/log/X\%smsgs\"
-CPPFLAGS.transport.c=	-DBSD44SOCKETS -I${X11SRCDIR.xc}/lib/xtrans
+CPPFLAGS.transport.c=	-DBSD44SOCKETS
 CPPFLAGS.utils.c=	${XDMCP_DEFINES} ${X11FLAGS.EXTENSION}
 CPPFLAGS.xdmauth.c=	${XDMCP_DEFINES}
 CPPFLAGS.xdmcp.c=	${XDMCP_DEFINES} -DBSD44SOCKETS

Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.6 src/external/mit/xorg/tools/mkfontscale/Makefile:1.7
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.6	Mon Jul 20 04:10:40 2015
+++ src/external/mit/xorg/tools/mkfontscale/Makefile	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/07/20 04:10:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2015/07/23 08:03:26 mrg Exp $
 
 NOMAN=		1
 
@@ -88,7 +88,6 @@ HOST_CPPFLAGS=	-DFONTENC_NO_LIBFONT -DXF
 HOST_CPPFLAGS+=	-DFT_CONFIG_OPTION_DISABLE_BZIP2
 HOST_CPPFLAGS+=	-I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
 		-I${DESTDIR}${X11INCDIR}/freetype2
-#		-I${X11SRCDIR.xc}/include/fonts
 
 .include <bsd.x11.mk>
 .include <bsd.hostprog.mk>

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.70 src/share/man/man5/mk.conf.5:1.71
--- src/share/man/man5/mk.conf.5:1.70	Wed Apr  8 05:47:00 2015
+++ src/share/man/man5/mk.conf.5	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.70 2015/04/08 05:47:00 wiz Exp $
+.\"	$NetBSD: mk.conf.5,v 1.71 2015/07/23 08:03:26 mrg Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -813,11 +813,7 @@ This also has implications on full build
 .YorN
 Indicates whether X11 is built and installed
 (by descending into
-.Pa src/x11
-or
-.Pa src/external/mit/xorg
-depending on the value of
-.Sy X11FLAVOUR ) .
+.Pa src/external/mit/xorg ) .
 .DFLTn
 .Pp
 .
@@ -1044,21 +1040,6 @@ otherwise (to preserve traditional seman
 .Xr make 1
 include files).
 .
-.It Sy X11FLAVOUR
-Picks which X11 distribution to cross-build with
-.Nx .
-Set to either
-.Dq Xorg
-or
-.Dq XFree86 .
-Only relevant if
-.Sy MKX11!=no .
-.DFLT
-.Dq XFree86
-on acorn32, alpha, amiga, mac68k, pmax, and sun3 platforms,
-.Dq Xorg
-on everything else.
-.
 .El
 .
 .Ss pkgsrc system variables

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.345 src/share/mk/bsd.README:1.346
--- src/share/mk/bsd.README:1.345	Sat Jun 27 16:21:07 2015
+++ src/share/mk/bsd.README	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.345 2015/06/27 16:21:07 matt Exp $
+#	$NetBSD: bsd.README,v 1.346 2015/07/23 08:03:26 mrg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -403,21 +403,18 @@ MKUPDATE 	If not "no", 'make install' on
 		installed counterparts.
 		Default: no
 
-MKX11		If not "no", depending on the value of ${X11FLAVOUR},
-		'make build' also descends into either src/x11 (XFree86) or
-		src/external/mit/xorg (modular Xorg) to cross-build X11 and
-		automatically enables creation of X sets.
+MKX11		If not "no", 'make build' also descends into 
+		src/external/mit/xorg to cross-build X11 and automatically
+		enables creation of X sets.
 		Default: no
 
-MKX11FONTS	If not "no", if ${X11FLAVOUR} is "Xorg", do not build or
-		install the X fonts.  The xfont set is still created but
-		will be empty.
+MKX11FONTS	If not "no", do not build or install the X fonts.  The xfont
+		set is still created but will be empty.
 		Default: yes
 
-MKX11MOTIF:	If "yes" and ${X11FLAVOUR} is "Xorg", build the native X11
-		libGLw with Motif stubs.  If Motif is not installed in the
-		default location /usr/pkg, the location can be specified
-		using the X11MOTIFPATH variable.
+MKX11MOTIF:	If "yes", build the native X11 libGLw with Motif stubs.  If
+		Motif is not installed in the default location /usr/pkg, the
+		location can be specified using the X11MOTIFPATH variable.
 		Default: no
 
 MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
@@ -495,11 +492,6 @@ USE_PIGZGZIP	If "no", use the host "gzip
 		and use nbpigz to compress things.
 		Default: "no".
 
-X11FLAVOUR	Set to "Xorg" or "XFree86", depending on whether to build
-		XFree86 or modular Xorg.  Only matters if MKX11!=no.
-		Default: "Xorg" on amd64, i386, macppc, shark and sparc64,
-		"XFree86" on everything else.
-
 COPTS.lib<lib>
 OBJCOPTS.lib<lib>
 LDADD.lib<lib>
@@ -650,8 +642,6 @@ NLSMODE		Native Language Support files m
 X11SRCDIR	The path to the xsrc tree.  [${NETBSDSRCDIR}/../xsrc,
 		if that exists; otherwise /usr/xsrc]
 
-X11SRCDIR.xc	The path to the (old) X11 xc src tree.  [${X11SRCDIR}/xfree/xc]
-
 X11SRCDIR.local	The path to the local X11 src tree.  [${X11SRCDIR}/local]
 
 X11SRCDIR.lib<package>
@@ -1793,9 +1783,9 @@ SUBDIR		For all of the directories liste
 =-=-=-=-=   bsd.x11.mk   =-=-=-=-=
 
 The include file <bsd.x11.mk> contains parameters and targets for
-cross-building X11 from ${X11SRCDIR.xc} / ${X11MITSRCDIR.*}.
-It should be included after the general Makefile contents but before
-the include files such as <bsd.prog.mk> and <bsd.lib.mk>.
+cross-building X11 from ${X11SRCDIR.<package>}.  It should be included
+after the general Makefile contents but before the include files such as
+<bsd.prog.mk> and <bsd.lib.mk>.
 
 It provides the following targets:
 	.man.1 .man.3 .man.4 .man.5 .man.7:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.861 src/share/mk/bsd.own.mk:1.862
--- src/share/mk/bsd.own.mk:1.861	Thu Jul 23 07:44:46 2015
+++ src/share/mk/bsd.own.mk	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.861 2015/07/23 07:44:46 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.862 2015/07/23 08:03:26 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1030,26 +1030,10 @@ ${var}?=	${${var}.${MACHINE_ARCH}:Uno}
 .endfor
 
 #
-# Do we default to XFree86 or Xorg for this platform?
-#
-.if \
-    ${MACHINE} == "acorn32"	|| \
-    ${MACHINE} == "alpha"	|| \
-    ${MACHINE} == "amiga"	|| \
-    ${MACHINE} == "mac68k"	|| \
-    ${MACHINE} == "pmax"	|| \
-    ${MACHINE} == "sun3"
-X11FLAVOUR?=	XFree86
-.else
-X11FLAVOUR?=	Xorg
-.endif
-
-#
 # Which platforms build the xorg-server drivers (as opposed
 # to just Xnest and Xvfb.)
 #
-.if ${X11FLAVOUR} == "Xorg"	&& ( \
-    ${MACHINE} == "alpha"	|| \
+.if ${MACHINE} == "alpha"	|| \
     ${MACHINE} == "amd64"	|| \
     ${MACHINE} == "bebox"	|| \
     ${MACHINE} == "cats"	|| \
@@ -1073,7 +1057,7 @@ X11FLAVOUR?=	Xorg
     ${MACHINE} == "sparc"	|| \
     ${MACHINE} == "sparc64"	|| \
     ${MACHINE} == "vax"		|| \
-    ${MACHINE} == "zaurus"	)
+    ${MACHINE} == "zaurus"
 MKXORG_SERVER?=yes
 .else
 MKXORG_SERVER?=no
@@ -1241,13 +1225,8 @@ X11SRCDIR=		/usr/xsrc
 .endif
 .endif # !defined(X11SRCDIR)
 
-X11SRCDIR.xc?=		${X11SRCDIR}/xfree/xc
 X11SRCDIR.local?=	${X11SRCDIR}/local
-.if ${X11FLAVOUR} == "Xorg"
 X11ROOTDIR?=		/usr/X11R7
-.else
-X11ROOTDIR?=		/usr/X11R6
-.endif
 X11BINDIR?=		${X11ROOTDIR}/bin
 X11ETCDIR?=		/etc/X11
 X11FONTDIR?=		${X11ROOTDIR}/lib/X11/fonts
@@ -1330,11 +1309,7 @@ MKRADEONFIRMWARE?=		yes
 .endif
 MKRADEONFIRMWARE?=		no
 
-.if ${X11FLAVOUR} == "Xorg"
 X11DRI?=			yes
-.endif
-
-X11DRI?=			no
 X11LOADABLE?=			yes
 
 

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.116 src/share/mk/bsd.x11.mk:1.117
--- src/share/mk/bsd.x11.mk:1.116	Wed Jun 24 22:20:26 2015
+++ src/share/mk/bsd.x11.mk	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.116 2015/06/24 22:20:26 matt Exp $
+#	$NetBSD: bsd.x11.mk,v 1.117 2015/07/23 08:03:26 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -29,7 +29,6 @@ X11FLAGS.CONNECTION+=	-DIPv6
 .endif
 
 #	 EXT_DEFINES
-.if ${X11FLAVOUR} == "Xorg"
 X11FLAGS.BASE_EXTENSION=	-DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC \
 				-DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE \
 				-DXF86MISC -DDPMSExtension -DEVI \
@@ -62,12 +61,6 @@ X11INCS.DIX=		-I${X11INCSDIR}/freetype2 
 			-I$(X11SRCDIR.xorg-server)/randr \
 			-I$(X11SRCDIR.xorg-server)/fb \
 			-I$(X11SRCDIR.xorg-server)/../include
-.else
-X11FLAGS.EXTENSION=	-DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC -DXRECORD \
-			-DMITSHM -DBIGREQS -DXF86MISC -DDBE -DDPMSExtension \
-			-DEVI -DSCREENSAVER -DXV -DXVMC -DGLXEXT \
-			-DGLX_USE_MESA -DFONTCACHE -DRES
-.endif
 
 X11FLAGS.DRI=		-DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING \
 			-DGLX_USE_DLOPEN -DGLX_USE_MESA
@@ -89,7 +82,6 @@ X11FLAGS.OS_DEFINES=	-DDDXOSINIT -DSERVE
 			-DDDXOSVERRORF -DDDXTIME -DUSB_HID
 
 .if !(${MACHINE} == "acorn32"	|| \
-    (${MACHINE} == "alpha"  && ${X11FLAVOUR} != "Xorg")	|| \
     ${MACHINE} == "amiga"	|| \
     ${MACHINE} == "pmax"	|| \
     ${MACHINE} == "sun3"	|| \
@@ -127,7 +119,6 @@ X11FLAGS.LOADABLE=	-DXFree86LOADER -DIN_
 .endif
   
 # XXX FIX ME
-.if ${X11FLAVOUR} == "Xorg"
 XVENDORNAMESHORT=	'"X.Org"'
 XVENDORNAME=		'"The X.Org Foundation"'
 XORG_RELEASE=		'"Release 1.10.6"'
@@ -137,7 +128,6 @@ XLOCALE.DEFINES=	-DXLOCALEDIR=\"${X11LIB
 
 # XXX oh yeah, fix me later
 XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)"
-.endif
 
 PRINT_PACKAGE_VERSION=	awk '/^PACKAGE_VERSION=/ {			\
 				match($$1, "([0-9]+\\.)+[0-9]+");	\
@@ -145,15 +135,6 @@ PRINT_PACKAGE_VERSION=	awk '/^PACKAGE_VE
 			} END { print version }'
 
 
-# Extract X11VERSION
-PRINTX11VERSION=${TOOL_AWK} ' \
-		     /^\#define XF86_VERSION_MAJOR/ {major = $$3} \
-		     /^\#define XF86_VERSION_MINOR/ {minor = $$3} \
-		     /^\#define XF86_VERSION_PATCH/ {patch = $$3} \
-		     /^\#define XF86_VERSION_SNAP/ {snap = $$3} \
-		     END { print "((("major") * 10000000) + (("minor") * 100000) + (("patch") * 1000) + "snap")"}' \
-		     ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h
-
 # Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other
 # things. Transformed from the "CppSedMagic" macro from "Imake.rules".
 #
@@ -408,12 +389,6 @@ _X11MANTRANSFORM= \
 	${X11EXTRAMANTRANSFORMS}
 
 # Note the escaping trick for _X11MANTRANSFORM using % to replace spaces
-.if ${X11FLAVOUR} != "Xorg"
-X11VERSION=	"XFree86 4.5.0"
-X11MANCPP?=	yes
-_X11MANTRANSFORM+= \
-	__vendorversion__	${X11VERSION:C/ /%/gW}
-.else
 XORGVERSION=	'"X Version 11"'
 X11MANCPP?=	no
 _X11MANTRANSFORM+= \
@@ -424,7 +399,6 @@ _X11MANTRANSFORM+= \
 	__xorgversion__		${XORGVERSION:C/ /%/gW} \
 	__XSERVERNAME__		Xorg \
 	__xservername__		Xorg
-.endif
 
 _X11MANTRANSFORMCMD=	${TOOL_SED} -e 's/\\$$/\\ /' ${.IMPSRC}
 

Index: src/tools/Makefile
diff -u src/tools/Makefile:1.181 src/tools/Makefile:1.182
--- src/tools/Makefile:1.181	Wed Jun 24 22:20:26 2015
+++ src/tools/Makefile	Thu Jul 23 08:03:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.181 2015/06/24 22:20:26 matt Exp $
+#	$NetBSD: Makefile,v 1.182 2015/07/23 08:03:26 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -211,7 +211,7 @@ SUBDIR+=	elftosb
 SUBDIR+=	mkubootimage
 .endif
 
-.if ${MKX11} != "no" && ${X11FLAVOUR} == "Xorg"
+.if ${MKX11} != "no"
 SUBDIR+=	makestrs
 SUBDIR+=	makekeys
 .endif

Reply via email to