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.)

BUILDING

@@ -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.

Makefile

@@ -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,15 +481,11 @@ 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

compat/compatsubdir.mk

@@ -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

crypto/external/bsd/openssh/Makefile.inc

@@ -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

distrib/sets/mkvars.mk

@@ -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*))

distrib/sets/sets.subr

@@ -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

doc/BUILDING.mdoc

@@ -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

doc/HACKS

@@ -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

etc/Makefile

@@ -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 distrib-dirs
 .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

etc/Makefile.params

@@ -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 BUILDINFO BUILDSEED \
 		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
 		USE_PAM USE_SKEY USE_YP \
 		USETOOLS USR_OBJMACHINE \
-		X11SRCDIR X11FLAVOUR
+		X11SRCDIR
 
 
 #

etc/mtree/Makefile

@@ -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.${MACHINE_ARCH}
 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

etc/mtree/NetBSD.dist.XFree86

@@ -1,178 +0,0 @@
-#	$NetBSD: NetBSD.dist.XFree86,v 1.2 2010/05/08 05:04:58 lukem Exp $
-
-./usr/X11R6
-./usr/X11R6/bin
-./usr/X11R6/include
-./usr/X11R6/include/DPS
-./usr/X11R6/include/GL
-./usr/X11R6/include/GL/internal
-./usr/X11R6/include/X11
-./usr/X11R6/include/X11/drm
-./usr/X11R6/include/X11/dri
-./usr/X11R6/include/X11/ICE
-./usr/X11R6/include/X11/PM
-./usr/X11R6/include/X11/SM
-./usr/X11R6/include/X11/Xaw
-./usr/X11R6/include/X11/Xcursor
-./usr/X11R6/include/X11/Xft
-./usr/X11R6/include/X11/Xmu
-./usr/X11R6/include/X11/XprintAppUtil
-./usr/X11R6/include/X11/XprintUtil
-./usr/X11R6/include/X11/Xtrans
-./usr/X11R6/include/X11/bitmaps
-./usr/X11R6/include/X11/extensions
-./usr/X11R6/include/X11/fonts
-./usr/X11R6/include/X11/pixmaps
-./usr/X11R6/include/fontconfig
-./usr/X11R6/include/freetype2
-./usr/X11R6/include/freetype2/freetype
-./usr/X11R6/include/freetype2/freetype/cache
-./usr/X11R6/include/freetype2/freetype/config
-./usr/X11R6/include/freetype2/freetype/internal
-./usr/X11R6/include/freetype2/freetype/internal/services
-./usr/X11R6/include/pixman-1
-./usr/X11R6/include/xorg
-./usr/X11R6/lib
-./usr/X11R6/lib/X11
-./usr/X11R6/lib/X11/app-defaults
-./usr/X11R6/lib/X11/config
-./usr/X11R6/lib/X11/doc
-./usr/X11R6/lib/X11/etc
-./usr/X11R6/lib/X11/fonts
-./usr/X11R6/lib/X11/fonts/100dpi
-./usr/X11R6/lib/X11/fonts/75dpi
-./usr/X11R6/lib/X11/fonts/CID
-./usr/X11R6/lib/X11/fonts/Speedo
-./usr/X11R6/lib/X11/fonts/TTF
-./usr/X11R6/lib/X11/fonts/Type1
-./usr/X11R6/lib/X11/fonts/cyrillic
-./usr/X11R6/lib/X11/fonts/encodings
-./usr/X11R6/lib/X11/fonts/encodings/large
-./usr/X11R6/lib/X11/fonts/local
-./usr/X11R6/lib/X11/fonts/misc
-./usr/X11R6/lib/X11/fonts/util
-./usr/X11R6/lib/X11/locale
-./usr/X11R6/lib/X11/locale/C
-./usr/X11R6/lib/X11/locale/am_ET.UTF-8
-./usr/X11R6/lib/X11/locale/armscii-8
-./usr/X11R6/lib/X11/locale/el_GR.UTF-8
-./usr/X11R6/lib/X11/locale/en_US.UTF-8
-./usr/X11R6/lib/X11/locale/georgian-academy
-./usr/X11R6/lib/X11/locale/georgian-ps
-./usr/X11R6/lib/X11/locale/ibm-cp1133
-./usr/X11R6/lib/X11/locale/iscii-dev
-./usr/X11R6/lib/X11/locale/isiri-3342
-./usr/X11R6/lib/X11/locale/iso8859-1
-./usr/X11R6/lib/X11/locale/iso8859-10
-./usr/X11R6/lib/X11/locale/iso8859-11
-./usr/X11R6/lib/X11/locale/iso8859-13
-./usr/X11R6/lib/X11/locale/iso8859-14
-./usr/X11R6/lib/X11/locale/iso8859-15
-./usr/X11R6/lib/X11/locale/iso8859-2
-./usr/X11R6/lib/X11/locale/iso8859-3
-./usr/X11R6/lib/X11/locale/iso8859-4
-./usr/X11R6/lib/X11/locale/iso8859-5
-./usr/X11R6/lib/X11/locale/iso8859-6
-./usr/X11R6/lib/X11/locale/iso8859-7
-./usr/X11R6/lib/X11/locale/iso8859-8
-./usr/X11R6/lib/X11/locale/iso8859-9
-./usr/X11R6/lib/X11/locale/iso8859-9e
-./usr/X11R6/lib/X11/locale/ja
-./usr/X11R6/lib/X11/locale/ja.JIS
-./usr/X11R6/lib/X11/locale/ja.SJIS
-./usr/X11R6/lib/X11/locale/ja.S90
-./usr/X11R6/lib/X11/locale/ja.U90
-./usr/X11R6/lib/X11/locale/ja_JP.UTF-8
-./usr/X11R6/lib/X11/locale/ko
-./usr/X11R6/lib/X11/locale/ko_KR.UTF-8
-./usr/X11R6/lib/X11/locale/koi8-c
-./usr/X11R6/lib/X11/locale/koi8-r
-./usr/X11R6/lib/X11/locale/koi8-u
-./usr/X11R6/lib/X11/locale/lib
-./usr/X11R6/lib/X11/locale/lib/common
-./usr/X11R6/lib/X11/locale/microsoft-cp1251
-./usr/X11R6/lib/X11/locale/microsoft-cp1255
-./usr/X11R6/lib/X11/locale/microsoft-cp1256
-./usr/X11R6/lib/X11/locale/mulelao-1
-./usr/X11R6/lib/X11/locale/nokhchi-1
-./usr/X11R6/lib/X11/locale/pt_BR.UTF-8
-./usr/X11R6/lib/X11/locale/tatar-cyr
-./usr/X11R6/lib/X11/locale/th_TH
-./usr/X11R6/lib/X11/locale/th_TH.UTF-8
-./usr/X11R6/lib/X11/locale/tscii-0
-./usr/X11R6/lib/X11/locale/vi_VN.tcvn
-./usr/X11R6/lib/X11/locale/vi_VN.viscii
-./usr/X11R6/lib/X11/locale/zh_CN
-./usr/X11R6/lib/X11/locale/zh_CN.UTF-8
-./usr/X11R6/lib/X11/locale/zh_CN.gb18030
-./usr/X11R6/lib/X11/locale/zh_CN.gbk
-./usr/X11R6/lib/X11/locale/zh_HK.UTF-8
-./usr/X11R6/lib/X11/locale/zh_HK.big5
-./usr/X11R6/lib/X11/locale/zh_HK.big5hkscs
-./usr/X11R6/lib/X11/locale/zh_TW
-./usr/X11R6/lib/X11/locale/zh_TW.UTF-8
-./usr/X11R6/lib/X11/locale/zh_TW.big5
-./usr/X11R6/lib/X11/x11perfcomp
-./usr/X11R6/lib/X11/xedit
-./usr/X11R6/lib/X11/xedit/lisp
-./usr/X11R6/lib/X11/xedit/lisp/progmodes
-./usr/X11R6/lib/X11/xkb
-./usr/X11R6/lib/X11/xkb/compat
-./usr/X11R6/lib/X11/xkb/compiled
-./usr/X11R6/lib/X11/xkb/geometry
-./usr/X11R6/lib/X11/xkb/geometry/digital
-./usr/X11R6/lib/X11/xkb/geometry/ibm
-./usr/X11R6/lib/X11/xkb/geometry/sgi
-./usr/X11R6/lib/X11/xkb/keycodes
-./usr/X11R6/lib/X11/xkb/keycodes/digital
-./usr/X11R6/lib/X11/xkb/keycodes/sgi
-./usr/X11R6/lib/X11/xkb/keymap
-./usr/X11R6/lib/X11/xkb/keymap/digital
-./usr/X11R6/lib/X11/xkb/keymap/sgi
-./usr/X11R6/lib/X11/xkb/keymap/sun
-./usr/X11R6/lib/X11/xkb/rules
-./usr/X11R6/lib/X11/xkb/semantics
-./usr/X11R6/lib/X11/xkb/symbols
-./usr/X11R6/lib/X11/xkb/symbols/digital
-./usr/X11R6/lib/X11/xkb/symbols/fujitsu
-./usr/X11R6/lib/X11/xkb/symbols/hp
-./usr/X11R6/lib/X11/xkb/symbols/macintosh
-./usr/X11R6/lib/X11/xkb/symbols/nec
-./usr/X11R6/lib/X11/xkb/symbols/pc
-./usr/X11R6/lib/X11/xkb/symbols/sgi
-./usr/X11R6/lib/X11/xkb/symbols/sharp
-./usr/X11R6/lib/X11/xkb/symbols/sony
-./usr/X11R6/lib/X11/xkb/symbols/sun
-./usr/X11R6/lib/X11/xkb/symbols/xfree68
-./usr/X11R6/lib/X11/xkb/torture
-./usr/X11R6/lib/X11/xkb/types
-./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/extensions
-./usr/X11R6/lib/modules/fonts
-./usr/X11R6/lib/modules/drivers
-./usr/X11R6/lib/modules/input
-./usr/X11R6/lib/pkgconfig
-./usr/X11R6/libexec
-./usr/X11R6/man
-./usr/X11R6/man/cat1
-./usr/X11R6/man/cat3
-./usr/X11R6/man/cat4
-./usr/X11R6/man/cat5
-./usr/X11R6/man/cat7
-./usr/X11R6/man/html1
-./usr/X11R6/man/html3
-./usr/X11R6/man/html4
-./usr/X11R6/man/html5
-./usr/X11R6/man/html7
-./usr/X11R6/man/man1
-./usr/X11R6/man/man3
-./usr/X11R6/man/man4
-./usr/X11R6/man/man5
-./usr/X11R6/man/man7
-./usr/X11R6/share
-./usr/X11R6/share/examples
-./usr/X11R6/share/examples/ssh-askpass
-./usr/libdata/debug/usr/X11R6
-./usr/libdata/debug/usr/X11R6/bin
-./usr/libdata/debug/usr/X11R6/lib
-./usr/libdata/debug/usr/X11R6/libexec

external/mit/Makefile

@@ -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
 

