Update a whole bunch of drivers to the latest version.

In this update: xf86-input-keyboard version 1.6.2 xf86-input-mouse version 1.8.0 -> most patches needed to be applied by hand and regenerated. xf86-video-apm version 1.2.5 xf86-video-ark version 0.7.5 xf86-video-chips version 1.2.5 xf86-video-cirrus version 1.5.1 xf86-video-dummy version 0.3.6 xf86-video-fbdev version 0.4.3 -> Copied from regular ports tree and updated. xf86-video-glint version 1.2.8 xf86-video-i128 version 1.3.6 xf86-video-i740 version 1.3.4 xf86-video-intel version 2.20.2 -> Only ypdated if WITH_NEW_XORG is set -> Added missing dependency on x11/xcb-util xf86-video-mach version 6.9.3 xf86-video-mga version 1.6.1 xf86-video-neomagic version 1.2.7 -> Copied from regular ports tree and updated xf86-video-nv version 2.1.20 -> Copied from regular ports tree and updated. xf86-video-openchrome version 1.3.0 xf86-video-r128 version 6.8.4 -> Copied from regular ports tree and updated. xf86-video-rendition version 4.2.5 xf86-video-s3 version 0.6.5 xf86-video-s3virge version 1.10.6 xf86-video-savage version 2.3.6 xf86-video-siliconmotion version 1.7.7 xf86-video-sis version 0.10.7 xf86-video-tdfx version 1.4.5 -> Copied from regular ports tree and updated. xf86-video-tga version 1.2.2 -> Copied from regular ports tree and updated. xf86-video-trident version 1.3.6 -> Copied from regular ports tree and updated. xf86-video-tseng version 1.2.5 -> Copied from regular ports tree and updated. xf86-video-voodoo version 1.2.5 git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@541 058c260c-8361-11dd-a0ac-aa2bafec7d09
author: zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> 2012-07-30 07:27:05 +0800
committer: zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> 2012-07-30 07:27:05 +0800
commit: 4c3ae772f44e37e99d6cae1be51d0b97c6116a35 (patch)
tree: b43655237fe74e9744828e8308e4606de8a9b5bf
parent: f983024626bbd4de6bc6948e21906ff7100e1169 (diff)
download: xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.gz
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.bz2
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.lz
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.xz
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.zst
xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.zip
78 files changed, 560 insertions, 333 deletions
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 86be55c..8649140 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index f093391..767398b 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
-SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166
+SHA256 (xorg/driver/xf86-input-keyboard-1.6.2.tar.bz2) = 76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a
+SIZE (xorg/driver/xf86-input-keyboard-1.6.2.tar.bz2) = 322733
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index a431fce..879fec7 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.7.2
+PORTVERSION=	1.8.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
index 5417e26..1d2966b 100644
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ b/x11-drivers/xf86-input-mouse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.7.2.tar.bz2) = 332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b
-SIZE (xorg/driver/xf86-input-mouse-1.7.2.tar.bz2) = 341378
+SHA256 (xorg/driver/xf86-input-mouse-1.8.0.tar.bz2) = 075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf
+SIZE (xorg/driver/xf86-input-mouse-1.8.0.tar.bz2) = 356951
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
index b1da04c..078d52a 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
@@ -1,64 +1,57 @@
---- src/bsd_mouse.c.orig	2008-11-26 23:11:36.000000000 -0500
-+++ src/bsd_mouse.c	2009-04-07 17:10:17.000000000 -0400
-@@ -1,4 +1,3 @@
--
- /*
-  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
-  *
-@@ -71,15 +70,20 @@
+--- src/bsd_mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/bsd_mouse.c	2012-07-30 00:49:09.000000000 +0200
+@@ -71,15 +71,20 @@
  static const char *FindDevice(InputInfoPtr, const char *, int);
  
  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
++#if !defined(XPS2_SUPPORT)
 +#define XPS2_SUPPORT
 +#endif
  /* These are for FreeBSD and DragonFly */
- #define DEFAULT_MOUSE_DEV		"/dev/mouse"
- #define DEFAULT_SYSMOUSE_DEV		"/dev/sysmouse"
- #define DEFAULT_PS2_DEV			"/dev/psm0"
-+#define DEFAULT_USB_DEV			"/dev/ums0"
+ #define DEFAULT_MOUSE_DEV               "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV            "/dev/sysmouse"
+ #define DEFAULT_PS2_DEV                 "/dev/psm0"
++#define DEFAULT_USB_DEV                 "/dev/ums0"
  
  static const char *mouseDevs[] = {
- 	DEFAULT_MOUSE_DEV,
- 	DEFAULT_SYSMOUSE_DEV,
- 	DEFAULT_PS2_DEV,
-+	DEFAULT_USB_DEV,
- 	NULL
+         DEFAULT_MOUSE_DEV,
+         DEFAULT_SYSMOUSE_DEV,
+         DEFAULT_PS2_DEV,
++        DEFAULT_USB_DEV,
+         NULL
  };
  #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT)
-@@ -100,7 +104,11 @@
+@@ -100,7 +105,11 @@
  #if defined(__NetBSD__)
      return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
  #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 -    return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
 +    return MSE_SERIAL | MSE_BUS | MSE_PS2 |
 +#ifdef XPS2_SUPPORT
-+	MSE_XPS2 |
++        MSE_XPS2 |
 +#endif
