--- x11-servers/xorg-server/Makefile	(revision 448818)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -45,7 +45,7 @@ 
 CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
 		--localstatedir=/var --with-shared-memory-dir=/tmp \
 		--disable-config-udev --disable-config-udev-kms \
-		--without-dtrace --enable-glamor
+		--without-dtrace
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland"
@@ -87,6 +87,13 @@ 
 # We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
 CONFIGURE_ARGS+=--disable-install-setuid
 
+.if ${ARCH} != "sparc64"
+CONFIGURE_ARGS+=--enable-glamor
+PLIST_SUB+=	GLAMOR=""
+.else
+PLIST_SUB+=	GLAMOR="@comment "
+.endif
+
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
--- x11-servers/xorg-server/pkg-plist	(revision 448818)
+++ x11-servers/xorg-server/pkg-plist	(working copy)
@@ -51,7 +51,7 @@ 
 include/xorg/gcstruct.h
 include/xorg/geext.h
 include/xorg/geint.h
-include/xorg/glamor.h
+%%GLAMOR%%include/xorg/glamor.h
 include/xorg/globals.h
 include/xorg/glx_extinit.h
 include/xorg/glyphstr.h
@@ -167,7 +167,7 @@ 
 lib/xorg/modules/libexa.so
 lib/xorg/modules/libfb.so
 lib/xorg/modules/libfbdevhw.so
-lib/xorg/modules/libglamoregl.so
+%%GLAMOR%%lib/xorg/modules/libglamoregl.so
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libshadow.so
 lib/xorg/modules/libshadowfb.so