external/mit/xorg/bin/xedit/lisp/Makefile

@@ -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 format.c hash.c helper.c \
 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

external/mit/xorg/lib/libX11/Makefile.libx11

@@ -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

external/mit/xorg/lib/libXrender/Makefile

@@ -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 \

external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile

@@ -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 \

external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

@@ -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/xfree86/common \
 		-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

external/mit/xorg/server/xorg-server/os/Makefile

@@ -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

external/mit/xorg/tools/mkfontscale/Makefile

@@ -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 -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
 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>

share/man/man5/mk.conf.5

@@ -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 builds (see next subsection).
 .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 semantics of the
 .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

share/mk/bsd.README

@@ -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' only installs targets that are
 		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" program to compress things.
 		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 mode.  [${NONBINMODE}]
 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 listed in ${SUBDIR}, the
 =-=-=-=-=   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:

share/mk/bsd.own.mk

@@ -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)
@@ -1029,27 +1029,11 @@ _MKVARS.no= \
 ${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
 
 

share/mk/bsd.x11.mk

@@ -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 -DSERVER_LOCK -DDDXOSFATALERROR \
 			-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_MODULE -DXFree86Module \
 .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=\"${X11LIBDIR}/locale\" \
 
 # 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_VERSION=/ {			\
 			} 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}
 

tools/Makefile

@@ -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

x11/Makefile

