16 files changed, 0 insertions, 698 deletions

diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index 5f2f7ab08768..ac199a684f84 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -12,7 +12,6 @@
     SUBDIR += xorg-dmx
     SUBDIR += xorg-nestserver
     SUBDIR += xorg-server
-    SUBDIR += xorg-server-snap
     SUBDIR += xorg-vfbserver
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
deleted file mode 100644
index 44a5ac80f81e..000000000000
--- a/x11-servers/xorg-server-snap/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xorg-server
-PORTVERSION=	1.2.99.903
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	x11-servers
-MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
-		${MASTER_SITE_SOURCEFORGE:S/$/:mesa/}
-MASTER_SITE_SUBDIR=mesa3d/:mesa
-DISTFILES=	xorg-server-${PORTVERSION}.tar.bz2:fdo \
-		MesaLib-6.5.2.tar.bz2:mesa
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org X server and related programs
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
-
-CONFLICTS=	XFree86-Server-*
-
-IGNORE=		is outdated
-DEPRECATED=	Port hasn't been used since the switch to modular releases
-EXPIRATION_DATE=2008-06-20
-
-XORG_CAT=	xserver
-
-USE_XORG=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
-		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
-		xcmiscproto xextproto xproto xtrans xf86miscproto \
-		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
-		resourceproto fontsproto inputproto xf86dgaproto \
-		videoproto compositeproto trapproto recordproto xineramaproto \
-		evieproto xfont fontenc xkbui
-
-USE_PERL5_BUILD=yes
-CONFIGURE_ARGS=	--with-mesa-source=${WRKDIR}/Mesa-6.5.2 \
-		--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
-		--localstatedir=/var
-
-.if !defined(WITHOUT_AIGLX)
-CONFIGURE_ARGS+=	--enable-aiglx=yes
-.endif
-
-.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
-CONFIGURE_ARGS+=--enable-install-setuid
-.endif
-
-MAN1=		Xorg.1 \
-		Xserver.1 \
-		cvt.1 \
-		gtf.1 \
-		pcitweak.1 \
-		xorgcfg.1 \
-		xorgconfig.1
-MAN4=		exa.4 \
-		fbdevhw.4
-MAN5=		xorg.conf.5
-
-NOT_FOR_ARCHS=	ia64
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == alpha
-PLIST_SUB+=	ALPHA_NA="@comment "
-.else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
-
-.if ${ARCH} == powerpc
-PLIST_SUB+=	PPC_NA="@comment "
-MAN4+=		nv.4x
-.else
-PLIST_SUB+=	PPC_NA=""
-.endif
-
-.if ${ARCH} == sparc64
-PLIST_SUB+=	SPARC64=""
-PLIST_SUB+=	SPARC64_NA="@comment "
-.else
-PLIST_SUB+=	SPARC64="@comment "
-PLIST_SUB+=	SPARC64_NA=""
-.endif
-
-.if ${ARCH} == amd64 || ${ARCH} == i386
-PLIST_SUB+=	AMD64_I386=""
-MAN1+=		scanpci.1
-.else
-PLIST_SUB+=	AMD64_I386="@comment "
-.endif
-
-.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
-pre-everything::
-	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
-	@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
-	@${ECHO_MSG} "port before handling them normally.  If you are concerned about the security"
-	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
-	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
-	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
deleted file mode 100644
index 800ab34af858..000000000000
--- a/x11-servers/xorg-server-snap/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = b7c61148bf5827f6a220696381bfba15
-SHA256 (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 0fe2986a8c6659bb2b7ff9b458000be053e14667db9ee3c288db0502c6e00770
-SIZE (xorg/xserver/xorg-server-1.2.99.903.tar.bz2) = 5968830
-MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d
-SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c
deleted file mode 100644
index 5894dbb727bc..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Xserver-Xext-xvmc.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: programs/Xserver/Xext/xvmc.c
-diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
---- Xext/xvmc.c.orig	Sun Jul  3 17:53:36 2005
-+++ Xext/xvmc.c	Thu Jan 26 14:22:20 2006
-@@ -24,8 +24,8 @@
- 
- #ifdef HAS_XVMCSHM
- #ifndef Lynx
--#include <sys/ipc.h>
- #include <sys/types.h>
-+#include <sys/ipc.h>
- #include <sys/shm.h>
- #else
- #include <ipc.h>
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c
deleted file mode 100644
index 59aad379ae11..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-common-xf86Config.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hw/xfree86/common/xf86Config.c.orig	Fri Jun 23 12:32:32 2006
-+++ hw/xfree86/common/xf86Config.c	Fri Jun 23 12:32:46 2006
-@@ -1042,7 +1042,7 @@
-     else
- 	xf86Info.estimateSizesAggressively = 0;
- 
--    xf86Info.aiglx = TRUE;
-+    xf86Info.aiglx = FALSE;
-     xf86Info.aiglxFrom = X_DEFAULT;
-     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
- 	xf86Info.aiglx = value;
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
deleted file mode 100644
index 933742b00170..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
-diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
---- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
-+++ hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
-@@ -35,6 +35,7 @@
- #include "xf86Priv.h"
- 
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- 
- #ifdef HAS_MTRR_SUPPORT
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c
deleted file mode 100644
index e9fb876333cc..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-Xserver-os-xprintf.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
---- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
-+++ os/xprintf.c	Thu Jan 26 12:47:37 2006
-@@ -39,7 +39,7 @@
- # ifdef __va_copy
- #  define va_copy __va_copy
- # else
--#  error "no working va_copy was found"
-+#  define va_copy(dest, src) ((dest) = (src))
- # endif
- #endif
-     
diff --git a/x11-servers/xorg-server-snap/files/patch-at_scancode.c b/x11-servers/xorg-server-snap/files/patch-at_scancode.c
deleted file mode 100644
index 68ffceb41e86..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-at_scancode.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- hw/xfree86/os-support/shared/at_scancode.c.orig	Sun Jul  3 09:01:35 2005
-+++ hw/xfree86/os-support/shared/at_scancode.c	Sat Oct  7 21:27:29 2006
-@@ -84,6 +84,10 @@
-        case KEY_Prefix0:
-           pKbd->scanPrefix = 0;
-           switch (*scanCode) {
-+            case 0x1e:            *scanCode = KEY_AudioRaise;break;
-+            case 0x1f:            *scanCode = KEY_AudioLower;break;
-+            case 0x20:            *scanCode = KEY_Power;     break;
-+            case 0x25:            *scanCode = KEY_Mute;      break;
-             case KEY_KP_7:        *scanCode = KEY_Home;      break;  /* curs home */
-             case KEY_KP_8:        *scanCode = KEY_Up;        break;  /* curs up */
-             case KEY_KP_9:        *scanCode = KEY_PgUp;      break;  /* curs pgup */
-@@ -104,6 +108,17 @@
-             case 0x5b:            *scanCode = KEY_LMeta;     break;
-             case 0x5c:            *scanCode = KEY_RMeta;     break;
-             case 0x5d:            *scanCode = KEY_Menu;      break;
-+            case 0x5e:            *scanCode = KEY_L1;        break;  /* stop */
-+            case 0x5f:            *scanCode = KEY_L2;        break;  /* again */
-+            case 0x60:            *scanCode = KEY_L3;        break;  /* props */
-+            case 0x61:            *scanCode = KEY_L4;        break;  /* undo */
-+            case 0x62:            *scanCode = KEY_L5;        break;  /* front */
-+            case 0x63:            *scanCode = KEY_L6;        break;  /* copy */
-+            case 0x64:            *scanCode = KEY_L7;        break;  /* open */
-+            case 0x65:            *scanCode = KEY_L8;        break;  /* paste */
-+            case 0x66:            *scanCode = KEY_L9;        break;  /* find */
-+            case 0x67:            *scanCode = KEY_L10;       break;  /* cut */
-+            case 0x68:            *scanCode = KEY_Help;      break;
-             case KEY_F3:          *scanCode = KEY_F13;       break;
-             case KEY_F4:          *scanCode = KEY_F14;       break;
-             case KEY_F5:          *scanCode = KEY_F15;       break;
diff --git a/x11-servers/xorg-server-snap/files/patch-bsdResource.c b/x11-servers/xorg-server-snap/files/patch-bsdResource.c
deleted file mode 100644
index 44388bb0a393..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-bsdResource.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- hw/xfree86/os-support/bsd/bsdResource.c.orig	Fri Apr 23 21:54:07 2004
-+++ hw/xfree86/os-support/bsd/bsdResource.c	Tue May 17 00:48:36 2005
-@@ -18,7 +18,7 @@
- 
- #ifdef INCLUDE_XF86_NO_DOMAIN
- 
--#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
-+#if defined(__alpha__) || defined(__amd64__)
- 
- resPtr
- xf86BusAccWindowsFromOS(void)
-@@ -112,7 +112,7 @@
-     return ret;
- }
- 
--#elif defined(__powerpc__)
-+#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
- 
- resPtr
- xf86BusAccWindowsFromOS(void)
-@@ -123,7 +123,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -137,7 +141,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -153,7 +161,11 @@
-     RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock);
-     ret = xf86AddResToList(ret, &range, -1);
- 
-+#if defined(__sparc__) || defined(__sparc64__)         
-+    RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
-     return ret;
- }
-@@ -175,7 +187,11 @@
-     ret = xf86AddResToList(ret, &range, -1);
-     RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock);
-     ret = xf86AddResToList(ret, &range, -1);
-+#if defined(__sparc__) || defined(__sparc64__)
-+    RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock);
-+#else
-     RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock);
-+#endif
-     ret = xf86AddResToList(ret, &range, -1);
- 
-     return ret;
diff --git a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c b/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c
deleted file mode 100644
index a7d8cb3fdd48..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-bsd_kbd.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- hw/xfree86/os-support/bsd/bsd_kbd.c.orig	Mon Oct  3 18:46:14 2005
-+++ hw/xfree86/os-support/bsd/bsd_kbd.c	Fri Sep 29 23:26:17 2006
-@@ -75,6 +75,17 @@
-     KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-     int real_leds = 0;
- 
-+#if defined (SYSCONS_SUPPORT)
-+    if (pKbd->sunKbd) {
-+  	if (leds & 0x08) real_leds |= XLED1;
-+  	if (leds & 0x04) real_leds |= XLED4;
-+  	if (leds & 0x02) real_leds |= XLED3;
-+  	if (leds & 0x01) real_leds |= XLED2;
-+        leds = real_leds;
-+        real_leds = 0;
-+    }
-+#endif
-+
- #ifdef LED_CAP
-     if (leds & XLED1)  real_leds |= LED_CAP;
- #endif
-@@ -83,7 +94,11 @@
- #endif
- #ifdef LED_SCR
-     if (leds & XLED3)  real_leds |= LED_SCR;
-+#ifdef LED_COMP
-+    if (leds & XLED4)  real_leds |= LED_COMP;
-+#else
-     if (leds & XLED4)  real_leds |= LED_SCR;
-+#endif
- #endif
- 
-     switch (pKbd->consType) {
diff --git a/x11-servers/xorg-server-snap/files/patch-render.c b/x11-servers/xorg-server-snap/files/patch-render.c
deleted file mode 100644
index 17f8b144b1a7..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-render.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- render/render.c.orig	Mon May 29 09:43:15 2006
-+++ render/render.c	Mon May 29 09:45:02 2006
-@@ -1340,7 +1340,7 @@
- 	{
- 	    if (buffer + sizeof (GlyphSet) < end)
- 	    {
--                memcpy(&gs, buffer, sizeof(GlyphSet));
-+		gs = *(CARD32 *) buffer;
- 		glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
- 								 gs,
- 								 GlyphSetType,
diff --git a/x11-servers/xorg-server-snap/files/patch-servermd.h b/x11-servers/xorg-server-snap/files/patch-servermd.h
deleted file mode 100644
index 5bbb1e4d8ab5..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-servermd.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
-+++ include/servermd.h	Sun Jan  8 14:06:22 2006
-@@ -216,7 +216,7 @@
-     defined(__sparc__) || defined(__mc68000__)
- 
- #if defined(__sparc) || defined(__sparc__)
--# if !defined(sparc)
-+# if !defined(sparc) && !defined(__FreeBSD__)
- #  define sparc 1
- # endif
- #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
deleted file mode 100644
index 2d88773233b8..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xf86Events.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
-+++ hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
-@@ -448,7 +448,7 @@
- #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
-   static Bool first_time = TRUE;
- #endif
--#if defined(__sparc__) && defined(__linux__)
-+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
-   static int  kbdSun = -1;
- #endif
-   /* Disable any keyboard processing while in suspend */
-@@ -464,7 +464,7 @@
-   }
- #endif
- 
--#if defined (__sparc__) && defined(__linux__)
-+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
-   if (kbdSun == -1) {
-     if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
- 	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
-@@ -474,7 +474,7 @@
-   }
-   if (kbdSun)
-     goto special;
--#endif /* __sparc__ && __linux__ */
-+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
- 
- #ifdef __linux__
-   if (xf86Info.kbdCustomKeycodes) {
-@@ -525,6 +525,7 @@
-     } else
- #endif /* i386 && SVR4 */
-     {
-+      if (!xf86IsPc98()) {
-       switch (scanCode) {
-       case 0x59:        scanCode = KEY_0x59; break;
-       case 0x5a:        scanCode = KEY_0x5A; break;
-@@ -555,6 +556,7 @@
-       case 0x75:        scanCode = KEY_0x75; break;
-       case 0x76:        scanCode = KEY_0x76; break;
-       }
-+      }  /*  end if (!xf86IsPc98())  */
-     }
-   }
- 
-@@ -636,10 +638,12 @@
-    * they need to get the same key code as the base key on the same
-    * physical keyboard key.
-    */
-+  if (!xf86IsPc98()) {
-   if (scanCode == KEY_SysReqest)
-     scanCode = KEY_Print;
-   else if (scanCode == KEY_Break)
-     scanCode = KEY_Pause;
-+  }
- #endif
-   
-   /*
-@@ -676,7 +680,7 @@
-     }
-   }
- #endif
--#if defined (__sparc__) && defined(__linux__)
-+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
- special:
-   if (kbdSun) {
-     switch (scanCode) {
-@@ -710,7 +714,7 @@
-      */
-     scanCode--;
-   }
--#endif /* defined (__sparc__) && defined(__linux__) */
-+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
- 
- #ifdef XKB
-   if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&
diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
deleted file mode 100644
index 04e217b8d9fe..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
-+++ hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
-@@ -624,3 +624,11 @@
-     InputDevice "Keyboard1" "CoreKeyboard"
- EndSection
- 
-+ 
-+XCOMM  Two experimental extensions are available -- Composite and XEVIE.  Uncomment
-+XCOMM  the section below to enable Composite.  Many extensions can also be disabled
-+XCOMM  in this manner.
-+
-+XCOMM Section "Extensions"
-+XCOMM 	Option "Composite" "Enable"
-+XCOMM EndSection
diff --git a/x11-servers/xorg-server-snap/pkg-descr b/x11-servers/xorg-server-snap/pkg-descr
deleted file mode 100644
index f95969b8294d..000000000000
--- a/x11-servers/xorg-server-snap/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package contains the X.Org X server and some associated programs.
-
-WWW: http://www.freedesktop.org/Software/xorg
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
deleted file mode 100644
index f91a562c1f69..000000000000
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ /dev/null
@@ -1,287 +0,0 @@
-bin/X
-bin/Xorg
-bin/cvt
-bin/gtf
-%%SPARC64_NA%%%%PPC_NA%%bin/inb
-%%SPARC64_NA%%%%PPC_NA%%bin/inl
-%%SPARC64_NA%%%%PPC_NA%%bin/inw
-%%SPARC64_NA%%%%PPC_NA%%bin/ioport
-%%SPARC64_NA%%%%PPC_NA%%bin/outb
-%%SPARC64_NA%%%%PPC_NA%%bin/outl
-%%SPARC64_NA%%%%PPC_NA%%bin/outw
-bin/pcitweak
-%%AMD64_I386%%bin/scanpci
-bin/xorgcfg
-bin/xorgconfig
-include/X11/bitmaps/card.xbm
-include/X11/bitmaps/down.xbm
-include/X11/bitmaps/keyboard.xbm
-include/X11/bitmaps/left.xbm
-include/X11/bitmaps/monitor.xbm
-include/X11/bitmaps/mouse.xbm
-include/X11/bitmaps/narrower.xbm
-include/X11/bitmaps/right.xbm
-include/X11/bitmaps/shorter.xbm
-include/X11/bitmaps/taller.xbm
-include/X11/bitmaps/up.xbm
-include/X11/bitmaps/wider.xbm
-include/X11/pixmaps/card.xpm
-include/X11/pixmaps/computer.xpm
-include/X11/pixmaps/keyboard.xpm
-include/X11/pixmaps/monitor.xpm
-include/X11/pixmaps/mouse.xpm
-include/xorg/BT.h
-include/xorg/IBM.h
-include/xorg/TI.h
-include/xorg/XIstubs.h
-include/xorg/afb.h
-include/xorg/assyntax.h
-include/xorg/atKeynames.h
-include/xorg/bstore.h
-include/xorg/bstorestr.h
-include/xorg/bt829.h
-include/xorg/cfb.h
-include/xorg/cfb16.h
-include/xorg/cfb32.h
-include/xorg/cfb8_16.h
-include/xorg/cfb8_32.h
-include/xorg/cfbmap.h
-include/xorg/cfbmskbits.h
-include/xorg/cfbunmap.h
-include/xorg/closestr.h
-include/xorg/closure.h
-include/xorg/colormap.h
-include/xorg/colormapst.h
-include/xorg/compiler.h
-include/xorg/cursor.h
-include/xorg/cursorstr.h
-include/xorg/damage.h
-include/xorg/damagestr.h
-include/xorg/dbestruct.h
-include/xorg/dgaproc.h
-include/xorg/dix.h
-include/xorg/dixevents.h
-include/xorg/dixfont.h
-include/xorg/dixfontstr.h
-include/xorg/dixgrabs.h
-include/xorg/dixstruct.h
-include/xorg/dri.h
-include/xorg/dristruct.h
-include/xorg/edid.h
-include/xorg/exa.h
-include/xorg/exevents.h
-include/xorg/extension.h
-include/xorg/extinit.h
-include/xorg/extnsionst.h
-include/xorg/fb.h
-include/xorg/fbdevhw.h
-include/xorg/fboverlay.h
-include/xorg/fbpseudocolor.h
-include/xorg/fbrop.h
-include/xorg/fi1236.h
-include/xorg/fourcc.h
-include/xorg/gc.h
-include/xorg/gcstruct.h
-include/xorg/globals.h
-include/xorg/glyphstr.h
-include/xorg/i2c_def.h
-include/xorg/input.h
-include/xorg/inputstr.h
-include/xorg/mfb.h
-include/xorg/mfbmap.h
-include/xorg/mfbunmap.h
-include/xorg/mi.h
-include/xorg/mibank.h
-include/xorg/mibstore.h
-include/xorg/micmap.h
-include/xorg/micoord.h
-include/xorg/mifillarc.h
-include/xorg/mifpoly.h
-include/xorg/migc.h
-include/xorg/miline.h
-include/xorg/mipict.h
-include/xorg/mipointer.h
-include/xorg/mipointrst.h
-include/xorg/misc.h
-include/xorg/miscstruct.h
-include/xorg/mispans.h
-include/xorg/mistruct.h
-include/xorg/miwideline.h
-include/xorg/mizerarc.h
-include/xorg/msp3430.h
-include/xorg/opaque.h
-include/xorg/os.h
-include/xorg/picture.h
-include/xorg/picturestr.h
-include/xorg/pixmap.h
-include/xorg/pixmapstr.h
-include/xorg/property.h
-include/xorg/propertyst.h
-include/xorg/randrstr.h
-include/xorg/region.h
-include/xorg/regionstr.h
-include/xorg/renderedge.h
-include/xorg/resource.h
-include/xorg/rgb.h
-include/xorg/sarea.h
-include/xorg/screenint.h
-include/xorg/scrnintstr.h
-include/xorg/selection.h
-include/xorg/servermd.h
-include/xorg/shadow.h
-include/xorg/shadowfb.h
-include/xorg/site.h
-include/xorg/swaprep.h
-include/xorg/swapreq.h
-include/xorg/tda8425.h
-include/xorg/tda9850.h
-include/xorg/tda9885.h
-include/xorg/uda1380.h
-include/xorg/validate.h
-include/xorg/vbe.h
-include/xorg/vbeModes.h
-include/xorg/vdif.h
-include/xorg/vgaHW.h
-include/xorg/window.h
-include/xorg/windowstr.h
-include/xorg/xaa.h
-include/xorg/xaaWrapper.h
-include/xorg/xaalocal.h
-include/xorg/xaarop.h
-include/xorg/xf1bpp.h
-include/xorg/xf4bpp.h
-include/xorg/xf86.h
-include/xorg/xf86Crtc.h
-include/xorg/xf86Cursor.h
-include/xorg/xf86DDC.h
-include/xorg/xf86Keymap.h
-include/xorg/xf86Modes.h
-include/xorg/xf86Module.h
-include/xorg/xf86OSKbd.h
-include/xorg/xf86OSmouse.h
-include/xorg/xf86Opt.h
-include/xorg/xf86Optrec.h
-include/xorg/xf86Parser.h
-include/xorg/xf86Pci.h
-include/xorg/xf86PciInfo.h
-include/xorg/xf86Priv.h
-include/xorg/xf86Privstr.h
-include/xorg/xf86RAC.h
-include/xorg/xf86RandR12.h
-include/xorg/xf86Rename.h
-include/xorg/xf86RamDac.h
-include/xorg/xf86Resources.h
-include/xorg/xf86Version.h
-include/xorg/xf86Xinput.h
-include/xorg/xf86_OSlib.h
-include/xorg/xf86_OSproc.h
-include/xorg/xf86_ansic.h
-include/xorg/xf86_libc.h
-include/xorg/xf86cmap.h
-include/xorg/xf86fbman.h
-include/xorg/xf86i2c.h
-include/xorg/xf86int10.h
-include/xorg/xf86sbusBus.h
-include/xorg/xf86str.h
-include/xorg/xf86xv.h
-include/xorg/xf86xvmc.h
-include/xorg/xf86xvpriv.h
-include/xorg/xisb.h
-include/xorg/xorg-server.h
-include/xorg/xorgVersion.h
-include/xorg/xvdix.h
-include/xorg/xvmcext.h
-lib/X11/Cards
-lib/X11/Options
-lib/xorg/modules/extensions/libGLcore.la
-lib/xorg/modules/extensions/libGLcore.so
-lib/xorg/modules/extensions/libdbe.la
-lib/xorg/modules/extensions/libdbe.so
-lib/xorg/modules/extensions/libdri.la
-lib/xorg/modules/extensions/libdri.so
-lib/xorg/modules/extensions/libextmod.la
-lib/xorg/modules/extensions/libextmod.so
-lib/xorg/modules/extensions/libglx.la
-lib/xorg/modules/extensions/libglx.so
-lib/xorg/modules/extensions/librecord.la
-lib/xorg/modules/extensions/librecord.so
-lib/xorg/modules/extensions/libxtrap.la
-lib/xorg/modules/extensions/libxtrap.so
-lib/xorg/modules/fonts/libfreetype.la
-lib/xorg/modules/fonts/libfreetype.so
-lib/xorg/modules/fonts/libtype1.la
-lib/xorg/modules/fonts/libtype1.so
-%%ALPHA_NA%%lib/xorg/modules/libafb.la
-%%ALPHA_NA%%lib/xorg/modules/libafb.so
-lib/xorg/modules/libcfb.la
-lib/xorg/modules/libcfb.so
-lib/xorg/modules/libcfb32.la
-lib/xorg/modules/libcfb32.so
-lib/xorg/modules/libexa.la
-lib/xorg/modules/libexa.so
-lib/xorg/modules/libfb.la
-lib/xorg/modules/libfb.so
-lib/xorg/modules/libint10.la
-lib/xorg/modules/libint10.so
-lib/xorg/modules/libmfb.la
-lib/xorg/modules/libmfb.so
-lib/xorg/modules/libpcidata.la
-lib/xorg/modules/libpcidata.so
-lib/xorg/modules/libscanpci.la
-lib/xorg/modules/libscanpci.so
-lib/xorg/modules/libshadow.la
-lib/xorg/modules/libshadow.so
-lib/xorg/modules/libshadowfb.la
-lib/xorg/modules/libshadowfb.so
-lib/xorg/modules/libvbe.la
-lib/xorg/modules/libvbe.so
-lib/xorg/modules/libvgahw.la
-lib/xorg/modules/libvgahw.so
-lib/xorg/modules/libxaa.la
-lib/xorg/modules/libxaa.so
-lib/xorg/modules/libxf1bpp.la
-lib/xorg/modules/libxf1bpp.so
-lib/xorg/modules/libxf4bpp.la
-lib/xorg/modules/libxf4bpp.so
-lib/xorg/modules/libxf8_16bpp.la
-lib/xorg/modules/libxf8_16bpp.so
-lib/xorg/modules/libxf8_32bpp.la
-lib/xorg/modules/libxf8_32bpp.so
-lib/xorg/modules/linux/libfbdevhw.la
-lib/xorg/modules/linux/libfbdevhw.so
-lib/xorg/modules/multimedia/bt829_drv.la
-lib/xorg/modules/multimedia/bt829_drv.so
-lib/xorg/modules/multimedia/fi1236_drv.la
-lib/xorg/modules/multimedia/fi1236_drv.so
-lib/xorg/modules/multimedia/msp3430_drv.la
-lib/xorg/modules/multimedia/msp3430_drv.so
-lib/xorg/modules/multimedia/tda8425_drv.la
-lib/xorg/modules/multimedia/tda8425_drv.so
-lib/xorg/modules/multimedia/tda9850_drv.la
-lib/xorg/modules/multimedia/tda9850_drv.so
-lib/xorg/modules/multimedia/tda9885_drv.la
-lib/xorg/modules/multimedia/tda9885_drv.so
-lib/xorg/modules/multimedia/uda1380_drv.la
-lib/xorg/modules/multimedia/uda1380_drv.so
-lib/xserver/SecurityPolicy
-libdata/pkgconfig/xorg-server.pc
-share/X11/app-defaults/XOrgCfg
-share/X11/xkb/compiled/README.compiled
-share/aclocal/xorg-server.m4
-@dirrm include/xorg
-@dirrm lib/xorg/modules/fonts
-@dirrm lib/xorg/modules/extensions
-@dirrm lib/xorg/modules/linux
-@dirrm lib/xorg/modules/multimedia
-@dirrm lib/xorg/modules
-@dirrm lib/xorg
-@dirrm lib/xserver
-@dirrmtry include/X11/bitmaps
-@dirrmtry include/X11/pixmaps
-@dirrmtry lib/X11/doc
-@dirrmtry lib/X11/etc
-@dirrmtry lib/X11/xserver
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
-@dirrmtry share/X11/app-defaults
-@dirrmtry share/X11