Pull up following revision(s) (requested by mrg in ticket #559):
	distrib/sets/lists/xdebug/md.amd64: revision 1.10
	distrib/sets/lists/xdebug/md.i386: revision 1.11
	distrib/sets/lists/xdebug/shl.mi: revision 1.18 via patch
	distrib/sets/lists/xserver/md.amd64: revision 1.75
	distrib/sets/lists/xserver/md.i386: revision 1.94
	distrib/sets/lists/xserver/mi: revision 1.35
	distrib/sets/sets.subr: revision 1.162
	external/mit/xorg/lib/Makefile: revision 1.31
	external/mit/xorg/lib/dri7/Makefile: revision 1.1
	external/mit/xorg/lib/dri7/dri.mk: revision 1.1
	external/mit/xorg/lib/dri7/libglsl7.mk: revision 1.1
	external/mit/xorg/lib/dri7/libmesa/Makefile: revision 1.1
	external/mit/xorg/lib/dri7/libmesa7.mk: revision 1.1
	external/mit/xorg/lib/dri7/r300/Makefile: revision 1.1
	share/mk/bsd.own.mk: revision 1.841
sets.subr: support machine=<xxx>, machine_arch=<xxx>, machine_cpu=<xxx> tags.
dri7: build Mesa 7 r300_dri.so for x86 platforms.


(snj)

# $NetBSD: Makefile,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

# Build MesaLib 7.x r300 driver, which requires LLVM in Mesa 10.x

.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR=		libmesa .WAIT r300
.endif

.include <bsd.subdir.mk>

# $NetBSD: dri.mk,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

# XXX DRI_LIB_DEPS

LIBISMODULE=	yes

.include <bsd.own.mk>

SHLIB_MAJOR=	0

CPPFLAGS+= \
	-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
	-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE}/server \
	-I${X11SRCDIR.MesaLib7}/include \
	-I${X11SRCDIR.MesaLib7}/src/mapi \
	-I${X11SRCDIR.MesaLib7}/src/mesa \
	-I${DESTDIR}${X11INCDIR}/libdrm

CPPFLAGS+=	-D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
		-DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING \
		-DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

CPPFLAGS+=	-Wno-stack-protector