@@ -1,76 +0,0 @@
-#	$NetBSD: Makefile,v 1.13 2004/08/04 09:38:56 lukem Exp $
-
-.include <bsd.own.mk>
-
-SUBDIR=	tools include lib bin share Xserver
-
-.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
-BUILDTARGETS+=  cleandir
-.endif
-.if ${MKOBJDIRS} != "no"
-BUILDTARGETS+=  obj
-.endif
-.if !defined(NOINCLUDES)
-BUILDTARGETS+=	includes
-.endif
-BUILDTARGETS+=	do-tools
-BUILDTARGETS+=	do-lib
-BUILDTARGETS+=	do-build
-
-.ORDER: ${BUILDTARGETS}
-
-START_TIME!=	date
-
-build: check_X11SRCDIR
-	@echo "X11 build started at: ${START_TIME}"
-.for tgt in ${BUILDTARGETS}
-	${MAKEDIRTARGET} . ${tgt}
-.endfor
-	@echo   "X11 build started at:  ${START_TIME}"
-	@printf "X11 build finished at: " && date
-
-do-build:
-.for targ in dependall install
-	${MAKEDIRTARGET} . ${targ}
-.endfor
-
-.for dir in	tools lib/X11 lib/ICE lib/Xau lib/SM lib/Xext lib/Xt lib/Xpm \
-		lib/Xrender lib/GL lib/Xmu lib/dps lib/expat lib
-do-${dir:S/\//-/g}:
-.  for targ in dependall install
-	${MAKEDIRTARGET} ${dir} ${targ}
-.  endfor
-.endfor
-
-afterinstall: .PHONY
-.if ${MKMAN} != "no"
-	${MAKEDIRTARGET} ${NETBSDSRCDIR}/share/man makedb \
-	    WHATISDBDIR=${X11MANDIR}
-.endif
-
-
-DISTRIBTARGETS=	Xserver/Xext/ext \
-		bin/lbxproxy bin/proxymngr bin/rstart bin/twm \
-		bin/xdm/config bin/xfs bin/xinit bin/xsm \
-		lib/fontconfig/etc
-
-distribution: check_X11SRCDIR
-.for tgt in ${DISTRIBTARGETS}
-	${MAKEDIRTARGET} ${tgt} configinstall
-.endfor
-
-
-check_X11SRCDIR: .PHONY .NOTMAIN
-.if !defined(X11SRCDIR)
-	@echo
-	@echo "ERROR: setenv X11SRCDIR before doing that!"
-	@false
-.elif !exists(${X11SRCDIR.xc})
-	@echo
-	@echo "ERROR: X11SRCDIR.xc \`${X11SRCDIR.xc}' does not exist"
-	@false
-.else
-	@true
-.endif
-
-.include <bsd.subdir.mk>

x11/TODO

@@ -1,22 +0,0 @@
-$NetBSD: TODO,v 1.13 2004/05/16 10:25:14 lukem Exp $
-
-clean up XTODO issues
-
-consider symlinking various CONFIGFILES dirs in lib/X11 to /etc/X11
-
-check all Imakefile & config diffs between  -rv4-3-0 -rv4-4-0  , including:
-	programs/Xserver
-	lib/font/*/module
-	lib/GL
-	lib/GLU
-	lib/GLw
-
-add getconfig (needs perl)
-
-convert lbxutil to a build-only library
-
-Native lib/Xxf86dga on i386 defines HAS_APERTURE_DRV to force the
-use of /dev/xf86 (from the aperture driver) instead of /dev/mem.
-The server code in programs/Xserver/hw/xfree86/os-support/bsd
-correctly tries both /dev/xf86 and /dev/mem.
-(/dev/mem requires options INSECURE)

x11/Xserver/GL/GLcore/Makefile

@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2003/12/21 03:07:01 rtr Exp $
-
-.include "../../Makefile.serverlib"
-.include "Makefile.GLcore"
-
-.if defined(X11FLAGS.LOADABLE)
-SUBDIR=	module
-.include <bsd.subdir.mk>
-.endif

x11/Xserver/GL/GLcore/Makefile.GLcore

@@ -1,97 +0,0 @@
-#	$NetBSD: Makefile.GLcore,v 1.10 2007/04/08 09:36:35 scw Exp $
-
-LIB=	GLcore
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/main
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi
-SRCS+=	accum.c api_arrayelt.c api_loopback.c api_noop.c \
-	api_validate.c attrib.c blend.c buffers.c bufferobj.c clip.c \
-	colortab.c \
-	context.c convolve.c debug.c depth.c dispatch.c dlist.c \
-	drawpix.c enable.c enums.c eval.c extensions.c feedback.c \
-	fog.c get.c glapi.c glthread.c hash.c hint.c histogram.c \
-	image.c imports.c light.c lines.c matrix.c occlude.c pixel.c \
-	points.c polygon.c rastpos.c state.c stencil.c texcompress.c \
-	texformat.c texcompress_fxt1.c texcompress_s3tc.c teximage.c \
-	texobj.c texstate.c texstore.c varray.c vtxfmt.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache
-SRCS+=	ac_context.c ac_import.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/math
-SRCS+=	m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
-	m_matrix.c m_translate.c m_vector.c m_xform.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast
-SRCS+=	s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
-	s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
-	s_depth.c s_drawpix.c s_feedback.c s_fog.c \
-	s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
-	s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
-	s_texture.c s_triangle.c s_zoom.c s_nvfragprog.c \
-	s_auxbuffer.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup
-SRCS+=	ss_context.c ss_triangle.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader
-SRCS+=	arbprogram.c nvprogram.c arbfragparse.c arbvertparse.c program.c \
-	nvvertexec.c nvfragparse.c arbprogparse.c grammar_mesa.c \
-	nvvertparse.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl
-SRCS+=	t_array_api.c t_array_import.c t_context.c \
-	t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
-	t_vb_points.c t_vb_program.c t_vb_render.c t_vb_texgen.c \
-	t_vb_texmat.c t_vb_vertex.c t_vtx_api.c t_vtx_generic.c \
-	t_vtx_eval.c t_save_api.c t_vtx_exec.c t_vertex.c t_vertex_c.c \
-	t_save_playback.c t_save_loopback.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11
-SRCS+=	xm_api.c xm_dd.c xm_line.c xm_span.c xm_tri.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common
-SRCS+=	glcontextmodes.c
-
-
-.PATH:	${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers//common
-SRCS+=	driverfuncs.c
-
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X
-.PATH:	${X11SRCDIR.xc}/lib/GL/glx
-SRCS+=		compsize.c xf86glx.c xf86glx_util.c
-
-
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
- 		-I${X11SRCDIR.xc}/extras/Mesa/include \
-		-I${X11SRCDIR.xc}/lib/GL/glx \
-		-I${X11SRCDIR.xc}/lib/GL/include \
- 		-I${X11SRCDIR.xc}/extras/Mesa/include \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/x11 \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${XSERVERINCDIR} \
- 		-I${X11SRCDIR.xc}/extras/Mesa/src/X \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X
-
-CPPFLAGS+=	${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/GL/GLcore/module/Makefile

@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2004/03/06 03:31:05 rtr Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
-
-.include "../../../Makefile.serverlib"
-
-.include <bsd.own.mk>
-
-.PATH:		${X11SRCDIR.xc}/programs/Xserver/GL/mesa/GLcore
-SRCS=		GLcoremodule.c
-
-.include "../Makefile.GLcore"

x11/Xserver/GL/Makefile

@@ -1,11 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2004/03/06 10:30:26 rtr Exp $
-
-SUBDIR=	glx GLcore
-
-.include <bsd.own.mk>
-
-.if ${X11DRI} != "no"
-SUBDIR+=	dri
-.endif
-
-.include <bsd.subdir.mk>

x11/Xserver/GL/dri/Makefile

@@ -1,37 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2004/03/06 10:30:26 rtr Exp $
-
-XMODULEDIR=	${X11ROOTDIR}/lib/modules/extensions
-
-.include "../../Makefile.serverlib"
-
-LIB=	dri
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/GL/dri
-SRCS=	xf86dri.c dri.c drimodule.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}/lib/GL/dri \
-		-I${X11SRCDIR.xc}/programs/Xserver/mi \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${XSERVERINCDIR}
-
-CPPFLAGS+=	${X11FLAGS.DRI}
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>
-
-# XXX NOTICE!
-#     subdirs install libxxx_dri.so.n.n however the final file installed
-#     needs to be xxx_dri.so, since our .mk magic can't do this I've been
-#     doing it by hand until I get enthusiastic about fixing it.
-SUBDIR=	mga_dri radeon_dri
-
-.include <bsd.subdir.mk>

x11/Xserver/GL/dri/mga_dri/Makefile

@@ -1,133 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules
-
-NOLINT=	1
-
-.include <bsd.own.mk>
-
-LIB=	mga_dri
-
-# dri
-.PATH:		${X11SRCDIR.xc}/lib/GL/dri
-SRCS.dri=	dri_util.c
-CPPFLAGS.dri_util.c=	-I${DESTDIR}${X11INCDIR}/X11 \
-			-I${DESTDIR}${X11INCDIR}/X11/extensions \
-			-I${X11SRCDIR.xc}/include/GL \
-			-I${X11SRCDIR.xc}/programs/Xserver/include \
-			-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-			-I${X11SRCDIR.xc}/lib/GL/include \
-			-I${X11SRCDIR.xc}/extras/Mesa/include \
-			-I${X11SRCDIR.xc}/extras/Mesa/src \
-			-I${X11SRCDIR.xc}/lib/GL/glx \
-			-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support
-CPPFLAGS.dri_util.c+=	-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules\"
-
-
-# drm
-.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/linux/drm
-SRCS.drm=	xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-.for fn in ${SRCS.drm}
-CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel
-#		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd/drm
-.endfor
-
-
-# mesa
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src
-SRCS.mesa=	accum.c api_arrayelt.c api_eval.c api_loopback.c \
-		api_noop.c api_validate.c attrib.c blend.c buffers.c \
-		clip.c colortab.c context.c convolve.c debug.c depth.c \
-		dispatch.c dlist.c drawpix.c enable.c enums.c \
-		eval.c extensions.c feedback.c fog.c get.c \
-		glthread.c hash.c hint.c histogram.c image.c \
-		imports.c light.c lines.c matrix.c mmath.c pixel.c \
-		points.c polygon.c rastpos.c state.c stencil.c \
-		texcompress.c texformat.c teximage.c texobj.c texstate.c \
-		texstore.c texutil.c varray.c vtxfmt.c vpexec.c \
-		vpparse.c  vpstate.c
-.for fn in ${SRCS.mesa}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/extras/Mesa/src/array_cache \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/math \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/swrast \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/tnl \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/tnl_dd \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}/extras/Mesa/src \
-		-I${X11SRCDIR.xc}/include
-.endfor
-
-# XXX MESA_ASM_OBJS
-
-.include <bsd.endian.mk>
-
-.if ${TARGET_ENDIANNESS} == "1234"
-X_BYTE_ORDER=X_LITTLE_ENDIAN
-.elif ${TARGET_ENDIANNESS} == "4321"
-X_BYTE_ORDER=X_BIG_ENDIAN
-.else
-X_BYTE_ORDER=0
-.endif
-
-# common
-.PATH:		${X11SRCDIR.xc}/lib/GL/mesa/src/drv/common
-SRCS.common=	hwlog.c mm.c utils.c vblank.c texmem.c
-.for fn in ${SRCS.common}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/GL/dri \
-		-I${X11SRCDIR.xc}/lib/GL/glx \
-		-I${X11SRCDIR.xc}/include/GL \
-		-I${X11SRCDIR.xc}/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-		-I${X11SRCDIR.xc}/lib/GL/dri/drm \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}/extras/Mesa/src
-CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
-.endfor
-
-# mga
-.PATH:		${X11SRCDIR.xc}/lib/GL/mesa/src/drv/mga
-SRCS.mga=	mgadd.c mgarender.c mgaioctl.c mgapixel.c mgaspan.c \
-		mgastate.c mgatex.c mgatexmem.c mga_texstate.c \
-		mga_texcombine.c mgatris.c mgavb.c mga_xmesa.c
-
-
-.for fn in ${SRCS.mga}
-#CPPFLAGS.${fn}= -I${DESTDIR}${X11INCDIR}/X11 \
-#		-I${DESTDIR}${X11INCDIR}/X11/extensions
-
-CPPFLAGS.${fn}= -I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/extensions
-CPPFLAGS.${fn}+=-I${X11SRCDIR.xc}/extras/Mesa/src \
-		-I${X11SRCDIR.xc}/lib/GL/mesa/src/drv/common \
-		-I${X11SRCDIR.xc}/lib/GL/mesa/src/drv/mga \
-		-I${X11SRCDIR.xc}/lib/GL/dri \
-		-I${X11SRCDIR.xc}/lib/GL/glx \
-		-I${X11SRCDIR.xc}/include \
-		-I${X11SRCDIR.xc}/include/GL \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/mga \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-		-I${X11SRCDIR.xc}/lib/GL/dri/drm \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}
-CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
-.endfor
-
-
-SRCS=	${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.mga}
-
-CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-LDADD=	-lm
-DPADD=	${LIBM}
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/GL/dri/mga_dri/shlib_version

@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2004/03/06 10:30:26 rtr Exp $
-#
-major=1
-minor=0

x11/Xserver/GL/dri/radeon_dri/Makefile

@@ -1,137 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2005/01/21 05:15:36 rtr Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules
-
-NOLINT=	1
-
-.include <bsd.own.mk>
-
-LIB=	radeon_dri
-
-# dri
-.PATH:		${X11SRCDIR.xc}/lib/GL/dri
-SRCS.dri=	dri_util.c
-CPPFLAGS.dri_util.c=	-I${DESTDIR}${X11INCDIR}/X11 \
-			-I${DESTDIR}${X11INCDIR}/X11/extensions \
-			-I${X11SRCDIR.xc}/include/GL \
-			-I${X11SRCDIR.xc}/programs/Xserver/include \
-			-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-			-I${X11SRCDIR.xc}/lib/GL/include \
-			-I${X11SRCDIR.xc}/extras/Mesa/include \
-			-I${X11SRCDIR.xc}/extras/Mesa/src \
-			-I${X11SRCDIR.xc}/lib/GL/glx \
-			-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support
-CPPFLAGS.dri_util.c+=	-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules\"
-
-
-# drm
-.PATH:		${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/linux/drm
-SRCS.drm=	xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-.for fn in ${SRCS.drm}
-CPPFLAGS.${fn}=	-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel
-#		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support/bsd/drm
-.endfor
-
-
-# mesa
-.PATH:		${X11SRCDIR.xc}/extras/Mesa/src
-SRCS.mesa=	accum.c api_arrayelt.c api_eval.c api_loopback.c \
-		api_noop.c api_validate.c attrib.c blend.c buffers.c \
-		clip.c colortab.c context.c convolve.c debug.c depth.c \
-		dispatch.c dlist.c drawpix.c enable.c enums.c \
-		eval.c extensions.c feedback.c fog.c get.c \
-		glthread.c hash.c hint.c histogram.c image.c \
-		imports.c light.c lines.c matrix.c mmath.c pixel.c \
-		points.c polygon.c rastpos.c state.c stencil.c \
-		texcompress.c texformat.c teximage.c texobj.c texstate.c \
-		texstore.c texutil.c varray.c vtxfmt.c vpexec.c \
-		vpparse.c  vpstate.c
-.for fn in ${SRCS.mesa}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/extras/Mesa/src/array_cache \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/math \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/swrast \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/tnl \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/tnl_dd \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}/extras/Mesa/src \
-		-I${X11SRCDIR.xc}/include
-.endfor
-
-# XXX MESA_ASM_OBJS
-
-.include <bsd.endian.mk>
-
-.if ${TARGET_ENDIANNESS} == "1234"
-X_BYTE_ORDER=X_LITTLE_ENDIAN
-.elif ${TARGET_ENDIANNESS} == "4321"
-X_BYTE_ORDER=X_BIG_ENDIAN
-.else
-X_BYTE_ORDER=0
-.endif
-
-# common
-.PATH:		${X11SRCDIR.xc}/lib/GL/mesa/src/drv/common
-SRCS.common=	hwlog.c mm.c utils.c vblank.c texmem.c
-.for fn in ${SRCS.common}
-CPPFLAGS.${fn}=	-I${X11SRCDIR.xc}/lib/GL/dri \
-		-I${X11SRCDIR.xc}/lib/GL/glx \
-		-I${X11SRCDIR.xc}/include/GL \
-		-I${X11SRCDIR.xc}/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-		-I${X11SRCDIR.xc}/lib/GL/dri/drm \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}/extras/Mesa/src
-CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
-.endfor
-
-# XXX currently i386 specific
-# radeon
-.PATH:		${X11SRCDIR.xc}/lib/GL/mesa/src/drv/radeon
-SRCS.radeon=	radeon_context.c radeon_ioctl.c radeon_lock.c \
-		radeon_maos.c radeon_sanity.c radeon_screen.c \
-		radeon_span.c radeon_state.c radeon_state_init.c \
-		radeon_swtcl.c radeon_tcl.c radeon_tex.c \
-		radeon_texmem.c radeon_texstate.c radeon_vtxfmt.c \
-		radeon_vtxfmt_x86.c radeon_vtxtmp_x86.S \
-		radeon_vtxfmt_sse.c radeon_vtxfmt_c.c
-
-.for fn in ${SRCS.radeon}
-#CPPFLAGS.${fn}= -I${DESTDIR}${X11INCDIR}/X11 \
-#		-I${DESTDIR}${X11INCDIR}/X11/extensions
-
-CPPFLAGS.${fn}= -I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/extensions
-CPPFLAGS.${fn}+=-I${X11SRCDIR.xc}/extras/Mesa/src \
-		-I${X11SRCDIR.xc}/lib/GL/mesa/src/drv/common \
-		-I${X11SRCDIR.xc}/lib/GL/mesa/src/drv/radeon \
-		-I${X11SRCDIR.xc}/lib/GL/dri \
-		-I${X11SRCDIR.xc}/lib/GL/glx \
-		-I${X11SRCDIR.xc}/include \
-		-I${X11SRCDIR.xc}/include/GL \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/dri \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/ati \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
-		-I${X11SRCDIR.xc}/lib/GL/dri/drm \
-		-I${X11SRCDIR.xc}/lib/GL/include \
-		-I${X11SRCDIR.xc}
-CPPFLAGS.${fn}+=-DX_BYTE_ORDER=${X_BYTE_ORDER}
-.endfor
-
-
-SRCS=	${SRCS.dri} ${SRCS.drm} ${SRCS.mesa} ${SRCS.common} ${SRCS.radeon}
-
-CPPFLAGS+=	${X11FLAGS.DRI} ${X11FLAGS.EXTENSION} ${X11FLAGS.THREADS} # -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-LDADD=	-lm
-DPADD=	${LIBM}
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/GL/dri/radeon_dri/shlib_version

@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2004/03/06 10:30:26 rtr Exp $
-#
-major=1
-minor=0

x11/Xserver/GL/glx/Makefile

@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2003/12/21 03:07:01 rtr Exp $
-
-.include "../../Makefile.serverlib"
-.include "Makefile.glx"
-
-.if defined(X11FLAGS.LOADABLE)
-SUBDIR=	module
-.include <bsd.subdir.mk>
-.endif

x11/Xserver/GL/glx/Makefile.glx

@@ -1,30 +0,0 @@
-#	$NetBSD: Makefile.glx,v 1.7 2005/05/14 19:27:56 martin Exp $
-
-LIB=		glx
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/GL/glx
-SRCS+=	global.c glxbuf.c glxcmds.c glxcmdsswap.c glxext.c glxfb.c \
-	glximports.c glxmem.c glxpix.c glxscreens.c glxutil.c \
-	render2.c render2swap.c renderpix.c renderpixswap.c \
-	rensize.c rensizetab.c single2.c single2swap.c singlepix.c \
-	singlepixswap.c singlesize.c xfont.c g_disptab.c \
-	g_disptab_EXT.c g_render.c g_renderswap.c g_single.c g_singleswap.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
-		-I${X11SRCDIR.xc}/programs/Xserver/GL/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${XSERVERINCDIR} \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/programs/Xserver/mi \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
-		-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
-		-I${X11SRCDIR.xc}/extras/Mesa/include \
-		-I${X11SRCDIR.xc}/lib/GL/include
-
-CPPFLAGS+=	${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/GL/glx/module/Makefile

@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2003/09/23 23:21:04 lukem Exp $
-
-XMODULEDIR=	${X11ROOTDIR}/lib/modules/extensions
-
-.include "../../../Makefile.serverlib"
-
-.include <bsd.own.mk>
-
-.PATH:		${X11SRCDIR.xc}/programs/Xserver/GL
-SRCS=		glxmodule.c
-
-.include "../Makefile.glx"

x11/Xserver/Makefile

@@ -1,55 +0,0 @@
-#	$NetBSD: Makefile,v 1.13 2004/10/07 13:47:13 rtr Exp $
-
-.include <bsd.own.mk>
-
-.include "Makefile.common"
-
-.if ${XSERVER_NEEDS_XFONT} != "no"
-SUBDIR.xfont=fontbase Xfont
-.else
-SUBDIR.xfont=
-.endif
-
-.if ${XSERVER_NEEDS_MIEXT} != "no"
-SUBDIR.miext=miext
-.else
-SUBDIR.miext=
-.endif
-
-.if ${XSERVER_HAS_CFB} != "no"
-SUBDIR.cfb=cfb cfb16 cfb24 cfb32
-.else
-SUBDIR.cfb=
-.endif
-
-.if ${XSERVER_HAS_FB} != "no"
-SUBDIR.fb=fb
-.else
-SUBDIR.fb=
-.endif
-
-.if ${XSERVER_HAS_AFB} != "no"
-SUBDIR.afb=afb
-.else
-SUBDIR.afb=
-.endif
-
-.if ${XSERVER_HAS_IPLAN} != "no"
-SUBDIR.iplan=iplan2p4 iplan2p8
-.else
-SUBDIR.iplan=
-.endif
-
-SUBDIR=		include
-SUBDIR+=	.WAIT dix os mi printer Xext xkb xinput GL lbx dbe record
-SUBDIR+=	mfb randr render xtrap
-SUBDIR+=	${SUBDIR.cfb} ${SUBDIR.fb} ${SUBDIR.iplan} hw
-SUBDIR+=	${SUBDIR.xfont} ${SUBDIR.afb} ${SUBDIR.miext}
-SUBDIR+=	.WAIT Xserver
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver
-MAN=	Xserver.1
-
-.include <bsd.x11.mk>
-.include <bsd.man.mk>
-.include <bsd.subdir.mk>

x11/Xserver/Makefile.common

@@ -1,135 +0,0 @@
-#	$NetBSD: Makefile.common,v 1.36 2012/05/15 14:29:29 abs Exp $
-
-# These define parts of the Xserver tree that are to be
-# conditionally compiled for different platforms.  See
-# below for descriptions of each variable.
-
-
-.if ${MACHINE} == "x68k"
-XSERVER_X68K=		yes
-.endif
-
-.if ${MACHINE} == "alpha"
-XSERVER_XALPHANETBSD=	yes
-.endif
-
-.if ${MACHINE} == "amiga"
-XSERVER_XAMIGA=		yes
-XSERVER_HAS_AFB=	yes
-.endif
-
-.if ${MACHINE} == "acorn32"
-XSERVER_XARM32VIDC=	yes
-.endif
-
-.if ${MACHINE} == "alpha" || ${MACHINE} == "pmax"
-XSERVER_XDECNETBSD=	yes
-.endif
-
-.if ${MACHINE} == "atari"
-XSERVER_HAS_IPLAN?=	yes
-#XSERVER_XFREE68=	yes
-.endif
-
-.if ${MACHINE} == "dreamcast"
-XSERVER_XDREAMCAST?=	yes
-.endif
-
-.if ${MACHINE} == "ews4800mips"
-XSERVER_XEWS4800MIPS?=	yes
-.endif
-
-.if ${MACHINE} == "newsmips"
-XSERVER_XNEWSMIPS?=	yes
-.endif
-
-# XFree86 servers all need XFONT as well.
-.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
-    ${MACHINE} == "sgimips" || ${MACHINE} == "sparc64" || \
-    ${MACHINE} == "sparc" || ${MACHINE} == "ofppc" || \
-    ${MACHINE} == "netwinder" || ${MACHINE} == "shark"
-XSERVER_NEEDS_XFONT=	yes
-XSERVER_NEEDS_MIEXT=	yes
-XSERVER_XFREE86=	yes
-# XXX xfree 4.5 installs libafb for i386 and others?
-.if ${MACHINE} == "i386"
-XSERVER_HAS_AFB=	yes
-.endif
-.endif
-
-.if ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcsh"
-XSERVER_XHPC=		yes
-.endif
-
-.if ${MACHINE} == "mac68k"
-XSERVER_XMAC68K=	yes
-.endif
-
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC=	yes
-.endif
-
-.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "sun3"
-XSERVER_XSUN=		yes
-XSERVER_XSUNMONO=	yes
-.endif
-
-.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN24=		yes
-.endif
-
-.if ${MACHINE} == "vax"
-XSERVER_XVAX=	yes
-.endif
-
-
-# Does this server need Xfont/fontbase libraries?
-XSERVER_NEEDS_XFONT?=	no
-# Does this server need miext modules?
-XSERVER_NEEDS_MIEXT?=	yes
-# Does this server use cfb* libraries?
-XSERVER_HAS_CFB?=	yes
-# Does this server use fb library?
-XSERVER_HAS_FB?=	yes
-# Does this server use afb library?
-XSERVER_HAS_AFB?=	no
-# Does this server use iplan2p? libraries?
-XSERVER_HAS_IPLAN?=	no
-
-# Does this platform build X68k X servers?
-XSERVER_X68K?=	no
-# Does this platform build the XalphaNetBSD server?
-XSERVER_XALPHANETBSD?=	no
-# Does this platform build Xamiga X server?
-XSERVER_XAMIGA?=no
-# Does this platform build the Xarm32VIDC server?
-XSERVER_XARM32VIDC?=	no
-# Does this platform build the XdecNetBSD server?
-XSERVER_XDECNETBSD?=	no
-# Does this platform build the Xdmx server?
-XSERVER_XDMX?=		yes
-# Does this platform build the Xdreamcast server?
-XSERVER_XDREAMCAST?=	no
-# Does this platform build the Xews4800mips server?
-XSERVER_XEWS4800MIPS?=	no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?=	no
-# Does this platform build the Xfree68 servers?
-XSERVER_XFREE68?=	no
-# Does this platform build XFree86 X server?
-XSERVER_XFREE86?=	no
-# Does this platform build Xhpc X servers?
-XSERVER_XHPC?=	no
-# Does this platform build the Xmac68k X server?
-XSERVER_XMAC68K?=	no
-# Does this platform build Xmacppc X server?
-XSERVER_XMACPPC?=	no
-# Does this platform build Xsun* X servers?
-XSERVER_XSUN?=		no
-XSERVER_XSUNMONO?=	no
-XSERVER_XSUN24?=	no
-# Does this platform build Xvfb X server?
-XSERVER_XVFB?=	yes
-# Does this platform build Xvax X server?
-XSERVER_XVAX?=	no

x11/Xserver/Makefile.serverlib

@@ -1,45 +0,0 @@
-#	$NetBSD: Makefile.serverlib,v 1.8 2004/07/14 13:34:13 sekiya Exp $
-
-NOLINT=         1
-NOPROFILE=      1
-
-.if ${MACHINE_ARCH} != "mipseb" && ${MACHINE_ARCH} != "mipsel"
-NOPIC=		1
-.endif
-
-.include <bsd.own.mk>		# for NETBSDSRCDIR
-.include <bsd.endian.mk>
-
-.if ${XMODULEDIR:U} == ""
-libinstall::
-.endif
-
-.if ${TARGET_ENDIANNESS} == "1234"
-X_BYTE_ORDER=X_LITTLE_ENDIAN
-.elif ${TARGET_ENDIANNESS} == "4321"
-X_BYTE_ORDER=X_BIG_ENDIAN
-.else
-X_BYTE_ORDER=0
-.endif
-
-CPPFLAGS+=	${X11FLAGS.SERVER} -DX_BYTE_ORDER=${X_BYTE_ORDER}
-
-.if !defined(XSERVERINCDIR)
-XSERVERINCDIR!=	cd ${NETBSDSRCDIR}/x11/Xserver/include && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=XSERVERINCDIR
-.endif
-
-# Architectures that can't use the XFree86 loader (such as MIPS) can use
-# dlopen() to load modules.
-
-.if defined(XMODULEDIR)
-CPPFLAGS+=	${X11FLAGS.LOADABLE}
-.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
-SHLIB_MAJOR=	0
-SHLIB_MINOR=	0
-MKPICLIB=	yes
-MKSTATICLIB=	no
-.endif
-.else
-NOPIC=		1
-.endif

x11/Xserver/Xext/Makefile

@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2003/12/21 03:07:01 rtr Exp $
-
-SUBDIR=	ext exts
-
-.include "../Makefile.serverlib"
-.include "Makefile.ext"
-
-.if defined(X11FLAGS.LOADABLE)
-SUBDIR+=	extmod
-.endif
-
-.include <bsd.subdir.mk>

x11/Xserver/Xext/Makefile.ext

@@ -1,28 +0,0 @@
-#	$NetBSD: Makefile.ext,v 1.10 2005/03/21 00:49:17 rtr Exp $
-
-.PATH:		${X11SRCDIR.xc}/programs/Xserver/Xext
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/Xext \
-		-I${X11SRCDIR.xc}/programs/Xserver/Xext/extmod \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${XSERVERINCDIR} \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/programs/Xserver/mi \
-		-I${X11SRCDIR.xc}/programs/Xserver/render \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/dmx \
-		-I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common
-
-CPPFLAGS+=	${X11FLAGS.EXTENSION}
-
-.if ${MACHINE} == "sparc64"
-CPPFLAGS+=	-UXF86VIDMODE
-.endif
-
-CPPFLAGS.security.c=	-DDEFAULTPOLICYFILE=\"${X11ETCDIR}/xserver/SecurityPolicy\"
-CPPFLAGS.xf86bigfont.c=	-DHAS_SHM
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/Xext/ext/Makefile

@@ -1,18 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2009/02/14 13:48:16 abs Exp $
-
-LIB=		ext
-SRCS=		EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \
-		panoramiX.c panoramiXSwap.c panoramiXprocs.c sampleEVI.c \
-		saver.c security.c shape.c shm.c sleepuntil.c sync.c \
-		xcmisc.c xf86bigfont.c xprint.c xres.c xtest.c xtest1dd.c \
-		xtest1di.c xvdisp.c xvmain.c xvmc.c dmx.c
-
-.if ${MACHINE_ARCH} != "sparc"
-SRCS+=	xf86vmode.c xf86misc.c xf86dga.c xf86dga2.c
-.endif
-
-CONFIGFILES=	SecurityPolicy
-FILESDIR=	${X11ETCDIR}/xserver
-
-.include "../../Makefile.serverlib"
-.include "../Makefile.ext"

x11/Xserver/Xext/extmod/Makefile

@@ -1,15 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2004/03/06 03:31:05 rtr Exp $
-
-LIB=		extmod
-SRCS=	shape.c mitmisc.c bigreq.c sync.c saver.c xcmisc.c xf86vmode.c \
-	xf86misc.c xf86dga.c xf86dga2.c cup.c dpms.c EVI.c fontcache.c \
-	sampleEVI.c xvmain.c xvdisp.c xvmod.c xvmc.c modinit.c xres.c
-
-CPPFLAGS+=	-DEXTMODULE
-
-XMODULEDIR=	${X11ROOTDIR}/lib/modules/extensions
-
-.include "../../Makefile.serverlib"
-.include "../Makefile.ext"
-
-.PATH:          ${X11SRCDIR.xc}/programs/Xserver/Xext/extmod

x11/Xserver/Xext/exts/Makefile

@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2003/12/21 03:07:01 rtr Exp $
-
-LIB=		exts
-SRCS=		appgroup.c panoramiX.c panoramiXSwap.c panoramiXprocs.c \
-		security.c shm.c sleepuntil.c xf86bigfont.c xprint.c \
-		xtest.c xtest1dd.c xtest1di.c
-
-.include "../../Makefile.serverlib"
-.include "../Makefile.ext"

x11/Xserver/Xfont/Makefile

@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2005/03/21 01:26:02 rtr Exp $
-
-SUBDIR=bitmap freetype type1 speedo xtt
-
-.include <bsd.subdir.mk>

x11/Xserver/Xfont/bitmap/Makefile

@@ -1,33 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2004/03/16 17:40:53 matt Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules/fonts
-
-.include "../../Makefile.serverlib"
-
-LIB=	bitmap
-.PATH:	${X11SRCDIR.xc}/lib/font/bitmap
-.PATH:	${X11SRCDIR.xc}/lib/font/bitmap/module
-
-SRCS=	bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c bitmapfunc.c \
-	pcfread.c pcfwrite.c snfread.c fontink.c bitmapmod.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${XSERVERINCDIR}
-
-CPPFLAGS+=	-DBDFFORMAT -DSNFFORMAT -DPCFFORMAT
-
-CPPFLAGS.bitmapfunc.c=	-DX_GZIP_FONT_COMPRESSION
-
-.include <bsd.x11.mk>
-
-.if !empty(X11FLAGS.LOADABLE)
-CPPFLAGS+=	-DFONTMODULE
-LIBDIR=	${XMODULEDIR}
-.else
-libinstall::
-.endif
-
-.include <bsd.lib.mk>

x11/Xserver/Xfont/freetype/Makefile

@@ -1,98 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2005/03/22 15:00:37 tron Exp $
-
-XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts
-
-.include "../../Makefile.serverlib"
-
-LIB=	freetype
-
-FT2DIR=	${X11SRCDIR.xc}/extras/freetype2
-FT2SRC=	${FT2DIR}/src
-
-.PATH:	${X11SRCDIR.xc}/lib/font/FreeType
-SRCS=	xttcap.c ftfuncs.c ftenc.c fttools.c
-
-.PATH:	${X11SRCDIR.xc}/lib/font/FreeType/module
-SRCS+=	ftmodule.c
-
-.PATH:	${FT2SRC}/base
-SRCS+=	ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c ftbdf.c 
-	
-.PATH:	${FT2SRC}/gzip
-SRCS+=	ftgzip.c
-
-.PATH:	${FT2SRC}/raster
-SRCS+=	raster.c
-
-.PATH:	${FT2SRC}/sfnt
-SRCS+=	sfnt.c
-
-.PATH:	${FT2SRC}/truetype
-SRCS+=	truetype.c
-
-.PATH:	${FT2SRC}/cff
-SRCS+=	cff.c
-
-.PATH:	${FT2SRC}/type1
-SRCS+=	type1.c
-
-.PATH:	${FT2SRC}/psaux
-SRCS+=	psaux.c
-
-.PATH:	${FT2SRC}/psnames
-SRCS+=	psnames.c
-
-.PATH:	${FT2SRC}/pshinter
-SRCS+=	pshinter.c
-
-.PATH:	${FT2SRC}/autohint
-SRCS+=	autohint.c
-
-.PATH:	${FT2SRC}/bdf
-SRCS+=	bdf.c
-
-.PATH:	${FT2SRC}/pcf
-SRCS+=	pcf.c
-
-.PATH:	${FT2SRC}/lzw
-SRCS+=	ftlzw.c
-
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/lib/font/FreeType/module \
-		-I${X11SRCDIR.xc}/lib/font/FreeType \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${FT2DIR}/include \
-		-I${FT2SRC}/base \
-		-I${FT2SRC}/gzip \
-		-I${FT2SRC}/raster \
-		-I${FT2SRC}/sfnt \
-		-I${FT2SRC}/truetype \
-		-I${FT2SRC}/cff \
-		-I${FT2SRC}/type1 \
-		-I${FT2SRC}/psaux \
-		-I${FT2SRC}/psnames \
-		-I${FT2SRC}/pshinter \
-		-I${FT2SRC}/autohint \
-		-I${FT2SRC}/bdf \
-		-I${FT2SRC}/pcf \
-		-I${XSERVERINCDIR}
-
-CPPFLAGS+=	-DXFREE86_FT2
-
-.include <bsd.x11.mk>
-
-.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
-CPPFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
-.endif
-
-.if !empty(X11FLAGS.LOADABLE)
-CPPFLAGS+=	-DFONTMODULE
-LIBDIR=	${XMODULEDIR}
-.else
-libinstall::
-.endif
-
-.include <bsd.lib.mk>

x11/Xserver/Xfont/speedo/Makefile

@@ -1,30 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2004/03/16 17:40:54 matt Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules/fonts
-
-.include "../../Makefile.serverlib"
-
-LIB=	speedo
-.PATH:	${X11SRCDIR.xc}/lib/font/Speedo
-.PATH:	${X11SRCDIR.xc}/lib/font/Speedo/module
-
-SRCS=	spfuncs.c spfile.c spinfo.c sperr.c spfont.c spglyph.c spencode.c \
-	bics-unicode.c do_char.c do_trns.c out_bl2d.c out_blk.c out_scrn.c \
-	out_util.c reset.c set_spcs.c set_trns.c speedomod.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${XSERVERINCDIR}
-
-.include <bsd.x11.mk>
-
-.if !empty(X11FLAGS.LOADABLE)
-CPPFLAGS+=	-DFONTMODULE
-LIBDIR=	${XMODULEDIR}
-.else
-libinstall::
-.endif
-		
-.include <bsd.lib.mk>

x11/Xserver/Xfont/type1/Makefile

@@ -1,33 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2004/03/16 17:40:54 matt Exp $
-
-XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts
-
-.include "../../Makefile.serverlib"
-
-LIB=	type1
-.PATH:	${X11SRCDIR.xc}/lib/font/Type1
-.PATH:	${X11SRCDIR.xc}/lib/font/Type1/module
-
-SRCS=	arith.c curves.c fontfcn.c hints.c lines.c objects.c paths.c \
-	regions.c scanfont.c spaces.c t1funcs.c t1info.c t1io.c t1malloc.c \
-	t1snap.c t1stub.c token.c type1.c util.c cidchar.c afm.c \
-	t1unicode.c type1mod.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${XSERVERINCDIR}
-
-CPPFLAGS+=	-DBUILDCID -DHAVE_CFM -DUSE_MMAP
-
-.include <bsd.x11.mk>
-
-.if !empty(X11FLAGS.LOADABLE)
-CPPFLAGS+=	-DFONTMODULE
-LIBDIR=	${XMODULEDIR}
-.else
-libinstall::
-.endif
-
-.include <bsd.lib.mk>

x11/Xserver/Xfont/xtt/Makefile

@@ -1,38 +0,0 @@
-#	$NetBSD: Makefile,v 1.7 2005/07/02 08:28:58 rtr Exp $
-
-XMODULEDIR=	${X11USRLIBDIR}/modules/fonts
-
-.include "../../Makefile.serverlib"
-
-LIB=	xtt
-
-.PATH:	${X11SRCDIR.xc}/lib/font/FreeType/module
-SRCS+=	xttmodule.c
-
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/fonts/codeconv \
-		-I${X11SRCDIR.xc}/lib/font/X-TrueType \
-		-I${X11SRCDIR.xc}/extras/FreeType/lib \
-		-I${X11SRCDIR.xc}/extras/FreeType/lib/extend \
-		-I${X11SRCDIR.xc}/lib/font/FreeType \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${X11SRCDIR.xc}/lib/font/include \
-		-I${X11SRCDIR.xc}/extras/X-TrueType \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xc}/lib/font/fontcache \
-		-I${XSERVERINCDIR}
-
-CPPFLAGS+=	-DTT_MAKE_OPTION_SINGLE_OBJECT=1 \
-		-DTT_CONFIG_OPTION_EXTEND_ENGINE \
-		-DOPT_ENCODINGS
-
-.include <bsd.x11.mk>
-
-.if !empty(X11FLAGS.LOADABLE)
-CPPFLAGS+=	-DFONTMODULE
-LIBDIR=	${XMODULEDIR}
-.else
-libinstall::
-.endif
-
-.include <bsd.lib.mk>

x11/Xserver/Xserver/Makefile

@@ -1,89 +0,0 @@
-#	$NetBSD: Makefile,v 1.19 2012/05/14 08:42:03 abs Exp $
-
-.include <bsd.own.mk>
-
-.include "../Makefile.common"
-
-SUBDIR=		Xnest Xprt
-
-.if ${XSERVER_X68K} != "no" 
-SUBDIR+=	X68k
-.endif
-
-.if ${XSERVER_XALPHANETBSD} != "no"
-SUBDIR+=	XalphaNetBSD
-.endif
-
-.if ${XSERVER_XAMIGA} != "no"
-SUBDIR+=	Xamiga
-.endif
-
-.if ${XSERVER_XARM32VIDC} != "no"
-SUBDIR+=	Xarm32VIDC
-.endif
-
-.if ${XSERVER_XDECNETBSD} != "no"
-SUBDIR+=	XdecNetBSD
-.endif
-
-.if ${XSERVER_XDMX} != "no"
-SUBDIR+=	Xdmx
-.endif
-
-.if ${XSERVER_XDREAMCAST} != "no"
-SUBDIR+=	Xdreamcast
-.endif
-
-.if ${XSERVER_XEWS4800MIPS} != "no"
-SUBDIR+=	Xews4800mips
-.endif
-
-.if ${XSERVER_XFREE68} != "no" 
-SUBDIR+=	XF68_FBDev
-SUBDIR+=	XF68_SVGA
-SUBDIR+=	XF68_W32
-.endif
-
-.if ${XSERVER_XFREE86} != "no" 
-SUBDIR+=	XFree86
-.endif
-
-.if ${XSERVER_XHPC} != "no" 
-SUBDIR+=	Xhpc
-.endif
-
-.if ${XSERVER_XMAC68K} != "no"
-SUBDIR+=	Xmac68k
-.endif
-
-.if ${XSERVER_XMACPPC} != "no"
-SUBDIR+=	Xmacppc
-.endif
-
-.if ${XSERVER_XNEWSMIPS} != "no"
-SUBDIR+=	Xnewsmips
-.endif
-
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=	Xsun
-.endif
-
-.if ${XSERVER_XSUNMONO} != "no"
-SUBDIR+=	XsunMono
-.endif
-
-.if ${XSERVER_XSUN24} != "no"
-SUBDIR+=	Xsun24
-.endif
-
-.if ${XSERVER_XVFB} != "no"
-SUBDIR+=	Xvfb
-.endif
-
-.if ${XSERVER_XVAX} != "no"
-SUBDIR+=	Xvax
-.endif
-
-.include "Makefile.Xserver"
-
-.include <bsd.subdir.mk>

x11/Xserver/Xserver/Makefile.Xserver

@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile.Xserver,v 1.23 2005/12/29 15:52:20 tsutsui Exp $
-
-.for _SL in	dix os mi printer printer/pcl printer/ps printer/raster \
-		Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
-		record randr render xtrap mfb iplan2p4 iplan2p8 \
-		cfb cfb16 cfb24 cfb32 fb \
-		hw/xnest hw/vfb fontbase afb/afb \
-		\
-		hw/dmx hw/dmx/dmxinput hw/dmx/dmxconfig \
-		\
-		miext/shadow \
-		dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
-		hw/xfree86/xf86config hw/xfree86/loader \
-		\
-		hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k \
-		hw/netbsd/mac68k hw/netbsd/amiga hw/netbsd/dec \
-		hw/netbsd/arm32vidc hw/netbsd/alpha hw/netbsd/dreamcast \
-		hw/netbsd/ews4800mips hw/netbsd/newsmips
-
-.if !defined(LIBDIR.${_SL})
-LIBDIR.${_SL}!=	cd ${NETBSDSRCDIR}/x11/Xserver/${_SL} && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=LIBDIR.${_SL}
-.endif
-LDADD.${_SL}=	${LIBDIR.${_SL}}/lib${_SL:T}.a
-DPADD.${_SL}=	${LIBDIR.${_SL}}/lib${_SL:T}.a
-.endfor
-.if (${USE_PAM} != "no")
-LDADD.os +=-lpam ${PAM_STATIC_LDADD}
-DPADD.os +=${LIBPAM} ${PAM_STATIC_DPADD}
-.endif
-
-LIBCWRAPPER=	${LIBDIR.os}/libc_wrapper.o

x11/Xserver/Xserver/X68k/Makefile

@@ -1,42 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2004/06/13 11:49:55 lukem Exp $
-
-.include <bsd.own.mk>
-
-PROG=	X68k
-BINMODE=4711
-
-MAN=	X68k.1
-
-FILES=	X68kConfig
-FILESDIR=${X11ETCDIR}
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/x68k
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.mi} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.hw/netbsd/x68k} ${LDADD.cfb16} ${LDADD.cfb} ${LDADD.mfb} \
-	${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.hw/netbsd/x68k} ${LDADD.Xext/ext} ${LDADD.dbe} \
-	${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lXext -lX11 -lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.mi} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.hw/netbsd/x68k} ${DPADD.cfb16} ${DPADD.cfb} ${DPADD.mfb} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.hw/netbsd/x68k} ${DPADD.Xext/ext} ${DPADD.dbe} \
-	${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
-	${LIBCWRAPPER} ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/X68k ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/X68k/X68k.c

@@ -1 +0,0 @@
-/*	$NetBSD: X68k.c,v 1.1 2004/01/07 13:02:54 minoura Exp $	*/

x11/Xserver/Xserver/XF68_FBDev/XF68_FBDev.c

@@ -1,42 +0,0 @@
-/* $XConsortium: XF68_FBDev.c /main/1 1996/09/21 11:17:40 kaleb $ */
-
-
-
-
-/* $XFree86: xc/programs/Xserver/hw/xfree68/common/XF68_FBDev.c,v 3.1 1996/12/27 06:52:00 dawes Exp $ */
-#include "X.h"
-#include "os.h"
-
-#define _NO_XF86_PROTOTYPES
-
-#include "xf86.h"
-#include "xf86_Config.h"
-
-
-extern ScrnInfoRec fbdevInfoRec;
-
-ScrnInfoPtr xf86Screens[] = {
-	&fbdevInfoRec,
-};
-
-int xf86MaxScreens = sizeof(xf86Screens)/sizeof(ScrnInfoPtr);
-
-int xf86ScreenNames[] = {
-	FBDEV,
-	-1
-};
-
-int fbdevValidTokens[] = {
-	STATICGRAY,
-	GRAYSCALE,
-	STATICCOLOR,
-	PSEUDOCOLOR,
-	TRUECOLOR,
-	DIRECTCOLOR,
-	MODES,
-	VIEWPORT,
-	VIRTUAL,
-	-1
-};
-
-#include "xf86ExtInit.h"

x11/Xserver/Xserver/XF68_SVGA/XF68_SVGA.c

@@ -1,54 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c,v 3.7 1996/02/04 09:05:57 dawes Exp $ */
-
-
-
-
-
-/* $XConsortium: XF86_SVGA.c /main/3 1995/11/12 19:20:51 kaleb $ */
-
-#include "X.h"
-#include "os.h"
-
-#define _NO_XF86_PROTOTYPES
-
-#include "xf86.h"
-#include "xf86_Config.h"
-
-extern ScrnInfoRec vga256InfoRec;
-
-ScrnInfoPtr xf86Screens[] = 
-{
-  &vga256InfoRec,
-};
-
-int  xf86MaxScreens = sizeof(xf86Screens) / sizeof(ScrnInfoPtr);
-
-int xf86ScreenNames[] =
-{
-  SVGA,
-  -1
-};
-
-int vga256ValidTokens[] =
-{
-  STATICGRAY,
-  GRAYSCALE,
-  STATICCOLOR,
-  PSEUDOCOLOR,
-  TRUECOLOR,
-  DIRECTCOLOR,
-  CHIPSET,
-  CLOCKS,
-  MODES,
-  OPTION,
-  VIDEORAM,
-  VIEWPORT,
-  VIRTUAL,
-  CLOCKPROG,
-  IOBASE,
-  MEMBASE,
-  -1
-};
-
-#include "xf86ExtInit.h"
-

x11/Xserver/Xserver/XF68_W32/XF68_W32.c

@@ -1,56 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_W32.c,v 3.2 1996/02/04 09:05:58 dawes Exp $ */
-
-
-
-
-
-/* $XConsortium: XF86_W32.c /main/3 1995/11/12 19:20:57 kaleb $ */
-
-#include "X.h"
-#include "os.h"
-
-#define _NO_XF86_PROTOTYPES
-
-#include "xf86.h"
-#include "xf86_Config.h"
-
-extern ScrnInfoRec vga256InfoRec;
-
-ScrnInfoPtr xf86Screens[] = 
-{
-  &vga256InfoRec,
-};
-
-int  xf86MaxScreens = sizeof(xf86Screens) / sizeof(ScrnInfoPtr);
-
-int xf86ScreenNames[] =
-{
-  ACCEL,
-  -1
-};
-
-int vga256ValidTokens[] =
-{
-  STATICGRAY,
-  GRAYSCALE,
-  STATICCOLOR,
-  PSEUDOCOLOR,
-  TRUECOLOR,
-  DIRECTCOLOR,
-  CHIPSET,
-  CLOCKS,
-  DISPLAYSIZE,
-  MODES,
-  OPTION,
-  VIDEORAM,
-  VIEWPORT,
-  VIRTUAL,
-  SPEEDUP,
-  NOSPEEDUP,
-  CLOCKPROG,
-  IOBASE,
-  MEMBASE,
-  -1
-};
-
-#include "xf86ExtInit.h"

x11/Xserver/Xserver/XFree86/Makefile

@@ -1,57 +0,0 @@
-#	$NetBSD: Makefile,v 1.14 2009/02/14 13:48:16 abs Exp $
-
-.include <bsd.own.mk>
-
-PROG=	XFree86
-BINMODE=4711
-
-MAN=	XFree86.1 XF86Config.5
-
-.PATH:  ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LIBDIR.xkb}/xf86KillSrv.o ${LIBDIR.xkb}/xf86VT.o \
-	${LIBDIR.xkb}/xf86Private.o ${LIBDIR.hw/xfree86/xf86}/xf86Init.o \
-	${LIBDIR.hw/xfree86/xf86}/xf86IniExt.o ${LIBDIR.fontbase}/fontcache.o
-
-LDADD+=	${LDADD.hw/xfree86/xf86} ${LDADD.hw/xfree86/xf86config} \
-	${LDADD.hw/xfree86/xf86_os} ${LDADD.hw/xfree86/loader} \
-	${LDADD.hw/xfree86/xf86} ${LDADD.dix} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.fontbase} ${LDADD.Xext/exts} ${LDADD.xkb} \
-	${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.hw/xfree86/xf86} ${LDADD.Xext/exts} ${LDADD.xkb} \
-	${LDADD.xinput} ${LDADD.lbx} -llbxutil ${LDADD.randr} \
-	${LDADD.render} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/exts} \
-	${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.randr} ${LDADD.render} ${LDADD.hw/xfree86/xf86_os} \
-	-lusbhid -lz -lm
-
-DPADD=	${DPADD.hw/xfree86/xf86} ${DPADD.hw/xfree86/xf86config} \
-	${DPADD.hw/xfree86/xf86_os} ${DPADD.hw/xfree86/loader} \
-	${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} ${DPADD.fontbase} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${LIBZ} ${LIBM}
-
-.if ${MACHINE_ARCH} == "x86_64"
-LDADD+=	-lx86_64
-DPADD+=	${LIBX86_64}
-.elif ${MACHINE_ARCH} == "i386"
-LDADD+=	-li386
-DPADD+=	${LIBI386}
-.endif
-
-SYMLINKS=	${X11BINDIR}/XFree86 ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb") \
-        && defined(X11FLAGS.LOADABLE)
-LDADD+= -larm
-DPADD+= ${LIBARM}
-.endif
-
-LDADD+= -export-dynamic
-
-.include <bsd.prog.mk>

