revert patch-hw_xfree86_common_xf86AutoConfig.c

Something is wrong with it, it breaks on x86.
I don't have time to figure out what is wrong right now.

In the meanwhile, to force wsfb instead of fbdev on ARM (which is blatantly
wrong and only applicable on Linux) you can create a config snippet:

cat << EOF > /usr/pkg/share/X11/xorg.conf.d/10-driver.conf
Section "Device"
  Identifier "wsfb"
  Driver "wsfb"
EndSection
EOF

3 files changed, 3 insertions, 51 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 2a39c3105ff..badddb676c8 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2016/02/23 22:32:45 tnn Exp $
+# $NetBSD: Makefile,v 1.108 2016/02/27 02:34:46 tnn Exp $
 
 DISTNAME=	xorg-server-${XORG_VERSION}
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Modular X11 server from modular X.org
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 6f21b25a3bf..d0ed7b290ed 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2016/02/23 22:32:45 tnn Exp $
+$NetBSD: distinfo,v 1.72 2016/02/27 02:34:46 tnn Exp $
 
 SHA1 (xorg-server-1.18.1.tar.bz2) = 968fe85773a41296199f8733c7235c8623d7c460
 RMD160 (xorg-server-1.18.1.tar.bz2) = f01c27c3b4aa7891a7f315f49d4928dfc137cc62
@@ -6,7 +6,6 @@ SHA512 (xorg-server-1.18.1.tar.bz2) = 4b2db85fe4386329b3d20fc53848556ce8dedeb955
 Size (xorg-server-1.18.1.tar.bz2) = 5846953 bytes
 SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2
 SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8
-SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 81190fd862ddbde685630e7e453348714378dc20
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c
deleted file mode 100644
index 4792ce2d7b6..00000000000
--- a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-hw_xfree86_common_xf86AutoConfig.c,v 1.1 2016/02/23 22:32:45 tnn Exp $
-
---- hw/xfree86/common/xf86AutoConfig.c.orig	2016-02-08 22:52:26.000000000 +0000
-+++ hw/xfree86/common/xf86AutoConfig.c
-@@ -269,26 +269,27 @@ listPossibleVideoDrivers(char *matches[]
- 
- #if defined(__linux__)
-     matches[i++] = xnfstrdup("modesetting");
-+    /* matches[i++] = xnfstrdup("fbdev"); */
- #endif
- 
--#if !defined(sun)
--    /* Fallback to platform default frame buffer driver */
--    if (i < (nmatches - 1)) {
--#if !defined(__linux__) && defined(__sparc__)
--        matches[i++] = xnfstrdup("wsfb");
--#else
--        matches[i++] = xnfstrdup("fbdev");
-+#if defined(__NetBSD__)
-+#if defined(__shark)
-+    matches[i++] = xnfstrdup("chips");
-+    matches[i++] = xnfstrdup("igs");
-+#elif defined(__sgimips)
-+    matches[i++] = xnfstrdup("crime");
-+    matches[i++] = xnfstrdup("newport");
- #endif
-+    if (i == 0) {
-+#if defined(__i386__) || defined(__amd64__)
-+         matches[i++] = xnfstrdup("vesa");
-+#endif
-+         matches[i++] = xnfstrdup("wsfb");
-     }
--#endif                          /* !sun */
--
--    /* Fallback to platform default hardware */
--    if (i < (nmatches - 1)) {
--#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
--        matches[i++] = xnfstrdup("vesa");
--#elif defined(__sparc__) && !defined(sun)
--        matches[i++] = xnfstrdup("sunffb");
- #endif
-+
-+    if (i == 0) {
-+         matches[i++] = xnfstrdup("wsfb");
-     }
- }
-