.PATH: ${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/${MODULE} ${DRI_EXTRA_PATHS}

# Common sources
.PATH:	${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/common \
	${X11SRCDIR.MesaLib7}/src/mesa/drivers/common
.if (${MODULE} == "swrast")
SRCS+=	drisw_util.c driverfuncs.c utils.c
.else
SRCS+=	dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
SRCS+=	utils.c vblank.c xmlconfig.c
.endif

.include <bsd.x11.mk>

LIB=		${MODULE}_dri
LIBDIR=		${X11USRLIBDIR}/modules/dri

LIBDPLIBS+= 	drm		${.CURDIR}/../../libdrm
LIBDPLIBS+=	expat		${NETBSDSRCDIR}/external/mit/expat/lib/libexpat
LIBDPLIBS+=	m		${NETBSDSRCDIR}/lib/libm
LIBDPLIBS+= 	mesa_dri	${.CURDIR}/../libmesa
# to find mesa_dri.so
LDFLAGS+=	-Wl,-rpath,${LIBDIR}

.include <bsd.lib.mk>

#	$NetBSD: libglsl7.mk,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

# This copy for MesaLib7 old drivers.

# Derived loosely from src/glsl/Makefile.

# XXX Now that we don't need glsl-compile as a tool, this should just
# be made into a library instead.

.PATH: ${X11SRCDIR.MesaLib7}/src/glsl
.PATH: ${X11SRCDIR.MesaLib7}/src/glsl/glcpp

CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/include
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/glsl
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/mapi
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/mesa

SRCS.glsl.libglcpp= \
	glcpp-lex.c \
	glcpp-parse.c \
	pp.c

SRCS.glsl.glcpp= \
	${SRCS.glsl.libglcpp} \
	strtod.c \
	glcpp.c

SRCS.glsl.c= \
	strtod.c \
	ralloc.c \
	${SRCS.glsl.libglcpp}

SRCS.glsl.cxx= \
	ast_expr.cpp \
	ast_function.cpp \
	ast_to_hir.cpp \
	ast_type.cpp \
	glsl_lexer.cpp \
	glsl_parser.cpp \
	glsl_parser_extras.cpp \
	glsl_types.cpp \
	glsl_symbol_table.cpp \
	hir_field_selection.cpp \
	ir_basic_block.cpp \
	ir_clone.cpp \
	ir_constant_expression.cpp \
	ir.cpp \
	ir_expression_flattening.cpp \
	ir_function_can_inline.cpp \
	ir_function_detect_recursion.cpp \
	ir_function.cpp \
	ir_hierarchical_visitor.cpp \
	ir_hv_accept.cpp \
	ir_import_prototypes.cpp \
	ir_print_visitor.cpp \
	ir_reader.cpp \
	ir_rvalue_visitor.cpp \
	ir_set_program_inouts.cpp \
	ir_validate.cpp \
	ir_variable.cpp \
	ir_variable_refcount.cpp \
	linker.cpp \
	link_functions.cpp \
	loop_analysis.cpp \
	loop_controls.cpp \
	loop_unroll.cpp \
	lower_discard.cpp \
	lower_if_to_cond_assign.cpp \
	lower_instructions.cpp \
	lower_jumps.cpp \
	lower_mat_op_to_vec.cpp \
	lower_noise.cpp \
	lower_texture_projection.cpp \
	lower_variable_index_to_cond_assign.cpp \
	lower_vec_index_to_cond_assign.cpp \
	lower_vec_index_to_swizzle.cpp \
	lower_vector.cpp \
	opt_algebraic.cpp \
	opt_constant_folding.cpp \
	opt_constant_propagation.cpp \
	opt_constant_variable.cpp \
	opt_copy_propagation.cpp \
	opt_copy_propagation_elements.cpp \
	opt_dead_code.cpp \
	opt_dead_code_local.cpp \
	opt_dead_functions.cpp \
	opt_discard_simplification.cpp \
	opt_function_inlining.cpp \
	opt_if_simplification.cpp \
	opt_noop_swizzle.cpp \
	opt_redundant_jumps.cpp \
	opt_structure_splitting.cpp \
	opt_swizzle_swizzle.cpp \
	opt_tree_grafting.cpp \
	s_expression.cpp

SRCS.glsl= \
	${SRCS.glsl.c} \
	${SRCS.glsl.cxx}

SRCS.glsl+= \
	builtin_function.cpp

#	$NetBSD: libmesa7.mk,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

# This copy for old MesaLib 7.x drivers only.

#
# Consumer of this Makefile should set MESA_SRC_MODULES.

INCLUDES.all=	mapi mesa mesa/main

# The source file lists derived from src/mesa/sources.mak and
# src/mapi/glapi/sources.mak.  Please keep the organization in line
# with those files.

# Main sources
PATHS.main=	mesa/main
INCLUDES.main=	glsl
SRCS.main= \
	api_exec_es1.c \
	api_exec_es2.c

SRCS.main+= \
	api_arrayelt.c \
	api_exec.c \
	api_loopback.c \
	api_noop.c \
	api_validate.c \
	accum.c \
	arbprogram.c \
	atifragshader.c \
	attrib.c \
	arrayobj.c \
	blend.c \
	bufferobj.c \
	buffers.c \
	clear.c \
	clip.c \
	colortab.c \
	condrender.c \
	context.c \
	convolve.c \
	cpuinfo.c \
	debug.c \
	depth.c \
	depthstencil.c \
	dlist.c \
	dlopen.c \
	drawpix.c \
	drawtex.c \
	enable.c \
	enums.c \
	MESAeval.c \
	execmem.c \
	extensions.c \
	fbobject.c \
	feedback.c \
	ffvertex_prog.c \
	fog.c \
	formats.c \
	framebuffer.c \
	get.c \
	getstring.c \
	hash.c \
	hint.c \
	histogram.c \
	image.c \
	imports.c \
	light.c \
	lines.c \
	matrix.c \
	mipmap.c \
	mm.c \
	multisample.c \
	nvprogram.c \
	pack.c \
	pbo.c \
	MESApixel.c \
	MESApixelstore.c \
	pixeltransfer.c \
	points.c \
	polygon.c \
	queryobj.c \
	querymatrix.c \
	rastpos.c \
	readpix.c \
	remap.c \
	renderbuffer.c \
	samplerobj.c \
	scissor.c \
	shaderapi.c \
	shaderobj.c \
	shared.c \
	state.c \
	stencil.c \
	syncobj.c \
	texcompress.c \
	texcompress_rgtc.c \
	texcompress_s3tc.c \
	texcompress_fxt1.c \
	texenv.c \
	texfetch.c \
	texformat.c \
	texgen.c \
	texgetimage.c \
	teximage.c \
	texobj.c \
	texpal.c \
	texparam.c \
	texstate.c \
	texstore.c \
	texturebarrier.c \
	transformfeedback.c \
	uniforms.c \
	varray.c \
	version.c \
	viewport.c \
	vtxfmt.c

SRCS.main+= \
	ff_fragment_shader.cpp

# XXX  avoid source name clashes with glx
.PATH:		${X11SRCDIR.MesaLib7}/src/mesa/main
BUILDSYMLINKS=	${X11SRCDIR.MesaLib7}/src/mesa/main/pixel.c MESApixel.c \
		${X11SRCDIR.MesaLib7}/src/mesa/main/pixelstore.c MESApixelstore.c \
		${X11SRCDIR.MesaLib7}/src/mesa/main/eval.c MESAeval.c

# Math sources
PATHS.math=	mesa/math
SRCS.math= \
	m_debug_clip.c \
	m_debug_norm.c \
	m_debug_xform.c \
	m_eval.c \
	m_matrix.c \
	m_translate.c \
	m_vector.c

SRCS.math+= \
	m_xform.c

# Software raster sources
PATHS.swrast=		mesa/swrast
SRCS.swrast= \
	s_aaline.c \
	s_aatriangle.c \
	s_accum.c \
	s_alpha.c \
	s_atifragshader.c \
	s_bitmap.c \
	s_blend.c \
	s_blit.c \
	s_clear.c \
	s_copypix.c \
	s_context.c \
	s_depth.c \
	s_drawpix.c \
	s_feedback.c \
	s_fog.c \
	s_fragprog.c \
	s_lines.c \
	s_logic.c \
	s_masking.c \
	s_points.c \
	s_readpix.c \
	s_span.c \
	s_stencil.c \
	s_texcombine.c \
	s_texfilter.c \
	s_texrender.c \
	s_triangle.c \
	s_zoom.c

# swrast_setup
PATHS.ss=	mesa/swrast_setup
SRCS.ss= \
	ss_context.c \
	ss_triangle.c 

# TNL sources
PATHS.tnl=	mesa/tnl
SRCS.tnl= \
	t_context.c \
	t_pipeline.c \
	t_draw.c \
	t_rasterpos.c \
	t_vb_program.c \
	t_vb_render.c \
	t_vb_texgen.c \
	t_vb_texmat.c \
	t_vb_vertex.c \
	t_vb_fog.c \
	t_vb_light.c \
	t_vb_normals.c \
	t_vb_points.c \
	t_vp_build.c \
	t_vertex.c \
	t_vertex_sse.c \
	t_vertex_generic.c 

# VBO sources
PATHS.vbo=	mesa/vbo
SRCS.vbo= \
	vbo_context.c \
	vbo_exec.c \
	vbo_exec_api.c \
	vbo_exec_array.c \
	vbo_exec_draw.c \
	vbo_exec_eval.c \
	vbo_rebase.c \
	vbo_split.c \
	vbo_split_copy.c \
	vbo_split_inplace.c \
	vbo_save.c \
	vbo_save_api.c \
	vbo_save_draw.c \
	vbo_save_loopback.c 

# statetracker

# Program sources
PATHS.program=		mesa/program
SRCS.program= \
	arbprogparse.c \
	hash_table.c \
	lex.yy.c \
	nvfragparse.c \
	nvvertparse.c \
	program.c \
	program_parse.tab.c \
	program_parse_extra.c \
	prog_cache.c \
	prog_execute.c \
	prog_instruction.c \
	prog_noise.c \
	prog_optimize.c \
	prog_parameter.c \
	prog_parameter_layout.c \
	prog_print.c \
	prog_statevars.c \
	prog_uniform.c \
	programopt.c \
	register_allocate.c \
	symbol_table.c

SRCS.program+= \
	ir_to_mesa.cpp \
	sampler.cpp

# Unused parts of mesa/sources.mak.
.if 0
ASM_C_SOURCES =	\
	x86/common_x86.c \
	x86/x86_xform.c \
	x86/3dnow.c \
	x86/sse.c \
	x86/rtasm/x86sse.c \
	sparc/sparc.c \
	ppc/common_ppc.c \
	x86-64/x86-64.c

X86_SOURCES =			\
	x86/common_x86_asm.S	\
	x86/x86_xform2.S	\
	x86/x86_xform3.S	\
	x86/x86_xform4.S	\
	x86/x86_cliptest.S	\
	x86/mmx_blend.S		\
	x86/3dnow_xform1.S	\
	x86/3dnow_xform2.S	\
	x86/3dnow_xform3.S	\
	x86/3dnow_xform4.S	\
	x86/3dnow_normal.S	\
	x86/sse_xform1.S	\
	x86/sse_xform2.S	\
	x86/sse_xform3.S	\
	x86/sse_xform4.S	\
	x86/sse_normal.S	\
	x86/read_rgba_span_x86.S

X86-64_SOURCES =		\
	x86-64/xform4.S

SPARC_SOURCES =			\
	sparc/clip.S		\
	sparc/norm.S		\
	sparc/xform.S
.endif

# Common driver sources
PATHS.common=	mesa/drivers/common
SRCS.common= \
	driverfuncs.c	\
	meta.c

# OSMesa driver sources
PATHS.osmesa=	mesa/drivers/osmesa
SRCS.osmesa= \
	osmesa.c

# GLAPI sources
PATHS.glapi=	mapi/glapi
SRCS.glapi = \
	glapi_dispatch.c \
	glapi_entrypoint.c \
	glapi_gentable.c \
	glapi_getproc.c \
	glapi_nop.c \
	glthread.c \
	glapi.c

# Unused parts of mapi/glapi/sources.mak.
.if 0
X86_API =		\
	glapi_x86.S

X86-64_API =		\
	glapi_x86-64.S

SPARC_API =		\
	glapi_sparc.S
.endif

.for _mod_ in ${MESA_SRC_MODULES}

SRCS+=	${SRCS.${_mod_}}

. for _path_ in ${PATHS.${_mod_}}
.PATH:	${X11SRCDIR.MesaLib7}/src/${_path_}
. endfor

. for _path_ in ${INCLUDES.${_mod_}}
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/${_path_}
. endfor

.endfor

.for _path_ in ${INCLUDES.all}
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/${_path_}
.endfor

LIBDPLIBS=	m	${NETBSDSRCDIR}/lib/libm

# build the shader headers
.include "../libglsl7.mk"

CPPFLAGS+=	-I.
CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/include

cleandir:     cleanmesa
cleanmesa: .PHONY
	-@if [ -d library ]; then rmdir library; fi

#	$NetBSD: Makefile,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

.include <bsd.own.mk>

_LIB_PREFIX=	lib
LIB=		mesa_dri
LIBISMODULE=	yes
LIBISCXX=	yes

SHLIB_MAJOR=	0

MESA_SRC_MODULES=	main math vbo tnl program swrast ss common

CPPFLAGS+=	\
	-I${X11SRCDIR.MesaLib7}/include \
	-I${X11SRCDIR.MesaLib7}/src/glsl \
	-I${X11SRCDIR.MesaLib7}/src/mesa \
	-I${X11SRCDIR.MesaLib7}/src/mapi

CPPFLAGS+=	${X11FLAGS.THREADLIB} \
		-DPTHREADS -D_NETBSD_SOURCE -DUSE_EXTERNAL_DXTN_LIB=1 \
		-DHAVE_ALIAS -DIN_DRI_DRIVER
#CPPFLAGS+=	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_POSIX_MEMALIGN
CFLAGS+=	-pthread

.include "../libmesa7.mk"
.include "../libglsl7.mk"

SRCS+=  ${SRCS.glsl}

.include <bsd.x11.mk>

LIBDIR=		${X11USRLIBDIR}/modules/dri

#LIBDPLIBS+=	GL	${.CURDIR}/../../libGL

CWARNFLAGS.clang+=	-Wno-format -Wno-constant-conversion \
			-Wno-tautological-compare

.include <bsd.lib.mk>

# $NetBSD: Makefile,v 1.1.2.2 2015/03/03 08:28:12 snj Exp $

MODULE=	r300

CPPFLAGS+=	-DCOMPILE_R300 -DR200_MERGED=0 \
		-DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
		-DRADEON_R300
CPPFLAGS+=	-DHAVE_LIBDRM_RADEON

CPPFLAGS+=	-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300 \
		-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300/compiler \
		-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon \
		-I${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon/server \
		-I${X11SRCDIR.MesaLib7}/src/glsl

DRI_EXTRA_PATHS=	${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/radeon \
			${X11SRCDIR.MesaLib7}/src/mesa/drivers/dri/r300/compiler \
			${X11SRCDIR.MesaLib7}/src/glsl \
			${X11SRCDIR.MesaLib7}/src/mesa/program

SRCS=	\
	radeon_bo_legacy.c \
	radeon_buffer_objects.c \
	radeon_common_context.c \
	radeon_common.c \
	radeon_cs_legacy.c \
	radeon_dma.c \
	radeon_debug.c \
	radeon_fbo.c \
	radeon_lock.c \
	radeon_mipmap_tree.c \
	radeon_pixel_read.c \
	radeon_queryobj.c \
	radeon_span.c \
	radeon_texture.c \
	radeon_tex_copy.c \
	radeon_tex_getimage.c \
	radeon_tile.c

SRCS+=	\
		 radeon_screen.c \
		 r300_blit.c \
		 r300_context.c \
		 r300_draw.c \
		 r300_cmdbuf.c \
		 r300_state.c \
		 r300_render.c \
		 r300_tex.c \
		 r300_texstate.c \
		 r300_vertprog.c \
		 r300_fragprog_common.c \
		 r300_shader.c \
		 radeon_mesa_to_rc.c \
		 r300_emit.c \
		 r300_swtcl.c

SRCS+= \
	radeon_cs_space_drm.c \
	radeon_bo.c \
	radeon_cs.c

# r300/compiler
SRCS+= \
		radeon_code.c \
		radeon_compiler.c \
		radeon_compiler_util.c \
		radeon_emulate_branches.c \
		radeon_emulate_loops.c \
		radeon_program.c \
		radeon_program_print.c \
		radeon_opcodes.c \
		radeon_program_alu.c \
		radeon_program_pair.c \
		radeon_program_tex.c \
		radeon_pair_translate.c \
		radeon_pair_schedule.c \
		radeon_pair_regalloc.c \
		radeon_pair_dead_sources.c \
		radeon_dataflow.c \
		radeon_dataflow_deadcode.c \
		radeon_dataflow_swizzles.c \
		radeon_list.c \
		radeon_optimize.c \
		radeon_remove_constants.c \
		radeon_rename_regs.c \
		radeon_variable.c \
		r3xx_fragprog.c \
		r300_fragprog.c \
		r300_fragprog_swizzle.c \
		r300_fragprog_emit.c \
		r500_fragprog.c \
		r500_fragprog_emit.c \
		r3xx_vertprog.c \
		r3xx_vertprog_dump.c \
		memory_pool.c

# glsl
SRCS+=	ralloc.c

# mesa/program
SRCS+=	register_allocate.c

LIBDPLIBS+=	drm_radeon	${.CURDIR}/../../libdrm_radeon

# uses C99 variable decl scoping
CFLAGS+=	-std=c99

CWARNFLAGS.clang+=	-Wno-empty-body -Wno-format -Wno-constant-conversion \
			-Wno-constant-logical-operand

.include "${.CURDIR}/../dri.mk"