x11/Xserver/Xserver/XFree86/XFree86.c

@@ -1 +0,0 @@
-/*	$NetBSD: XFree86.c,v 1.1 2003/12/23 03:33:41 rtr Exp $ */

x11/Xserver/Xserver/XalphaNetBSD/Makefile

@@ -1,30 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2008/05/25 01:46:18 rtr Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	XalphaNetBSD
-BINMODE=4711
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/alpha
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/alpha} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.cfb} ${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} \
-	${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
-	-lXau -lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/alpha} ${DPADD.os} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.mfb} ${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render \
-	${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${LDADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
-	${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/XalphaNetBSD/XalphaNetBSD.c

@@ -1 +0,0 @@
-/*	$NetBSD: XalphaNetBSD.c,v 1.1 2004/01/18 05:35:04 rtr Exp $	*/

x11/Xserver/Xserver/Xamiga/Makefile

@@ -1,33 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2005/07/03 14:30:52 tron Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xamiga
-
-MAN=	Xamiga.1
-MLINKS=	Xamiga.1 Xamiga24.1
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/amiga
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/amiga} ${LDADD.afb/afb} -lXfont \
-	-lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb24} \
-	${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} ${LDADD.mi} \
-	${LDADD.Xext/ext} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
-	-lXau -lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/amiga} ${DPADD.afb/afb} ${LIBXFONT} \
-	${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.cfb24} ${DPADD.cfb32} ${DPADD.mfb} ${DPADD.xkb} \
-	${DPADD.mi} ${DPADD.Xext/ext} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.dbe} ${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xamiga ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xamiga/Xamiga.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xamiga.c,v 1.1 2004/01/17 04:03:26 rtr Exp $	*/

x11/Xserver/Xserver/Xarm32VIDC/Makefile

@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2008/05/25 01:46:18 rtr Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	Xarm32VIDC
-BINMODE=4711
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/arm32vidc
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/arm32vidc} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.mfb} ${LDADD.xkb} \
-	${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
-	-lXau -lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/arm32vidc} ${DPADD.os} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.mfb} ${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render \
-	${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${LDADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
-	${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xarm32VIDC ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xarm32VIDC/Xarm32VIDC.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xarm32VIDC.c,v 1.1 2004/01/18 05:35:04 rtr Exp $	*/

x11/Xserver/Xserver/XdecNetBSD/Makefile

@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2008/05/25 01:46:18 rtr Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	XdecNetBSD
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dec
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/dec} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.cfb} ${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} \
-	${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} -lXau -lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/dec} ${DPADD.os} ${LIBXFONT} \
-	${LIBFREETYPE} ${DPADD.cfb} ${DPADD.cfb32} ${DPADD.mfb} \
-	${DPADD.xkb} ${DPADD.mi} ${DPADD.Xext/ext} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.dix/xpstubs} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${LIBXAU} ${LIBXDMCP} \
-	${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/XdecNetBSD ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/XdecNetBSD/XdecNetBSD.c

@@ -1 +0,0 @@
-/*	$NetBSD: XdecNetBSD.c,v 1.1 2004/01/18 05:35:04 rtr Exp $	*/

x11/Xserver/Xserver/Xdmx/Makefile

@@ -1,55 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2005/04/09 18:00:01 tron Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xdmx
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/dmx
-
-.include "../Makefile.Xserver"
-
-LDADD+= ${LDADD.dix} \
-	${LDADD.hw/dmx} \
-	${LDADD.os} \
-	${LDADD.randr} \
-	${LDADD.hw/dmx/dmxconfig} \
-	${LDADD.miext/shadow} \
-	${LDADD.fb} \
-	${LDADD.mi} \
-	${LDADD.Xext/ext} \
-	${LDADD.record} \
-	${LDADD.xtrap} \
-	${LDADD.xkb} \
-	${LDADD.xinput} \
-	${LDADD.lbx} \
-	-llbxutil \
-	${LDADD.render} \
-	${LDADD.hw/dmx/dmxinput} \
-	-lXfont \
-	-lfreetype \
-	${LDADD.dix/xpstubs} \
-	-lXi -lXmu -lXt -lSM \
-	-lICE -lXext -lX11 \
-	-lXrender -lXext -lX11 \
-	-lz -lm -lXdmcp
-
-DPADD+= ${DPADD.dix} \
-	${DPADD.hw/dmx} \
-	${DPADD.os} \
-	${DPADD.randr} \
-	${DPADD.hw/dmx/dmxconfig} \
-	${DPADD.miext/shadow} \
-	${DPADD.fb} \
-	${DPADD.mi} \
-	${DPADD.Xext/ext} \
-	${DPADD.record} \
-	${DPADD.xtrap} \
-	${DPADD.xkb} \
-	${DPADD.xinput} \
-	${DPADD.lbx} \
-	${DPADD.render} \
-	${DPADD.hw/dmx/dmxinput} \
-	${DPADD.dix/xpstubs}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xdreamcast/Makefile

@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.3 2004/02/07 12:46:48 rtr Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xdreamcast
-BINMODE=4711
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/dreamcast
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/dreamcast} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb} \
-	${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/ext} \
-	${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} -lXau \
-	-lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/dreamcast} ${LIBXFONT} \
-	${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.xkb} ${DPADD.mfb} ${DPADD.dix/xpstubs} ${DPADD.mi} \
-	${DPADD.Xext/ext} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} ${DPADD.xtrap} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} ${DPADD.render} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xdreamcast ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xdreamcast/Xdreamcast.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xdreamcast.c,v 1.1 2004/02/07 08:30:34 rtr Exp $ */

x11/Xserver/Xserver/Xews4800mips/Makefile

@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2005/12/29 15:52:20 tsutsui Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xews4800mips
-BINMODE=4711
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/ews4800mips
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/ews4800mips} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb} \
-	${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/ext} \
-	${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} -lXau \
-	-lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/ews4800mips} ${LIBXFONT} \
-	${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.xkb} ${DPADD.mfb} ${DPADD.dix/xpstubs} ${DPADD.mi} \
-	${DPADD.Xext/ext} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} ${DPADD.xtrap} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} ${DPADD.render} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xews4800mips ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xews4800mips/Xews4800mips.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xews4800mips.c,v 1.1 2005/12/29 15:52:20 tsutsui Exp $	*/

x11/Xserver/Xserver/Xhpc/Makefile

@@ -1,39 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2004/01/10 16:14:37 rtr Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xhpc
-BINMODE=4711
-
-MAN=	Xhpc.1
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/hpc
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.mi} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.hw/netbsd/hpc} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.mfb} \
-	${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.hw/netbsd/hpc} ${LDADD.Xext/ext} ${LDADD.dbe} \
-	${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lXext -lX11 -lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.mi} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.hw/netbsd/hpc} ${DPADD.cfb} ${DPADD.cfb16} ${DPADD.mfb} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.hw/netbsd/hpc} ${DPADD.Xext/ext} ${DPADD.dbe} \
-	${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
-	${LIBCWRAPPER} ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xhpc ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xhpc/Xhpc.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xhpc.c,v 1.1 2004/01/03 02:05:49 takemura Exp $	*/

x11/Xserver/Xserver/Xmac68k/Makefile

@@ -1,39 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 2004/01/10 14:44:18 rtr Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xmac68k
-BINMODE=4711
-
-MAN=	Xmac68k.1
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/mac68k
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.mi} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.hw/netbsd/mac68k} ${LDADD.cfb} ${LDADD.mfb} \
-	${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.hw/netbsd/mac68k} ${LDADD.Xext/ext} ${LDADD.dbe} \
-	${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lXext -lX11 -lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.mi} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.hw/netbsd/mac68k} ${DPADD.cfb} ${DPADD.mfb} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.hw/netbsd/mac68k} ${DPADD.Xext/ext} ${DPADD.dbe} \
-	${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
-	${LIBCWRAPPER} ${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xmac68k ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xmac68k/Xmac68k.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xmac68k.c,v 1.1 2004/01/10 04:34:33 fredb Exp $	*/

x11/Xserver/Xserver/Xmacppc/Makefile

@@ -1,37 +0,0 @@
-#	$NetBSD: Makefile,v 1.4 2008/05/25 01:46:18 rtr Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	Xmacppc
-BINMODE=4711
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/macppc
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.mi} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.hw/netbsd/macppc} ${LDADD.cfb} ${LDADD.mfb} \
-	${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.hw/netbsd/macppc} ${LDADD.Xext/ext} ${LDADD.dbe} \
-	${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lXext -lX11 -lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.mi} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.hw/netbsd/macppc} ${DPADD.cfb} ${DPADD.mfb} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.hw/netbsd/macppc} ${DPADD.Xext/ext} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} ${LIBCWRAPPER} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xmacppc/Xmacppc.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xmacppc.c,v 1.1 2003/12/27 15:16:54 mrg Exp $	*/

