Index: external/mit/xorg/server/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- external/mit/xorg/server/drivers/Makefile	28 May 2010 04:16:06 -0000	1.42
+++ external/mit/xorg/server/drivers/Makefile	17 Jun 2010 15:42:20 -0000
@@ -161,6 +161,9 @@
 	xf86-video-trident \
 	xf86-video-tseng \
 
+.elif ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+SUBDIR+= \
+	xf86-video-wsfb
 .elif ${MACHINE} == "zaurus"
 SUBDIR+= \
 	xf86-video-wsfb
Index: external/mit/xorg/server/xorg-server/Makefile.common
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/Makefile.common,v
retrieving revision 1.10
diff -u -r1.10 Makefile.common
--- external/mit/xorg/server/xorg-server/Makefile.common	13 Dec 2009 05:04:36 -0000	1.10
+++ external/mit/xorg/server/xorg-server/Makefile.common	17 Jun 2010 15:42:21 -0000
@@ -41,6 +41,9 @@
 
 # XFree86 servers all need XFONT as well.
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "hpcarm" || \
+    ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "hpcsh" ||\
     ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
     ${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
@@ -50,9 +53,9 @@
 XSERVER_XFREE86=	yes
 .endif
 
-.if ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcsh"
-XSERVER_XHPC=		yes
-.endif
+#.if ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
+#XSERVER_XHPC=		yes
+#.endif
 
 .if ${MACHINE} == "mac68k"
 XSERVER_XMAC68K=	yes
Index: external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	13 Dec 2009 05:04:36 -0000	1.19
+++ external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	17 Jun 2010 15:42:21 -0000
@@ -54,7 +54,8 @@
 .endfor
 .endif
 
-.if ${MACHINE} == "sgimips"
+.if ${MACHINE} == "hpcmips" || \
+    ${MACHINE} == "sgimips"
 SRCS.bsd+=	ppc_video.c stdResource.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -62,6 +63,7 @@
 .endif
 
 .if ${MACHINE} == "cats" || \
+    ${MACHINE} == "hpcarm" || \
     ${MACHINE} == "shark" || \
     ${MACHINE} == "netwinder" || \
     ${MACHINE} == "zaurus"
@@ -72,6 +74,13 @@
 CPPFLAGS.arm_video.c=	-Wno-error
 .endif
 
+.if ${MACHINE} == "hpcsh"
+SRCS.bsd+=	ppc_video.c stdResource.c pm_noop.c agp_noop.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
+
 # some platforms will probably need ioperm_noop.c
 
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus