Index: graphics/libdrm/Makefile
===================================================================
--- graphics/libdrm/Makefile	(revision 340046)
+++ graphics/libdrm/Makefile	(working copy)
@@ -65,11 +65,15 @@
 PLIST_SUB+=	OLD="" NEW="@comment " NOUVEAU=""
 .endif
 
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+PLIST_SUB+=	INTEL_DRIVER=""
+.else
+PLIST_SUB+=	INTEL_DRIVER="@comment "
+.endif
+
 .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc"
-PLIST_SUB+=	INTEL_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
 .else
-PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	RADEON_DRIVERS="@comment "
 .endif
 
Index: x11/pixman/Makefile
===================================================================
--- x11/pixman/Makefile	(revision 340046)
+++ x11/pixman/Makefile	(working copy)
@@ -20,6 +20,7 @@
 
 .if ! {PORT_OPTIONS:MSIMD}
 CONFIGURE_ARGS=	--disable-vmx --disable-arm-simd
+. if ${ARCH} == i386 || ${ARCH} == amd64
 . if ! ${MACHINE_CPU:Mmmx}
 CONFIGURE_ARGS+=	--disable-mmx
 . endif
@@ -26,6 +27,7 @@
 . if ! ${MACHINE_CPU:Msse2}
 CONFIGURE_ARGS+=	--disable-sse2
 . endif
+. endif
 .endif
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-ati/Makefile
===================================================================
--- x11-drivers/xf86-video-ati/Makefile	(revision 340046)
+++ x11-drivers/xf86-video-ati/Makefile	(working copy)
@@ -14,7 +14,7 @@
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
+.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) || (${ARCH} != "i386" && ${ARCH} != "amd64")
 ATI_VERSION=	6.14.6
 ATI_REVISION=	1
 CONFIGURE_ARGS+=--disable-kms
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile	(revision 340207)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -124,7 +124,7 @@
 
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
-EXTRA_PATCHES=	${.CURDIR}/files/extra-arch-ia64
+EXTRA_PATCHES+=	${.CURDIR}/files/extra-arch-ia64
 .else
 PLIST_SUB+=	IA64_NA=""
 .endif
@@ -132,9 +132,9 @@
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	PPC_NA="@comment "
 .if defined(WITH_NEW_XORG)
-EXTRA_PATCHES=	${.CURDIR}/files/extra-new-arch-powerpc
+EXTRA_PATCHES+=	${.CURDIR}/files/extra-new-arch-powerpc
 .else
-EXTRA_PATCHES=	${.CURDIR}/files/extra-old-arch-powerpc
+EXTRA_PATCHES+=	${.CURDIR}/files/extra-old-arch-powerpc
 .endif
 .else
 PLIST_SUB+=	PPC_NA=""
Index: x11-servers/xorg-server/files/extra-new-arch-powerpc
===================================================================
--- x11-servers/xorg-server/files/extra-new-arch-powerpc	(revision 340207)
+++ x11-servers/xorg-server/files/extra-new-arch-powerpc	(working copy)
@@ -1,8 +1,29 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2012-05-17 19:09:03.000000000 +0200
-+++ hw/xfree86/os-support/bsd/ppc_video.c	2013-06-03 13:46:05.165578200 +0200
-@@ -135,7 +135,11 @@
+--- ./hw/xfree86/os-support/bsd/ppc_video.c.orig	2012-05-17 12:09:03.000000000 -0500
++++ ./hw/xfree86/os-support/bsd/ppc_video.c	2014-01-18 14:36:42.000000000 -0600
+@@ -115,17 +115,19 @@
+ Bool
+ xf86EnableIO()
  {
+-    int fd = xf86Info.consoleFd;
++    int fd = open(DEV_MEM, O_RDWR);
  
+     xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
+     if (ioBase == MAP_FAILED) {
+         ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+                       0xf2000000);
+         xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
++#if 0 /* Non-fatal */
+         if (ioBase == MAP_FAILED) {
+             xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
+             return FALSE;
+         }
++#endif
+     }
+     return TRUE;
+ }
+@@ -135,7 +137,11 @@
+ {
+ 
      if (ioBase != MAP_FAILED) {
 +#if defined(__FreeBSD__)
 +        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
Index: x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
===================================================================
--- x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c	(revision 0)
+++ x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c	(working copy)
@@ -0,0 +1,14 @@
+--- src/nv_driver.c.orig	2014-01-19 15:24:45.000000000 -0600
++++ src/nv_driver.c	2014-01-19 15:24:07.000000000 -0600
+@@ -1543,7 +1543,11 @@
+ 	xf86FreeInt10(pNv->pInt);
+ 	return FALSE;
+     }
++#ifdef __powerpc__ /* XXX probably MI */
++    vgaHWSetMmioFuncs(VGAHWPTR(pScrn), pNv->IOAddress, 0);
++#else
+     vgaHWSetStdFuncs(VGAHWPTR(pScrn));
++#endif
+     
+     /* We use a programmable clock */
+     pScrn->progClock = TRUE;

Property changes on: x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property