x11/Xserver/Xserver/Xnest/Makefile

@@ -1,32 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2005/04/09 18:00:01 tron Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xnest
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/xnest
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.hw/xnest} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} \
-	-llbxutil ${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.hw/xnest} ${LDADD.Xext/ext} ${LDADD.dbe} ${LDADD.record} \
-	${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} ${LIBCWRAPPER} \
-	-lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lXext -lX11 -lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} ${DPADD.hw/xnest} \
-	${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.hw/xnest} ${DPADD.Xext/ext} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} ${LIBCWRAPPER} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBXEXT} ${LIBX11} ${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xnest/Xnest.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xnest.c,v 1.1 2003/09/23 23:21:07 lukem Exp $	*/

x11/Xserver/Xserver/Xnewsmips/Makefile

@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2004/08/01 18:52:03 uch Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xnewsmips
-BINMODE=4711
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/newsmips
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/newsmips} ${LDADD.os} -lXfont \
-	-lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb} \
-	${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/ext} \
-	${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} ${LDADD.GL/glx} \
-	${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} -lXau \
-	-lXdmcp -lz -lm
-
-DPADD=	${DPADD.dix} ${DPADD.hw/netbsd/newsmips} ${LIBXFONT} \
-	${LIBFREETYPE} ${DPADD.os} ${DPADD.cfb} ${DPADD.cfb16} \
-	${DPADD.xkb} ${DPADD.mfb} ${DPADD.dix/xpstubs} ${DPADD.mi} \
-	${DPADD.Xext/ext} ${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} \
-	${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} ${DPADD.xtrap} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} ${DPADD.render} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-SYMLINKS=	${X11BINDIR}/Xnewsmips ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xnewsmips/Xnewsmips.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xnewsmips.c,v 1.1 2004/08/01 18:52:03 uch Exp $	*/

x11/Xserver/Xserver/Xprt/Makefile

@@ -1,38 +0,0 @@
-#	$NetBSD: Makefile,v 1.5 2008/05/25 01:46:18 rtr Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	Xprt
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LIBDIR.printer}/ddxInit.o ${LIBDIR.printer}/miinitext.o \
-	${LIBDIR.printer}/dpmsstubs.o \
-	${LDADD.dix} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.printer} ${LDADD.printer/raster} ${LDADD.printer/pcl} \
-	${LDADD.printer/ps} ${LDADD.mfb} ${LDADD.cfb} ${LDADD.cfb32} \
-	${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} ${LDADD.Xext/exts} \
-	${LDADD.xkb} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
-	${LDADD.randr} ${LDADD.render} ${LDADD.Xext/ext} ${LDADD.dbe} \
-	${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} \
-	-lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lz -lm
-
-DPADD+=	${LIBDIR.printer}/ddxInit.o ${LIBDIR.printer}/miinitext.o \
-	${LIBDIR.printer}/dpmsstubs.o \
-	${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.printer} ${DPADD.printer/raster} ${DPADD.printer/pcl} \
-	${DPADD.printer/ps} ${DPADD.mfb} ${DPADD.cfb} ${DPADD.cfb32} \
-	${DPADD.mfb} ${DPADD.dix/xpstubs} ${DPADD.mi} ${DPADD.Xext/exts} \
-	${DPADD.xkb} ${DPADD.xinput} ${DPADD.lbx} ${LIBLBXUTIL} \
-	${DPADD.randr} ${DPADD.render} ${DPADD.Xext/ext} ${DPADD.dbe} \
-	${DPADD.record} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
-	${LIBCWRAPPER} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xprt/Xprt.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xprt.c,v 1.1 2003/09/23 23:21:08 lukem Exp $	*/

