diff --git a/external/mit/xorg/server/xorg-server.old/Makefile.common b/external/mit/xorg/server/xorg-server.old/Makefile.common
index 39330185d4ab..219bad39c892 100644
--- a/external/mit/xorg/server/xorg-server.old/Makefile.common
+++ b/external/mit/xorg/server/xorg-server.old/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $
+#	$NetBSD: Makefile.common,v 1.4 2020/07/23 09:09:12 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -32,10 +32,6 @@ XSERVER_XAMIGA=		yes
 XSERVER_XMAC68K=	yes
 .endif
 
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC=	yes
-.endif
-
 .if ${MACHINE} == "pmax"
 XSERVER_XDECNETBSD=	yes
 XSERVER_XPMAX=		no # XXX should be yes but may be obsoleted
@@ -72,10 +68,6 @@ XSERVER_XDECNETBSD?=	no
 XSERVER_XFREE68?=	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 the Xnewsmips server?
-XSERVER_XNEWSMIPS?=	no
 # Does this platform build Xpmax X servers?
 XSERVER_XPMAX?=		no
 # Does this platform build Xsun* X servers?
diff --git a/external/mit/xorg/server/xorg-server.old/hw/Makefile b/external/mit/xorg/server/xorg-server.old/hw/Makefile
index e6c58c87b5ed..466a9be06415 100644
--- a/external/mit/xorg/server/xorg-server.old/hw/Makefile
+++ b/external/mit/xorg/server/xorg-server.old/hw/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -34,30 +34,14 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
-.if ${XSERVER_XDREAMCAST} != "no"
-SUBDIR+=netbsd/dreamcast
-.endif
-
 .if ${XSERVER_XFREE86} != "no"
 SUBDIR+=xfree86
 .endif
 
-.if ${XSERVER_XHPC} != "no"
-SUBDIR+=netbsd/hpc
-.endif
-
 .if ${XSERVER_XMAC68K} != "no"
 SUBDIR+=netbsd/mac68k
 .endif
 
-.if ${XSERVER_XMACPPC} != "no"
-SUBDIR+=netbsd/macppc
-.endif
-
-.if ${XSERVER_XNEWSMIPS} != "no"
-SUBDIR+=netbsd/newsmips
-.endif
-
 .if ${XSERVER_XVFB} != "no"
 SUBDIR+=vfb
 .endif
diff --git a/external/mit/xorg/server/xorg-server/Makefile.common b/external/mit/xorg/server/xorg-server/Makefile.common
index 499db42d74ed..76e00a97c7d5 100644
--- a/external/mit/xorg/server/xorg-server/Makefile.common
+++ b/external/mit/xorg/server/xorg-server/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $
+#	$NetBSD: Makefile.common,v 1.29 2020/07/23 09:09:12 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -33,10 +33,6 @@ XSERVER_XAMIGA=		yes
 XSERVER_XMAC68K=	yes
 .endif
 
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC=	yes
-.endif
-
 .if ${MACHINE} == "pmax"
 XSERVER_XDECNETBSD=	yes
 XSERVER_XPMAX=		no # XXX should be yes but may be obsoleted
@@ -73,10 +69,6 @@ XSERVER_XDECNETBSD?=	no
 XSERVER_XFREE68?=	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 the Xnewsmips server?
-XSERVER_XNEWSMIPS?=	no
 # Does this platform build Xpmax X servers?
 XSERVER_XPMAX?=		no
 # Does this platform build Xsun* X servers?
diff --git a/external/mit/xorg/server/xorg-server/hw/Makefile b/external/mit/xorg/server/xorg-server/hw/Makefile
index a7d4f665902a..aab4c58d7325 100644
--- a/external/mit/xorg/server/xorg-server/hw/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2020/07/22 20:54:07 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.7 2020/07/23 09:09:13 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -34,30 +34,14 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
-.if ${XSERVER_XDREAMCAST} != "no"
-SUBDIR+=netbsd/dreamcast
-.endif
-
 .if ${XSERVER_XFREE86} != "no"
 SUBDIR+=xfree86
 .endif
 
-.if ${XSERVER_XHPC} != "no"
-SUBDIR+=netbsd/hpc
-.endif
-
 .if ${XSERVER_XMAC68K} != "no"
 SUBDIR+=netbsd/mac68k
 .endif
 
-.if ${XSERVER_XMACPPC} != "no"
-SUBDIR+=netbsd/macppc
-.endif
-
-.if ${XSERVER_XNEWSMIPS} != "no"
-SUBDIR+=netbsd/newsmips
-.endif
-
 .if ${XSERVER_XVFB} != "no"
 SUBDIR+=vfb
 .endif