Thu Feb 26 07:36:05 2009 UTC ()

Apply patch (requested by macallan in ticket #524):
Switch sgimips over to Xorg


(snj)

diff -r1.542.2.6 -r1.542.2.7 src/share/mk/bsd.own.mk

--- src/share/mk/bsd.own.mk 2009/02/25 20:33:49	1.542.2.6
+++ src/share/mk/bsd.own.mk 2009/02/26 07:36:05	1.542.2.7

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.own.mk,v 1.542.2.6 2009/02/25 20:33:49 snj Exp $
+#	$NetBSD: bsd.own.mk,v 1.542.2.7 2009/02/26 07:36:05 snj Exp $
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
+#
 # CPU model, derived from MACHINE_ARCH
+#
 MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
+#
 @@ -660,28 +660,28 @@ ${var}?=	yes
 .for var in \
 	MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
 	MKMANZ MKMODULAR MKOBJDIRS \
 	MKPCC MKPCCCMDS \
 	MKSOFTFLOAT MKSTRIPIDENT \
 	MKUNPRIVED MKUPDATE MKX11
 ${var}?=no
 .endfor
+#
 # Do we default to XFree86 or Xorg for this platform?
+#
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "shark" || \
+    ${MACHINE} == "macppc" || ${MACHINE} == "sgimips" || \
-    ${MACHINE} == "sparc64"
+    ${MACHINE} == "shark" || ${MACHINE} == "sparc64"
 X11FLAVOUR?=	Xorg
 .else
 X11FLAVOUR?=	XFree86
 .endif
+#
 # Force some options off if their dependencies are off.
+#
 .if ${MKCRYPTO} == "no"
 MKKERBEROS:=	no
 .endif