-+	MSE_AUTO | MSE_MISC;
++        MSE_AUTO | MSE_MISC;
  #else
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
  #endif
-@@ -179,10 +187,31 @@
- 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
- 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
+@@ -180,9 +189,30 @@
+         { MOUSE_PROTO_SYSMOUSE,         "SysMouse" }
  };
--	
-+
+ 
 +#ifdef XPS2_SUPPORT
 +static struct {
-+	int dmodel;
-+	char *name;
++        int dmodel;
++        char *name;
 +} ps2proto[] = {
-+	{ MOUSE_MODEL_NETSCROLL,	"NetScrollPS/2" },
-+	{ MOUSE_MODEL_NET,		"NetMousePS/2" },
-+	{ MOUSE_MODEL_GLIDEPOINT,	"GlidePointPS/2" },
-+	{ MOUSE_MODEL_THINK,		"ThinkingMousePS/2" },
-+	{ MOUSE_MODEL_INTELLI,		"IMPS/2" },
-+	{ MOUSE_MODEL_MOUSEMANPLUS,	"MouseManPlusPS/2" },
-+	{ MOUSE_MODEL_EXPLORER,		"ExplorerPS/2" },
-+	{ MOUSE_MODEL_4D,		"IMPS/2" },
-+	{ MOUSE_MODEL_4DPLUS,		"IMPS/2" },
++        { MOUSE_MODEL_NETSCROLL,        "NetScrollPS/2" },
++        { MOUSE_MODEL_NET,              "NetMousePS/2" },
++        { MOUSE_MODEL_GLIDEPOINT,       "GlidePointPS/2" },
++        { MOUSE_MODEL_THINK,            "ThinkingMousePS/2" },
++        { MOUSE_MODEL_INTELLI,          "IMPS/2" },
++        { MOUSE_MODEL_MOUSEMANPLUS,     "MouseManPlusPS/2" },
++        { MOUSE_MODEL_EXPLORER,         "ExplorerPS/2" },
++        { MOUSE_MODEL_4D,               "IMPS/2" },
++        { MOUSE_MODEL_4DPLUS,           "IMPS/2" },
 +};
 +#endif
 +
@@ -72,56 +65,52 @@
      int i;
      mousehw_t hw;
      mousemode_t mode;
-@@ -190,10 +219,16 @@
+@@ -190,7 +220,13 @@
      if (pInfo->fd == -1)
- 	return NULL;
+         return NULL;
  
 +#ifdef XPS2_SUPPORT
      /* set the driver operation level, if applicable */
 +    dev = xf86FindOptionValue(pInfo->options, "Device");
 +    if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8))
-+	i = 2;
++        i = 2;
 +    else
 +#endif
      i = 1;
      ioctl(pInfo->fd, MOUSE_SETLEVEL, &i);
--    
-+
-     /* interrogate the driver and get some intelligence on the device. */
-     hw.iftype = MOUSE_IF_UNKNOWN;
-     hw.model = MOUSE_MODEL_GENERIC;
-@@ -209,9 +244,18 @@
- 		    protoPara[0] = mode.syncmask[0];
- 		    protoPara[1] = mode.syncmask[1];
- 		}
-+		proto = devproto[i].name;
+ 
+@@ -209,9 +245,18 @@
+                     protoPara[0] = mode.syncmask[0];
+                     protoPara[1] = mode.syncmask[1];
+                 }
++                proto = devproto[i].name;
 +#ifdef XPS2_SUPPORT
-+		if (mode.protocol == MOUSE_PROTO_PS2)
-+		    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
-+			if (hw.model == ps2proto[i].dmodel) {
-+			    proto = ps2proto[i].name;
-+			    break;
-+			}
++                if (mode.protocol == MOUSE_PROTO_PS2)
++                    for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i)
++                        if (hw.model == ps2proto[i].dmodel) {
++                           proto = ps2proto[i].name;
++                           break;
++                }
 +#endif
- 		xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
--			    pInfo->name, devproto[i].name);
--		return devproto[i].name;
-+			    pInfo->name, proto);
-+		return proto;
- 	    }
- 	}
+                 xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n",
+-                            pInfo->name, devproto[i].name);
+-                return devproto[i].name;
++                            pInfo->name, proto);
++                return proto;
+             }
+         }
      }
-@@ -234,41 +278,41 @@
- 	(protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
- 	/*
- 	 * As the FreeBSD sysmouse driver defaults to protocol level 0
--	 * everytime it is opened we enforce protocol level 1 again at
-+	 * everytime it is closed we enforce protocol level 1 again at
- 	 * this point.
- 	 */
- 	mode.level = 1;
+@@ -234,41 +279,41 @@
+         (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+         /*
+          * As the FreeBSD sysmouse driver defaults to protocol level 0
+-         * everytime it is opened we enforce protocol level 1 again at
++         * everytime it is closed we enforce protocol level 1 again at
+          * this point.
+          */
+         mode.level = 1;
      } else
--	mode.level = -1;
+-        mode.level = -1;
 -#else
 -    mode.level = -1;
  #endif
@@ -151,26 +140,26 @@
 +    unsigned int i;
  
 -    if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) {
--	if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
--	    if (kill(pid, 0) == 0) {
--		fclose(f);
--		return TRUE;
--	    }
+-        if (fscanf(f, "%u", &pid) == 1 && pid > 0) {
+-            if (kill(pid, 0) == 0) {
+-                fclose(f);
+-                return TRUE;
+-            }
 +    if (dev)
-+	sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
++        sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev);
 +    else
-+	sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
++        sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null");
 +    if ((f = popen(cmd, "r")) != NULL) {
-+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
-+	    pclose(f);
-+	    return TRUE;
- 	}
--	fclose(f);
-+	pclose(f);
++        if (fscanf(f, "%u", &i) == 1 && i > 0) {
++            pclose(f);
++            return TRUE;
+         }
+-        fclose(f);
++        pclose(f);
      }
      return FALSE;
  }
-@@ -276,17 +320,17 @@
+@@ -276,17 +321,17 @@
  static const char *
  FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
  {
@@ -182,63 +171,63 @@
      struct stat sb;
  
      for (pdev = mouseDevs; *pdev; pdev++) {
--	SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
--	if (fd == -1) {
-+	SYSCALL (ret = stat(*pdev, &sb));
-+	if (ret == -1) {
+-        SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK));
+-        if (fd == -1) {
++        SYSCALL (ret = stat(*pdev, &sb));
++        if (ret == -1) {
  #ifdef DEBUG
--	    ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
-+	    ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
+-            ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno));
++            ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno));
  #endif
- 	} else {
- 	    /*
-@@ -295,28 +339,32 @@
- 	     * the test for whether /dev/sysmouse is usable can be made.
- 	     */
- 	    if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
--		if (fstat(fd, &devMouseStat) == 0)
--		    devMouse = TRUE;
--		close(fd);
-+		memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
-+		devMouse = TRUE;
- 		continue;
- 	    } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
- 		/* Check if /dev/mouse is the same as /dev/sysmouse. */
--		if (devMouse && fstat(fd, &sb) == 0 && 
--		    devMouseStat.st_dev == sb.st_dev &&
-+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
- 		    devMouseStat.st_ino == sb.st_ino) {
- 		    /* If the same, use /dev/sysmouse. */
- 		    devMouse = FALSE;
- 		}
--		close(fd);
--		if (MousedRunning())
-+		if (MousedRunning(NULL))
- 		    break;
--		else {
+         } else {
+             /*
+@@ -295,28 +340,32 @@
+              * the test for whether /dev/sysmouse is usable can be made.
+              */
+             if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) {
+-                if (fstat(fd, &devMouseStat) == 0)
+-                    devMouse = TRUE;
+-                close(fd);
++                memcpy(&devMouseStat, &sb, sizeof(devMouseStat));
++                devMouse = TRUE;
+                 continue;
+             } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) {
+                 /* Check if /dev/mouse is the same as /dev/sysmouse. */
+-                if (devMouse && fstat(fd, &sb) == 0 &&
+-                    devMouseStat.st_dev == sb.st_dev &&
++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
+                     devMouseStat.st_ino == sb.st_ino) {
+                     /* If the same, use /dev/sysmouse. */
+                     devMouse = FALSE;
+                 }
+-                close(fd);
+-                if (MousedRunning())
++                if (MousedRunning(NULL))
+                     break;
+-                else {
 -#ifdef DEBUG
--	    	    ErrorF("moused isn't running\n");
+-                    ErrorF("moused isn't running\n");
 -#endif
--		}
- 	    } else {
--		close(fd);
-+		/* Check if /dev/mouse is the same as this device. */
-+		if (devMouse && devMouseStat.st_dev == sb.st_dev &&
-+		    devMouseStat.st_ino == sb.st_ino) {
-+		    /* If the same, use this device. */
-+		    devMouse = FALSE;
-+		}
-+		if (MousedRunning(*pdev))
-+		    continue;
-+		/* ums(4) does not support anything but SysMouse protocol. */
-+		if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
-+		    xf86NameCmp(protocol, "auto") != 0 &&
-+		    xf86NameCmp(protocol, "sysmouse") != 0)
-+		    continue;
- 		break;
- 	    }
- 	}
-@@ -782,7 +830,9 @@
+-                }
+             } else {
+-                close(fd);
++                /* Check if /dev/mouse is the same as this device. */
++                if (devMouse && devMouseStat.st_dev == sb.st_dev &&
++                    devMouseStat.st_ino == sb.st_ino) {
++                    /* If the same, use this device. */
++                    devMouse = FALSE;
++                }
++                if (MousedRunning(*pdev))
++                    continue;
++                /* ums(4) does not support anything but SysMouse protocol. */
++                if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol &&
++                    xf86NameCmp(protocol, "auto") != 0 &&
++                    xf86NameCmp(protocol, "sysmouse") != 0)
++                    continue;
+                 break;
+             }
+         }
+@@ -764,7 +813,9 @@
      p->CheckProtocol = CheckProtocol;
  #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
      p->SetupAuto = SetupAuto;
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
index c32b5b6..2d363d5 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c
@@ -1,56 +1,56 @@
---- ./src/mouse.c.orig	2011-06-25 07:26:47.000000000 +0200
-+++ ./src/mouse.c	2012-03-02 14:02:43.000000000 +0100
-@@ -271,13 +271,39 @@
+--- src/mouse.c.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.c	2012-07-30 00:31:48.000000000 +0200
+@@ -280,13 +280,39 @@
  
      pMse = pInfo->private;
  
 -    pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
 +    i = xf86SetIntOption(pInfo->options, "Buttons", 0);
 +    if (i != 0)
-+	pMse->buttons = i;
++        pMse->buttons = i;
      if (!pMse->buttons) {
- 	pMse->buttons = MSE_DFLTBUTTONS;
- 	buttons_from = X_DEFAULT;
+         pMse->buttons = MSE_DFLTBUTTONS;
+         buttons_from = X_DEFAULT;
      }
      origButtons = pMse->buttons;
  
 +    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 +    if (s) {
-+       int b, n = 0;
-+       char *s1 = s;
-+       /* keep getting numbers which are buttons */
-+       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
-+	   /* check sanity for a button */
-+	   if (b < 0 || b > MSE_MAXBUTTONS) {
-+	       xf86Msg(X_WARNING,
-+		       "ButtonMapping: Invalid button number = %d\n", b);
-+	       break;
-+	   };
-+	   pMse->buttonMap[n++] = 1 << (b-1);
-+	   if (b > pMse->buttons) pMse->buttons = b;
-+       }
-+       free(s);
++        int b, n = 0;
++        char *s1 = s;
++        /* keep getting numbers which are buttons */
++        while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
++            /* check sanity for a button */
++            if (b < 0 || b > MSE_MAXBUTTONS) {
++                xf86Msg(X_WARNING,
++                        "ButtonMapping: Invalid button number = %d\n", b);
++                break;
++           };
++           pMse->buttonMap[n++] = 1 << (b-1);
++           if (b > pMse->buttons) pMse->buttons = b;
++        }
++        free(s);
 +    }
 +    /* get maximum of mapped buttons */
 +    for (i = pMse->buttons-1; i >= 0; i--) {
-+	int f = ffs (pMse->buttonMap[i]);
-+	if (f > pMse->buttons)
-+	    pMse->buttons = f;
++        int f = ffs (pMse->buttonMap[i]);
++        if (f > pMse->buttons)
++            pMse->buttons = f;
 +    }
 +
      pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options,
- 					      "Emulate3Buttons", FALSE);
+                                               "Emulate3Buttons", FALSE);
      if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) {
-@@ -289,6 +315,8 @@
- 					     "Emulate3Timeout", 50);
+@@ -298,6 +324,8 @@
+                                              "Emulate3Timeout", 50);
      if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
- 	MessageType from = X_CONFIG;
+         MessageType from = X_CONFIG;
 +	if (pMse->buttons < 3)
-+	    pMse->buttons = 3;
- 	if (pMse->emulate3ButtonsSoft)
- 	    from = X_DEFAULT;
- 	xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
-@@ -296,6 +324,8 @@
++            pMse->buttons = 3;
+         if (pMse->emulate3ButtonsSoft)
+             from = X_DEFAULT;
+         xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n",
+@@ -305,6 +333,8 @@
      }
  
      pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE);
@@ -58,39 +58,39 @@
 +	    pMse->buttons = 3;
      pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE);
      if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) {
- 	pMse->invX = -1;
-@@ -306,7 +336,7 @@
+         pMse->invX = -1;
+@@ -315,7 +345,7 @@
      } else
- 	pMse->invY = 1;
+         pMse->invY = 1;
      pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0);
--    
+-
 +    pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0);
  
      if (pMse->pDragLock)
- 	free(pMse->pDragLock);
-@@ -416,14 +446,17 @@
- 	free(s);
+         free(pMse->pDragLock);
+@@ -425,14 +455,17 @@
+         free(s);
      }
  
 -    s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5");
 +    s = xf86SetStrOption(pInfo->options, "ZAxisMapping",
-+	pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
++        pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off");
      if (s) {
- 	int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
- 	char *msg = NULL;
- 
- 	pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
- 	pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
--	if (!xf86NameCmp(s, "x")) {
-+	if (!xf86NameCmp(s, "off")) {
-+	    msg = xstrdup("off");
+         int b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+         char *msg = NULL;
+ 
+         pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP;
+         pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP;
+-        if (!xf86NameCmp(s, "x")) {
++        if (!xf86NameCmp(s, "off")) {
++            msg = xstrdup("off");
 +	} else if (!xf86NameCmp(s, "x")) {
- 	    pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
- 	    msg = xstrdup("X axis");
- 	} else if (!xf86NameCmp(s, "y")) {
-@@ -559,29 +592,6 @@
- 		pInfo->name, wheelButton, pMse->wheelInertia,
- 		pMse->wheelButtonTimeout);
+             pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX;
+             msg = xstrdup("X axis");
+         } else if (!xf86NameCmp(s, "y")) {
+@@ -568,29 +601,6 @@
+                 pInfo->name, wheelButton, pMse->wheelInertia,
+                 pMse->wheelButtonTimeout);
      }
 -    s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL);
 -    if (s) {
@@ -98,27 +98,27 @@
 -       char *s1 = s;
 -       /* keep getting numbers which are buttons */
 -       while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) {
--	   /* check sanity for a button */
--	   if (b < 0 || b > MSE_MAXBUTTONS) {
--	       xf86Msg(X_WARNING,
--		       "ButtonMapping: Invalid button number = %d\n", b);
--	       break;
--	   };
--	   pMse->buttonMap[n++] = 1 << (b-1);
--	   if (b > pMse->buttons) pMse->buttons = b;
+-           /* check sanity for a button */
+-           if (b < 0 || b > MSE_MAXBUTTONS) {
+-               xf86Msg(X_WARNING,
+-                       "ButtonMapping: Invalid button number = %d\n", b);
+-               break;
+-           };
+-           pMse->buttonMap[n++] = 1 << (b-1);
+-           if (b > pMse->buttons) pMse->buttons = b;
 -       }
 -       free(s);
 -    }
 -    /* get maximum of mapped buttons */
 -    for (i = pMse->buttons-1; i >= 0; i--) {
--	int f = ffs (pMse->buttonMap[i]);
--	if (f > pMse->buttons)
--	    pMse->buttons = f;
+-        int f = ffs (pMse->buttonMap[i]);
+-        if (f > pMse->buttons)
+-            pMse->buttons = f;
 -    }
      if (origButtons != pMse->buttons)
- 	buttons_from = X_CONFIG;
+         buttons_from = X_CONFIG;
      xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons);
-@@ -659,7 +669,6 @@
+@@ -668,7 +678,6 @@
      }
      pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0);
      pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0);
@@ -126,51 +126,57 @@
  }
  
  static void
-@@ -948,6 +957,8 @@
+@@ -959,6 +968,8 @@
      /* Default Mapping: 1 2 3 8 9 10 11 ... */
      for (i = 0; i < MSE_MAXBUTTONS; i++)
- 	pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
+         pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i);
 +    pMse->hasZ = 1;
 +    pMse->hasW = 0;
  
      protocol = MousePickProtocol(pInfo, device, protocol, &protocolID);
  
-@@ -2085,6 +2096,9 @@
- 			}
- 		    }
- 		}
-+	    } else {
-+		pMse->wheelXDistance = 0;
-+		pMse->wheelYDistance = 0;
- 	    }
- 
- 	    /* Absorb the mouse movement while the wheel button is pressed. */
-@@ -2102,7 +2116,7 @@
+@@ -2137,7 +2148,7 @@
+ 
+     if (pMse->emulateWheel) {
+         /* Emulate wheel button handling */
+-        if(pMse->wheelButton == 0)
++        if (pMse->wheelButton == 0)
+             wheelButtonMask = 0;
+         else
+             wheelButtonMask = 1 << (pMse->wheelButton - 1);
+@@ -2221,6 +2232,9 @@
+                         }
+                     }
+                 }
++            } else {
++                pMse->wheelXDistance = 0;
++                pMse->wheelYDistance = 0;
+             }
+ 
+             /* Absorb the mouse movement while the wheel button is pressed. */
+@@ -2238,7 +2252,7 @@
      if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy))
- 	buttonTimer(pInfo);
+         buttonTimer(pInfo);
  
 -    if (dx || dy)
 +    if ((dx || dy) && !pMse->disableXY)
- 	xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
+         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
  
      if (change) {
-@@ -2312,13 +2326,13 @@
+@@ -2448,11 +2462,11 @@
  
-     /* Accumulate the scaled dx, dy in the private variables 
+     /* Accumulate the scaled dx, dy in the private variables
         fracdx,fracdy and return the integer number part */
 -    if (mousepriv) {
--	mousepriv->fracdx += mousepriv->sensitivity*dx;
--	mousepriv->fracdy += mousepriv->sensitivity*dy;
--	mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
--	mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
+-        mousepriv->fracdx += mousepriv->sensitivity*dx;
+-        mousepriv->fracdy += mousepriv->sensitivity*dy;
+-        mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) );
+-        mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) );
 +    if (pMse->sensitivity != 0) {
-+	pMse->fracdx += pMse->sensitivity*dx;
-+	pMse->fracdy += pMse->sensitivity*dy;
-+	pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
-+	pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
++        pMse->fracdx += pMse->sensitivity*dx;
++        pMse->fracdy += pMse->sensitivity*dy;
++        pMse->fracdx -= ( dx=(int)(pMse->fracdx) );
++        pMse->fracdy -= ( dy=(int)(pMse->fracdy) );
      }
--    
-+
+ 
      /* If mouse wheel movement has to be mapped on a button, we need to
-      * loop for button press and release events. */
-     do {
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
index 98defb1..abb2ac9 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h
@@ -1,24 +1,25 @@
---- ./src/mouse.h.orig	2011-06-25 07:24:41.000000000 +0200
-+++ ./src/mouse.h	2012-03-02 14:02:43.000000000 +0100
-@@ -217,10 +217,12 @@
-     Bool		emulate3ButtonsSoft;
-     int			emulate3Timeout;/* Timeout for 3 button emulation */
-     Bool		chordMiddle;
-+    Bool		disableXY;
+--- src/mouse.h.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mouse.h	2012-07-30 00:41:02.000000000 +0200
+@@ -217,10 +217,13 @@
+     Bool                emulate3ButtonsSoft;
+     int                 emulate3Timeout;/* Timeout for 3 button emulation */
+     Bool                chordMiddle;
++    Bool                disableXY;
      Bool                flipXY;
      int                 invX;
      int                 invY;
-     int			resolution;
-+    Bool		hasZ, hasW;
-     int			negativeZ;	/* button mask */
-     int			positiveZ;	/* button mask */
-     int			negativeW;	/* button mask */
-@@ -259,6 +261,8 @@
-     int			doubleClickOldSourceState;
-     int			lastMappedButtons;
-     int			buttonMap[MSE_MAXBUTTONS];
-+    float		fracdx,fracdy;
-+    float		sensitivity;
+     int                 resolution;
++    Bool                hasW;
++    Bool                hasZ;
+     int                 negativeZ;      /* button mask */
+     int                 positiveZ;      /* button mask */
+     int                 negativeW;      /* button mask */
+@@ -259,6 +262,8 @@
+     int                 doubleClickOldSourceState;
+     int                 lastMappedButtons;
+     int                 buttonMap[MSE_MAXBUTTONS];
++    float               fracdx,fracdy;
++    float               sensitivity;
  } MouseDevRec, *MouseDevPtr;
  
  #endif /* _XF86OSMOUSE_H_ */
diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
index 2661ab7..8abb8c3 100644
--- a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
+++ b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h
@@ -1,11 +1,11 @@
---- ./src/mousePriv.h.orig	2009-10-16 23:40:45.000000000 +0200
-+++ ./src/mousePriv.h	2012-03-02 14:02:43.000000000 +0100
+--- src/mousePriv.h.orig	2012-07-27 08:10:56.000000000 +0200
++++ src/mousePriv.h	2012-07-30 00:39:00.000000000 +0200
 @@ -63,8 +63,6 @@
-     int		acc;
-     CARD32	pnpLast;
-     Bool	disablePnPauto;
--    float	fracdx,fracdy; 
--    float	sensitivity;
+     int         acc;
+     CARD32      pnpLast;
+     Bool        disablePnPauto;
+-    float       fracdx,fracdy;
+-    float       sensitivity;
  } mousePrivRec, *mousePrivPtr;
  
  /* mouse proto flags */
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index adb00ee..5fe6c8f 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-apm
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
index ef1c219..cd9591f 100644
--- a/x11-drivers/xf86-video-apm/distinfo
+++ b/x11-drivers/xf86-video-apm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-apm-1.2.4.tar.bz2) = ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302
-SIZE (xorg/driver/xf86-video-apm-1.2.4.tar.bz2) = 325979
+SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f
+SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 369ab08..d7679f3 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-ark
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
index eb52fe7..bbd43c7 100644
--- a/x11-drivers/xf86-video-ark/distinfo
+++ b/x11-drivers/xf86-video-ark/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.4.tar.bz2) = bd4cdba48a974acaca289d20b8268a4d3084e2b2c9d1c83adb03ba1dcb609fa4
-SIZE (xorg/driver/xf86-video-ark-0.7.4.tar.bz2) = 273338
+SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e
+SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 15e327e..47f5966 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
index f03b719..a6eb707 100644
--- a/x11-drivers/xf86-video-chips/distinfo
+++ b/x11-drivers/xf86-video-chips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
-SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618
+SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2
+SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 7dc33d3..ae5acba 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-cirrus
-PORTVERSION=	1.4.0
+PORTVERSION=	1.5.1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
index 96e2ebb..bf43794 100644
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ b/x11-drivers/xf86-video-cirrus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-cirrus-1.4.0.tar.bz2) = 2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e
-SIZE (xorg/driver/xf86-video-cirrus-1.4.0.tar.bz2) = 317013
+SHA256 (xorg/driver/xf86-video-cirrus-1.5.1.tar.bz2) = a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557
+SIZE (xorg/driver/xf86-video-cirrus-1.5.1.tar.bz2) = 329436
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 2154b3a..72e501a 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-dummy
-PORTVERSION=	0.3.5
+PORTVERSION=	0.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
index 899bec9..bb0e34d 100644
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ b/x11-drivers/xf86-video-dummy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
-SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761
+SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798
+SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
new file mode 100644
index 0000000..e1b10bc
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xf86-video-fbdev
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-fbdev/Makefile,v 1.13 2012/04/21 17:03:24 miwi Exp $
+#
+
+PORTNAME=	xf86-video-fbdev
+PORTVERSION=	0.4.3
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org fbdev display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto
+MAN4=		fbdev.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo
new file mode 100644
index 0000000..603c5ce
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831
+SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056
diff --git a/x11-drivers/xf86-video-fbdev/pkg-descr b/x11-drivers/xf86-video-fbdev/pkg-descr
new file mode 100644
index 0000000..22797ee
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-fbdev driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
new file mode 100644
index 0000000..274315c
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/fbdev_drv.la
+lib/xorg/modules/drivers/fbdev_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index 3a38752..809da0b 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
index 23480e3..8d55f37 100644
--- a/x11-drivers/xf86-video-glint/distinfo
+++ b/x11-drivers/xf86-video-glint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.7.tar.bz2) = 9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359
-SIZE (xorg/driver/xf86-video-glint-1.2.7.tar.bz2) = 397381
+SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221
+SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index e24e994..3360081 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-i128
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
index 28e1dae..2c29d2b 100644
--- a/x11-drivers/xf86-video-i128/distinfo
+++ b/x11-drivers/xf86-video-i128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i128-1.3.5.tar.bz2) = 3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea
-SIZE (xorg/driver/xf86-video-i128-1.3.5.tar.bz2) = 306803
+SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c
+SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index 64edd60..2d5c37e 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-i740
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
index d36b39f..1907b7d 100644
--- a/x11-drivers/xf86-video-i740/distinfo
+++ b/x11-drivers/xf86-video-i740/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-i740-1.3.3.tar.bz2) = a39e8cf8e34816d07d33eae79dcb26fc2137f719156ae90fa4afff319e320dcc
-SIZE (xorg/driver/xf86-video-i740-1.3.3.tar.bz2) = 316716
+SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78
+SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 028b121..7da9ede 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -22,11 +22,12 @@ USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
 MAN4=		intel.4x
 
 .if defined(WITH_NEW_XORG)
-INTEL_VERSION=	2.20.0
+INTEL_VERSION=	2.20.2
 INTEL_REVISION=	0
 MAKE_JOBS_UNSAFE=yes
 PLIST_SUB+=	OLD="@comment "
 EXTRA_PATCHES+=	${PATCHDIR}/extra-i915kms
+LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
 INTEL_REVISION=	4
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index 1c10a7d..15fb7ba 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
-SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
-SHA256 (xorg/driver/xf86-video-intel-2.20.0.tar.bz2) = 21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783
-SIZE (xorg/driver/xf86-video-intel-2.20.0.tar.bz2) = 1552275
+SHA256 (xorg/driver/xf86-video-intel-2.20.2.tar.bz2) = 4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9
+SIZE (xorg/driver/xf86-video-intel-2.20.2.tar.bz2) = 1559622
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 81b2ae6..690f790 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.9.1
+PORTVERSION=	6.9.3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
index f800599..d4739a0 100644
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mach64-6.9.1.tar.bz2) = 9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e
-SIZE (xorg/driver/xf86-video-mach64-6.9.1.tar.bz2) = 534392
+SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218
+SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 26eb146..7e2efa2 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xf86-video-mga
-PORTVERSION=	1.9.100
-PORTEPOCH=	2
+PORTVERSION=	1.6.1
+PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
index f5c05ee..f24b15a 100644
--- a/x11-drivers/xf86-video-mga/distinfo
+++ b/x11-drivers/xf86-video-mga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c
-SIZE (xorg/driver/xf86-video-mga-1.9.100.tar.bz2) = 369119
+SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4
+SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
new file mode 100644
index 0000000..4969965
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xf86-video-neomagic
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-neomagic/Makefile,v 1.13 2012/04/21 17:03:26 miwi Exp $
+#
+
+PORTNAME=	xf86-video-neomagic
+PORTVERSION=	1.2.7
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org neomagic display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+MAN4=		neomagic.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo
new file mode 100644
index 0000000..e740d00
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76
+SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716
diff --git a/x11-drivers/xf86-video-neomagic/pkg-descr b/x11-drivers/xf86-video-neomagic/pkg-descr
new file mode 100644
index 0000000..5870a95
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-neomagic driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
new file mode 100644
index 0000000..e96d47e
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/neomagic_drv.la
+lib/xorg/modules/drivers/neomagic_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
new file mode 100644
index 0000000..13df9fd
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xf86-video-nv
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-nv/Makefile,v 1.26 2012/04/21 17:03:27 miwi Exp $
+#
+
+PORTNAME=	xf86-video-nv
+PORTVERSION=	2.1.20
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org nv display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		nv.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo
new file mode 100644
index 0000000..54a09c6
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf
+SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982
diff --git a/x11-drivers/xf86-video-nv/pkg-descr b/x11-drivers/xf86-video-nv/pkg-descr
new file mode 100644
index 0000000..f7f0bab
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-nv driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
new file mode 100644
index 0000000..78ec8ce
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/nv_drv.la
+lib/xorg/modules/drivers/nv_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index b3e4d07..d01a28e 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-video-openchrome
-PORTVERSION=	0.2.904
-PORTREVISION=	3
+PORTVERSION=	0.3.0
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.openchrome.org/releases/
 
diff --git a/x11-drivers/xf86-video-openchrome/distinfo b/x11-drivers/xf86-video-openchrome/distinfo
index 98e6907..0a53c42 100644
--- a/x11-drivers/xf86-video-openchrome/distinfo
+++ b/x11-drivers/xf86-video-openchrome/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
+SHA256 (xorg/driver/xf86-video-openchrome-0.3.0.tar.bz2) = e2627bf247e7ef1dc1e6596f496be63ae61a8632a6dae84ac8de4c9003dc2a97
+SIZE (xorg/driver/xf86-video-openchrome-0.3.0.tar.bz2) = 517294
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
new file mode 100644
index 0000000..22efbf4
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	xf86-video-r128
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-r128/Makefile,v 1.11 2012/04/21 17:03:27 miwi Exp $
+#
+
+PORTNAME=	xf86-video-r128
+PORTVERSION=	6.8.4
+PORTREVISION=	3
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org r128 display driver
+
+USE_GL=		gl
+XORG_CAT=	driver
+USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
+MAN4=		r128.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
new file mode 100644
index 0000000..541af7b
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7
+SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364
diff --git a/x11-drivers/xf86-video-r128/pkg-descr b/x11-drivers/xf86-video-r128/pkg-descr
new file mode 100644
index 0000000..7fa7879
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/pkg-descr
@@ -0,0 +1,2 @@
+This package contains the X.Org xf86-video-r128 driver.
+
diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist
new file mode 100644
index 0000000..e599abd
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/r128_drv.la
+lib/xorg/modules/drivers/r128_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 72fdd37..a667d33 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-rendition
-PORTVERSION=	4.2.4
+PORTVERSION=	4.2.5
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
index 2b683b7..8686170 100644
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ b/x11-drivers/xf86-video-rendition/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
+SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
+SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 79bdb65..49b5d9b 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-s3
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
index 5b0ccdf..1dd127d 100644
--- a/x11-drivers/xf86-video-s3/distinfo
+++ b/x11-drivers/xf86-video-s3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
+SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39
+SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 2d0fa4a..9559341 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-s3virge
-PORTVERSION=	1.10.5
+PORTVERSION=	1.10.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
index 99c965b..8eabf45 100644
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ b/x11-drivers/xf86-video-s3virge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.5.tar.bz2) = 583b2d2982c2dd8b3c2d8f09c3cbca901c3cb844115ac99251ae6521560fac31
-SIZE (xorg/driver/xf86-video-s3virge-1.10.5.tar.bz2) = 348314
+SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e
+SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 7510229..8bbbe18 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-savage
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
index 6b54372..1732846 100644
--- a/x11-drivers/xf86-video-savage/distinfo
+++ b/x11-drivers/xf86-video-savage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
-SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252
+SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6
+SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 681fdd4..fb7cb9f 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
index 5707cf9..536d2c2 100644
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ b/x11-drivers/xf86-video-siliconmotion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610
+SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa
+SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 16f7899..9613221 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.3
+PORTVERSION=	0.10.7
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -20,8 +20,4 @@ XORG_CAT=	driver
 USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
 MAN4=		sis.4x
 
-post-patch:
-	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
-		${WRKSRC}/configure
-	
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
index 0b66a0d..7a8c42e 100644
--- a/x11-drivers/xf86-video-sis/distinfo
+++ b/x11-drivers/xf86-video-sis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
-SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750
+SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0
+SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
new file mode 100644
index 0000000..330882f
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xf86-video-tdfx
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-tdfx/Makefile,v 1.13 2012/04/21 17:03:29 miwi Exp $
+#
+
+PORTNAME=	xf86-video-tdfx
+PORTVERSION=	1.4.5
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tdfx display driver
+
+USE_GL=		gl
+
+XORG_CAT=	driver
+USE_XORG=	xf86driproto videoproto xextproto glproto
+MAN4=		tdfx.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo
new file mode 100644
index 0000000..c726ba6
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859
+SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623
diff --git a/x11-drivers/xf86-video-tdfx/pkg-descr b/x11-drivers/xf86-video-tdfx/pkg-descr
new file mode 100644
index 0000000..43f01e1
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-tdfx driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
new file mode 100644
index 0000000..97d1e6d
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tdfx_drv.la
+lib/xorg/modules/drivers/tdfx_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
new file mode 100644
index 0000000..d02be2d
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	xf86-video-tga
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-tga/Makefile,v 1.13 2012/04/21 17:03:29 miwi Exp $
+#
+
+PORTNAME=	xf86-video-tga
+PORTVERSION=	1.2.2
+PORTREVISION=	2
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tga display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo
new file mode 100644
index 0000000..d0af787
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131
+SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943
diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr
new file mode 100644
index 0000000..4b6648a
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the X.Org xf86-video-tga driver.
+
+WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist
new file mode 100644
index 0000000..342702c
--- /dev/null
+++ b/x11-drivers/xf86-video-tga/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tga_drv.la
+lib/xorg/modules/drivers/tga_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
new file mode 100644
index 0000000..f076566
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xf86-video-trident
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-trident/Makefile,v 1.13 2012/04/21 17:03:29 miwi Exp $
+#
+
+PORTNAME=	xf86-video-trident
+PORTVERSION=	1.3.6
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org trident display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto xf86dgaproto
+MAN4=		trident.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo
new file mode 100644
index 0000000..db131b8
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104
+SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092
diff --git a/x11-drivers/xf86-video-trident/pkg-descr b/x11-drivers/xf86-video-trident/pkg-descr
new file mode 100644
index 0000000..b8727f4
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-trident driver.
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
new file mode 100644
index 0000000..a2348ba
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/trident_drv.la
+lib/xorg/modules/drivers/trident_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
new file mode 100644
index 0000000..4cb4796
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	xf86-video-tseng
+# Date Created:				17 Feb 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-drivers/xf86-video-tseng/Makefile,v 1.13 2012/04/21 17:03:29 miwi Exp $
+#
+
+PORTNAME=	xf86-video-tseng
+PORTVERSION=	1.2.5
+PORTREVISION=	1
+CATEGORIES=	x11-drivers
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org tseng display driver
+
+XORG_CAT=	driver
+USE_XORG=	videoproto xextproto
+MAN4=		tseng.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo
new file mode 100644
index 0000000..c0ad1ad
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819
+SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575
diff --git a/x11-drivers/xf86-video-tseng/pkg-descr b/x11-drivers/xf86-video-tseng/pkg-descr
new file mode 100644
index 0000000..2956770
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/pkg-descr
@@ -0,0 +1 @@
+This package contains the X.Org xf86-video-tseng driver.
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
new file mode 100644
index 0000000..62decd9
--- /dev/null
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/tseng_drv.la
+lib/xorg/modules/drivers/tseng_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 5cc2a7d..008e865 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xf86-video-voodoo
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
index 20eff8e..cd1d29c 100644
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ b/x11-drivers/xf86-video-voodoo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
-SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
+SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8
+SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489
author	zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>	2012-07-30 07:27:05 +0800
committer	zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>	2012-07-30 07:27:05 +0800
commit	4c3ae772f44e37e99d6cae1be51d0b97c6116a35 (patch)
tree	b43655237fe74e9744828e8308e4606de8a9b5bf
parent	f983024626bbd4de6bc6948e21906ff7100e1169 (diff)
download	xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.gz xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.bz2 xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.lz xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.xz xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.tar.zst xorg-devel-ports-4c3ae772f44e37e99d6cae1be51d0b97c6116a35.zip