x11/Xserver/Xserver/Xsun/Makefile

@@ -1,48 +0,0 @@
-#	$NetBSD: Makefile,v 1.10 2009/02/14 13:48:16 abs Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xsun
-BINMODE=4711
-
-.include "../../Makefile.common"
-
-MAN=		Xsun.1
-
-MLINKS=		Xsun.1 XsunMono.1
-.if ${XSERVER_XSUN24} != "no"
-MLINKS+=	Xsun.1 Xsun24.1
-.endif
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/sun
-
-LDADD=	${LIBDIR.hw/sun}/sunInit.o ${LDADD.dix} ${LDADD.hw/sun} ${LDADD.os} \
-	${LDADD.cfb} ${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} \
-	${LDADD.Xext/ext} ${LDADD.xkb}
-
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-LDADD+=	${LDADD.xinput}
-DPADD=	${DPADD.xinput}
-.endif
-
-LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
-	${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
-	${LDADD.render} -lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lfreetype -lXau -lXdmcp -lz -lm
-
-DPADD+=	${LIBDIR.hw/sun}/sunInit.o ${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} \
-	${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
-	${DPADD.render} ${LIBXFONT} ${LDADD.dix/xpstubs} ${LIBFREETYPE} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-.if ${MACHINE_ARCH} != "sparc64"
-# sparc64 uses XFree86 as default X link
-SYMLINKS=	${X11BINDIR}/Xsun ${X11BINDIR}/X
-.endif
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xsun/Xsun.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xsun.c,v 1.1 2003/12/20 01:38:00 rtr Exp $ */

x11/Xserver/Xserver/Xsun24/Makefile

@@ -1,38 +0,0 @@
-#	$NetBSD: Makefile,v 1.7 2009/02/14 13:48:16 abs Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	Xsun24
-BINMODE=4711
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/sun
-
-LDADD=  ${LIBDIR.hw/sun}/sunInitMulti.o ${LDADD.dix} ${LDADD.hw/sun} \
-	${LDADD.os} ${LDADD.cfb16} ${LDADD.cfb24} ${LDADD.cfb32} \
-	${LDADD.cfb} ${LDADD.mfb} ${LDADD.dix/xpstubs} ${LDADD.mi} \
-	${LDADD.Xext/ext} ${LDADD.xkb}
-
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-LDADD+= ${LDADD.xinput}
-DPADD=	${DPADD.xinput}
-.endif
-
-LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} \
-	${LDADD.xtrap} ${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} \
-	${LDADD.render} -lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype \
-	-lXau -lXdmcp -lz -lm
-
-DPADD+=	${LIBDIR.hw/sun}/sunInitMulti.o ${DPADD.hw/sun} ${DPADD.dix} \
-	${DPADD.os} ${DPADD.cfb16} ${DPADD.cfb24} ${DPADD.cfb32} \
-	${DPADD.cfb} ${DPADD.mfb} ${DPADD.mi} ${LIBXEXT} ${DPADD.xkb} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.randr} \
-	${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} ${LIBFREETYPE} \
-	${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xsun24/Xsun24.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xsun24.c,v 1.1 2003/12/20 01:38:00 rtr Exp $ */

x11/Xserver/Xserver/XsunMono/Makefile

@@ -1,35 +0,0 @@
-#	$NetBSD: Makefile,v 1.6 2009/02/14 13:48:16 abs Exp $
-
-NOMAN=	# defined (must come before bsd.own.mk)
-
-.include <bsd.own.mk>
-
-PROG=	XsunMono
-BINMODE=4711
-
-.include "../Makefile.Xserver"
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/sun
-
-LDADD=	${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
-	${LDADD.hw/sun} ${LDADD.dix} ${LDADD.os} ${LDADD.mfb} ${LDADD.mi} \
-	${LDADD.Xext/ext} ${LDADD.xkb}
-
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-LDADD+= ${LDADD.xinput}
-DPADD+=	${DPADD.xinput}
-.endif
-
-LDADD+=	${LDADD.lbx} -llbxutil ${LDADD.dbe} ${LDADD.record} ${LDADD.xtrap} \
-	${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.randr} ${LDADD.render} \
-	-lXfont -lfreetype ${LDADD.dix/xpstubs} -lfreetype -lXau -lXdmcp -lz -lm
-
-DPADD+=	${LIBDIR.hw/sun}/sunInitMono.o ${LIBDIR.hw/sun}/sunInExMono.o \
-	${DPADD.hw/sun} ${DPADD.dix} ${DPADD.os} ${DPADD.mfb} ${DPADD.mi} \
-	${LIBXEXT} ${DPADD.xkb} ${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.dbe} \
-	${DPADD.record} ${DPADD.xtrap} ${DPADD.GL/glx} ${DPADD.GL/GLcore} \
-	${DPADD.randr} ${DPADD.render} ${LIBXFONT} ${DPADD.dix/xpstubs} \
-	${LIBFREETYPE} ${LIBXAU} ${LIBXDMCP} ${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/XsunMono/XsunMono.c

@@ -1 +0,0 @@
-/*	$NetBSD: XsunMono.c,v 1.1 2003/12/20 01:38:00 rtr Exp $ */

x11/Xserver/Xserver/Xvfb/Makefile

@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.5 2005/04/09 18:00:01 tron Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xvfb
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/vfb
-
-.include "../Makefile.Xserver"
-
-LDADD+=	${LDADD.dix} ${LDADD.hw/vfb} ${LDADD.os} -lXau -lXdmcp \
-	${LDADD.fb} ${LDADD.mfb} ${LDADD.dix/xpstubs} \
-	${LDADD.mi} ${LDADD.Xext/exts} ${LDADD.xkb} ${LDADD.xinput} \
-	${LDADD.lbx} -llbxutil ${LDADD.randr} ${LDADD.render} \
-	${LDADD.mi} ${LDADD.Xext/ext} ${LDADD.dbe} ${LDADD.record} \
-	${LDADD.GL/glx} ${LDADD.GL/GLcore} ${LDADD.xtrap} \
-	${LIBCWRAPPER} \
-	-lXfont -lfreetype ${LDADD.dix/xpstubs} \
-	-lz -lm
-
-DPADD+=	${DPADD.dix} ${DPADD.os} ${LIBXAU} ${LIBXDMCP} \
-	${DPADD.hw/vfb} ${DPADD.fb} ${DPADD.mfb} ${DPADD.dix/xpstubs} \
-	${DPADD.mi} ${DPADD.Xext/exts} ${DPADD.xkb} ${DPADD.xinput} \
-	${DPADD.lbx} ${LIBLBXUTIL} ${DPADD.randr} ${DPADD.render} \
-	${DPADD.mi} ${DPADD.Xext/ext} ${DPADD.dbe} ${DPADD.record} \
-	${DPADD.GL/glx} ${DPADD.GL/GLcore} ${DPADD.xtrap} \
-	${LIBCWRAPPER} \
-	${LIBXFONT} ${LIBFREETYPE} ${DPADD.dix/xpstubs} \
-	${LIBZ} ${LIBM}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>

x11/Xserver/Xserver/Xvfb/Xvfb.c

@@ -1 +0,0 @@
-/*	$NetBSD: Xvfb.c,v 1.1 2003/09/23 23:21:09 lukem Exp $	*/

x11/Xserver/afb/Makefile

@@ -1,14 +0,0 @@
-#	$NetBSD: Makefile,v 1.7 2005/07/03 14:30:52 tron Exp $
-
-.include <bsd.x11.mk>
-
-.if defined(X11FLAGS.LOADABLE)
-SUBDIR+=	afbmod
-.else
-SUBDIR+=	afb
-.endif
-
-.include <bsd.subdir.mk>
-
-gaga:
-	@echo ${SUBDIR}

x11/Xserver/afb/Makefile.afb

@@ -1,46 +0,0 @@
-#	$NetBSD: Makefile.afb,v 1.3 2005/07/03 14:30:52 tron Exp $
-
-.include "../Makefile.serverlib"
-
-LIB=	afb
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/${LIB}
-SRCS+=	afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c \
-	afbtileG.c afbseg.c afbbitblt.c afbbres.c afbbresd.c \
-	afbbstore.c afbclip.c afbcmap.c afbfillarc.c afbfillrct.c \
-	afbfillsp.c afbfont.c afbgc.c afbgetsp.c afbhrzvert.c \
-	afbimage.c afbimggblt.c afbline.c afbmisc.c afbpixmap.c \
-	afbply1rct.c afbplygblt.c afbpntarea.c afbpntwin.c \
-	afbpolypnt.c afbpushpxl.c afbscrinit.c afbsetsp.c afbtegblt.c \
-	afbwindow.c afbzerarc.c
-
-CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/${LIB} \
-		-I${X11SRCDIR.xc}/programs/Xserver/cfb \
-		-I${X11SRCDIR.xc}/programs/Xserver/mfb \
-		-I${X11SRCDIR.xc}/programs/Xserver/mi \
-		-I${X11SRCDIR.xc}/programs/Xserver/include \
-		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${XSERVERINCDIR}
-
-BUILDSYMLINKS=	afbblt.c afbbltC.c \
-		afbblt.c afbbltCI.c \
-		afbblt.c afbbltG.c \
-		afbblt.c afbbltO.c \
-		afbblt.c afbbltX.c \
-		afbline.c afbseg.c \
-		afbtile.c afbtileC.c \
-		afbtile.c afbtileG.c
-
-CPPFLAGS.afbbltC.c=	-DMROP=Mcopy
-CPPFLAGS.afbbltCI.c=	-DMROP=McopyInverted
-CPPFLAGS.afbbltG.c=	-DMROP=0
-CPPFLAGS.afbbltO.c=	-DMROP=Mor
-CPPFLAGS.afbbltX.c=	-DMROP=Mxor
-CPPFLAGS.afbseg.c=	-DPOLYSEGMENT
-CPPFLAGS.afbtileC.c=	-DMROP=Mcopy
-CPPFLAGS.afbtileG.c=	-DMROP=0
-
-.include <bsd.x11.mk>
-LIBDIR=	${XMODULEDIR}
-.include <bsd.lib.mk>

x11/Xserver/afb/afb/Makefile

@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2005/07/03 14:30:52 tron Exp $
-
-.include "../Makefile.afb"

x11/Xserver/afb/afbmod/Makefile

@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2005/07/03 14:30:52 tron Exp $
-
-SRCS=		afbmodule.c
-CPPFLAGS+=	${X11FLAGS.LOADABLE}
-XMODULEDIR=	${X11USRLIBDIR}/modules
-
-.include "../Makefile.afb"