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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/external/mit/xorg/server/xorg-server/Makefile.Xserver,v
rcsdiff: /ftp/cvs/cvsroot/src/external/mit/xorg/server/xorg-server/Makefile.Xserver,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.7
retrieving revision 1.7.6.2
diff -u -p -r1.7 -r1.7.6.2
--- src/external/mit/xorg/server/xorg-server/Makefile.Xserver	2008/09/25 12:30:04	1.7
+++ src/external/mit/xorg/server/xorg-server/Makefile.Xserver	2009/09/17 04:24:37	1.7.6.2
@@ -1,22 +1,4 @@
-#	$NetBSD: Makefile.Xserver,v 1.7 2008/09/25 12:30:04 rtr Exp $
-
-# XXX old list
-.if 0
-.for _SL in	dix os mi composite damage miext/damage \
-		Xext/ext Xext/exts GL/glx GL/GLcore xkb dbe \
-		record randr render xtrap mfb iplan2p4 iplan2p8 \
-		cfb cfb16 cfb24 cfb32 fb xfixes miext/cw \
-		hw/xnest hw/vfb fontbase afb \
-		\
-		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/newsmips
-.endfor
-.endif
+#	$NetBSD: Makefile.Xserver,v 1.7.6.2 2009/09/17 04:24:37 snj Exp $
 
 .for _SL in \
 	mi \
@@ -26,7 +8,6 @@
 	Xext \
 	Xext/Xextbuiltin \
 	dbe \
-	XTrap \
 	record \
 	render \
 	randr \
@@ -36,23 +17,21 @@
 	miext/cw \
 	Xi \
 	xkb \
+	xkbstubs \
 	composite \
 	dix/xpstubs \
 	os \
 	dix \
 	config \
+	glx \
 	hw/xnest \
 	hw/xfree86/common \
 	hw/xfree86/ddc \
 	hw/xfree86/dixmods \
-	hw/xfree86/dixmods/afb \
-	hw/xfree86/dixmods/cfb \
-	hw/xfree86/dixmods/cfb32 \
 	hw/xfree86/dixmods/dbe \
 	hw/xfree86/dixmods/extmod \
 	hw/xfree86/dixmods/fb \
 	hw/xfree86/dixmods/freetype \
-	hw/xfree86/dixmods/mfb \
 	hw/xfree86/dixmods/record \
 	hw/xfree86/dixmods/shadow \
 	hw/xfree86/dixmods/type1 \
@@ -76,8 +55,6 @@
 	hw/xfree86/vgahw \
 	hw/xfree86/x86emu \
 	hw/xfree86/xaa \
-	hw/xfree86/xf1bpp \
-	hw/xfree86/xf4bpp \
 	hw/xfree86/xf8_16bpp \
 	hw/xfree86/xf8_32bpp \
 	hw/xfree86/xf86config \
@@ -94,8 +71,6 @@ DPADD.${_SL}=	${LIBDIR.${_SL}}/lib${_SL:
 LDADD.XORG_CORE=	${LDADD.dix} ${LDADD.config}
 DPADD.XORG_CORE=	${DPADD.dix} ${DPADD.config}
 
-LIBCWRAPPER=	${LIBDIR.os}/libc_wrapper.o
-
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \