Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.122
diff -u -r1.122 Makefile
--- Makefile	19 Sep 2002 06:37:27 -0000	1.122
+++ Makefile	19 Sep 2002 07:49:57 -0000
@@ -167,7 +167,7 @@
 	@${ECHO_MSG} "4.2.0!  ENABLE AT YOUR OWN RISK!"
 	@${ECHO_MSG} "********************************************************"
 
-.if ${BuildXF86DRI} == YES
+.if ${ARCH} == i386
 .if !defined(WITH_MATROX_GXX_DRIVER)
 HaveMatroxHal=		NO
 PLIST_SUB+=		MATROX="@comment "
@@ -180,7 +180,7 @@
 	@${ECHO_MSG} "This has been tested on a G400 AGP card."
 	@${ECHO_MSG} "********************************************************"
 .else
-NO_PACKAGE=	"Matrox drivers may not be distributed."
+NO_PACKAGE=	"Matrox drivers may not be distributed"
 RESTRICTED=	"Matrox drivers may not be distributed."
 HaveMatroxHal=		YES
 MGA_DRIVER_VERSION=	2.0
@@ -200,6 +200,10 @@
 .else
 HaveMatroxHal=		NO
 PLIST_SUB+=		MATROX="@comment "
+.endif
+
+.if ${HaveMatroxHal} == NO
+EXTRA_PATCHES+=		${.CURDIR}/files/patch-mga_driver.c
 .endif
 
 post-extract::
Index: files/patch-mga_driver.c
===================================================================
RCS file: files/patch-mga_driver.c
diff -N files/patch-mga_driver.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-mga_driver.c	19 Sep 2002 07:14:17 -0000
@@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig	Thu Sep 19 00:12:42 2002
++++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c	Thu Sep 19 00:13:56 2002
+@@ -2745,6 +2745,7 @@
+ 	    case PCI_CHIP_MGAG200:
+ 	    case PCI_CHIP_MGAG200_PCI:
+ 	    case PCI_CHIP_MGAG400:	      
++	    case PCI_CHIP_MGAG550:	      
+ 	      if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
+ 		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
+ 			  pMga->FbCursorOffset >> 10);