Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile
+++ x11-servers/xorg-server/Makefile
@@ -4,7 +4,7 @@
 PORTNAME?=	xorg-server
 PORTVERSION=	${XORG_VERSION}
 PORTREVISION?=	${XORG_REVISION}
-PORTEPOCH?=	1
+PORTEPOCH?=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG
 MASTER_SITE_SUBDIR=	individual/xserver
Index: x11-servers/xorg-server/files/patch-hw__xfree86__os-support__bsd__Makefile.in
===================================================================
--- /dev/null
+++ x11-servers/xorg-server/files/patch-hw__xfree86__os-support__bsd__Makefile.in
@@ -0,0 +1,17 @@
+--- hw/xfree86/os-support/bsd/Makefile.in.orig	2014-09-10 14:57:51 UTC
++++ hw/xfree86/os-support/bsd/Makefile.in
+@@ -84,11 +84,13 @@
+ 	$(srcdir)/../shared/pm_noop.c $(srcdir)/bsd_apm.c \
+ 	$(srcdir)/bsd_kqueue_apm.c $(srcdir)/../shared/kmod_noop.c \
+ 	bsd_kmod.c
++@FREEBSD_KLDLOAD_TRUE@@ARM_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
++@FREEBSD_KLDLOAD_TRUE@@ARM_VIDEO_TRUE@	ioperm_noop.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+-@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
++@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@@FREEBSD_KLDLOAD_FALSE@am__objects_1 = arm_video.lo
+ @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
+ @ALPHA_VIDEO_TRUE@	bsd_axp.lo xf86Axp.lo
+ @AGP_FALSE@am__objects_2 = agp_noop.lo
Index: x11-servers/xorg-server/files/patch-include__servermd.h
===================================================================
--- /dev/null
+++ x11-servers/xorg-server/files/patch-include__servermd.h
@@ -0,0 +1,31 @@
+--- include/servermd.h.orig	2014-09-10 15:01:49 UTC
++++ include/servermd.h
+@@ -104,6 +104,19 @@
+ 
+ #endif                          /* __nds32__ */
+ 
++#if defined(__FreeBSD__) && defined(__arm__)
++
++#ifdef __BIG_ENDIAN
++#define        IMAGE_BYTE_ORDER        MSBFirst
++#define        BITMAP_BIT_ORDER        MSBFirst
++#else
++#define        IMAGE_BYTE_ORDER        LSBFirst
++#define        BITMAP_BIT_ORDER        LSBFirst
++#endif
++#define        GLYPHPADBYTES           4
++
++#endif /* __FreeBSD__ && __arm__ */
++
+ #if defined __hppa__
+ 
+ #define IMAGE_BYTE_ORDER	MSBFirst
+@@ -153,7 +166,7 @@
+     defined(__sparc__) || defined(__mc68000__)
+ 
+ #if defined(__sparc) || defined(__sparc__)
+-#if !defined(sparc)
++#if !defined(sparc) && !defined(__FreeBSD__)
+ #define sparc 1
+ #endif
+ #endif