Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src remove the xfree86 reachover makefiles and the vast majority of
details: https://anonhg.NetBSD.org/src/rev/2761fb538fac
branches: trunk
changeset: 339452:2761fb538fac
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Jul 23 08:03:24 2015 +0000
description:
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.)
diffstat:
BUILDING | 17 +-
Makefile | 9 +-
compat/compatsubdir.mk | 4 +-
crypto/external/bsd/openssh/Makefile.inc | 4 +-
distrib/sets/mkvars.mk | 9 +-
distrib/sets/sets.subr | 7 +-
doc/BUILDING.mdoc | 23 +-
doc/HACKS | 3 +-
etc/Makefile | 6 +-
etc/Makefile.params | 4 +-
etc/mtree/Makefile | 9 +-
etc/mtree/NetBSD.dist.XFree86 | 178 -
external/mit/Makefile | 4 +-
external/mit/xorg/bin/xedit/lisp/Makefile | 5 +-
external/mit/xorg/lib/libX11/Makefile.libx11 | 4 +-
external/mit/xorg/lib/libXrender/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 5 +-
external/mit/xorg/server/xorg-server/os/Makefile | 4 +-
external/mit/xorg/tools/mkfontscale/Makefile | 3 +-
share/man/man5/mk.conf.5 | 23 +-
share/mk/bsd.README | 34 +-
share/mk/bsd.own.mk | 31 +-
share/mk/bsd.x11.mk | 28 +-
tools/Makefile | 4 +-
x11/Makefile | 76 -
x11/TODO | 22 -
x11/Xserver/GL/GLcore/Makefile | 9 -
x11/Xserver/GL/GLcore/Makefile.GLcore | 97 -
x11/Xserver/GL/GLcore/module/Makefile | 12 -
x11/Xserver/GL/Makefile | 11 -
x11/Xserver/GL/dri/Makefile | 37 -
x11/Xserver/GL/dri/mga_dri/Makefile | 133 -
x11/Xserver/GL/dri/mga_dri/shlib_version | 4 -
x11/Xserver/GL/dri/radeon_dri/Makefile | 137 -
x11/Xserver/GL/dri/radeon_dri/shlib_version | 4 -
x11/Xserver/GL/glx/Makefile | 9 -
x11/Xserver/GL/glx/Makefile.glx | 30 -
x11/Xserver/GL/glx/module/Makefile | 12 -
x11/Xserver/Makefile | 55 -
x11/Xserver/Makefile.common | 135 -
x11/Xserver/Makefile.serverlib | 45 -
x11/Xserver/Xext/Makefile | 12 -
x11/Xserver/Xext/Makefile.ext | 28 -
x11/Xserver/Xext/ext/Makefile | 18 -
x11/Xserver/Xext/extmod/Makefile | 15 -
x11/Xserver/Xext/exts/Makefile | 9 -
x11/Xserver/Xfont/Makefile | 5 -
x11/Xserver/Xfont/bitmap/Makefile | 33 -
x11/Xserver/Xfont/freetype/Makefile | 98 -
x11/Xserver/Xfont/speedo/Makefile | 30 -
x11/Xserver/Xfont/type1/Makefile | 33 -
x11/Xserver/Xfont/xtt/Makefile | 38 -
x11/Xserver/Xserver/Makefile | 89 -
x11/Xserver/Xserver/Makefile.Xserver | 32 -
x11/Xserver/Xserver/X68k/Makefile | 42 -
x11/Xserver/Xserver/X68k/X68k.c | 1 -
x11/Xserver/Xserver/XF68_FBDev/XF68_FBDev.c | 42 -
x11/Xserver/Xserver/XF68_SVGA/XF68_SVGA.c | 54 -
x11/Xserver/Xserver/XF68_W32/XF68_W32.c | 56 -
x11/Xserver/Xserver/XFree86/Makefile | 57 -
x11/Xserver/Xserver/XFree86/XFree86.c | 1 -
x11/Xserver/Xserver/XalphaNetBSD/Makefile | 30 -
x11/Xserver/Xserver/XalphaNetBSD/XalphaNetBSD.c | 1 -
x11/Xserver/Xserver/Xamiga/Makefile | 33 -
x11/Xserver/Xserver/Xamiga/Xamiga.c | 1 -
x11/Xserver/Xserver/Xarm32VIDC/Makefile | 32 -
x11/Xserver/Xserver/Xarm32VIDC/Xarm32VIDC.c | 1 -
x11/Xserver/Xserver/XdecNetBSD/Makefile | 31 -
x11/Xserver/Xserver/XdecNetBSD/XdecNetBSD.c | 1 -
x11/Xserver/Xserver/Xdmx/Makefile | 55 -
x11/Xserver/Xserver/Xdreamcast/Makefile | 31 -
x11/Xserver/Xserver/Xdreamcast/Xdreamcast.c | 1 -
x11/Xserver/Xserver/Xews4800mips/Makefile | 31 -
x11/Xserver/Xserver/Xews4800mips/Xews4800mips.c | 1 -
x11/Xserver/Xserver/Xhpc/Makefile | 39 -
x11/Xserver/Xserver/Xhpc/Xhpc.c | 1 -
x11/Xserver/Xserver/Xmac68k/Makefile | 39 -
x11/Xserver/Xserver/Xmac68k/Xmac68k.c | 1 -
x11/Xserver/Xserver/Xmacppc/Makefile | 37 -
x11/Xserver/Xserver/Xmacppc/Xmacppc.c | 1 -
x11/Xserver/Xserver/Xnest/Makefile | 32 -
x11/Xserver/Xserver/Xnest/Xnest.c | 1 -
x11/Xserver/Xserver/Xnewsmips/Makefile | 31 -
x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c | 1 -
x11/Xserver/Xserver/Xprt/Makefile | 38 -
x11/Xserver/Xserver/Xprt/Xprt.c | 1 -
x11/Xserver/Xserver/Xsun/Makefile | 48 -
x11/Xserver/Xserver/Xsun/Xsun.c | 1 -
x11/Xserver/Xserver/Xsun24/Makefile | 38 -
x11/Xserver/Xserver/Xsun24/Xsun24.c | 1 -
x11/Xserver/Xserver/XsunMono/Makefile | 35 -
x11/Xserver/Xserver/XsunMono/XsunMono.c | 1 -
x11/Xserver/Xserver/Xvfb/Makefile | 31 -
x11/Xserver/Xserver/Xvfb/Xvfb.c | 1 -
x11/Xserver/afb/Makefile | 14 -
x11/Xserver/afb/Makefile.afb | 46 -
x11/Xserver/afb/afb/Makefile | 3 -
x11/Xserver/afb/afbmod/Makefile | 7 -
x11/Xserver/cfb/Makefile | 14 -
x11/Xserver/cfb/Makefile.cfb | 124 -
x11/Xserver/cfb/module/Makefile | 10 -
x11/Xserver/cfb16/Makefile | 11 -
x11/Xserver/cfb16/module/Makefile | 10 -
x11/Xserver/cfb24/Makefile | 11 -
x11/Xserver/cfb24/module/Makefile | 9 -
x11/Xserver/cfb32/Makefile | 11 -
x11/Xserver/cfb32/module/Makefile | 9 -
x11/Xserver/dbe/Makefile | 9 -
x11/Xserver/dbe/Makefile.dbe | 15 -
x11/Xserver/dbe/module/Makefile | 7 -
x11/Xserver/dix/Makefile | 34 -
x11/Xserver/dix/xpstubs/Makefile | 20 -
x11/Xserver/fb/Makefile | 11 -
x11/Xserver/fb/Makefile.fb | 27 -
x11/Xserver/fb/module/Makefile | 6 -
x11/Xserver/fontbase/Makefile | 67 -
x11/Xserver/hw/Makefile | 67 -
x11/Xserver/hw/dmx/Makefile | 60 -
x11/Xserver/hw/dmx/bin/Makefile | 7 -
x11/Xserver/hw/dmx/bin/dmxaddinput/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxaddscreen/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxreconfig/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxresize/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxrminput/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxrmscreen/Makefile | 17 -
x11/Xserver/hw/dmx/bin/dmxtodmx/Makefile | 18 -
x11/Xserver/hw/dmx/bin/dmxwininfo/Makefile | 17 -
x11/Xserver/hw/dmx/bin/evi/Makefile | 17 -
x11/Xserver/hw/dmx/bin/res/Makefile | 17 -
x11/Xserver/hw/dmx/bin/vdltodmx/Makefile | 18 -
x11/Xserver/hw/dmx/bin/xbell/Makefile | 17 -
x11/Xserver/hw/dmx/bin/xdmx/Makefile | 19 -
x11/Xserver/hw/dmx/bin/xdmxconfig/Makefile | 30 -
x11/Xserver/hw/dmx/bin/xinput/Makefile | 17 -
x11/Xserver/hw/dmx/bin/xled/Makefile | 17 -
x11/Xserver/hw/dmx/bin/xtest/Makefile | 17 -
x11/Xserver/hw/dmx/dmxconfig/Makefile | 25 -
x11/Xserver/hw/dmx/dmxinput/Makefile | 26 -
x11/Xserver/hw/netbsd/alpha/Makefile | 55 -
x11/Xserver/hw/netbsd/amiga/Makefile | 67 -
x11/Xserver/hw/netbsd/arm32vidc/Makefile | 23 -
x11/Xserver/hw/netbsd/dec/Makefile | 89 -
x11/Xserver/hw/netbsd/dreamcast/Makefile | 32 -
x11/Xserver/hw/netbsd/ews4800mips/Makefile | 32 -
x11/Xserver/hw/netbsd/hpc/Makefile | 31 -
x11/Xserver/hw/netbsd/mac68k/Makefile | 28 -
x11/Xserver/hw/netbsd/macppc/Makefile | 29 -
x11/Xserver/hw/netbsd/newsmips/Makefile | 32 -
x11/Xserver/hw/netbsd/pmax/Makefile | 26 -
x11/Xserver/hw/netbsd/x68k/Makefile | 34 -
x11/Xserver/hw/sun/Makefile | 45 -
x11/Xserver/hw/sun/bin/constype/Makefile | 12 -
x11/Xserver/hw/sun/bin/kbd_mode/Makefile | 12 -
x11/Xserver/hw/vfb/Makefile | 39 -
x11/Xserver/hw/xfree68/FBDev/Makefile | 29 -
x11/Xserver/hw/xfree68/FBDev/fbdev_netbsd.c | 950 ----------
x11/Xserver/hw/xfree68/Makefile | 27 -
x11/Xserver/hw/xfree86/Makefile | 58 -
x11/Xserver/hw/xfree86/Makefile.drivermod | 22 -
x11/Xserver/hw/xfree86/bin/Makefile | 11 -
x11/Xserver/hw/xfree86/bin/getconfig/Makefile | 16 -
x11/Xserver/hw/xfree86/bin/gtf/Makefile | 25 -
x11/Xserver/hw/xfree86/bin/ioport/Makefile | 46 -
x11/Xserver/hw/xfree86/bin/kbd_mode/Makefile | 32 -
x11/Xserver/hw/xfree86/bin/mmapr/Makefile | 24 -
x11/Xserver/hw/xfree86/bin/mmapw/Makefile | 24 -
x11/Xserver/hw/xfree86/bin/pcitweak/Makefile | 39 -
x11/Xserver/hw/xfree86/bin/scanpci/Makefile | 43 -
x11/Xserver/hw/xfree86/bin/xf86cfg/Makefile | 95 -
x11/Xserver/hw/xfree86/bin/xf86config/Makefile | 30 -
x11/Xserver/hw/xfree86/ddc/Makefile | 23 -
x11/Xserver/hw/xfree86/doc/Makefile | 24 -
x11/Xserver/hw/xfree86/drivers/Makefile | 41 -
x11/Xserver/hw/xfree86/drivers/ag10e/Makefile | 30 -
x11/Xserver/hw/xfree86/drivers/apm/Makefile | 40 -
x11/Xserver/hw/xfree86/drivers/ark/Makefile | 38 -
x11/Xserver/hw/xfree86/drivers/ati/Makefile | 69 -
x11/Xserver/hw/xfree86/drivers/atimisc/Makefile | 79 -
x11/Xserver/hw/xfree86/drivers/chips/Makefile | 58 -
x11/Xserver/hw/xfree86/drivers/cirrus/Makefile | 45 -
x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_alpine/Makefile | 42 -
x11/Xserver/hw/xfree86/drivers/cirrus/cirrus_laguna/Makefile | 42 -
x11/Xserver/hw/xfree86/drivers/cyrix/Makefile | 37 -
x11/Xserver/hw/xfree86/drivers/dummy/Makefile | 29 -
x11/Xserver/hw/xfree86/drivers/fbdev/Makefile | 38 -
x11/Xserver/hw/xfree86/drivers/glint/Makefile | 55 -
x11/Xserver/hw/xfree86/drivers/i128/Makefile | 42 -
x11/Xserver/hw/xfree86/drivers/i740/Makefile | 39 -
x11/Xserver/hw/xfree86/drivers/i810/Makefile | 47 -
x11/Xserver/hw/xfree86/drivers/imstt/Makefile | 36 -
x11/Xserver/hw/xfree86/drivers/mga/Makefile | 67 -
x11/Xserver/hw/xfree86/drivers/neomagic/Makefile | 44 -
x11/Xserver/hw/xfree86/drivers/newport/Makefile | 35 -
x11/Xserver/hw/xfree86/drivers/nsc/Makefile | 57 -
x11/Xserver/hw/xfree86/drivers/nv/Makefile | 48 -
x11/Xserver/hw/xfree86/drivers/nv/riva128/Makefile | 43 -
x11/Xserver/hw/xfree86/drivers/pnozz/Makefile | 30 -
x11/Xserver/hw/xfree86/drivers/r128/Makefile | 61 -
x11/Xserver/hw/xfree86/drivers/radeon/Makefile | 60 -
x11/Xserver/hw/xfree86/drivers/rendition/Makefile | 49 -
x11/Xserver/hw/xfree86/drivers/s3/Makefile | 50 -
x11/Xserver/hw/xfree86/drivers/s3virge/Makefile | 43 -
x11/Xserver/hw/xfree86/drivers/savage/Makefile | 44 -
x11/Xserver/hw/xfree86/drivers/siliconmotion/Makefile | 43 -
x11/Xserver/hw/xfree86/drivers/sis/Makefile | 46 -
x11/Xserver/hw/xfree86/drivers/sunbw2/Makefile | 29 -
x11/Xserver/hw/xfree86/drivers/suncg14/Makefile | 29 -
x11/Xserver/hw/xfree86/drivers/suncg3/Makefile | 29 -
x11/Xserver/hw/xfree86/drivers/suncg6/Makefile | 30 -
x11/Xserver/hw/xfree86/drivers/sunffb/Makefile | 64 -
x11/Xserver/hw/xfree86/drivers/sunleo/Makefile | 31 -
x11/Xserver/hw/xfree86/drivers/suntcx/Makefile | 29 -
x11/Xserver/hw/xfree86/drivers/tdfx/Makefile | 38 -
x11/Xserver/hw/xfree86/drivers/tga/Makefile | 37 -
x11/Xserver/hw/xfree86/drivers/trident/Makefile | 44 -
x11/Xserver/hw/xfree86/drivers/tseng/Makefile | 41 -
x11/Xserver/hw/xfree86/drivers/vesa/Makefile | 40 -
x11/Xserver/hw/xfree86/drivers/vga/Makefile | 41 -
x11/Xserver/hw/xfree86/drivers/via/Makefile | 57 -
x11/Xserver/hw/xfree86/drivers/vmware/Makefile | 38 -
x11/Xserver/hw/xfree86/drivers/wsfb/Makefile | 34 -
x11/Xserver/hw/xfree86/drm/Makefile | 33 -
x11/Xserver/hw/xfree86/drm/mga/Makefile | 25 -
x11/Xserver/hw/xfree86/drm/radeon/Makefile | 25 -
x11/Xserver/hw/xfree86/dummy/Makefile | 26 -
x11/Xserver/hw/xfree86/etc/Makefile | 11 -
x11/Xserver/hw/xfree86/fbdevhw/Makefile | 11 -
x11/Xserver/hw/xfree86/i2c/Makefile | 23 -
x11/Xserver/hw/xfree86/input/Makefile | 11 -
x11/Xserver/hw/xfree86/input/acecad/Makefile | 25 -
x11/Xserver/hw/xfree86/input/calcomp/Makefile | 23 -
x11/Xserver/hw/xfree86/input/citron/Makefile | 25 -
x11/Xserver/hw/xfree86/input/digitaledge/Makefile | 24 -
x11/Xserver/hw/xfree86/input/dmc/Makefile | 24 -
x11/Xserver/hw/xfree86/input/dynapro/Makefile | 24 -
x11/Xserver/hw/xfree86/input/elographics/Makefile | 24 -
x11/Xserver/hw/xfree86/input/fpit/Makefile | 25 -
x11/Xserver/hw/xfree86/input/hyperpen/Makefile | 24 -
x11/Xserver/hw/xfree86/input/js_x/Makefile | 25 -
x11/Xserver/hw/xfree86/input/kbd/Makefile | 25 -
x11/Xserver/hw/xfree86/input/magellan/Makefile | 23 -
x11/Xserver/hw/xfree86/input/microtouch/Makefile | 24 -
x11/Xserver/hw/xfree86/input/mouse/Makefile | 27 -
x11/Xserver/hw/xfree86/input/mutouch/Makefile | 25 -
x11/Xserver/hw/xfree86/input/palmax/Makefile | 25 -
x11/Xserver/hw/xfree86/input/penmount/Makefile | 24 -
x11/Xserver/hw/xfree86/input/spaceorb/Makefile | 23 -
x11/Xserver/hw/xfree86/input/summa/Makefile | 24 -
x11/Xserver/hw/xfree86/input/tek4957/Makefile | 25 -
x11/Xserver/hw/xfree86/input/usbtablet/Makefile | 25 -
x11/Xserver/hw/xfree86/input/void/Makefile | 25 -
x11/Xserver/hw/xfree86/input/wacom/Makefile | 25 -
x11/Xserver/hw/xfree86/int10/Makefile | 33 -
x11/Xserver/hw/xfree86/loader/Makefile | 49 -
x11/Xserver/hw/xfree86/pcidata/Makefile | 36 -
x11/Xserver/hw/xfree86/rac/Makefile | 23 -
x11/Xserver/hw/xfree86/ramdac/Makefile | 31 -
x11/Xserver/hw/xfree86/scanpci/Makefile | 33 -
x11/Xserver/hw/xfree86/shadowfb/Makefile | 24 -
x11/Xserver/hw/xfree86/vbe/Makefile | 24 -
x11/Xserver/hw/xfree86/vgahw/Makefile | 28 -
x11/Xserver/hw/xfree86/xaa/Makefile | 86 -
x11/Xserver/hw/xfree86/xf1bpp/Makefile | 106 -
x11/Xserver/hw/xfree86/xf24_32bpp/Makefile | 33 -
x11/Xserver/hw/xfree86/xf4bpp/Makefile | 39 -
x11/Xserver/hw/xfree86/xf86/Makefile | 116 -
x11/Xserver/hw/xfree86/xf86_os/Makefile | 139 -
x11/Xserver/hw/xfree86/xf86config/Makefile | 32 -
x11/Xserver/hw/xfree86/xf8_16bpp/Makefile | 26 -
x11/Xserver/hw/xfree86/xf8_32bpp/Makefile | 36 -
x11/Xserver/hw/xfree86/xf8_32wid/Makefile | 26 -
x11/Xserver/hw/xfree86/xloader/Makefile | 43 -
x11/Xserver/hw/xnest/Makefile | 32 -
x11/Xserver/include/Makefile | 18 -
x11/Xserver/iplan2p2/Makefile | 7 -
x11/Xserver/iplan2p4/Makefile | 5 -
x11/Xserver/iplan2p4/Makefile.iplan | 74 -
x11/Xserver/iplan2p8/Makefile | 7 -
x11/Xserver/lbx/Makefile | 22 -
x11/Xserver/mfb/Makefile | 9 -
x11/Xserver/mfb/Makefile.mfb | 72 -
x11/Xserver/mfb/module/Makefile | 6 -
x11/Xserver/mi/Makefile | 37 -
x11/Xserver/miext/Makefile | 5 -
x11/Xserver/miext/layer/Makefile | 9 -
x11/Xserver/miext/layer/Makefile.layer | 22 -
x11/Xserver/miext/layer/module/Makefile | 8 -
x11/Xserver/miext/shadow/Makefile | 9 -
x11/Xserver/miext/shadow/Makefile.shadow | 24 -
x11/Xserver/miext/shadow/module/Makefile | 8 -
x11/Xserver/os/Makefile | 69 -
x11/Xserver/printer/Makefile | 54 -
x11/Xserver/printer/pcl/Makefile | 26 -
x11/Xserver/printer/ps/Makefile | 27 -
x11/Xserver/printer/raster/Makefile | 24 -
x11/Xserver/randr/Makefile | 21 -
x11/Xserver/record/Makefile | 9 -
x11/Xserver/record/Makefile.record | 18 -
x11/Xserver/record/module/Makefile | 7 -
x11/Xserver/render/Makefile | 26 -
x11/Xserver/xinput/Makefile | 37 -
x11/Xserver/xkb/Makefile | 52 -
x11/Xserver/xtrap/Makefile | 9 -
x11/Xserver/xtrap/Makefile.xtrap | 16 -
x11/Xserver/xtrap/module/Makefile | 8 -
x11/bin/Makefile | 21 -
x11/bin/appres/Makefile | 13 -
x11/bin/bdftopcf/Makefile | 17 -
x11/bin/bdftruncate/Makefile | 11 -
x11/bin/beforelight/Makefile | 20 -
x11/bin/bitmap/Makefile | 30 -
x11/bin/bitmap/atobm/Makefile | 16 -
x11/bin/bitmap/bmtoa/Makefile | 16 -
x11/bin/ccmakedep/Makefile | 15 -
x11/bin/cleanlinks/Makefile | 11 -
x11/bin/cxpm/Makefile | 13 -
x11/bin/dpsexec/Makefile | 13 -
x11/bin/dpsinfo/Makefile | 20 -
x11/bin/editres/Makefile | 20 -
x11/bin/fc-cache/Makefile | 13 -
x11/bin/fc-list/Makefile | 13 -
x11/bin/fonttosfnt/Makefile | 17 -
x11/bin/fslsfonts/Makefile | 13 -
x11/bin/fstobdf/Makefile | 14 -
x11/bin/gccmakedep/Makefile | 16 -
x11/bin/glxgears/Makefile | 15 -
x11/bin/glxinfo/Makefile | 19 -
x11/bin/iceauth/Makefile | 14 -
x11/bin/ico/Makefile | 15 -
x11/bin/imake/Makefile | 16 -
x11/bin/lbxproxy/Makefile | 54 -
x11/bin/listres/Makefile | 14 -
x11/bin/lndir/Makefile | 10 -
x11/bin/luit/Makefile | 16 -
x11/bin/makedepend/Makefile | 18 -
x11/bin/makeg/Makefile | 11 -
x11/bin/makepsres/Makefile | 12 -
x11/bin/makestrs/Makefile | 10 -
x11/bin/mergelib/Makefile | 13 -
x11/bin/mkcfm/Makefile | 25 -
x11/bin/mkdirhier/Makefile | 11 -
x11/bin/mkfontdir/Makefile | 21 -
x11/bin/mkfontscale/Makefile | 17 -
x11/bin/mkhtmlindex/Makefile | 11 -
x11/bin/oclock/Makefile | 18 -
x11/bin/proxymngr/Makefile | 28 -
x11/bin/pswrap/Makefile | 21 -
x11/bin/revpath/Makefile | 10 -
x11/bin/rgb/Makefile | 29 -
x11/bin/rgb/rgb_mkdb.sh | 60 -
x11/bin/rman/Makefile | 16 -
x11/bin/rstart/Makefile | 39 -
x11/bin/rstart/Makefile.rstart | 21 -
x11/bin/rstart/commands/Makefile | 18 -
x11/bin/rstart/commands/x11r6/Makefile | 12 -
x11/bin/rstart/contexts/Makefile | 14 -
x11/bin/scripts/Makefile | 11 -
x11/bin/setxkbmap/Makefile | 15 -
x11/bin/showfont/Makefile | 13 -
x11/bin/showrgb/Makefile | 13 -
x11/bin/smproxy/Makefile | 16 -
x11/bin/ssh-askpass/Makefile | 39 -
x11/bin/sxpm/Makefile | 13 -
x11/bin/texteroids/Makefile | 20 -
x11/bin/twm/Makefile | 43 -
x11/bin/ucs2any/Makefile | 10 -
x11/bin/viewres/Makefile | 16 -
x11/bin/x11perf/Makefile | 34 -
x11/bin/xauth/Makefile | 17 -
x11/bin/xbiff/Makefile | 15 -
x11/bin/xcalc/Makefile | 19 -
x11/bin/xclipboard/Makefile | 16 -
x11/bin/xclock/Makefile | 24 -
x11/bin/xcmsdb/Makefile | 14 -
x11/bin/xconsole/Makefile | 16 -
x11/bin/xcutsel/Makefile | 14 -
x11/bin/xditview/Makefile | 28 -
x11/bin/xdm/Makefile | 58 -
x11/bin/xdm/Makefile.xdm | 27 -
x11/bin/xdm/chooser/Makefile | 21 -
x11/bin/xdm/config/Makefile | 55 -
x11/bin/xdm/sessreg/Makefile | 10 -
x11/bin/xdm/xdmshell/Makefile | 14 -
x11/bin/xdpyinfo/Makefile | 18 -
x11/bin/xedit/Makefile | 5 -
x11/bin/xedit/lisp/Makefile | 22 -
x11/bin/xedit/modules/Makefile | 14 -
x11/bin/xedit/modules/progmodes/Makefile | 12 -
x11/bin/xedit/mp/Makefile | 13 -
x11/bin/xedit/re/Makefile | 13 -
x11/bin/xedit/xedit/Makefile | 25 -
x11/bin/xev/Makefile | 13 -
x11/bin/xeyes/Makefile | 14 -
x11/bin/xf86dga/Makefile | 13 -
x11/bin/xfd/Makefile | 21 -
x11/bin/xfindproxy/Makefile | 13 -
x11/bin/xfontsel/Makefile | 17 -
x11/bin/xfs/Makefile | 58 -
x11/bin/xfsinfo/Makefile | 13 -
x11/bin/xfwp/Makefile | 16 -
x11/bin/xgamma/Makefile | 14 -
x11/bin/xgc/Makefile | 21 -
x11/bin/xhost/Makefile | 15 -
x11/bin/xinit/Makefile | 52 -
x11/bin/xkbcomp/Makefile | 29 -
x11/bin/xkbcomp/Makefile.xkbcomp | 24 -
x11/bin/xkbcomp/compat/Makefile | 14 -
x11/bin/xkbcomp/compiled/Makefile | 11 -
x11/bin/xkbcomp/geometry/Makefile | 18 -
x11/bin/xkbcomp/geometry/digital/Makefile | 11 -
x11/bin/xkbcomp/geometry/ibm/Makefile | 11 -
x11/bin/xkbcomp/geometry/sgi/Makefile | 11 -
x11/bin/xkbcomp/keycodes/Makefile | 17 -
x11/bin/xkbcomp/keycodes/digital/Makefile | 11 -
x11/bin/xkbcomp/keycodes/sgi/Makefile | 11 -
x11/bin/xkbcomp/keymap/Makefile | 16 -
x11/bin/xkbcomp/keymap/digital/Makefile | 11 -
x11/bin/xkbcomp/keymap/sgi/Makefile | 12 -
x11/bin/xkbcomp/keymap/sun/Makefile | 11 -
x11/bin/xkbcomp/rules/Makefile | 12 -
x11/bin/xkbcomp/semantics/Makefile | 11 -
x11/bin/xkbcomp/symbols/Makefile | 42 -
x11/bin/xkbcomp/symbols/digital/Makefile | 11 -
x11/bin/xkbcomp/symbols/fujitsu/Makefile | 11 -
x11/bin/xkbcomp/symbols/hp/Makefile | 11 -
x11/bin/xkbcomp/symbols/macintosh/Makefile | 11 -
x11/bin/xkbcomp/symbols/nec/Makefile | 11 -
x11/bin/xkbcomp/symbols/pc/Makefile | 30 -
x11/bin/xkbcomp/symbols/sgi/Makefile | 11 -
x11/bin/xkbcomp/symbols/sharp/Makefile | 11 -
x11/bin/xkbcomp/symbols/sony/Makefile | 11 -
x11/bin/xkbcomp/symbols/sun/Makefile | 11 -
x11/bin/xkbcomp/symbols/xfree68/Makefile | 11 -
x11/bin/xkbcomp/types/Makefile | 14 -
x11/bin/xkbevd/Makefile | 15 -
x11/bin/xkbprint/Makefile | 14 -
x11/bin/xkbutils/Makefile | 5 -
x11/bin/xkbutils/Makefile.xkbutils | 16 -
x11/bin/xkbutils/xkbbell/Makefile | 5 -
x11/bin/xkbutils/xkbvleds/Makefile | 6 -
x11/bin/xkbutils/xkbwatch/Makefile | 6 -
x11/bin/xkill/Makefile | 13 -
x11/bin/xload/Makefile | 19 -
x11/bin/xlogo/Makefile | 23 -
x11/bin/xlsatoms/Makefile | 13 -
x11/bin/xlsclients/Makefile | 15 -
x11/bin/xlsfonts/Makefile | 14 -
x11/bin/xmag/Makefile | 17 -
x11/bin/xman/Makefile | 25 -
x11/bin/xmessage/Makefile | 19 -
x11/bin/xmh/Makefile | 25 -
x11/bin/xmkmf/Makefile | 13 -
x11/bin/xmodmap/Makefile | 14 -
x11/bin/xprop/Makefile | 18 -
x11/bin/xrandr/Makefile | 13 -
x11/bin/xrdb/Makefile | 15 -
x11/bin/xrefresh/Makefile | 13 -
x11/bin/xset/Makefile | 16 -
x11/bin/xsetmode/Makefile | 13 -
x11/bin/xsetpointer/Makefile | 15 -
x11/bin/xsetroot/Makefile | 13 -
x11/bin/xsm/Makefile | 28 -
x11/bin/xstdcmap/Makefile | 13 -
x11/bin/xterm/Makefile | 35 -
x11/bin/xterm/resize/Makefile | 13 -
x11/bin/xterm/uxterm/Makefile | 12 -
x11/bin/xtrap/Makefile | 17 -
x11/bin/xtrap/Makefile.xtrap | 17 -
x11/bin/xtrap/xtrapchar/Makefile | 6 -
x11/bin/xtrap/xtrapin/Makefile | 5 -
x11/bin/xtrap/xtrapinfo/Makefile | 5 -
x11/bin/xtrap/xtrapout/Makefile | 5 -
x11/bin/xtrap/xtrapproto/Makefile | 5 -
x11/bin/xtrap/xtrapreset/Makefile | 5 -
x11/bin/xtrap/xtrapstats/Makefile | 5 -
x11/bin/xvidtune/Makefile | 16 -
x11/bin/xvinfo/Makefile | 13 -
x11/bin/xwd/Makefile | 17 -
x11/bin/xwininfo/Makefile | 17 -
x11/bin/xwud/Makefile | 13 -
x11/include/DPS/Makefile | 16 -
x11/include/GL/Makefile | 14 -
x11/include/Makefile | 18 -
x11/include/bitmaps/Makefile | 20 -
x11/include/extensions/Makefile | 28 -
x11/include/fonts/Makefile | 12 -
x11/lib/FS/Makefile | 33 -
x11/lib/FS/shlib_version | 4 -
x11/lib/GL/Makefile | 136 -
x11/lib/GL/shlib_version | 4 -
x11/lib/GLU/Makefile | 80 -
x11/lib/GLU/shlib_version | 4 -
x11/lib/GLw/Makefile | 23 -
x11/lib/GLw/shlib_version | 4 -
x11/lib/ICE/Makefile | 30 -
x11/lib/ICE/shlib_version | 4 -
x11/lib/Makefile | 38 -
x11/lib/OSmesa/Makefile | 115 -
x11/lib/OSmesa/shlib_version | 4 -
x11/lib/SM/Makefile | 25 -
x11/lib/SM/shlib_version | 4 -
x11/lib/X11/Makefile | 18 -
x11/lib/X11/Makefile.libx11 | 130 -
x11/lib/X11/dynamic/Makefile | 22 -
x11/lib/X11/dynamic/shlib_version | 4 -
x11/lib/X11/static/Makefile | 18 -
x11/lib/XRes/Makefile | 24 -
x11/lib/XRes/shlib_version | 4 -
x11/lib/XTrap/Makefile | 21 -
x11/lib/XTrap/shlib_version | 4 -
x11/lib/Xau/Makefile | 17 -
x11/lib/Xau/shlib_version | 4 -
x11/lib/Xaw/Makefile | 45 -
x11/lib/Xaw/shlib_version | 4 -
x11/lib/Xaw6/Makefile | 30 -
x11/lib/Xaw6/shlib_version | 4 -
x11/lib/Xcursor/Makefile | 49 -
x11/lib/Xcursor/shlib_version | 4 -
x11/lib/Xdmcp/Makefile | 24 -
x11/lib/Xdmcp/shlib_version | 4 -
x11/lib/Xext/Makefile | 18 -
x11/lib/Xext/shlib_version | 4 -
x11/lib/Xfontcache/Makefile | 24 -
x11/lib/Xfontcache/shlib_version | 4 -
x11/lib/Xft/Makefile | 59 -
x11/lib/Xft/shlib_version | 4 -
x11/lib/Xft1/Makefile | 26 -
x11/lib/Xft1/shlib_version | 4 -
x11/lib/Xi/Makefile | 24 -
x11/lib/Xi/shlib_version | 4 -
x11/lib/Xinerama/Makefile | 17 -
x11/lib/Xinerama/shlib_version | 4 -
x11/lib/Xmu/Makefile | 37 -
x11/lib/Xmu/shlib_version | 4 -
x11/lib/Xmuu/Makefile | 16 -
x11/lib/Xmuu/shlib_version | 4 -
x11/lib/Xp/Makefile | 21 -
x11/lib/Xp/shlib_version | 4 -
x11/lib/Xpm/Makefile | 23 -
x11/lib/Xpm/shlib_version | 4 -
x11/lib/Xrandr/Makefile | 24 -
x11/lib/Xrandr/shlib_version | 4 -
x11/lib/Xrender/Makefile | 23 -
x11/lib/Xrender/shlib_version | 4 -
x11/lib/Xss/Makefile | 27 -
x11/lib/Xss/shlib_version | 4 -
x11/lib/Xt/Makefile | 54 -
x11/lib/Xt/shlib_version | 4 -
x11/lib/Xtst/Makefile | 17 -
x11/lib/Xtst/shlib_version | 4 -
x11/lib/Xv/Makefile | 17 -
x11/lib/Xv/shlib_version | 4 -
x11/lib/XvMC/Makefile | 17 -
x11/lib/XvMC/shlib_version | 4 -
x11/lib/Xxf86dga/Makefile | 41 -
x11/lib/Xxf86dga/shlib_version | 4 -
x11/lib/Xxf86misc/Makefile | 15 -
x11/lib/Xxf86misc/shlib_version | 4 -
x11/lib/Xxf86vm/Makefile | 15 -
x11/lib/Xxf86vm/shlib_version | 4 -
x11/lib/dmx/Makefile | 18 -
x11/lib/dmx/shlib_version | 4 -
x11/lib/dps/Makefile | 78 -
x11/lib/dps/shlib_version | 4 -
x11/lib/dpstk/Makefile | 27 -
x11/lib/dpstk/shlib_version | 4 -
x11/lib/font/Makefile | 178 -
x11/lib/font/shlib_version | 4 -
x11/lib/font/stubs/Makefile | 20 -
x11/lib/font/xtt/Makefile | 15 -
x11/lib/fontconfig/Makefile | 27 -
x11/lib/fontconfig/etc/Makefile | 11 -
x11/lib/fontconfig/etc/fonts.conf | 305 ---
x11/lib/fontconfig/fontconfig/Makefile | 12 -
x11/lib/fontconfig/src/Makefile | 23 -
x11/lib/fontconfig/src/shlib_version | 4 -
x11/lib/fontenc/Makefile | 22 -
x11/lib/fontenc/shlib_version | 4 -
x11/lib/freetype2/Makefile | 51 -
x11/lib/freetype2/freetype/Makefile | 36 -
x11/lib/freetype2/freetype/cache/Makefile | 13 -
x11/lib/freetype2/freetype/config/Makefile | 12 -
x11/lib/freetype2/freetype/internal/Makefile | 19 -
x11/lib/freetype2/freetype/internal/services/Makefile | 13 -
x11/lib/freetype2/shlib_version | 4 -
x11/lib/lbxutil/Makefile | 34 -
x11/lib/oldX/Makefile | 19 -
x11/lib/oldX/shlib_version | 4 -
x11/lib/psres/Makefile | 11 -
x11/lib/psres/shlib_version | 4 -
x11/lib/xkbfile/Makefile | 20 -
x11/lib/xkbfile/shlib_version | 4 -
x11/lib/xkbui/Makefile | 23 -
x11/lib/xkbui/shlib_version | 4 -
x11/lib/xlibi18n/Makefile | 5 -
x11/lib/xlibi18n/Makefile.xlibi18n | 31 -
x11/lib/xlibi18n/im/Makefile | 14 -
x11/lib/xlibi18n/lc/Makefile | 5 -
x11/lib/xlibi18n/lc/Utf8/Makefile | 6 -
x11/lib/xlibi18n/lc/def/Makefile | 6 -
x11/lib/xlibi18n/lc/gen/Makefile | 6 -
x11/lib/xlibi18n/lc/xlocale/Makefile | 6 -
x11/lib/xlibi18n/om/Makefile | 7 -
x11/lib/xtrans/Makefile | 12 -
x11/share/Makefile | 11 -
x11/share/cf/Makefile | 37 -
x11/share/fonts/Makefile | 21 -
x11/share/fonts/Makefile.mkfontscale | 33 -
x11/share/fonts/bdf/100dpi/Makefile | 12 -
x11/share/fonts/bdf/75dpi/Makefile | 12 -
x11/share/fonts/bdf/Makefile | 5 -
x11/share/fonts/bdf/Makefile.bdf | 57 -
x11/share/fonts/bdf/Makefile.nnndpi | 663 ------
x11/share/fonts/bdf/cyrillic/Makefile | 34 -
x11/share/fonts/bdf/misc/Makefile | 154 -
x11/share/fonts/encodings/Makefile | 27 -
x11/share/fonts/encodings/Makefile.enc | 33 -
x11/share/fonts/encodings/large/Makefile | 17 -
x11/share/fonts/local/Makefile | 10 -
x11/share/fonts/scaled/CID/Makefile | 10 -
x11/share/fonts/scaled/Makefile | 5 -
x11/share/fonts/scaled/Makefile.scaled | 6 -
x11/share/fonts/scaled/Speedo/Makefile | 18 -
x11/share/fonts/scaled/TTF/Makefile | 20 -
x11/share/fonts/scaled/Type1/Makefile | 25 -
x11/share/fonts/util/Makefile | 33 -
x11/share/man/GL/Makefile | 5 -
x11/share/man/GL/gl/Makefile | 503 -----
x11/share/man/GL/glx/Makefile | 47 -
x11/share/man/GLU/Makefile | 79 -
x11/share/man/GLw/Makefile | 19 -
x11/share/man/Makefile | 5 -
x11/share/man/X11/Makefile | 487 -----
x11/share/man/Xau/Makefile | 14 -
x11/share/man/Xext/Makefile | 43 -
x11/share/man/Xext/dbe/Makefile | 24 -
x11/share/man/Xi/Makefile | 58 -
x11/share/man/Xt/Makefile | 305 ---
x11/share/man/Xv/Makefile | 15 -
x11/share/man/general/Makefile | 44 -
x11/share/nls/Compose/Makefile | 31 -
x11/share/nls/Makefile | 37 -
x11/share/nls/XI18N_OBJS/Makefile | 25 -
x11/share/nls/XLC_LOCALE/Makefile | 35 -
x11/tools/Makefile | 13 -
x11/tools/bdftopcf/Makefile | 33 -
x11/tools/bdftopcf/Makefile.bdftopcf | 7 -
x11/tools/fc-cache/Makefile | 63 -
x11/tools/fc-cache/Makefile.fc-cache | 7 -
x11/tools/gen_matypes/Makefile | 17 -
x11/tools/gen_matypes/Makefile.gen_matypes | 7 -
x11/tools/makekeys/Makefile | 13 -
x11/tools/makekeys/Makefile.makekeys | 15 -
x11/tools/makestrs/Makefile | 18 -
x11/tools/makestrs/Makefile.makestrs | 7 -
x11/tools/mkfontscale/Makefile | 68 -
x11/tools/mkg3states/Makefile | 11 -
x11/tools/mkg3states/Makefile.mkg3states | 7 -
x11/tools/pswrap/Makefile | 27 -
x11/tools/pswrap/Makefile.pswrap | 19 -
x11/tools/ucs2any/Makefile | 11 -
x11/tools/ucs2any/Makefile.ucs2any | 7 -
x11/tools/xkbcomp/Makefile | 38 -
x11/tools/xkbcomp/Makefile.xkbcomp | 7 -
x11/tools/xkbcomp/xkbcomp-KeyBind.c | 756 -------
x11/tools/xkbcomp/xkbcomp-stubs.c | 145 -
x11/tools/xkbcomp/xkbfile-xkbmisc.c | 9 -
668 files changed, 62 insertions(+), 20280 deletions(-)
diffs (truncated from 23417 to 300 lines):
diff -r 4beedb92687f -r 2761fb538fac BUILDING
--- a/BUILDING Thu Jul 23 07:45:44 2015 +0000
+++ b/BUILDING Thu Jul 23 08:03:24 2015 +0000
@@ -77,8 +77,9 @@
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 @@
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.
diff -r 4beedb92687f -r 2761fb538fac Makefile
--- a/Makefile Thu Jul 23 07:45:44 2015 +0000
+++ b/Makefile Thu Jul 23 08:03:24 2015 +0000
@@ -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-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
diff -r 4beedb92687f -r 2761fb538fac compat/compatsubdir.mk
--- a/compat/compatsubdir.mk Thu Jul 23 07:45:44 2015 +0000
+++ b/compat/compatsubdir.mk Thu Jul 23 08:03:24 2015 +0000
@@ -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/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
diff -r 4beedb92687f -r 2761fb538fac crypto/external/bsd/openssh/Makefile.inc
--- a/crypto/external/bsd/openssh/Makefile.inc Thu Jul 23 07:45:44 2015 +0000
+++ b/crypto/external/bsd/openssh/Makefile.inc Thu Jul 23 08:03:24 2015 +0000
@@ -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+=-DWITH_LDAP_PUBKEY
.endif
-.if ${X11FLAVOUR} == "Xorg"
CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
-.endif
CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
CPPFLAGS+=-DLIBWRAP
diff -r 4beedb92687f -r 2761fb538fac distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk Thu Jul 23 07:45:44 2015 +0000
+++ b/distrib/sets/mkvars.mk Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
MKXORG \
MKXORG_SERVER \
MKRADEONFIRMWARE \
- X11FLAVOR \
USE_INET6 \
USE_KERBEROS \
USE_LDAP \
@@ -58,12 +57,10 @@
.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*))
diff -r 4beedb92687f -r 2761fb538fac distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Thu Jul 23 07:45:44 2015 +0000
+++ b/distrib/sets/sets.subr Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
# 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 @@
# 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
diff -r 4beedb92687f -r 2761fb538fac doc/BUILDING.mdoc
--- a/doc/BUILDING.mdoc Thu Jul 23 07:45:44 2015 +0000
+++ b/doc/BUILDING.mdoc Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
.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 @@
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
diff -r 4beedb92687f -r 2761fb538fac doc/HACKS
--- a/doc/HACKS Thu Jul 23 07:45:44 2015 +0000
+++ b/doc/HACKS Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
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
diff -r 4beedb92687f -r 2761fb538fac etc/Makefile
--- a/etc/Makefile Thu Jul 23 07:45:44 2015 +0000
+++ b/etc/Makefile Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
.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
diff -r 4beedb92687f -r 2761fb538fac etc/Makefile.params
--- a/etc/Makefile.params Thu Jul 23 07:45:44 2015 +0000
+++ b/etc/Makefile.params Thu Jul 23 08:03:24 2015 +0000
@@ -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 @@
USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
USE_PAM USE_SKEY USE_YP \
USETOOLS USR_OBJMACHINE \
- X11SRCDIR X11FLAVOUR
+ X11SRCDIR
#
diff -r 4beedb92687f -r 2761fb538fac etc/mtree/Makefile
--- a/etc/mtree/Makefile Thu Jul 23 07:45:44 2015 +0000
+++ b/etc/mtree/Makefile Thu Jul 23 08:03:24 2015 +0000
@@ -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.dist.earm
.endif
EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
Home |
Main Index |
Thread Index |
Old Index