From c62b813b0de5b690a936fcaf2ab29f0ccbdf3cb7 Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Sun, 30 Jul 2006 03:25:43 +0000
Subject: [PATCH] Remove Xpmax stuff.

---
 x11/Xserver/Makefile.common        |  8 +-------
 x11/Xserver/Xserver/Makefile       |  6 +-----
 x11/Xserver/Xserver/Xpmax/Makefile | 31 ------------------------------
 x11/Xserver/Xserver/Xpmax/Xpmax.c  |  1 -
 4 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 x11/Xserver/Xserver/Xpmax/Makefile
 delete mode 100644 x11/Xserver/Xserver/Xpmax/Xpmax.c

diff --git a/x11/Xserver/Makefile.common b/x11/Xserver/Makefile.common
index ac10d392b821..fee012da2e65 100644
--- a/x11/Xserver/Makefile.common
+++ b/x11/Xserver/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.31 2006/04/03 11:15:17 uwe Exp $
+#	$NetBSD: Makefile.common,v 1.32 2006/07/30 03:25:43 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -71,10 +71,6 @@ XSERVER_XMAC68K=	yes
 XSERVER_XMACPPC=	yes
 .endif
 
-.if ${MACHINE} == "pmax"
-XSERVER_XPMAX=		no # XXX should be yes but may be obsoleted
-.endif
-
 .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || ${MACHINE} == "sun3"
 XSERVER_XSUN=		yes
 XSERVER_XSUNMONO=	yes
@@ -130,8 +126,6 @@ XSERVER_XHPC?=	no
 XSERVER_XMAC68K?=	no
 # Does this platform build Xmacppc X server?
 XSERVER_XMACPPC?=	no
-# Does this platform build Xpmax X servers?
-XSERVER_XPMAX?=	no
 # Does this platform build Xsun* X servers?
 XSERVER_XSUN?=		no
 XSERVER_XSUNMONO?=	no
diff --git a/x11/Xserver/Xserver/Makefile b/x11/Xserver/Xserver/Makefile
index 5208a0406ffd..10857366bd40 100644
--- a/x11/Xserver/Xserver/Makefile
+++ b/x11/Xserver/Xserver/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2005/12/29 15:52:20 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.18 2006/07/30 03:25:43 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -64,10 +64,6 @@ SUBDIR+=	Xmacppc
 SUBDIR+=	Xnewsmips
 .endif
 
-.if ${XSERVER_XPMAX} != "no"
-SUBDIR+=	Xpmax
-.endif
-
 .if ${XSERVER_XSUN} != "no"
 SUBDIR+=	Xsun
 .endif
diff --git a/x11/Xserver/Xserver/Xpmax/Makefile b/x11/Xserver/Xserver/Xpmax/Makefile
deleted file mode 100644
index dcbd8787cfd9..000000000000
--- a/x11/Xserver/Xserver/Xpmax/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2004/01/10 05:26:14 rtr Exp $
-
-.include <bsd.own.mk>
-
-PROG=	Xpmax
-BINMODE=4711
-
-MKMAN=	no
-
-.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/pmax
-
-.include "../Makefile.Xserver"
-
-LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/pmax} -lXfont -lfreetype \
-	${LDADD.os} ${LDADD.cfb} ${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.pmax} ${LIBXFONT} ${LIBFREETYPE} \
-	${DPADD.os} ${DPADD.cfb} ${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}/Xpmax ${X11BINDIR}/X
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff --git a/x11/Xserver/Xserver/Xpmax/Xpmax.c b/x11/Xserver/Xserver/Xpmax/Xpmax.c
deleted file mode 100644
index 244313f209e7..000000000000
--- a/x11/Xserver/Xserver/Xpmax/Xpmax.c
+++ /dev/null
@@ -1 +0,0 @@
-/*	$NetBSD: Xpmax.c,v 1.1 2004/01/10 05:26:14 rtr Exp $	*/