- Cleanup

git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@236 058c260c-8361-11dd-a0ac-aa2bafec7d09
author: miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> 2011-03-10 01:40:31 +0800
committer: miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> 2011-03-10 01:40:31 +0800
commit: 6fedf9a374de58685de001c1c7c89a9c5fd732a0 (patch)
tree: 4ffdd234a99b30c66bf31d43392baba1d6c0c01a
parent: e068131583dea29440897d77171f4e3163ec78e7 (diff)
download: xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.gz
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.bz2
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.lz
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.xz
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.zst
xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.zip
285 files changed, 0 insertions, 4519 deletions
diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
deleted file mode 100644
index 37b71cf..0000000
--- a/x11-drivers/input-wacom/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# New ports collection makefile for:	input-wacom
-# Date Created:				24 Oct 2008
-# Whom:					Dominic Fandrey <kamikaze@bsdforen.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	input-wacom
-PORTVERSION=	${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION=	6
-CATEGORIES=	x11-drivers kld
-MASTER_SITES=	http://www.chillt.de/bsdwacom/:bsdwacom \
-		SF/linuxwacom/linuxwacom/${WACOM_VERSION}:linuxwacom
-DISTFILES=	${BSDWACOM}.tbz:bsdwacom \
-		${LINUXWACOM}.tar.bz2:linuxwacom
-EXTRACT_ONLY=	${BSDWACOM}.tbz
-
-MAINTAINER=	kamikaze@bsdforen.de
-COMMENT=	X.Org Wacom tablet driver and kernel module
-
-MAN4=		wacom.4x
-MANCOMPRESSED=	yes
-
-USE_GMAKE=	yes
-USE_RC_SUBR=	wacom
-
-KMODDIR?=	/boot/modules
-XINPUTMODDIR=	lib/xorg/modules/input
-MAN4DIR=	man/man4
-WRKSRC=		${WRKDIR}
-
-PLIST_SUB+=	KMODDIR=${KMODDIR} \
-		XINPUTMODDIR=${XINPUTMODDIR} \
-		PORTTYPE=${PORTTYPE}
-SUB_LIST:=	${PLIST_SUB}
-SUB_FILES+=	pkg-message-${PORTTYPE}
-PKGMESSAGE=	${WRKDIR}/pkg-message-${PORTTYPE}
-
-XORG_CAT=	driver
-USE_XORG=	xi
-
-LINUXWACOM=	linuxwacom-${WACOM_VERSION}
-BSDWACOM=	bsdwacom-${KLD_VERSION}
-WACOM_VERSION=	0.8.2-2
-KLD_VERSION=	40
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800064
-OPTIONS=	UWACOMKLD "Install USB kernel module (not supported on 8.x)" Off
-.else
-OPTIONS=	UWACOMKLD "Install USB kernel module (not supported on 8.x)" On
-.endif
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_UWACOMKLD)
-.if ${OSVERSION} >= 800064
-BROKEN=		does not build with USB support
-.endif
-PLIST_SUB+=	UWACOMKLD="uwacom.ko"
-PORTTYPE=	usb
-.else
-PLIST_SUB+=	UWACOMKLD="@noinst UWACOMKLD uwacom.ko"
-PORTTYPE=	serial
-.endif
-
-do-configure:
-	@cd ${WRKDIR}/linuxwacom \
-		&& ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${LINUXWACOM}.tar.bz2 \
-		&& ${SETENV} ${MAKE_ENV} ./run_configure
-
-do-build:
-.if defined(WITH_UWACOMKLD)
-	@cd ${WRKDIR}/uwacom \
-		&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
-.endif
-	@cd ${WRKDIR}/linuxwacom/${LINUXWACOM} \
-		&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS}
-
-do-install:
-.if defined(WITH_UWACOMKLD)
-	@${MKDIR} ${KMODDIR}
-	@${INSTALL_KLD} ${WRKDIR}/uwacom/uwacom.ko ${KMODDIR}/
-.endif
-	@${MKDIR} ${PREFIX}/${XINPUTMODDIR} ${PREFIX}/${MAN4DIR}
-	@cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util/ \
-		&& ${SETENV} ${MAKE_ENV} ${GMAKE} install
-	@${INSTALL} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/xdrv/wacom_drv.so \
-		${PREFIX}/${XINPUTMODDIR}/
-	@${INSTALL_MAN} ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/wacom.4x.gz \
-		${PREFIX}/${MAN4DIR}/
-
-plist: clean configure
-	@${ECHO} "===>  Rebuilding PLIST."
-	@${TOUCH} ${PLIST}
-	@${RM} ${PLIST}
-	@cd ${WRKDIR}/linuxwacom \
-		&& ${SETENV} ${MAKE_ENV} PREFIX=${WRKDIR}/plist ./run_configure
-	@${MKDIR} ${WRKDIR}/plist
-	@cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util \
-		&& ${SETENV} ${MAKE_ENV} ${GMAKE} install
-	@cd ${WRKDIR}/linuxwacom \
-		&& ${SETENV} ${MAKE_ENV} ./run_configure
-	@${FIND} ${WRKDIR}/plist/ -not -type d \
-		| ${SED} "s|${WRKDIR}/plist/||1" \
-		>> ${PLIST}
-	@${FIND} -d ${WRKDIR}/plist/ -mindepth 2 -type d \
-		| ${SED} "s|${WRKDIR}/plist/|@dirrm |1" \
-		>> ${PLIST}
-	@${ECHO} "%%XINPUTMODDIR%%/wacom_drv.so" >> ${PLIST}
-	@${ECHO} "@dirrmtry %%XINPUTMODDIR%%" >> ${PLIST}
-	@${ECHO} "@cwd %%KMODDIR%%" >> ${PLIST}
-	@${ECHO} "%%UWACOMKLD%%" >> ${PLIST}
-
-post-install:
-	@${ECHO} "===>  Displaying pkg-message."
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/input-wacom/distinfo b/x11-drivers/input-wacom/distinfo
deleted file mode 100644
index fb26328..0000000
--- a/x11-drivers/input-wacom/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (xorg/driver/bsdwacom-40.tbz) = 022a5225cca8bbf3af1014d32d5c12de
-SHA256 (xorg/driver/bsdwacom-40.tbz) = 42c37d321768ff29fef10eb088a87a83c94753a1b4ae5f92fd453781039a5df9
-SIZE (xorg/driver/bsdwacom-40.tbz) = 19305
-MD5 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = bdfaf6da49b446e251ac1f98754a89a2
-SHA256 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1d3b8dc397510309b14239291781135af0c4fab99907d8e0b8aad95465390733
-SIZE (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1098067
diff --git a/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure b/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
deleted file mode 100644
index 2f4dccc..0000000
--- a/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- linuxwacom/run_configure.orig	2009-01-21 11:26:52.000000000 +0100
-+++ linuxwacom/run_configure	2009-01-21 11:27:00.000000000 +0100
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # $Id: run_configure 40 2008-12-26 01:08:35Z undo $
- 
--LINUXWACOM=0.8.2
-+LINUXWACOM=0.8.2-2
- 
- rm -rf linuxwacom-${LINUXWACOM}
- tar xf linuxwacom-${LINUXWACOM}.tar.bz2
-@@ -14,5 +14,5 @@
- cp files/types.h linuxwacom-${LINUXWACOM}/src/xdrv/asm
- cp files/input.h linuxwacom-${LINUXWACOM}/src/xdrv/linux
- cd linuxwacom-${LINUXWACOM}
--./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include"
-+./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include -DWCM_XORG_XSERVER_1_6=true"
diff --git a/x11-drivers/input-wacom/files/pkg-message-serial.in b/x11-drivers/input-wacom/files/pkg-message-serial.in
deleted file mode 100644
index f64f53d..0000000
--- a/x11-drivers/input-wacom/files/pkg-message-serial.in
+++ /dev/null
@@ -1,12 +0,0 @@
-To setup the wacom driver for X run the following commands as the root user:
-# %%PREFIX%%/etc/rc.d/wacom onesetup
-
-Now open your xorg.conf file and check weather the correct serial device
-was chosen. If you are using a USB to serial converter you might have
-to change it to cuaUX.
-
-You can clean up the Xorg configuration by running the following command
-before deinstalling:
-# %%PREFIX%%/etc/rc.d/wacom onecleanup
-
-Now (re)plug in your tablet and restart X.
diff --git a/x11-drivers/input-wacom/files/pkg-message-usb.in b/x11-drivers/input-wacom/files/pkg-message-usb.in
deleted file mode 100644
index fdf3c41..0000000
--- a/x11-drivers/input-wacom/files/pkg-message-usb.in
+++ /dev/null
@@ -1,16 +0,0 @@
-To setup the wacom driver for X and start the kernel module upon boot
-run the following commands as the root user:
-
-# echo 'wacom_enable="YES"' >> /etc/rc.conf
-# %%PREFIX%%/etc/rc.d/wacom setup
-
-You can unload the driver and clean up the Xorg configuration by
-running the following lines before deinstalling:
-# %%PREFIX%%/etc/rc.d/wacom cleanup
-# %%PREFIX%%/etc/rc.d/wacom stop
-
-To activate the driver without rebooting run:
-
-# %%PREFIX%%/etc/rc.d/wacom start
-
-Now (re)plug in your tablet and restart X.
diff --git a/x11-drivers/input-wacom/files/wacom.in b/x11-drivers/input-wacom/files/wacom.in
deleted file mode 100644
index b4264db..0000000
--- a/x11-drivers/input-wacom/files/wacom.in
+++ /dev/null
@@ -1,433 +0,0 @@
-#!/bin/sh 
-
-# PROVIDE: wacom
-# REQUIRE: FILESYSTEMS
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# wacom_enable (bool):		Set to NO by default.
-#				Set it to YES to enable wacom.
-# wacom_types (list):		Set to "stylus eraser cursor pad touch" by
-#				default. A list of wacom profiles to set up.
-# wacom_porttype (enum):	Set to "%%PORTTYPE%%" by default.
-#				Set this to usb or serial.
-#
-# This script additionally offers setup and cleanup to configure Xorg
-# for use of the driver or remove the configuration settings.
-# The input devices are only added to the first ServerLayout section
-# and also only removed once.
-# In USB mode the file /boot/loader.conf is also adjusted.
-#
-
-. /etc/rc.subr
-
-name="wacom"
-rcvar=${name}_enable
-
-extra_commands="setup cleanup"
-setup_cmd=do_setup
-start_cmd=do_start
-stop_cmd=do_stop
-cleanup_cmd=do_cleanup
-
-#
-# Outputs the location of the Xorg configuration file.
-# Returns 1 if no file could be found.
-#
-get_xorg_conf() {
-	local config_locations config
-
-	# Possible Xorg configuration file locations, taken from the
-	# xorg.conf(5) manual page.
-	config_locations="
-/etc/X11/$XORGCONFIG
-%%PREFIX%%/etc/X11/$XORGCONFIG
-/etc/X11/xorg.conf-4
-/etc/X11/xorg.conf
-/etc/xorg.conf
-%%PREFIX%%/etc/X11/xorg.conf.$HOST
-%%PREFIX%%/etc/X11/xorg.conf-4
-%%PREFIX%%/etc/X11/xorg.conf
-%%PREFIX%%/lib/X11/xorg.conf.$HOST
-%%PREFIX%%/lib/X11/xorg.conf-4
-%%PREFIX%%/lib/X11/xorg.conf
-NONE
-"
-
-	# Find the first matching config file.
-	for config in $config_locations; {
-		test -f "$config" && break
-	}
-
-	if [ "$config" = "NONE" ]; then
-		echo "No Xorg configuration has been found." 1>&2
-		return 1
-	fi
-
-	echo "$config"
-	return 0
-}
-
-#
-# Returns the line number of the first line matching the extended regular
-# expression $2 in the file $1.
-#
-# @param $1
-#	The file to get the line number from.
-# @param $2
-#	An extend regular expression.
-# @stdout
-#	The line number of the first line matching $2.
-#
-get_first() {
-	local result IFS
-	IFS='
-'
-	result="$(/usr/bin/grep -Ein "$2" "$1")"
-	result="${result%%:*}"
-
-	# No match.
-	if [ -z "$result" ]; then
-		return 1
-	fi
-
-	echo "$result"
-	return 0
-}
-
-#
-# Returns the line numbers of lines matching the extended regular
-# expression $2 in the file $1.
-#
-# @param $1
-#	The file to get the line numbers from.
-# @param $2
-#	An extend regular expression.
-# @stdout
-#	The line numbers of lines matching $2.
-#
-get_all() {
-	local entry result IFS
-	IFS='
-'
-
-	result="$(/usr/bin/grep -Ein "$2" "$1")"
-
-	# No match.
-	if [ -z "$result" ]; then
-		return 1
-	fi
-
-	for entry in $result; {
-		echo "${entry%%:*}"
-	}
-}
-
-#
-# Returns the line number of the line before line number $2 that matches the
-# extended regular expression $3 in the file $1.
-#
-# @param $1
-#	The file to get the line number from.
-# @param $2
-#	The line before which the expression should match.
-# @param $3
-#	An extend regular expression.
-# @stdout
-#	The line number of the first line before line $2 matching $3.
-#
-get_before() {
-	local result IFS line length
-	IFS='
-'
-
-	# The length is necessary to make sure the check is run once
-	# again for the last match.
-	length="$(/usr/bin/wc -l "$1")"
-	length=${length% *}
-
-	result=-1
-	for line in $(/usr/bin/grep -Ein "$3" "$1") $(($length + 1)); {
-		line="${line%%:*}"
-
-		# We have passed the line to look for.
-		if [ $line -ge $2 ]; then
-
-			# No match before this line.
-			if [ $result -lt 0 ]; then
-				return 1
-			fi
-
-			echo "$result"
-			return 0
-		fi
-
-		result=$line
-	}
-
-	# No result.
-	return 1
-}
-
-#
-# Returns the line number of the line behind line number $2 that matches the
-# extended regular expression $3 in the file $1.
-#
-# @param $1
-#	The file to get the line number from.
-# @param $2
-#	The line behind which the expression should match.
-# @param $3
-#	An extend regular expression.
-# @stdout
-#	The line number of the first line behind line $2 matching $3.
-#
-get_behind() {
-	local IFS line
-	IFS='
-'
-
-	for line in $(/usr/bin/grep -Ein "$3" "$1"); {
-		line="${line%%:*}"
-
-		# We have passed the line to look for.
-		if [ $line -gt $2 ]; then
-			echo "$line"
-			return 0
-		fi
-	}
-
-	# No result.
-	return 1
-}
-
-#
-# Inserts a line at the end of a section of an Xorg configuration file.
-# The insertion is done on all matching sections!
-#
-section_insert_line() {
-	local file section insert sections begin end length
-	file="$1"
-	section="$2"
-	insert="$3"
-
-	# Find the beginning of the section.
-	# Start with the last section to avoid moving sections around
-	# before something is inserted into them.
-	sections="$(get_all "$file" \
-		"^[[:space:]]*Section[[:space:]]+\"$section\"" \
-		| /usr/bin/sort -nr
-	)"
-
-	if [ -z "$sections" ]; then
-		echo "Identifying section $section has failed." 1>&2
-		return 1
-	fi
-
-	for begin in $sections; {
-
-		# Find the end of the section.
-		end="$(get_behind "$file" "$begin" "^[[:space:]]*EndSection")"
-
-		if [ -z "$end" ]; then
-			echo "The section $section($begin) is not closed." 1>&2
-			return 2
-		fi
-
-		# Determine the length of the configuration file.
-		length="$(/usr/bin/wc -l "$file")"
-		length=${length% *}
-
-		# Insert the line.
-		/bin/cp "$file" "$file.$$"
-
-		/usr/bin/head -n$(($end - 1)) "$file.$$" > "$file"
-		echo "$insert" >> "$file"
-		/usr/bin/tail -n$(($length - $end + 1)) "$file.$$" >> "$file"
-	
-		/bin/rm "$file.$$"
-	}
-}
-
-#
-# Adds the necessary lines to the Xorg configuration.
-#
-do_setup() {
-	local config ident status
-
-	# Get the Xorg configuration file.
-	config="$(get_xorg_conf)"
-	status=$?
-	test $status -ne 0 && return $status
-
-	echo "Setting up configuration in $config."
-
-	# Add all the necessary sections.
-	for ident in $(eval "echo \${${name}_types}"); {
-		if /usr/bin/grep -Eqi "^[[:space:]]*Identifier[[:space:]]+\"$ident\"" "$config"; then
-			echo "Skipping $ident, because it already exists in $config."
-			continue
-		fi
-
-		echo "Inserting $ident."
-
-		echo "Section \"InputDevice\"
-	Driver		\"wacom\"
-	Identifier	\"$ident\"
-	Option		\"Type\"	\"$ident\"" >> "$config"
-
-	if [ "$(eval "echo \${${name}_porttype}")" = "usb" ]; then
-		echo "	Option		\"Device\"	\"/dev/event0\"
-	Option		\"USB\"		\"on\"" >> "$config"
-	else
-		echo "	Option		\"Device\"	\"/dev/ttyd0\"
-	Option		\"ForceDevice\"	\"ISDV4\"" >> "$config"
-	fi
-
-	echo "EndSection
-" >> "$config"
-
-		section_insert_line "$config" "ServerLayout" "	InputDevice	\"$ident\"	\"SendCoreEvents\""
-	}
-
-	if [ "$(eval "echo \${${name}_porttype}")" = "usb" ]; then
-		if ! /usr/bin/grep -qx 'uwacom_load="YES"' \
-			/boot/loader.conf; then
-			echo "Setting up /boot/loader.conf"
-			/bin/cp /boot/loader.conf /boot/loader.conf.orig
-			echo 'uwacom_load="YES"' >> /boot/loader.conf
-		fi
-	fi
-}
-
-#
-# Removes all wacom stuff from the Xorg configuration file. Beware,
-# this also affects handwritten content.
-#
-do_cleanup() {
-	local config status driver i begin last_begin end length ident IFS
-
-	# Get the Xorg configuration file.
-	config="$(get_xorg_conf)"
-	status=$?
-	test $status -ne 0 && return $status
-
-	echo "Removing wacom entries from $config."
-
-	IFS='
-'
-	while true; do
-		# Find a wacom section.
-		driver="$(get_first "$config" \
-			"^[[:space:]]*Driver[[:space:]]+\"wacom\"" \
-		)"
-
-		# Not a numeric, no more wacom sections left.
-		test -z "$driver" && break
-
-		# Find the beginning of the section.
-		begin="$(get_before "$config" "$driver" \
-			"^[[:space:]]*Section[[:space:]]+\"InputDevice\"" \
-		)"
-
-		if [ -z "$begin" ]; then
-			echo "Beginning of wacom driver section" \
-				"could not be found!" 1>&2
-			return 1
-		fi
-
-		# Find the end of the section.
-		end="$(get_behind "$config" "$driver" \
-			"^[[:space:]]*EndSection" \
-		)"
-
-		if [ -z "$end" ]; then
-			echo "The Wacom driver section is" \
-				"not closed properly." 1>&2
-			return 2
-		fi
-
-		# Determine the length of the configuration file.
-		length="$(/usr/bin/wc -l "$config")"
-		length=${length% *}
-
-		# Adjust the end by trailing newlines.
-		while [ $end -lt $length -a \
-			-z "$(/usr/bin/tail -n$(($length - $end)) "$config" \
-			| /usr/bin/head -n1)" ]; do
-			end=$(($end + 1))
-		done
-
-		# Remove the section.
-		/bin/cp "$config" "$config.$$"
-
-		/usr/bin/head -n$(($begin - 1)) "$config.$$" > "$config"
-		/usr/bin/tail -n$(($length - $end)) "$config.$$" >> "$config"
-	
-		/bin/rm "$config.$$"
-	done
-	IFS='	 
-'
-
-	echo "Cleaning up ServerLayout section."
-
-	for ident in $(eval "echo \${${name}_types}"); {
-		while true; do
-		driver="$(get_first "$config" \
-			"[[:space:]]*InputDevice[[:space:]]+\"$ident\"" \
-		)"
-
-		# There is no line matching this driver.
-		test -z "$driver" && break 
-
-		# Determine the length of the configuration file.
-		length="$(/usr/bin/wc -l "$config")"
-		length=${length% *}
-
-		# Remove the section.
-		/bin/cp "$config" "$config.$$"
-
-		/usr/bin/head -n$(($driver - 1)) "$config.$$" > "$config"
-		/usr/bin/tail -n$(($length - $driver)) "$config.$$" >> "$config"
-	
-		/bin/rm "$config.$$"
-		done
-	}
-
-	if [ "$(eval "echo \${${name}_porttype}")" = "usb" ]; then
-		if /usr/bin/grep -qx 'uwacom_load="YES"' \
-			/boot/loader.conf; then
-			echo "Cleaning up /boot/loader.conf"
-			/bin/cp /boot/loader.conf /boot/loader.conf.orig
-			/usr/bin/grep -xv 'uwacom_load="YES"' \
-				/boot/loader.conf.orig > /boot/loader.conf
-		fi
-	fi
-
-}
-
-do_start() {
-	if /sbin/kldstat | /usr/bin/grep -q uwacom; then
-		return 0
-	fi
-	echo "Starting ${name}."
-	/sbin/kldload %%KMODDIR%%/uwacom.ko
-}
-
-do_stop() {
-	if ! /sbin/kldstat | /usr/bin/grep -q uwacom; then
-		echo "${name} is not running."
-		return 0
-	fi
-	echo "Stopping ${name}."
-	/sbin/kldunload %%KMODDIR%%/uwacom.ko
-}
-
-load_rc_config $name
-
-eval ": \${${name}_enable=\"NO\"}"
-eval ": \${${name}_types=\"stylus eraser cursor pad touch\"}"
-eval ": \${${name}_porttype=\"%%PORTTYPE%%\"}"
-
-run_rc_command "$1"
diff --git a/x11-drivers/input-wacom/pkg-descr b/x11-drivers/input-wacom/pkg-descr
deleted file mode 100644
index 228b6cf..0000000
--- a/x11-drivers/input-wacom/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-This package contains the X.Org linuxwacom driver, a Wacom kernel module
-and a script to configure Xorg.
-
-The kernel module is provided by Bartosz Fabianowski <freebsd@chillt.de> and
-supports the following devices:
-	Graphire*, Graphire2*, Graphire3, Graphire4
-	Bamboo, Bamboo One*, Bamboo Fun
-	Intuos3, Cintiq 21UX
-	Volito*, Volito2*
-	PenStation2*, PenPartner2*
-
-* not tested
-
-WWW: http://linuxwacom.sourceforge.net/
diff --git a/x11-drivers/input-wacom/pkg-plist b/x11-drivers/input-wacom/pkg-plist
deleted file mode 100644
index c47a60d..0000000
--- a/x11-drivers/input-wacom/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-lib/libwacomcfg.so.0
-lib/libwacomcfg.so
-lib/libwacomcfg.la
-lib/libwacomcfg.a
-bin/wacdump
-bin/xidump
-bin/xsetwacom
-include/wacomcfg/wacomcfg.h
-@dirrm include/wacomcfg
-%%XINPUTMODDIR%%/wacom_drv.so
-@dirrmtry %%XINPUTMODDIR%%
-@cwd %%KMODDIR%%
-%%UWACOMKLD%%
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
deleted file mode 100644
index 6282853..0000000
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-input-acecad
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-acecad
-PORTVERSION=	1.4.0
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org acecad input driver
-
-XORG_CAT=	driver
-MAN4=		acecad.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo
deleted file mode 100644
index c4f044b..0000000
--- a/x11-drivers/xf86-input-acecad/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 51247dc0d73185e35bec326283bc49a5
-SHA256 (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
-SIZE (xorg/driver/xf86-input-acecad-1.4.0.tar.bz2) = 255888
diff --git a/x11-drivers/xf86-input-acecad/pkg-descr b/x11-drivers/xf86-input-acecad/pkg-descr
deleted file mode 100644
index ceb6161..0000000
--- a/x11-drivers/xf86-input-acecad/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-acecad driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
deleted file mode 100644
index bece9a4..0000000
--- a/x11-drivers/xf86-input-acecad/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/acecad_drv.la
-lib/xorg/modules/input/acecad_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile
deleted file mode 100644
index be7a630..0000000
--- a/x11-drivers/xf86-input-citron/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-input-citron
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-citron
-PORTVERSION=	2.2.2
-PORTREVISION=	3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org citron input driver
-
-XORG_CAT=	driver
-MAN4=		citron.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-citron/distinfo b/x11-drivers/xf86-input-citron/distinfo
deleted file mode 100644
index 3866088..0000000
--- a/x11-drivers/xf86-input-citron/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-citron-2.2.2.tar.bz2) = 8cad35da16ea4688ebb74533ccc7f190
-SHA256 (xorg/driver/xf86-input-citron-2.2.2.tar.bz2) = 6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf
-SIZE (xorg/driver/xf86-input-citron-2.2.2.tar.bz2) = 255920
diff --git a/x11-drivers/xf86-input-citron/pkg-descr b/x11-drivers/xf86-input-citron/pkg-descr
deleted file mode 100644
index f6f6d69..0000000
--- a/x11-drivers/xf86-input-citron/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-citron driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-citron/pkg-plist b/x11-drivers/xf86-input-citron/pkg-plist
deleted file mode 100644
index 5505ae7..0000000
--- a/x11-drivers/xf86-input-citron/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/citron_drv.la
-lib/xorg/modules/input/citron_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
deleted file mode 100644
index 48901c3..0000000
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-input-elographics
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-elographics
-PORTVERSION=	1.2.4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org elographics input driver
-
-XORG_CAT=	driver
-MAN4=		elographics.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo
deleted file mode 100644
index 8de17ce..0000000
--- a/x11-drivers/xf86-input-elographics/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = dfede47c14c40e51294c84bf8f9bec5f5e0b17c80f370ae2ac6bddad79f9e66b
-SIZE (xorg/driver/xf86-input-elographics-1.2.4.tar.bz2) = 259101
diff --git a/x11-drivers/xf86-input-elographics/pkg-descr b/x11-drivers/xf86-input-elographics/pkg-descr
deleted file mode 100644
index c941465..0000000
--- a/x11-drivers/xf86-input-elographics/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-elographics driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
deleted file mode 100644
index b6f57b1..0000000
--- a/x11-drivers/xf86-input-elographics/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/elographics_drv.la
-lib/xorg/modules/input/elographics_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
deleted file mode 100644
index 6f81064..0000000
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-input-fpit
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-fpit
-PORTVERSION=	1.3.0
-PORTREVISION=	3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org fpit input driver
-
-XORG_CAT=	driver
-USE_XORG=	xrandr
-
-MAN4=		fpit.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo
deleted file mode 100644
index 245c323..0000000
--- a/x11-drivers/xf86-input-fpit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = e5bfda480f25121e3c4222e5e1eb5880
-SHA256 (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8
-SIZE (xorg/driver/xf86-input-fpit-1.3.0.tar.bz2) = 243747
diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr
deleted file mode 100644
index 28985ef..0000000
--- a/x11-drivers/xf86-input-fpit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-fpit driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
deleted file mode 100644
index 988bba8..0000000
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/fpit_drv.la
-lib/xorg/modules/input/fpit_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
deleted file mode 100644
index 5a13b52..0000000
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-input-hyperpen
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-hyperpen
-PORTVERSION=	1.3.0
-PORTREVISION=	5
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org hyperpen input driver
-
-XORG_CAT=	driver
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo
deleted file mode 100644
index 37722c9..0000000
--- a/x11-drivers/xf86-input-hyperpen/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = c50d0da3206d18d9d94f720e3688eca5
-SHA256 (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
-SIZE (xorg/driver/xf86-input-hyperpen-1.3.0.tar.bz2) = 236593
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-descr b/x11-drivers/xf86-input-hyperpen/pkg-descr
deleted file mode 100644
index 30e7b36..0000000
--- a/x11-drivers/xf86-input-hyperpen/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-hyperpen driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
deleted file mode 100644
index 59dc017..0000000
--- a/x11-drivers/xf86-input-hyperpen/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/hyperpen_drv.la
-lib/xorg/modules/input/hyperpen_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
deleted file mode 100644
index f58f182..0000000
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	xf86-input-joystick
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD: ports/x11-drivers/xf86-input-joystick/Makefile,v 1.10 2010/05/07 03:37:44 miwi Exp $
-#
-
-PORTNAME=	xf86-input-joystick
-PORTVERSION=	1.5.0
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org joystick input driver
-
-XORG_CAT=	driver
-
-MAN4=		joystick.4x
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo
deleted file mode 100644
index 9be3820..0000000
--- a/x11-drivers/xf86-input-joystick/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 79b20f86d1b2e625ae65e35c3457027f
-SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
-SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763
diff --git a/x11-drivers/xf86-input-joystick/pkg-descr b/x11-drivers/xf86-input-joystick/pkg-descr
deleted file mode 100644
index cfcfc76..0000000
--- a/x11-drivers/xf86-input-joystick/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-joystick driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
deleted file mode 100644
index 1a0ab46..0000000
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-include/xorg/joystick-properties.h
-lib/xorg/modules/input/joystick_drv.la
-lib/xorg/modules/input/joystick_drv.so
-libdata/pkgconfig/xorg-joystick.pc
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
deleted file mode 100644
index 3a5205d..0000000
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-input-keyboard
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.5.0
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org keyboard input driver
-
-XORG_CAT=	driver
-USE_XORG=	kbproto
-MAN4=		kbd.4x
-
-.include <bsd.port.mk>
-
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
deleted file mode 100644
index b484e1c..0000000
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 2303510e905465ebee91f22cdd75706a15afb108258bc220c7500f213de19cb0
-SIZE (xorg/driver/xf86-input-keyboard-1.5.0.tar.bz2) = 301181
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c b/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
deleted file mode 100644
index 4a24423..0000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/at_scancode.c.orig	Sun Jul  3 09:01:35 2005
-+++ src/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 */
-@@ -103,6 +107,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-drivers/xf86-input-keyboard/pkg-descr b/x11-drivers/xf86-input-keyboard/pkg-descr
deleted file mode 100644
index 0ee3dcb..0000000
--- a/x11-drivers/xf86-input-keyboard/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-keyboard driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
deleted file mode 100644
index 7e9f47e..0000000
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/kbd_drv.la
-lib/xorg/modules/input/kbd_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
deleted file mode 100644
index 29727d1..0000000
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	xf86-input-magictouch
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-magictouch
-PORTVERSION=	1.0.0.5
-PORTREVISION=	7
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org magictouch input driver
-
-IGNORE=		needs xf86_ansic.h which doesn't exist with recent xserver
-
-XORG_CAT=	driver
-MAN4=		magictouch.4x
-USE_AUTOTOOLS=	libtool
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/distinfo b/x11-drivers/xf86-input-magictouch/distinfo
deleted file mode 100644
index 3062800..0000000
--- a/x11-drivers/xf86-input-magictouch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = d23f2791cd634ef85b7cc5e9da8f8407
-SHA256 (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 9cedc831e9d86889f473fbe3b8f1478afe5ed8c0dd71492aeb896cc681d7444c
-SIZE (xorg/driver/xf86-input-magictouch-1.0.0.5.tar.bz2) = 218289
diff --git a/x11-drivers/xf86-input-magictouch/pkg-descr b/x11-drivers/xf86-input-magictouch/pkg-descr
deleted file mode 100644
index b3eb245..0000000
--- a/x11-drivers/xf86-input-magictouch/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-input-magictouch driver.
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
deleted file mode 100644
index c9dff92..0000000
--- a/x11-drivers/xf86-input-magictouch/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/xorg/modules/input/magictouch_drv.a
-lib/xorg/modules/input/magictouch_drv.la
-lib/xorg/modules/input/magictouch_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
deleted file mode 100644
index 319e96c..0000000
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-input-mouse
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-mouse
-PORTVERSION=	1.6.0
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org mouse input driver
-
-XORG_CAT=	driver
-MAN4=		mousedrv.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo
deleted file mode 100644
index d4f66ba..0000000
--- a/x11-drivers/xf86-input-mouse/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = c7ae245e5168276346145f196d1d1faed618f41d5174a2031c71fab6e1a2fbdb
-SIZE (xorg/driver/xf86-input-mouse-1.6.0.tar.bz2) = 316953
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
deleted file mode 100644
index b1da04c..0000000
--- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c
+++ /dev/null
@@ -1,250 +0,0 @@
---- 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 @@
- static const char *FindDevice(InputInfoPtr, const char *, int);
- 
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106)
-+#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"
- 
- static const char *mouseDevs[] = {
- 	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 @@
- #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 |
-+#endif
-+	MSE_AUTO | MSE_MISC;
- #else
-     return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
- #endif
-@@ -179,10 +187,31 @@
- 	{ MOUSE_PROTO_THINK,		"ThinkingMouse" },
- 	{ MOUSE_PROTO_SYSMOUSE,		"SysMouse" }
- };
--	
-+
-+#ifdef XPS2_SUPPORT
-+static struct {
-+	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" },
-+};
-+#endif
-+
- static const char *
- SetupAuto(InputInfoPtr pInfo, int *protoPara)
- {
-+#ifdef XPS2_SUPPORT
-+    char *dev;
-+#endif
-+    const char *proto;
-     int i;
-     mousehw_t hw;
-     mousemode_t mode;
-@@ -190,10 +219,16 @@
-     if (pInfo->fd == -1)
- 	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;
-+    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;
-+#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;
-+			}
-+#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;
- 	    }
- 	}
-     }
-@@ -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;
-     } else
--	mode.level = -1;
--#else
--    mode.level = -1;
- #endif
-+    mode.level = -1;
-     ioctl(pInfo->fd, MOUSE_SETMODE, &mode);
- }
- #endif
- 
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
--
--#define MOUSED_PID_FILE "/var/run/moused.pid"
--
- /*
-  * Try to check if moused is running.  DEFAULT_SYSMOUSE_DEV is useless without
-- * it.  There doesn't seem to be a better way of checking.
-+ * it.  Also, try to check if the device is used by moused.  If it is opened
-+ * by moused, we do not want to use it directly.  There doesn't seem to be
-+ * a better way of checking.
-  */
- static Bool
--MousedRunning(void)
-+MousedRunning(const char *dev)
- {
-+    char cmd[128];
-     FILE *f = NULL;
--    unsigned int pid;
-+    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 (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");
-+    if ((f = popen(cmd, "r")) != NULL) {
-+	if (fscanf(f, "%u", &i) == 1 && i > 0) {
-+	    pclose(f);
-+	    return TRUE;
- 	}
--	fclose(f);
-+	pclose(f);
-     }
-     return FALSE;
- }
-@@ -276,17 +320,17 @@
- static const char *
- FindDevice(InputInfoPtr pInfo, const char *protocol, int flags)
- {
--    int fd = -1;
-+    int ret = -1;
-     const char **pdev, *dev = NULL;
-     Bool devMouse = FALSE;
-     struct stat devMouseStat;
-     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) {
- #ifdef DEBUG
--	    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 {
--#ifdef DEBUG
--	    	    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 @@
-     p->CheckProtocol = CheckProtocol;
- #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
-     p->SetupAuto = SetupAuto;
-+#ifndef XPS2_SUPPORT
-     p->SetPS2Res = SetSysMouseRes;
-+#endif
-     p->SetBMRes = SetSysMouseRes;
-     p->SetMiscRes = SetSysMouseRes;
- #endif
diff --git a/x11-drivers/xf86-input-mouse/pkg-descr b/x11-drivers/xf86-input-mouse/pkg-descr
deleted file mode 100644
index c45fe40..0000000
--- a/x11-drivers/xf86-input-mouse/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-mouse driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
deleted file mode 100644
index dd465f1..0000000
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/mouse_drv.la
-lib/xorg/modules/input/mouse_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
deleted file mode 100644
index de56832..0000000
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-input-mutouch
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-mutouch
-PORTVERSION=	1.2.1
-PORTREVISION=	6
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org mutouch input driver
-
-XORG_CAT=	driver
-MAN4=		mutouch.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo
deleted file mode 100644
index f0c1f7a..0000000
--- a/x11-drivers/xf86-input-mutouch/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = f28998cdfae2a4c41589299a4ee1f459
-SHA256 (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
-SIZE (xorg/driver/xf86-input-mutouch-1.2.1.tar.bz2) = 246240
diff --git a/x11-drivers/xf86-input-mutouch/pkg-descr b/x11-drivers/xf86-input-mutouch/pkg-descr
deleted file mode 100644
index e3d06cc..0000000
--- a/x11-drivers/xf86-input-mutouch/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-mutouch driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
deleted file mode 100644
index b3ef9f3..0000000
--- a/x11-drivers/xf86-input-mutouch/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/mutouch_drv.la
-lib/xorg/modules/input/mutouch_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-penmount/CVS/Entries b/x11-drivers/xf86-input-penmount/CVS/Entries
deleted file mode 100644
index 036e3ed..0000000
--- a/x11-drivers/xf86-input-penmount/CVS/Entries
+++ /dev/null
@@ -1,5 +0,0 @@
-/Makefile/1.7/Sun Feb  7 15:25:25 2010//
-/distinfo/1.4/Sat Apr  4 04:03:57 2009//
-/pkg-descr/1.1/Sat May 19 20:28:42 2007//
-/pkg-plist/1.1/Sat May 19 20:28:42 2007//
-D
diff --git a/x11-drivers/xf86-input-penmount/CVS/Repository b/x11-drivers/xf86-input-penmount/CVS/Repository
deleted file mode 100644
index 24eac90..0000000
--- a/x11-drivers/xf86-input-penmount/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-ports/x11-drivers/xf86-input-penmount
diff --git a/x11-drivers/xf86-input-penmount/CVS/Root b/x11-drivers/xf86-input-penmount/CVS/Root
deleted file mode 100644
index 2e761ea..0000000
--- a/x11-drivers/xf86-input-penmount/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-/home/pcvs
diff --git a/x11-drivers/xf86-input-penmount/CVS/Template b/x11-drivers/xf86-input-penmount/CVS/Template
deleted file mode 100644
index 7233214..0000000
--- a/x11-drivers/xf86-input-penmount/CVS/Template
+++ /dev/null
@@ -1,21 +0,0 @@
-
-PR:		
-Submitted by:	
-Reviewed by:	
-Approved by:	
-Obtained from:	
-MFC after:	
-Security:	
-Feature safe:	
-CVS: ----------------------------------------------------------------------
-CVS: PR:              Fill this in if a GNATS PR is affected by the change.
-CVS: Submitted by:    Fill this in if someone else sent in the change.
-CVS: Reviewed by:     Fill this in if someone else reviewed your modification.
-CVS: Approved by:     Fill this in if you needed approval for this commit.
-CVS: Obtained from:   Fill this in if the change is from third party software.
-CVS: MFC after:       N [day[s]|week[s]|month[s]]
-CVS:	Fill in to get MFC notification later. (days assumed unless specified)
-CVS: Security:        vulnerability reference or description
-CVS:	If the change is related to a security vulnerability, include one or
-CVS:	more references (e.g. CVE names, VuXML IDs, URLs) or a description
-CVS:	of the issue.  Please use one `Security:' entry per reference.
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
deleted file mode 100644
index 90520a2..0000000
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-input-penmount
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-penmount
-PORTVERSION=	1.4.1
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org penmount input driver
-
-XORG_CAT=	driver
-MAN4=		penmount.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo
deleted file mode 100644
index 56cfcda..0000000
--- a/x11-drivers/xf86-input-penmount/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = e5984e43ce31d45659eb6ee91c02aba5
-SHA256 (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
-SIZE (xorg/driver/xf86-input-penmount-1.4.1.tar.bz2) = 255951
diff --git a/x11-drivers/xf86-input-penmount/pkg-descr b/x11-drivers/xf86-input-penmount/pkg-descr
deleted file mode 100644
index fe0bbbe..0000000
--- a/x11-drivers/xf86-input-penmount/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-penmount driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
deleted file mode 100644
index a48eb14..0000000
--- a/x11-drivers/xf86-input-penmount/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/penmount_drv.la
-lib/xorg/modules/input/penmount_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
deleted file mode 100644
index b251bd5..0000000
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:	xf86-input-synaptics
-# Date Created:				25 Sep 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.2.1
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org synaptics input driver
-
-CONFLICTS=	synaptics-[0-9]*
-
-USE_GNOME=	gnomehack
-USE_XORG=	x11
-XORG_CAT=	driver
-
-MAN1=		syndaemon.1 \
-		synclient.1
-MAN4=		synaptics.4x
-
-post-install:
-	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
-	${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
-		${PREFIX}/share/hal/fdi/policy/10osvendor/
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
deleted file mode 100644
index 1024acd..0000000
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
-SIZE (xorg/driver/xf86-input-synaptics-1.2.1.tar.bz2) = 295524
diff --git a/x11-drivers/xf86-input-synaptics/files/patch-configure b/x11-drivers/xf86-input-synaptics/files/patch-configure
deleted file mode 100644
index aa413d6..0000000
--- a/x11-drivers/xf86-input-synaptics/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2009-04-25 14:02:33.000000000 -0500
-+++ configure	2009-04-25 14:02:34.000000000 -0500
-@@ -21128,7 +21128,7 @@
- $as_echo "yes" >&6; }
- 	:
- fi
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir="${prefix}/include/xorg"
- 
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/x11-drivers/xf86-input-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr
deleted file mode 100644
index 6d29e1b..0000000
--- a/x11-drivers/xf86-input-synaptics/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-synaptics driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
deleted file mode 100644
index 7fa2267..0000000
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/synclient
-bin/syndaemon
-include/xorg/synaptics-properties.h
-include/xorg/synaptics.h
-lib/xorg/modules/input/synaptics_drv.la
-lib/xorg/modules/input/synaptics_drv.so
-libdata/pkgconfig/xorg-synaptics.pc
-share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
-@dirrmtry include/xorg
-@dirrmtry share/hal/fdi/policy/10osvendor
-@dirrmtry share/hal/fdi/policy
-@dirrmtry share/hal/fdi
-@dirrmtry share/hal
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
deleted file mode 100644
index 78cc5c0..0000000
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	xf86-input-vmmouse
-# Date Created:				17 Feb 2006
-# Whom:					NIIMI Satoshi <sa2c@sa2c.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-vmmouse
-PORTVERSION=	12.6.9
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org vmmouse input driver
-
-XORG_CAT=	driver
-CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
-USE_GMAKE=	yes
-
-MAN1=		vmmouse_detect.1
-MAN4=		vmmouse.4x
-
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo
deleted file mode 100644
index 6084b12..0000000
--- a/x11-drivers/xf86-input-vmmouse/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 6b7f2ffffc650ed61c9d333aeece893f
-SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f
-SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-descr b/x11-drivers/xf86-input-vmmouse/pkg-descr
deleted file mode 100644
index 266fa13..0000000
--- a/x11-drivers/xf86-input-vmmouse/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-vmmouse driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
deleted file mode 100644
index d5ba6a3..0000000
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/vmmouse_detect
-libexec/hal/scripts/hal-probe-vmmouse
-lib/xorg/modules/input/vmmouse_drv.la
-lib/xorg/modules/input/vmmouse_drv.so
-share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
deleted file mode 100644
index 530f563..0000000
--- a/x11-drivers/xf86-input-void/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-input-void
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-input-void
-PORTVERSION=	1.3.1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org void input driver
-
-XORG_CAT=	driver
-MAN4=		void.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo
deleted file mode 100644
index 7b1b4c5..0000000
--- a/x11-drivers/xf86-input-void/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
-SIZE (xorg/driver/xf86-input-void-1.3.1.tar.bz2) = 242189
diff --git a/x11-drivers/xf86-input-void/pkg-descr b/x11-drivers/xf86-input-void/pkg-descr
deleted file mode 100644
index 7aa7847..0000000
--- a/x11-drivers/xf86-input-void/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-input-void driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
deleted file mode 100644
index 554c368..0000000
--- a/x11-drivers/xf86-input-void/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/input/void_drv.la
-lib/xorg/modules/input/void_drv.so
-@dirrmtry lib/xorg/modules/input
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
deleted file mode 100644
index 5eaddcc..0000000
--- a/x11-drivers/xf86-video-apm/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-apm
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-apm
-PORTVERSION=	1.2.3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org apm display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		apm.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo
deleted file mode 100644
index 230f03e..0000000
--- a/x11-drivers/xf86-video-apm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
-SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470
diff --git a/x11-drivers/xf86-video-apm/pkg-descr b/x11-drivers/xf86-video-apm/pkg-descr
deleted file mode 100644
index 0ef8131..0000000
--- a/x11-drivers/xf86-video-apm/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-apm driver.
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
deleted file mode 100644
index e43fd89..0000000
--- a/x11-drivers/xf86-video-apm/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/apm_drv.la
-lib/xorg/modules/drivers/apm_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
deleted file mode 100644
index b3e381a..0000000
--- a/x11-drivers/xf86-video-ark/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-video-ark
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-ark
-PORTVERSION=	0.7.3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ark display driver
-
-XORG_CAT=	driver
-USE_XORG=	xextproto
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo
deleted file mode 100644
index d7e2a50..0000000
--- a/x11-drivers/xf86-video-ark/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
-SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946
diff --git a/x11-drivers/xf86-video-ark/pkg-descr b/x11-drivers/xf86-video-ark/pkg-descr
deleted file mode 100644
index 46a0bec..0000000
--- a/x11-drivers/xf86-video-ark/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-ark driver.
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
deleted file mode 100644
index ce3a4e9..0000000
--- a/x11-drivers/xf86-video-ark/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/ark_drv.la
-lib/xorg/modules/drivers/ark_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
deleted file mode 100644
index d9eb947..0000000
--- a/x11-drivers/xf86-video-ati/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-ati
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-ati
-PORTVERSION=	6.14.0
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4=		ati.4x radeon.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
deleted file mode 100644
index 1180e65..0000000
--- a/x11-drivers/xf86-video-ati/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
-SIZE (xorg/driver/xf86-video-ati-6.14.0.tar.bz2) = 1054336
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c b/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
deleted file mode 100644
index bb4d826..0000000
--- a/x11-drivers/xf86-video-ati/files/patch-src-atombios_output.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/atombios_output.c.orig	2011-01-27 10:05:58.000000000 -0700
-+++ src/atombios_output.c	2011-02-05 12:20:30.000000000 -0700
-@@ -172,7 +172,6 @@
- #define DP_SET_POWER_D3  0x2
- 
- static void do_displayport_link_train(xf86OutputPtr output);
--static void atombios_pick_dig_encoder(xf86OutputPtr output);
- 
- static int
- atombios_output_dac_setup(xf86OutputPtr output, int action)
-@@ -1469,7 +1468,6 @@
- 
-     if (radeon_encoder == NULL)
-         return;
--    atombios_pick_dig_encoder(output);
- 
-     switch (radeon_encoder->encoder_id) {
-     case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
-@@ -1781,7 +1779,7 @@
-     }
- }
- 
--static void
-+void
- atombios_pick_dig_encoder(xf86OutputPtr output)
- {
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(output->scrn);
-@@ -1878,7 +1876,6 @@
- 	return;
- 
-     radeon_output->pixel_clock = adjusted_mode->Clock;
--    atombios_pick_dig_encoder(output);
-     atombios_output_overscan_setup(output, mode, adjusted_mode);
-     atombios_output_scaler_setup(output);
-     atombios_set_output_crtc_source(output);
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c b/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c
deleted file mode 100644
index 2b47c53..0000000
--- a/x11-drivers/xf86-video-ati/files/patch-src-radeon_driver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/radeon_driver.c.orig	2010-12-03 20:34:44.419175412 +1000
-+++ src/radeon_driver.c	2010-12-03 20:37:22.896179333 +1000
-@@ -1454,6 +1454,9 @@
-      * internal memory map.
-      * See fdo bug 24301.
-      */
-+    if (mem_size > aper_size)
-+	mem_size = aper_size;
-+
-     if (mem_size > 0x20000000)
- 	mem_size = aper_size;
- 
diff --git a/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c b/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
deleted file mode 100644
index 18a0713..0000000
--- a/x11-drivers/xf86-video-ati/files/patch-src-radeon_output.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/radeon_output.c.orig	2011-02-01 17:01:22.000000000 -0700
-+++ src/radeon_output.c	2011-02-05 12:22:53.000000000 -0700
-@@ -120,6 +120,8 @@
- radeon_bios_output_crtc(xf86OutputPtr output);
- static void
- radeon_bios_output_lock(xf86OutputPtr output, Bool lock);
-+extern void
-+atombios_pick_dig_encoder(xf86OutputPtr output);
- 
- void RADEONPrintPortMap(ScrnInfoPtr pScrn)
- {
-@@ -731,6 +733,8 @@
-     }
- 
-     radeon_bios_output_lock(output, TRUE);
-+    if (IS_AVIVO_VARIANT)
-+	atombios_pick_dig_encoder(output);
-     radeon_dpms(output, DPMSModeOff);
-     radeon_crtc_dpms(output->crtc, DPMSModeOff);
- 
diff --git a/x11-drivers/xf86-video-ati/pkg-descr b/x11-drivers/xf86-video-ati/pkg-descr
deleted file mode 100644
index fe1b01b..0000000
--- a/x11-drivers/xf86-video-ati/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-ati driver.
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
deleted file mode 100644
index 52b1421..0000000
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-lib/xorg/modules/drivers/ati_drv.la
-lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
-lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.la
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.la
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.la
-lib/xorg/modules/multimedia/theatre_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules/multimedia
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
deleted file mode 100644
index ac0e01b..0000000
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	xf86-video-ati
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD: ports/x11-drivers/xf86-video-ati613/Makefile,v 1.23 2010/12/27 19:55:37 pgollucci Exp $
-#
-
-PORTNAME=	xf86-video-ati
-PORTVERSION=	6.13.2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4=		ati.4x radeon.4x
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-USE_GCC=	4.2+
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
deleted file mode 100644
index e9633aa..0000000
--- a/x11-drivers/xf86-video-ati613/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = a8f92fe3c458e511f4e2ead7f92c02b0
-SHA256 (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
-SIZE (xorg/driver/xf86-video-ati-6.13.2.tar.bz2) = 985673
diff --git a/x11-drivers/xf86-video-ati613/pkg-descr b/x11-drivers/xf86-video-ati613/pkg-descr
deleted file mode 100644
index 16d7100..0000000
--- a/x11-drivers/xf86-video-ati613/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package contains the X.Org xf86-video-ati driver.
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ati613/pkg-plist b/x11-drivers/xf86-video-ati613/pkg-plist
deleted file mode 100644
index 52b1421..0000000
--- a/x11-drivers/xf86-video-ati613/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-lib/xorg/modules/drivers/ati_drv.la
-lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
-lib/xorg/modules/drivers/radeon_drv.so
-lib/xorg/modules/multimedia/theatre200_drv.la
-lib/xorg/modules/multimedia/theatre200_drv.so
-lib/xorg/modules/multimedia/theatre_detect_drv.la
-lib/xorg/modules/multimedia/theatre_detect_drv.so
-lib/xorg/modules/multimedia/theatre_drv.la
-lib/xorg/modules/multimedia/theatre_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules/multimedia
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
deleted file mode 100644
index 2de3dc7..0000000
--- a/x11-drivers/xf86-video-chips/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-chips
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-chips
-PORTVERSION=	1.2.3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org chips display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		chips.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo
deleted file mode 100644
index 8a19b72..0000000
--- a/x11-drivers/xf86-video-chips/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 0561278e06f84d4ee20317b19831cc8d42c952a1577c7865163ad2d6d900cb1d
-SIZE (xorg/driver/xf86-video-chips-1.2.3.tar.bz2) = 338968
diff --git a/x11-drivers/xf86-video-chips/pkg-descr b/x11-drivers/xf86-video-chips/pkg-descr
deleted file mode 100644
index 2145d88..0000000
--- a/x11-drivers/xf86-video-chips/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-chips driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
deleted file mode 100644
index 437be4c..0000000
--- a/x11-drivers/xf86-video-chips/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/chips_drv.la
-lib/xorg/modules/drivers/chips_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
deleted file mode 100644
index 1def9f8..0000000
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-video-cirrus
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-cirrus
-PORTVERSION=	1.3.2
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org cirrus display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		cirrus.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo
deleted file mode 100644
index e1d7b31..0000000
--- a/x11-drivers/xf86-video-cirrus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 8195d03ed0be0975c03441e66a9f53b3
-SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
-SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949
diff --git a/x11-drivers/xf86-video-cirrus/pkg-descr b/x11-drivers/xf86-video-cirrus/pkg-descr
deleted file mode 100644
index e6007b2..0000000
--- a/x11-drivers/xf86-video-cirrus/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-cirrus driver.
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
deleted file mode 100644
index 74f53f5..0000000
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-lib/xorg/modules/drivers/cirrus_alpine.la
-lib/xorg/modules/drivers/cirrus_alpine.so
-lib/xorg/modules/drivers/cirrus_drv.la
-lib/xorg/modules/drivers/cirrus_drv.so
-lib/xorg/modules/drivers/cirrus_laguna.la
-lib/xorg/modules/drivers/cirrus_laguna.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
deleted file mode 100644
index 39057d8..0000000
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	xf86-video-cyrix
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-cyrix
-PORTVERSION=	1.1.0
-PORTREVISION=	7
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org cyrix display driver
-
-IGNORE=		requires pciVideoPtr typedef
-
-XORG_CAT=	driver
-USE_XORG=	xextproto xf86dgaproto
-MAN4=		cyrix.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-cyrix/distinfo b/x11-drivers/xf86-video-cyrix/distinfo
deleted file mode 100644
index 515a434..0000000
--- a/x11-drivers/xf86-video-cyrix/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = 02ed7d5215610a3463a0307b30bb5425
-SHA256 (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = d6a66778e0f6ddd907cba5784386bd6bb526f773b5db9faa35875ba67c2ca6ad
-SIZE (xorg/driver/xf86-video-cyrix-1.1.0.tar.bz2) = 249372
diff --git a/x11-drivers/xf86-video-cyrix/pkg-descr b/x11-drivers/xf86-video-cyrix/pkg-descr
deleted file mode 100644
index 91f0ec5..0000000
--- a/x11-drivers/xf86-video-cyrix/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-cyrix driver.
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
deleted file mode 100644
index 3354c41..0000000
--- a/x11-drivers/xf86-video-cyrix/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/cyrix_drv.la
-lib/xorg/modules/drivers/cyrix_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
deleted file mode 100644
index 9b0f147..0000000
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	xf86-video-dummy
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-dummy
-PORTVERSION=	0.3.4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org dummy display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xf86dgaproto
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo
deleted file mode 100644
index b8a7deb..0000000
--- a/x11-drivers/xf86-video-dummy/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
-SIZE (xorg/driver/xf86-video-dummy-0.3.4.tar.bz2) = 255658
diff --git a/x11-drivers/xf86-video-dummy/pkg-descr b/x11-drivers/xf86-video-dummy/pkg-descr
deleted file mode 100644
index 4aa6c28..0000000
--- a/x11-drivers/xf86-video-dummy/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-dummy driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
deleted file mode 100644
index d9b858d..0000000
--- a/x11-drivers/xf86-video-dummy/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/dummy_drv.la
-lib/xorg/modules/drivers/dummy_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
deleted file mode 100644
index 5573b32..0000000
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-fbdev
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-fbdev
-PORTVERSION=	0.4.2
-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
deleted file mode 100644
index 9f19d13..0000000
--- a/x11-drivers/xf86-video-fbdev/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5
-SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094
diff --git a/x11-drivers/xf86-video-fbdev/pkg-descr b/x11-drivers/xf86-video-fbdev/pkg-descr
deleted file mode 100644
index 22797ee..0000000
--- a/x11-drivers/xf86-video-fbdev/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 274315c..0000000
--- a/x11-drivers/xf86-video-fbdev/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index fe6678e..0000000
--- a/x11-drivers/xf86-video-glint/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-glint
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-glint
-PORTVERSION=	1.2.5
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org glint display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto xf86dgaproto glproto
-MAN4=		glint.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo
deleted file mode 100644
index 91b9ad9..0000000
--- a/x11-drivers/xf86-video-glint/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
-SIZE (xorg/driver/xf86-video-glint-1.2.5.tar.bz2) = 394136
diff --git a/x11-drivers/xf86-video-glint/pkg-descr b/x11-drivers/xf86-video-glint/pkg-descr
deleted file mode 100644
index ef6b272..0000000
--- a/x11-drivers/xf86-video-glint/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-glint driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
deleted file mode 100644
index cb5ce1f..0000000
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/glint_drv.la
-lib/xorg/modules/drivers/glint_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
deleted file mode 100644
index 3c61786..0000000
--- a/x11-drivers/xf86-video-i128/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-i128
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-i128
-PORTVERSION=	1.3.4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org i128 display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		i128.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo
deleted file mode 100644
index 1b2a870..0000000
--- a/x11-drivers/xf86-video-i128/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
-SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046
diff --git a/x11-drivers/xf86-video-i128/pkg-descr b/x11-drivers/xf86-video-i128/pkg-descr
deleted file mode 100644
index 9bea2a1..0000000
--- a/x11-drivers/xf86-video-i128/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-i128 driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
deleted file mode 100644
index 585e6b4..0000000
--- a/x11-drivers/xf86-video-i128/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/i128_drv.la
-lib/xorg/modules/drivers/i128_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
deleted file mode 100644
index 7320b92..0000000
--- a/x11-drivers/xf86-video-i740/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-video-i740
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-i740
-PORTVERSION=	1.3.2
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org i740 display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		i740.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo
deleted file mode 100644
index 0236892..0000000
--- a/x11-drivers/xf86-video-i740/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 4ac1318788f62159965f15131c869e7a
-SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
-SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853
diff --git a/x11-drivers/xf86-video-i740/pkg-descr b/x11-drivers/xf86-video-i740/pkg-descr
deleted file mode 100644
index d739909..0000000
--- a/x11-drivers/xf86-video-i740/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-i740 driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
deleted file mode 100644
index 60628b4..0000000
--- a/x11-drivers/xf86-video-i740/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/i740_drv.la
-lib/xorg/modules/drivers/i740_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile
deleted file mode 100644
index 54147b7..0000000
--- a/x11-drivers/xf86-video-imstt/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-imstt
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-imstt
-PORTVERSION=	1.1.0
-PORTREVISION=	7
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org imstt display driver
-
-IGNORE=		requires pciVideoPtr typedef
-
-XORG_CAT=	driver
-MAN4=		imstt.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-imstt/distinfo b/x11-drivers/xf86-video-imstt/distinfo
deleted file mode 100644
index 511580f..0000000
--- a/x11-drivers/xf86-video-imstt/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 94853ca217238ed1f568a10cbeebe057
-SHA256 (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 9238c2257f9437dd7ab37c049d7f20c010e2f5ff833a37d2d6243f223f10fb7d
-SIZE (xorg/driver/xf86-video-imstt-1.1.0.tar.bz2) = 234492
diff --git a/x11-drivers/xf86-video-imstt/pkg-descr b/x11-drivers/xf86-video-imstt/pkg-descr
deleted file mode 100644
index 8b3638e..0000000
--- a/x11-drivers/xf86-video-imstt/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-imstt driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-imstt/pkg-plist b/x11-drivers/xf86-video-imstt/pkg-plist
deleted file mode 100644
index b50e55f..0000000
--- a/x11-drivers/xf86-video-imstt/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/imstt_drv.la
-lib/xorg/modules/drivers/imstt_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
deleted file mode 100644
index fbabd24..0000000
--- a/x11-drivers/xf86-video-intel/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	xf86-video-intel
-# Date Created:				28 May 2007
-# Whom:					lesi@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-intel
-PORTVERSION=	2.7.1
-PORTREVISION=	4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Driver for Intel integrated graphics chipsets
-
-CONFLICTS=	xf86-video-i810-[0-9]*
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
-MAN4=		intel.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
deleted file mode 100644
index 954e3df..0000000
--- a/x11-drivers/xf86-video-intel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 0eed17138da18ff1fb2b8ab0f076d957
-SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42
-SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
deleted file mode 100644
index 278354a..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_ch7017_ch7017.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ch7017/ch7017.c.orig	2009-04-08 18:59:47.000000000 -0500
-+++ src/ch7017/ch7017.c	2010-02-21 12:40:12.000000000 -0600
-@@ -34,13 +34,11 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
- 
- #include "../i2c_vid.h"
- #include "ch7017_reg.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c b/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
deleted file mode 100644
index 6dbc0a7..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_ch7xxx_ch7xxx.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ch7xxx/ch7xxx.c.orig	2010-02-21 12:42:11.000000000 -0600
-+++ src/ch7xxx/ch7xxx.c	2010-02-21 12:44:40.000000000 -0600
-@@ -34,13 +34,11 @@
- #include <string.h>
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
- 
- #include "../i2c_vid.h"
- #include "ch7xxx.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
deleted file mode 100644
index 5ccb55a..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_driver.c
+++ /dev/null
@@ -1,111 +0,0 @@
---- src/i810_driver.c.orig	2010-02-21 12:55:16.000000000 -0600
-+++ src/i810_driver.c	2010-02-21 13:17:04.000000000 -0600
-@@ -69,8 +69,6 @@
-  */
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
-@@ -490,20 +488,6 @@
- 		    );
- 
-       /*
--       * Tell the loader about symbols from other modules that this module
--       * might refer to.
--       */
--      LoaderRefSymLists(I810vgahwSymbols,
--			I810fbSymbols, I810xaaSymbols, I810ramdacSymbols,
--#ifdef XF86DRI
--			I810drmSymbols,
--			I810driSymbols,
--#endif
--			I810shadowFBSymbols,
--			I810vbeSymbols, vbeOptionalSymbols,
--			I810ddcSymbols, NULL);
--
--      /*
-        * The return value must be non-NULL on success even though there
-        * is no TearDownProc.
-        */
-@@ -809,7 +793,6 @@
-    }
- 
-    if (xf86LoadSubModule(pScrn, "vbe") && (pVbe = VBEInit(NULL, index))) {
--      xf86LoaderReqSymLists(I810vbeSymbols, NULL);
-       MonInfo = vbeDoEDID(pVbe, NULL);
-       xf86PrintEDID(MonInfo);
-       xf86SetDDCproperties(pScrn, MonInfo);
-@@ -864,8 +847,6 @@
-    if (!xf86LoadSubModule(pScrn, "vgahw"))
-       return FALSE;
- 
--   xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
--
-    /* Allocate a vgaHWRec */
-    if (!vgaHWGetHWRec(pScrn))
-       return FALSE;
-@@ -878,10 +859,6 @@
- 			  pI810->PciInfo->func);
- #endif
- 
--   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
--      return FALSE;
--   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
--
-    /* Set pScrn->monitor */
-    pScrn->monitor = pScrn->confScreen->monitor;
- 
-@@ -960,7 +937,6 @@
- 	 I810FreeRec(pScrn);
- 	 return FALSE;
-       }
--      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
-    }
-    
- #ifdef XF86DRI
-@@ -1244,14 +1220,12 @@
-       I810FreeRec(pScrn);
-       return FALSE;
-    }
--   xf86LoaderReqSymLists(I810fbSymbols, NULL);
- 
-    if (!xf86ReturnOptValBool(pI810->Options, OPTION_SW_CURSOR, FALSE)) {
-       if (!xf86LoadSubModule(pScrn, "ramdac")) {
- 	 I810FreeRec(pScrn);
- 	 return FALSE;
-       }
--      xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
-    }
- 
-    if (xf86GetOptValInteger
-@@ -1278,9 +1252,6 @@
- 	 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
- 		    "Couldn't load shadowfb module:\n");
-        }
--       else {
--	 xf86LoaderReqSymLists(I810shadowFBSymbols, NULL);
--       }
-      }
-      
-      xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "page flipping %s\n",
-@@ -1312,16 +1283,12 @@
- #ifdef XF86DRI
-    /* Load the dri module if requested. */
-    if (xf86ReturnOptValBool(pI810->Options, OPTION_DRI, FALSE)) {
--      if (xf86LoadSubModule(pScrn, "dri")) {
--	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
--      }
-+   	xf86LoadSubModule(pScrn, "dri");
-    }
- #endif
- 
-    /*  We won't be using the VGA access after the probe */
-    I810SetMMIOAccess(pI810);
--   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
--   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
- 
-    return TRUE;
- }
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
deleted file mode 100644
index ffb2ac3..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_hwmc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/i810_hwmc.c.orig	2010-02-21 13:40:44.000000000 -0600
-+++ src/i810_hwmc.c	2010-02-21 13:41:16.000000000 -0600
-@@ -42,7 +42,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
deleted file mode 100644
index c10b5e6..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i810_video.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/i810_video.c.orig	2010-02-21 13:17:58.000000000 -0600
-+++ src/i810_video.c	2010-02-21 13:18:37.000000000 -0600
-@@ -42,7 +42,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
deleted file mode 100644
index 05bdb93..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_dri.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/i830_dri.c.orig	2010-02-21 13:30:37.000000000 -0600
-+++ src/i830_dri.c	2010-02-21 13:39:02.000000000 -0600
-@@ -1731,9 +1731,10 @@
-     info.driverName = IS_I965G(pI830) ? "i965" : "i915";
-     info.deviceName = p;
-     info.version = 1;
--
-+#if 0
-     info.CreateBuffers = I830DRI2CreateBuffers;
-     info.DestroyBuffers = I830DRI2DestroyBuffers;
-+#endif
-     info.CopyRegion = I830DRI2CopyRegion;
- 
-     pI830->drmSubFD = info.fd;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
deleted file mode 100644
index 776b67f..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_driver.c
+++ /dev/null
@@ -1,97 +0,0 @@
---- src/i830_driver.c.orig	2010-02-21 13:20:12.000000000 -0600
-+++ src/i830_driver.c	2010-02-21 13:26:14.000000000 -0600
-@@ -175,8 +175,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86Priv.h"
- #include "xf86cmap.h"
- #include "compiler.h"
-@@ -1050,7 +1048,6 @@
-    if (!xf86LoadSubModule(pScrn, "ddc")) {
-       pI830->ddc2 = FALSE;
-    } else {
--      xf86LoaderReqSymLists(I810ddcSymbols, NULL);
-       pI830->ddc2 = TRUE;
-    }
- 
-@@ -1058,8 +1055,6 @@
-    /* Load I2C if we have the code to use it */
-    if (pI830->ddc2) {
-       if (xf86LoadSubModule(pScrn, "i2c")) {
--	 xf86LoaderReqSymLists(I810i2cSymbols, NULL);
--
- 	 pI830->ddc2 = TRUE;
-       } else {
- 	 pI830->ddc2 = FALSE;
-@@ -1511,11 +1506,9 @@
-     /* The vgahw module should be loaded here when needed */
-     if (!xf86LoadSubModule(pScrn, "vgahw"))
- 	return FALSE;
--    xf86LoaderReqSymLists(I810vgahwSymbols, NULL);
- 
-     if (!xf86LoadSubModule(pScrn, "ramdac"))
-        return FALSE;
--    xf86LoaderReqSymLists(I810ramdacSymbols, NULL);
- 
-     return TRUE;
- }
-@@ -1854,12 +1847,6 @@
- 			  pI830->PciInfo->func);
- #endif
- 
--   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
--      PreInitCleanup(pScrn);
--      return FALSE;
--   }
--
--   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-    pScrn->monitor = pScrn->confScreen->monitor;
-    pScrn->progClock = TRUE;
-    pScrn->rgbBits = 8;
-@@ -1942,8 +1929,6 @@
-       return FALSE;
-    }
- 
--   xf86LoaderReqSymLists(I810fbSymbols, NULL);
--
-    switch (pI830->accel) {
- #ifdef I830_USE_XAA
-    case ACCEL_XAA:
-@@ -1951,7 +1936,6 @@
- 	 PreInitCleanup(pScrn);
- 	 return FALSE;
-       }
--      xf86LoaderReqSymLists(I810xaaSymbols, NULL);
-       break;
- #endif
- 
-@@ -1973,7 +1957,6 @@
- 	 PreInitCleanup(pScrn);
- 	 return FALSE;
-       }
--      xf86LoaderReqSymLists(I830exaSymbols, NULL);
-       break;
-    }
- #endif
-@@ -1988,17 +1971,13 @@
- 
-        /*  We won't be using the VGA access after the probe. */
-        I830SetMMIOAccess(pI830);
--       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
--       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
-    }
- 
- #if defined(XF86DRI)
-    /* Load the dri module if requested. */
-    if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
-        pI830->directRenderingType != DRI_DISABLED) {
--      if (xf86LoadSubModule(pScrn, "dri")) {
--	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
--      }
-+      xf86LoadSubModule(pScrn, "dri");
-    }
- #endif
- 
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
deleted file mode 100644
index 1f4461c..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_i2c.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/i830_i2c.c.orig	2010-02-21 13:27:07.000000000 -0600
-+++ src/i830_i2c.c	2010-02-21 13:27:45.000000000 -0600
-@@ -31,8 +31,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
--#include "xf86RAC.h"
- #include "xf86cmap.h"
- #include "compiler.h"
- #include "mibstore.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
deleted file mode 100644
index e292a7d..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_render.c
+++ /dev/null
@@ -1,78 +0,0 @@
---- src/i830_render.c.orig	2009-05-12 19:12:11.000000000 -0500
-+++ src/i830_render.c	2010-03-07 15:30:45.000000000 -0600
-@@ -210,26 +210,8 @@
- 	(dblend << S8_DST_BLEND_FACTOR_SHIFT);
- }
- 
--static Bool i830_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    int i;
--
--    if ((w > 2048) || (h > 2048))
--        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
--    for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
--	 i++)
--    {
--        if (i830_tex_formats[i].fmt == pPict->format)
--            break;
--    }
--    if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
--        I830FALLBACK("Unsupported picture format 0x%x\n",
--		     (int)pPict->format);
--
-     if (pPict->repeatType > RepeatReflect)
-         I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
- 
-@@ -239,6 +221,26 @@
-         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
-     }
- 
-+    if (pPict->pDrawable)
-+    {
-+	int w, h, i;
-+
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	if ((w > 2048) || (h > 2048))
-+	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+	for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
-+	     i++)
-+	{
-+	    if (i830_tex_formats[i].fmt == pPict->format)
-+		break;
-+	}
-+	if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
-+	    I830FALLBACK("Unsupported picture format 0x%x\n",
-+			 (int)pPict->format);
-+    }
-+
-     return TRUE;
- }
- 
-@@ -376,9 +378,9 @@
- 			     "alpha and source value blending.\n");
-     }
- 
--    if (!i830_check_composite_texture(pSrcPicture, 0))
-+    if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
-         I830FALLBACK("Check Src picture texture\n");
--    if (pMaskPicture != NULL && !i830_check_composite_texture(pMaskPicture, 1))
-+    if (pMaskPicture != NULL && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
-         I830FALLBACK("Check Mask picture texture\n");
- 
-     if (!i830_get_dest_format(pDstPicture, &tmp1))
-@@ -392,7 +394,7 @@
- 		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-     I830Ptr pI830 = I830PTR(pScrn);
-     uint32_t dst_format, dst_pitch;
-     Bool is_affine_src, is_affine_mask;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c b/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
deleted file mode 100644
index b93a98e..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i830_video.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/i830_video.c.orig	2010-02-21 13:28:37.000000000 -0600
-+++ src/i830_video.c	2010-02-21 13:29:05.000000000 -0600
-@@ -57,7 +57,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
deleted file mode 100644
index ab7f679..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i915_hwmc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/i915_hwmc.c.orig	2010-02-21 13:42:21.000000000 -0600
-+++ src/i915_hwmc.c	2010-02-21 13:42:38.000000000 -0600
-@@ -32,7 +32,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
deleted file mode 100644
index 53b1a0e..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i915_render.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/i915_render.c.orig	2009-05-12 19:12:11.000000000 -0500
-+++ src/i915_render.c	2010-03-07 15:30:45.000000000 -0600
-@@ -167,26 +167,8 @@
-     return TRUE;
- }
- 
--static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    int i;
--
--    if ((w > 2048) || (h > 2048))
--        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
--    for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
--	 i++)
--    {
--        if (i915_tex_formats[i].fmt == pPict->format)
--            break;
--    }
--    if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
--        I830FALLBACK("Unsupported picture format 0x%x\n",
--		     (int)pPict->format);
--
-     if (pPict->repeatType > RepeatReflect)
-         I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
- 
-@@ -194,6 +176,26 @@
-         pPict->filter != PictFilterBilinear)
-         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
- 
-+    if (pPict->pDrawable)
-+    {
-+	int w, h, i;
-+
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	if ((w > 2048) || (h > 2048))
-+	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+	for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-+	     i++)
-+	{
-+	    if (i915_tex_formats[i].fmt == pPict->format)
-+		break;
-+	}
-+	if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
-+	    I830FALLBACK("Unsupported picture format 0x%x\n",
-+			 (int)pPict->format);
-+    }
-+
-     return TRUE;
- }
- 
-@@ -220,9 +222,9 @@
- 			     "alpha and source value blending.\n");
-     }
- 
--    if (!i915_check_composite_texture(pSrcPicture, 0))
-+    if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
-         I830FALLBACK("Check Src picture texture\n");
--    if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
-+    if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
-         I830FALLBACK("Check Mask picture texture\n");
- 
-     if (!i915_get_dest_format(pDstPicture, &tmp1))
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c b/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
deleted file mode 100644
index 99b7d78..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_i965_render.c
+++ /dev/null
@@ -1,78 +0,0 @@
---- src/i965_render.c.orig	2009-05-12 19:12:11.000000000 -0500
-+++ src/i965_render.c	2010-03-07 15:30:45.000000000 -0600
-@@ -181,26 +181,8 @@
-     return TRUE;
- }
- 
--static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    int i;
--
--    if ((w > 8192) || (h > 8192))
--        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
--    for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
--	 i++)
--    {
--        if (i965_tex_formats[i].fmt == pPict->format)
--            break;
--    }
--    if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
--        I830FALLBACK("Unsupported picture format 0x%x\n",
--		     (int)pPict->format);
--
-     if (pPict->repeatType > RepeatReflect)
- 	I830FALLBACK("extended repeat (%d) not supported\n",
- 		     pPict->repeatType);
-@@ -211,6 +193,26 @@
-         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
-     }
- 
-+    if (pPict->pDrawable)
-+    {
-+	int w, h, i;
-+
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	if ((w > 8192) || (h > 8192))
-+	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+	for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
-+	     i++)
-+	{
-+	    if (i965_tex_formats[i].fmt == pPict->format)
-+		break;
-+	}
-+	if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
-+	    I830FALLBACK("Unsupported picture format 0x%x\n",
-+			 (int)pPict->format);
-+    }
-+
-     return TRUE;
- }
- 
-@@ -239,9 +241,9 @@
- 	}
-     } 
- 
--    if (!i965_check_composite_texture(pSrcPicture, 0))
-+    if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
-         I830FALLBACK("Check Src picture texture\n");
--    if (pMaskPicture != NULL && !i965_check_composite_texture(pMaskPicture, 1))
-+    if (pMaskPicture != NULL && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
-         I830FALLBACK("Check Mask picture texture\n");
- 
-     if (!i965_get_dest_format(pDstPicture, &tmp1))
-@@ -1258,7 +1260,7 @@
- 		       PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 		       PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
-     I830Ptr pI830 = I830PTR(pScrn);
-     struct gen4_render_state *render_state= pI830->gen4_render_state;
-     gen4_composite_op *composite_op = &render_state->composite_op;
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c b/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
deleted file mode 100644
index b54885d..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_ivch_ivch.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ivch/ivch.c.orig	2010-02-21 12:47:05.000000000 -0600
-+++ src/ivch/ivch.c	2010-02-21 12:48:09.000000000 -0600
-@@ -31,13 +31,11 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsproto.h>
- #include <unistd.h>
- 
- #include "../i2c_vid.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c b/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
deleted file mode 100644
index f9d7177..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_sil164_sil164.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/sil164/sil164.c.orig	2010-02-21 12:49:54.000000000 -0600
-+++ src/sil164/sil164.c	2010-02-21 12:50:40.000000000 -0600
-@@ -35,13 +35,11 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsproto.h>
- 
- #include "../i2c_vid.h"
- #include "sil164.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c b/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
deleted file mode 100644
index 89927b3..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-src_tfp410_tfp410.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/tfp410/tfp410.c.orig	2010-02-21 12:52:35.000000000 -0600
-+++ src/tfp410/tfp410.c	2010-02-21 12:53:19.000000000 -0600
-@@ -34,13 +34,11 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "miscstruct.h"
- #include "xf86i2c.h"
- #include "xf86Crtc.h"
--#define DPMS_SERVER
--#include <X11/extensions/dpms.h>
-+#include <X11/extensions/dpmsconst.h>
- 
- #include "../i2c_vid.h"
- #include "tfp410.h"
diff --git a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
deleted file mode 100644
index 46eb72e..0000000
--- a/x11-drivers/xf86-video-intel/files/patch-uxa_uxa-priv.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- uxa/uxa-priv.h.orig	2009-05-12 19:12:11.000000000 -0500
-+++ uxa/uxa-priv.h	2010-02-21 12:27:32.000000000 -0600
-@@ -42,8 +42,7 @@
- #define NEED_EVENTS
- #include <X11/Xproto.h>
- #ifdef MITSHM
--#define _XSHM_SERVER_
--#include <X11/extensions/shmstr.h>
-+#include <X11/extensions/shmproto.h>
- #endif
- #include "scrnintstr.h"
- #include "pixmapstr.h"
-@@ -319,17 +318,11 @@
- extern const GCOps uxa_ops;
- 
- #ifdef MITSHM
--extern ShmFuncs uxa_shm_funcs;
--
- /* XXX these come from shmint.h, which isn't exported by the server */
--void
--ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
- 
--void
--ShmSetPixmapFormat(ScreenPtr pScreen, int format);
-+#include "shmint.h"
- 
--void
--fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-+extern ShmFuncs uxa_shm_funcs;
- 
- #endif
- 
diff --git a/x11-drivers/xf86-video-intel/pkg-descr b/x11-drivers/xf86-video-intel/pkg-descr
deleted file mode 100644
index 6ace253..0000000
--- a/x11-drivers/xf86-video-intel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Driver for Intel integrated graphics chipsets. It supports the i810,
-i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
-945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
deleted file mode 100644
index 900e0a9..0000000
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-lib/libI810XvMC.la
-lib/libI810XvMC.so
-lib/libI810XvMC.so.1
-lib/libIntelXvMC.la
-lib/libIntelXvMC.so.1
-lib/libIntelXvMC.so
-lib/xorg/modules/drivers/ch7017.la
-lib/xorg/modules/drivers/ch7017.so
-lib/xorg/modules/drivers/ch7xxx.la
-lib/xorg/modules/drivers/ch7xxx.so
-lib/xorg/modules/drivers/intel_drv.la
-lib/xorg/modules/drivers/intel_drv.so
-lib/xorg/modules/drivers/ivch.la
-lib/xorg/modules/drivers/ivch.so
-lib/xorg/modules/drivers/sil164.la
-lib/xorg/modules/drivers/sil164.so
-lib/xorg/modules/drivers/tfp410.la
-lib/xorg/modules/drivers/tfp410.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile
deleted file mode 100644
index 1adf954..0000000
--- a/x11-drivers/xf86-video-intel29/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	xf86-video-intel
-# Date Created:				28 May 2007
-# Whom:					lesi@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-intel29
-PORTVERSION=	2.9.1
-CATEGORIES=	x11-drivers
-DISTNAME=	xf86-video-intel-${PORTVERSION}
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Driver for Intel integrated graphics chipsets
-
-CONFLICTS=	xf86-video-i810-[0-9]* xf86-video-intel-[0-9]*
-
-ONLY_FOR_ARCHS=	amd64 i386
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xvmc xineramaproto xextproto x11 xf86driproto glproto
-MAN4=		intel.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo
deleted file mode 100644
index a9b91d4..0000000
--- a/x11-drivers/xf86-video-intel29/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 8951d0366c16991badb7f9050556f4f3
-SHA256 (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
-SIZE (xorg/driver/xf86-video-intel-2.9.1.tar.bz2) = 789001
diff --git a/x11-drivers/xf86-video-intel29/pkg-descr b/x11-drivers/xf86-video-intel29/pkg-descr
deleted file mode 100644
index 69bd312..0000000
--- a/x11-drivers/xf86-video-intel29/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Driver for Intel integrated graphics chipsets. It supports the i810,
-i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM, 865G, 915G, 915GM,
-945G, 945GM, 965G, 965Q, 946GZ and 965GM chipsets.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-intel29/pkg-plist b/x11-drivers/xf86-video-intel29/pkg-plist
deleted file mode 100644
index 900e0a9..0000000
--- a/x11-drivers/xf86-video-intel29/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-lib/libI810XvMC.la
-lib/libI810XvMC.so
-lib/libI810XvMC.so.1
-lib/libIntelXvMC.la
-lib/libIntelXvMC.so.1
-lib/libIntelXvMC.so
-lib/xorg/modules/drivers/ch7017.la
-lib/xorg/modules/drivers/ch7017.so
-lib/xorg/modules/drivers/ch7xxx.la
-lib/xorg/modules/drivers/ch7xxx.so
-lib/xorg/modules/drivers/intel_drv.la
-lib/xorg/modules/drivers/intel_drv.so
-lib/xorg/modules/drivers/ivch.la
-lib/xorg/modules/drivers/ivch.so
-lib/xorg/modules/drivers/sil164.la
-lib/xorg/modules/drivers/sil164.so
-lib/xorg/modules/drivers/tfp410.la
-lib/xorg/modules/drivers/tfp410.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
deleted file mode 100644
index d4ba10d..0000000
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-mach64
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-mach64
-PORTVERSION=	6.8.2
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org mach64 display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
deleted file mode 100644
index cdec12e..0000000
--- a/x11-drivers/xf86-video-mach64/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 6c0522b2b72a0a47c48d718443616651
-SHA256 (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
-SIZE (xorg/driver/xf86-video-mach64-6.8.2.tar.bz2) = 486282
diff --git a/x11-drivers/xf86-video-mach64/pkg-descr b/x11-drivers/xf86-video-mach64/pkg-descr
deleted file mode 100644
index 98066b1..0000000
--- a/x11-drivers/xf86-video-mach64/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-mach64 driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
deleted file mode 100644
index 32f0985..0000000
--- a/x11-drivers/xf86-video-mach64/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/mach64_drv.la
-lib/xorg/modules/drivers/mach64_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
deleted file mode 100644
index 8ffe2cc..0000000
--- a/x11-drivers/xf86-video-mga/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	xf86-video-mga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-mga
-PORTVERSION=	1.4.11
-PORTEPOCH=	2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org mga display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto glproto
-MAN4=		mga.4x
-
-pre-patch:
-	${REINPLACE_CMD} \
-		-e 's|values.h|sys/limits.h|g' \
-		-e 's|MAXSHORT|SHRT_MAX|g' \
-		${WRKSRC}/src/mga_arc.c
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo
deleted file mode 100644
index 03f6bca..0000000
--- a/x11-drivers/xf86-video-mga/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 9d1ca965cedb0856296b47442f3c739d
-SHA256 (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = c91922316f486f74d41ddbda92ff94a7917cea151ad802cf25603ab6b90f97e6
-SIZE (xorg/driver/xf86-video-mga-1.4.11.tar.bz2) = 415829
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga.h b/x11-drivers/xf86-video-mga/files/patch-src__mga.h
deleted file mode 100644
index 2550f2c..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./src/mga.h.orig	2009-07-27 17:24:51.000000000 -0700
-+++ ./src/mga.h	2010-03-09 17:58:54.154420020 -0800
-@@ -133,6 +133,10 @@
- #define PCI_CHIP_MGAG200_EV_PCI 0x0530
- #endif
- 
-+#ifndef PCI_CHIP_MGAG200_EH_PCI
-+#define PCI_CHIP_MGAG200_EH_PCI 0x0533
-+#endif
-+
- /*
-  * Read/write to the DAC via MMIO 
-  */
-@@ -474,6 +478,7 @@
-     int is_G200SE:1;
-     int is_G200WB:1;
-     int is_G200EV:1;
-+    int is_G200EH:1;
- 
-     int KVM;
- 
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
deleted file mode 100644
index b71a68f..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga_dacG.c
+++ /dev/null
@@ -1,232 +0,0 @@
---- ./src/mga_dacG.c.orig	2010-03-09 17:58:54.152419708 -0800
-+++ ./src/mga_dacG.c	2010-03-09 17:58:54.157420208 -0800
-@@ -211,6 +211,55 @@
- }
- 
- static void
-+MGAG200EHComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *M, int *N, int *P)
-+{
-+    unsigned int ulComputedFo;
-+    unsigned int ulFDelta;
-+    unsigned int ulFPermitedDelta;
-+    unsigned int ulFTmpDelta;
-+    unsigned int ulTestP;
-+    unsigned int ulTestM;
-+    unsigned int ulTestN;
-+    unsigned int ulVCOMax;
-+    unsigned int ulVCOMin;
-+    unsigned int ulPLLFreqRef;
-+
-+    ulVCOMax        = 800000;
-+    ulVCOMin        = 400000;
-+    ulPLLFreqRef    = 33333;
-+
-+    ulFDelta = 0xFFFFFFFF;
-+    /* Permited delta is 0.5% as VESA Specification */
-+    ulFPermitedDelta = lFo * 5 / 1000;  
-+
-+    /* Then we need to minimize the M while staying within 0.5% */
-+    for (ulTestP = 16; ulTestP > 0; ulTestP>>= 1) {
-+        if ((lFo * ulTestP) > ulVCOMax) continue;
-+        if ((lFo * ulTestP) < ulVCOMin) continue;
-+
-+        for (ulTestM = 1; ulTestM <= 32; ulTestM++) {
-+           for (ulTestN = 17; ulTestN <= 256; ulTestN++) {
-+               ulComputedFo = (ulPLLFreqRef * ulTestN) / (ulTestM * ulTestP);
-+               if (ulComputedFo > lFo)
-+		           ulFTmpDelta = ulComputedFo - lFo;
-+               else
-+                   ulFTmpDelta = lFo - ulComputedFo;
-+
-+               if (ulFTmpDelta < ulFDelta) {
-+                   ulFDelta = ulFTmpDelta;
-+                   *M = (CARD8)(ulTestM - 1);
-+                   *N = (CARD8)(ulTestN - 1);
-+                   *P = (CARD8)(ulTestP - 1);
-+               }
-+
-+               if ((lFo * ulTestP) >= 600000)
-+                   *P |= 0x80;
-+           }
-+        }
-+    }
-+}
-+
-+static void
- MGAG200EVPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
- {
-     MGAPtr pMga = MGAPTR(pScrn);
-@@ -483,6 +532,89 @@
-     outMGAdac(MGA1064_GEN_IO_DATA, ucTmpData);
- }
- 
-+static void
-+MGAG200EHPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
-+{
-+    MGAPtr pMga = MGAPTR(pScrn);
-+
-+    unsigned long ulFallBackCounter, ulLoopCount, ulLockCheckIterations = 0, ulTempCount, ulVCount;
-+    unsigned char ucTempByte, ucPixCtrl, ucPLLLocked = FALSE;
-+    unsigned char ucM;
-+    unsigned char ucN;
-+    unsigned char ucP;
-+    unsigned char ucS;
-+
-+    while(ulLockCheckIterations <= 32 && ucPLLLocked == FALSE)
-+    {
-+        // Set pixclkdis to 1
-+        ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
-+        ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
-+        outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+        // Select PLL Set C
-+        ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
-+        ucTempByte |= 0x3<<2; //select MGA pixel clock
-+        OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
-+
-+        ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
-+        ucPixCtrl &= ~0x80;
-+        outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
-+
-+        // Wait 500 us
-+        usleep(500);
-+
-+        // Program the Pixel PLL Register
-+        outMGAdac(MGA1064_EH_PIX_PLLC_N, mgaReg->PllN);
-+        outMGAdac(MGA1064_EH_PIX_PLLC_M, mgaReg->PllM);
-+        outMGAdac(MGA1064_EH_PIX_PLLC_P, mgaReg->PllP);
-+
-+        // Wait 500 us
-+        usleep(500);
-+
-+        // Select the pixel PLL by setting pixclksel to 1
-+        ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
-+        ucTempByte &= ~MGA1064_PIX_CLK_CTL_SEL_MSK;
-+        ucTempByte |= MGA1064_PIX_CLK_CTL_SEL_PLL;
-+        outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
-+
-+        // Reset dotclock rate bit.
-+        OUTREG8(MGAREG_SEQ_INDEX, 1);
-+        ucTempByte = INREG8(MGAREG_SEQ_DATA);
-+        OUTREG8(MGAREG_SEQ_DATA, ucTempByte & ~0x8);
-+
-+        // Set pixclkdis to 0 and pixplldn to 0
-+        ucTempByte = inMGAdac(MGA1064_PIX_CLK_CTL);
-+        ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_DIS;
-+        ucTempByte &= ~MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
-+        outMGAdac(MGA1064_PIX_CLK_CTL, ucTempByte);
-+
-+        // Poll VCount. If it increments twice inside 150us, 
-+        // we assume that the PLL has locked.
-+        ulLoopCount = 0;
-+        ulVCount = INREG(MGAREG_VCOUNT);
-+
-+        while(ulLoopCount < 30 && ucPLLLocked == FALSE)
-+        {
-+            ulTempCount = INREG(MGAREG_VCOUNT);
-+
-+            if(ulTempCount < ulVCount)
-+            {
-+                ulVCount = 0;
-+            }
-+            if ((ucTempByte - ulVCount) > 2)
-+            {
-+                ucPLLLocked = TRUE;
-+            }
-+            else
-+            {
-+                usleep(5);
-+            }
-+            ulLoopCount++;
-+        }
-+        ulLockCheckIterations++;
-+    }
-+}
-+
- /**
-  * Calculate the PLL settings (m, n, p, s).
-  *
-@@ -631,6 +763,12 @@
- 	    pReg->PllM = m;
- 	    pReg->PllN = n;
- 	    pReg->PllP = p;
-+    } else if (pMga->is_G200EH) {
-+	    MGAG200EHComputePLLParam(pScrn, f_out, &m, &n, &p);
-+
-+	    pReg->PllM = m;
-+	    pReg->PllN = n;
-+	    pReg->PllP = p;
-         } else {
- 	    /* Do the calculations for m, n, p and s */
- 	    MGAGCalcClock( pScrn, f_out, &m, &n, &p, &s );
-@@ -828,6 +966,15 @@
-                 pReg->Option2 = 0x0000b000;
-                 break;
- 
-+        case PCI_CHIP_MGAG200_EH_PCI:
-+                pReg->DacRegs[MGA1064_MISC_CTL] =
-+                    MGA1064_MISC_CTL_VGA8 |
-+                    MGA1064_MISC_CTL_DAC_RAM_CS;
-+
-+                pReg->Option = 0x00000120;
-+                pReg->Option2 = 0x0000b000;
-+                break;
-+
- 	case PCI_CHIP_MGAG200:
- 	case PCI_CHIP_MGAG200_PCI:
- 	default:
-@@ -1177,7 +1324,7 @@
- 	      if (pMga->is_G200SE
- 		  && ((i == 0x2C) || (i == 0x2D) || (i == 0x2E)))
- 	         continue;
--	      if ( (pMga->is_G200EV || pMga->is_G200WB) &&
-+	      if ( (pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) &&
- 		   (i >= 0x44) && (i <= 0x4E))
- 	         continue;
- 
-@@ -1218,6 +1365,8 @@
-                MGAG200EVPIXPLLSET(pScrn, mgaReg);
-            } else if (pMga->is_G200WB) {
-                MGAG200WBPIXPLLSET(pScrn, mgaReg);
-+           } else if (pMga->is_G200EH) {
-+               MGAG200EHPIXPLLSET(pScrn, mgaReg);
-            }
- );	/* MGA_NOT_HAL */
- #ifdef USEMGAHAL
-@@ -1402,6 +1551,10 @@
-             mgaReg->PllM = inMGAdac(MGA1064_EV_PIX_PLLC_M);
-             mgaReg->PllN = inMGAdac(MGA1064_EV_PIX_PLLC_N);
-             mgaReg->PllP = inMGAdac(MGA1064_EV_PIX_PLLC_P);
-+        } else if (pMga->is_G200EH) {
-+            mgaReg->PllM = inMGAdac(MGA1064_EH_PIX_PLLC_M);
-+            mgaReg->PllN = inMGAdac(MGA1064_EH_PIX_PLLC_N);
-+            mgaReg->PllP = inMGAdac(MGA1064_EH_PIX_PLLC_P);
-         }
- 
-         mgaReg->PIXPLLCSaved = TRUE;
-@@ -1584,6 +1737,7 @@
-     { (1 << 0), (1 << 2) },
-     { (1 << 4), (1 << 5) },
-     { (1 << 0), (1 << 1) },  /* G200SE, G200EV and G200WB I2C bits */
-+    { (1 << 1), (1 << 0) },  /* G200EH I2C bits */
- };
- 
- 
-@@ -1596,6 +1750,8 @@
- 
-   if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-     i2c_index = 3;
-+  else if (pMga->is_G200EH)
-+    i2c_index = 4;
-   else
-     i2c_index = 0;
- 
-@@ -1695,6 +1851,8 @@
- 
-         if (pMga->is_G200SE || pMga->is_G200WB || pMga->is_G200EV)
-             i2c_index = 3;
-+        else if (pMga->is_G200EH)
-+            i2c_index = 4;
-         else
-             i2c_index = 0;
- 
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
deleted file mode 100644
index cd3f68d..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga_driver.c
+++ /dev/null
@@ -1,115 +0,0 @@
---- ./src/mga_driver.c.orig	2009-07-27 22:11:40.000000000 -0700
-+++ ./src/mga_driver.c	2010-03-09 17:58:54.163419467 -0800
-@@ -388,6 +388,22 @@
- 	8192, 0x4000,          /* Memory probe size & offset values */
-     },
- 
-+    /* G200EH */
-+    [14] = { 0, 1, 0, 0, 1, 0, 0, 0, new_BARs,
-+            (TRANSC_SOLID_FILL | TWO_PASS_COLOR_EXPAND | USE_LINEAR_EXPANSION),
-+	{
-+	    { 50000, 230000 }, /* System VCO frequencies */
-+	    { 50000, 203400 }, /* Pixel VCO frequencies */
-+	    { 0, 0 },          /* Video VCO frequencies */
-+	    45000,            /* Memory clock */
-+	    27050,             /* PLL reference frequency */
-+	    0,                 /* Supports fast bitblt? */
-+	    MGA_HOST_PCI       /* Host interface */
-+	},
-+
-+	8192, 0x4000,          /* Memory probe size & offset values */
-+    },
-+
- };
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -415,6 +431,8 @@
- 
-     MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_WINBOND_PCI, 13 ),
- 
-+    MGA_DEVICE_MATCH( PCI_CHIP_MGAG200_EH_PCI, 14 ),
-+
-     { 0, 0, 0 },
- };
- #endif
-@@ -433,6 +451,7 @@
-     { PCI_CHIP_MGAG200_SE_B_PCI,	"mgag200 SE B PCI" },
-     { PCI_CHIP_MGAG200_EV_PCI,	"mgag200 EV Maxim" },
-     { PCI_CHIP_MGAG200_WINBOND_PCI,	"mgag200 eW Nuvoton" },
-+    { PCI_CHIP_MGAG200_EH_PCI,	"mgag200eH" },
-     { PCI_CHIP_MGAG400,		"mgag400" },
-     { PCI_CHIP_MGAG550,		"mgag550" },
-     {-1,			NULL }
-@@ -455,6 +474,8 @@
- 	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG200_WINBOND_PCI, PCI_CHIP_MGAG200_WINBOND_PCI,
- 	RES_SHARED_VGA },
-+    { PCI_CHIP_MGAG200_EH_PCI, PCI_CHIP_MGAG200_EH_PCI,
-+	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG400,	    PCI_CHIP_MGAG400,	RES_SHARED_VGA },
-     { PCI_CHIP_MGAG550,	    PCI_CHIP_MGAG550,	RES_SHARED_VGA },
-     { -1,			-1,		RES_UNDEFINED }
-@@ -889,6 +910,10 @@
-                 attrib_no = 13;
-                 break;
- 
-+            case PCI_CHIP_MGAG200_EH_PCI:
-+                attrib_no = 14;
-+                break;
-+
- 	    default:
- 		return FALSE;
-             }
-@@ -1112,7 +1137,7 @@
- 	OUTREG8(MGAREG_CRTCEXT_DATA, tmp | 0x80);
- 
- 	/* apparently the G200 IP don't have a BIOS to read */
--	if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB) {
-+	if (pMga->is_G200SE || pMga->is_G200EV || pMga->is_G200WB || pMga->is_G200EH) {
- 	    CARD32 MemoryAt0, MemoryAt1, Offset;
- 	    CARD32 FirstMemoryVal1, FirstMemoryVal2;
- 	    CARD32 SecondMemoryVal1, SecondMemoryVal2;
-@@ -1594,6 +1619,7 @@
- 	|| (pMga->Chipset == PCI_CHIP_MGAG200_SE_B_PCI);
-     pMga->is_G200EV = (pMga->Chipset == PCI_CHIP_MGAG200_EV_PCI);
-     pMga->is_G200WB = (pMga->Chipset == PCI_CHIP_MGAG200_WINBOND_PCI);
-+    pMga->is_G200EH = (pMga->Chipset == PCI_CHIP_MGAG200_EH_PCI);
- 
- #ifdef USEMGAHAL
-     if (pMga->chip_attribs->HAL_chipset) {
-@@ -2115,6 +2141,7 @@
-     case PCI_CHIP_MGAG200_SE_B_PCI:
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-+    case PCI_CHIP_MGAG200_EH_PCI:
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -2227,6 +2254,7 @@
- 	  case PCI_CHIP_MGAG200_SE_B_PCI:
-           case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	  case PCI_CHIP_MGAG200_EV_PCI:
-+      case PCI_CHIP_MGAG200_EH_PCI:
- 	    pMga->SrcOrg = 0;
- 	    pMga->DstOrg = 0;
- 	    break;
-@@ -2413,6 +2441,7 @@
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
- 	case PCI_CHIP_MGAG200_EV_PCI:
-+    case PCI_CHIP_MGAG200_EH_PCI:
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
-@@ -4316,7 +4345,10 @@
- 	    return MODE_BANDWIDTH;
-     } else if (pMga->is_G200EV
- 	       && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 327)) {
--	return MODE_BANDWIDTH;
-+        return MODE_BANDWIDTH;
-+    } else if (pMga->is_G200EH
-+               && (xf86ModeBandwidth(mode, pScrn->bitsPerPixel) > 375)) {
-+        return MODE_BANDWIDTH;
-     }
- 
-     lace = 1 + ((mode->Flags & V_INTERLACE) != 0);
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
deleted file mode 100644
index 7797270..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga_merge.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/mga_merge.c.orig	2009-07-27 17:24:03.000000000 -0700
-+++ ./src/mga_merge.c	2010-03-09 17:58:54.164420182 -0800
-@@ -362,6 +362,7 @@
-     case PCI_CHIP_MGAG200_SE_B_PCI:
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-+    case PCI_CHIP_MGAG200_EH_PCI:
-     case PCI_CHIP_MGAG400:
-     case PCI_CHIP_MGAG550:
- 	MGAGSetupFuncs(pScrn);
-@@ -516,6 +517,7 @@
- 	case PCI_CHIP_MGAG200_SE_B_PCI:
-         case PCI_CHIP_MGAG200_WINBOND_PCI:
-         case PCI_CHIP_MGAG200_EV_PCI:
-+        case PCI_CHIP_MGAG200_EH_PCI:
- 	case PCI_CHIP_MGAG400:
- 	case PCI_CHIP_MGAG550:
- 	   maxPitch = 4096;
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h b/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
deleted file mode 100644
index 25e03a8..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga_reg.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/mga_reg.h.orig	2009-07-26 20:37:46.000000000 -0700
-+++ ./src/mga_reg.h	2010-03-09 17:58:54.165420896 -0800
-@@ -432,6 +432,11 @@
- #define MGA1064_EV_PIX_PLLC_N	0xb7
- #define MGA1064_EV_PIX_PLLC_P	0xb8
- 
-+/* Modified PLL for G200 EH */
-+#define MGA1064_EH_PIX_PLLC_M   0xb6
-+#define MGA1064_EH_PIX_PLLC_N   0xb7
-+#define MGA1064_EH_PIX_PLLC_P   0xb8
-+
- 
- #define MGA1064_DISP_CTL        0x8a
- #define MGA1064_DISP_CTL_DAC1OUTSEL_MASK       0x01
diff --git a/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c b/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
deleted file mode 100644
index 39f5565..0000000
--- a/x11-drivers/xf86-video-mga/files/patch-src__mga_storm.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/mga_storm.c.orig	2009-07-26 20:37:46.000000000 -0700
-+++ ./src/mga_storm.c	2010-03-09 17:58:54.168419688 -0800
-@@ -1130,6 +1130,7 @@
-     case PCI_CHIP_MGAG200_SE_B_PCI:
-     case PCI_CHIP_MGAG200_WINBOND_PCI:
-     case PCI_CHIP_MGAG200_EV_PCI:
-+    case PCI_CHIP_MGAG200_EH_PCI:
- 	pMga->SrcOrg = 0;
- 	OUTREG(MGAREG_SRCORG, pMga->realSrcOrg);
- 	OUTREG(MGAREG_DSTORG, pMga->DstOrg);
diff --git a/x11-drivers/xf86-video-mga/pkg-descr b/x11-drivers/xf86-video-mga/pkg-descr
deleted file mode 100644
index 6dbb594..0000000
--- a/x11-drivers/xf86-video-mga/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-mga driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
deleted file mode 100644
index 5653292..0000000
--- a/x11-drivers/xf86-video-mga/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/mga_drv.la
-lib/xorg/modules/drivers/mga_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
deleted file mode 100644
index 17a2a42..0000000
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-neomagic
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-neomagic
-PORTVERSION=	1.2.5
-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
deleted file mode 100644
index 67022a7..0000000
--- a/x11-drivers/xf86-video-neomagic/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
-SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723
diff --git a/x11-drivers/xf86-video-neomagic/pkg-descr b/x11-drivers/xf86-video-neomagic/pkg-descr
deleted file mode 100644
index 8d41f9f..0000000
--- a/x11-drivers/xf86-video-neomagic/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-neomagic driver.
-
-WWW: http://www.x.org
-\ No newline at end of file
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
deleted file mode 100644
index e96d47e..0000000
--- a/x11-drivers/xf86-video-neomagic/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
deleted file mode 100644
index 7d8e362..0000000
--- a/x11-drivers/xf86-video-newport/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	xf86-video-newport
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-newport
-PORTVERSION=	0.2.3
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org newport display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto
-MAN4=		newport.4x
-
-post-patch:
-		${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
-				 -e 's|MAXSHORT|SHRT_MAX|g' \
-				 ${WRKSRC}/src/newport_accel.c
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo
deleted file mode 100644
index e3ca5b8..0000000
--- a/x11-drivers/xf86-video-newport/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 923baa1ee0429f03ed19ec0be6a4f62b
-SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
-SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377
diff --git a/x11-drivers/xf86-video-newport/pkg-descr b/x11-drivers/xf86-video-newport/pkg-descr
deleted file mode 100644
index b85c38a..0000000
--- a/x11-drivers/xf86-video-newport/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-newport driver.
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
deleted file mode 100644
index 2100eb2..0000000
--- a/x11-drivers/xf86-video-newport/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/newport_drv.la
-lib/xorg/modules/drivers/newport_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
deleted file mode 100644
index 0b4dac7..0000000
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for:	xf86-video-nouveau
-# Date Created:				29 Jan 2009
-# Whom:					Anonymous <swell.k@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-nouveau
-PORTVERSION=	0.0.10.${SNAPDATE}
-DISTVERSIONSUFFIX=.${SNAPREV}
-PORTREVISION=	3
-CATEGORIES=	x11-drivers
-MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Free nouveau display driver for nvidia-based cards
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto xf86driproto glproto
-MAN4=		nouveau.4x
-
-MAKE_JOBS_SAFE=	yes
-
-.if defined(WITHOUT_NOUVEAU)
-BROKEN=		Please disable WITHOUT_NOUVEAU global macro.
-.endif
-
-post-configure:
-	${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
-
-post-install:	.SILENT
-	${ECHO_MSG}
-	${CAT} ${PKGMESSAGE}
-	${ECHO_MSG}
-
-GIT_WORK=	${WRKDIR}/${PORTNAME}.git-clone
-GIT_DATE=	$$(date -ur$$(git log --pretty=format:%ct -1 ) +%Y%m%d)
-GIT_REV=	$$(git log --pretty=format:%h -1)
-NEWDISTNAME=	${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_DATE}.${GIT_REV}
-
-maint-gen-distfile:
-	git clone git://anongit.freedesktop.org/nouveau/xf86-video-nouveau \
-		${GIT_WORK}
-
-	( cd ${GIT_WORK}; \
-	  git log --stat >ChangeLog; \
-	  autoreconf -if; \
-	  ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${NEWDISTNAME}${EXTRACT_SUFX} \
-	  	--exclude '.git*' --exclude autogen.sh \
-		--exclude autom4te.cache \
-	  	-s "|${GIT_WORK}|${NEWDISTNAME}|" \
-	  	${GIT_WORK}; \
-	  ${ECHO_CMD} "SNAPDATE=	${GIT_DATE}" \
-		>${MASTERDIR}/Makefile.rev; \
-	  ${ECHO_CMD} "SNAPREV=	${GIT_REV}" \
-		>>${MASTERDIR}/Makefile.rev )
-
-	${RM} -rf ${GIT_WORK}
-
-.include "Makefile.rev"
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nouveau/Makefile.rev b/x11-drivers/xf86-video-nouveau/Makefile.rev
deleted file mode 100644
index b8cc5e2..0000000
--- a/x11-drivers/xf86-video-nouveau/Makefile.rev
+++ /dev/null
@@ -1,2 +0,0 @@
-SNAPDATE=	20090728
-SNAPREV=	e259925
diff --git a/x11-drivers/xf86-video-nouveau/distinfo b/x11-drivers/xf86-video-nouveau/distinfo
deleted file mode 100644
index 3c1101c..0000000
--- a/x11-drivers/xf86-video-nouveau/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 8e0b3246a8b2a49a9609b1bdf6279e64
-SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 48e328a04a2dc9ea5dfebd21eae7c23987dcf53dcd3db7bee477d873cbb31906
-SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 552302
diff --git a/x11-drivers/xf86-video-nouveau/pkg-descr b/x11-drivers/xf86-video-nouveau/pkg-descr
deleted file mode 100644
index 9c753dc..0000000
--- a/x11-drivers/xf86-video-nouveau/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-nouveau is an X.Org Foundation and Freedesktop.org project which was
-initially based on the obfuscated 2D-only free and open source "nv"
-driver, aiming to develop free software drivers for NVIDIA graphics
-cards, by reverse engineering NVIDIA's current proprietary drivers for
-Linux.
-
-WWW: http://nouveau.freedesktop.org/
diff --git a/x11-drivers/xf86-video-nouveau/pkg-message b/x11-drivers/xf86-video-nouveau/pkg-message
deleted file mode 100644
index 34c29a2..0000000
--- a/x11-drivers/xf86-video-nouveau/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-The DRM part is still not in the kernel tree and will not be there
-until it stabilized. It won't happen anytime soon. So, consider using
-the following patch in the meantime unless you don't want any hardware
-accelerated 2D like EXA and Xvideo.
-
-http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
-
-Installing it should be as simple as below procedure provided you have
-base sources in /usr/src.
-
-    # cd /usr/src/sys
-    # fetch http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
-    # patch -sp0 -i drm-nouveau-062309.patch
-    # cd modules/drm
-    # make depend all install
diff --git a/x11-drivers/xf86-video-nouveau/pkg-plist b/x11-drivers/xf86-video-nouveau/pkg-plist
deleted file mode 100644
index 63ff28c..0000000
--- a/x11-drivers/xf86-video-nouveau/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/nouveau_drv.la
-lib/xorg/modules/drivers/nouveau_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
deleted file mode 100644
index 7a3dd9c..0000000
--- a/x11-drivers/xf86-video-nv/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-nv
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-nv
-PORTVERSION=	2.1.18
-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
deleted file mode 100644
index efc4d2e..0000000
--- a/x11-drivers/xf86-video-nv/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415
-SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719
diff --git a/x11-drivers/xf86-video-nv/pkg-descr b/x11-drivers/xf86-video-nv/pkg-descr
deleted file mode 100644
index f7f0bab..0000000
--- a/x11-drivers/xf86-video-nv/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78ec8ce..0000000
--- a/x11-drivers/xf86-video-nv/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index b3e4d07..0000000
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# New ports collection makefile for:	xf86-video-openchrome
-# Date Created:				17 Sep 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-openchrome
-PORTVERSION=	0.2.904
-PORTREVISION=	3
-CATEGORIES=	x11-drivers
-MASTER_SITES=	http://www.openchrome.org/releases/
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org openChrome display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
-MAN4=		openchrome.4x
-
-MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
-
-ONLY_FOR_ARCHS=	amd64 i386 ia64
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-openchrome/distinfo b/x11-drivers/xf86-video-openchrome/distinfo
deleted file mode 100644
index 77bc055..0000000
--- a/x11-drivers/xf86-video-openchrome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = f2481d98ef54febf5bffbb88a2a2426d
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-configure b/x11-drivers/xf86-video-openchrome/files/patch-configure
deleted file mode 100644
index 42654fc..0000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-01-02 15:05:04.000000000 -0500
-+++ configure	2008-01-10 20:48:21.000000000 -0500
-@@ -21484,7 +21484,7 @@
- _ACEOF
- 
- 
--DRIVER_MAN_SUFFIX="4"
-+DRIVER_MAN_SUFFIX="4x"
- 
- 
- 
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c b/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
deleted file mode 100644
index 130e2ba..0000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/via_id.c.orig	2008-08-18 18:25:16.000000000 -0400
-+++ src/via_id.c	2008-11-11 21:20:14.000000000 -0500
-@@ -207,6 +207,7 @@
-     {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
-     {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
-     {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
-+    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-     {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
- 
-     /* keep this */
diff --git a/x11-drivers/xf86-video-openchrome/pkg-descr b/x11-drivers/xf86-video-openchrome/pkg-descr
deleted file mode 100644
index 2643b9a..0000000
--- a/x11-drivers/xf86-video-openchrome/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-openchrome driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
deleted file mode 100644
index 51f4809..0000000
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-lib/libchromeXvMC.la
-lib/libchromeXvMC.so
-lib/libchromeXvMC.so.1
-lib/libchromeXvMCPro.la
-lib/libchromeXvMCPro.so
-lib/libchromeXvMCPro.so.1
-lib/xorg/modules/drivers/openchrome_drv.la
-lib/xorg/modules/drivers/openchrome_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
deleted file mode 100644
index e94bed1..0000000
--- a/x11-drivers/xf86-video-r128/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	xf86-video-r128
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-r128
-PORTVERSION=	6.8.1
-PORTREVISION=	2
-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
deleted file mode 100644
index 9d2081a..0000000
--- a/x11-drivers/xf86-video-r128/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 2b90854a62a4d45d652062f582dc8d13
-SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
-SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251
diff --git a/x11-drivers/xf86-video-r128/pkg-descr b/x11-drivers/xf86-video-r128/pkg-descr
deleted file mode 100644
index 7fa7879..0000000
--- a/x11-drivers/xf86-video-r128/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index e599abd..0000000
--- a/x11-drivers/xf86-video-r128/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
deleted file mode 100644
index 296a5df..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	xf86-video-radeonhd-devel
-# Date Created:				2008-09-07
-# Whom:					nork@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-radeonhd
-PORTVERSION=	1.3.0.20091101
-PORTREVISION=	5
-CATEGORIES=	x11-drivers
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nork
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	nork@FreeBSD.org
-COMMENT=	X.Org ati RadeonHD display driver development version
-
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros \
-		${LOCALBASE}/libdata/pkgconfig/gl.pc:${PORTSDIR}/graphics/libGL
-LIB_DEPENDS=	pciaccess.0:${PORTSDIR}/devel/libpciaccess
-
-XORG_CAT=	driver
-USE_XORG=	damageproto glproto videoproto xextproto xf86driproto
-USE_AUTOTOOLS=	automake:env aclocal:env autoconf libtool
-
-CONFLICTS=	xf86-video-radeonhd-[0-9]*
-
-MAN4=		radeonhd.4x
-
-ACLOCAL_ARGS=	--acdir=${LOCALBASE}/share/aclocal
-
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} --force -v --install
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-radeonhd-devel/distinfo b/x11-drivers/xf86-video-radeonhd-devel/distinfo
deleted file mode 100644
index 3c229a5..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-radeonhd-1.3.0.20091101.tar.bz2) = 8b511d827046705582e8870c479ffefa
-SHA256 (xorg/driver/xf86-video-radeonhd-1.3.0.20091101.tar.bz2) = 8608a5d8c6968778f46784a9459047eba41a053929a8b682630b6af35e4f28da
-SIZE (xorg/driver/xf86-video-radeonhd-1.3.0.20091101.tar.bz2) = 402631
diff --git a/x11-drivers/xf86-video-radeonhd-devel/files/patch-configure.ac b/x11-drivers/xf86-video-radeonhd-devel/files/patch-configure.ac
deleted file mode 100644
index a16fa13..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2009-11-01 04:18:22.000000000 +0900
-+++ configure.ac	2009-11-01 04:23:22.892872472 +0900
-@@ -21,6 +21,9 @@
- AC_DISABLE_STATIC
- AC_PROG_CC
- 
-+dnl Define MKDIR_P var without requiring AC_PROG_MKDIR_P (new in autoconf-2.59b)
-+m4_ifdef([AC_PROG_MKDIR_P], [AC_PROG_MKDIR_P], [AC_SUBST([MKDIR_P], [${MKDIR_P-mkdir -p}])])
-+
- dnl Define SED var without requiring AC_PROG_SED (new in autoconf-2.59b)
- m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_SUBST([SED], [${SED-sed}])])
- 
diff --git a/x11-drivers/xf86-video-radeonhd-devel/files/patch-src-Makefile.am b/x11-drivers/xf86-video-radeonhd-devel/files/patch-src-Makefile.am
deleted file mode 100644
index 6fe17e1..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/files/patch-src-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2009-05-09 00:44:27.000000000 +0900
-+++ src/Makefile.am	2009-05-09 02:01:40.761722699 +0900
-@@ -4,7 +4,7 @@
- 
- EXTRA_DIST = Imakefile
- 
--AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @WARN_CFLAGS@
-+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @WARN_CFLAGS@ @ATOMBIOS_CFLAGS@
- 
- driversdir = ${moduledir}/drivers
- drivers_LTLIBRARIES = radeonhd_drv.la
diff --git a/x11-drivers/xf86-video-radeonhd-devel/pkg-descr b/x11-drivers/xf86-video-radeonhd-devel/pkg-descr
deleted file mode 100644
index f50f556..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-radeonhd driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist b/x11-drivers/xf86-video-radeonhd-devel/pkg-plist
deleted file mode 100644
index 8e39279..0000000
--- a/x11-drivers/xf86-video-radeonhd-devel/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-sbin/rhd_conntest
-sbin/rhd_dump
-lib/xorg/modules/drivers/radeonhd_drv.la
-lib/xorg/modules/drivers/radeonhd_drv.so
-lib/xorg/modules/drivers/radeonhd_drv.a
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile
deleted file mode 100644
index 03f06fe..0000000
--- a/x11-drivers/xf86-video-radeonhd/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for:	xf86-video-radeonhd
-# Date Created:				20 Oct 2007
-# Whom:					Rene Ladan <r.c.ladan@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-radeonhd
-PORTVERSION=	1.3.0
-PORTREVISION=	4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati RadeonHD display driver
-
-OPTIONS=	UTILS "Install rhd_conntest and rhd_dump utilities" off
-
-XORG_CAT=	driver
-USE_XORG=	damageproto glproto videoproto xextproto xf86driproto
-CONFIGURE_ARGS=	--enable-exa
-
-CONFLICTS=	xf86-video-radeonhd-devel-[0-9]*
-
-MAN4=	radeonhd.4x
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_UTILS)
-LIB_DEPENDS+=	pci.3:${PORTSDIR}/devel/libpci
-PLIST_SUB=	UTILS=""
-CONFIGURE_ENV+=	PCIUTILS_CFLAGS="-I${LOCALBASE}/include -lpci -lz" \
-		PCIUTILS_LIBS="-L${LOCALBASE}/lib"
-.else
-PLIST_SUB=	UTILS="@comment "
-.endif
-
-.if defined(WITH_UTILS)
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-radeonhd/distinfo b/x11-drivers/xf86-video-radeonhd/distinfo
deleted file mode 100644
index b2a5545..0000000
--- a/x11-drivers/xf86-video-radeonhd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-radeonhd-1.3.0.tar.bz2) = 7b6641aa9d836f1621b9b220ad6771b8
-SHA256 (xorg/driver/xf86-video-radeonhd-1.3.0.tar.bz2) = 5adad675e60e973f2e3522a01457d9214157fbb5005090fe48092e6e5e698ad5
-SIZE (xorg/driver/xf86-video-radeonhd-1.3.0.tar.bz2) = 772985
diff --git a/x11-drivers/xf86-video-radeonhd/pkg-descr b/x11-drivers/xf86-video-radeonhd/pkg-descr
deleted file mode 100644
index f50f556..0000000
--- a/x11-drivers/xf86-video-radeonhd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-radeonhd driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-radeonhd/pkg-plist b/x11-drivers/xf86-video-radeonhd/pkg-plist
deleted file mode 100644
index 115b3f1..0000000
--- a/x11-drivers/xf86-video-radeonhd/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/xorg/modules/drivers/radeonhd_drv.la
-lib/xorg/modules/drivers/radeonhd_drv.so
-%%UTILS%%sbin/rhd_conntest
-%%UTILS%%sbin/rhd_dump
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
deleted file mode 100644
index 375817d..0000000
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	xf86-video-rdc
-# Date created:				14 April 2010
-# Whom:					stas
-#
-# $FreeBSD: ports/x11-drivers/xf86-video-rdc/Makefile,v 1.3 2010/05/12 19:16:16 pav Exp $
-#
-
-PORTNAME=	xf86-video-rdc
-PORTVERSION=	0.5
-PORTREVISION=	2
-CATEGORIES=	x11-drivers
-MASTER_SITES=	http://www.SpringDaemons.com/stas/
-
-MAINTAINER=	stas@FreeBSD.org
-COMMENT=	X.Org RDC display driver
-
-#USE_GL=		gl
-XORG_CAT=	driver
-USE_XORG=	xvmc xf86driproto xextproto x11 glproto
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/xorg/modules/drivers
-	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \
-	    ${PREFIX}/lib/xorg/modules/drivers/rdc_drv.so
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rdc/distinfo b/x11-drivers/xf86-video-rdc/distinfo
deleted file mode 100644
index 7f93949..0000000
--- a/x11-drivers/xf86-video-rdc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-rdc-0.5.tar.bz2) = 1a0a9dbdd54fb3ab3e81f35193b1c23c
-SHA256 (xorg/driver/xf86-video-rdc-0.5.tar.bz2) = 513d990a2ee69a6c85fc855e4b71b024fdd6b0b9bedbd8332fab6c94c0a22eef
-SIZE (xorg/driver/xf86-video-rdc-0.5.tar.bz2) = 279659
diff --git a/x11-drivers/xf86-video-rdc/pkg-descr b/x11-drivers/xf86-video-rdc/pkg-descr
deleted file mode 100644
index 25f6123..0000000
--- a/x11-drivers/xf86-video-rdc/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org driver for RDC Semiconductors video chip.
-
-WWW:	http://www.rdc.com.tw/en/
diff --git a/x11-drivers/xf86-video-rdc/pkg-plist b/x11-drivers/xf86-video-rdc/pkg-plist
deleted file mode 100644
index 5bb95aa..0000000
--- a/x11-drivers/xf86-video-rdc/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xorg/modules/drivers/rdc_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
deleted file mode 100644
index 8fc96d2..0000000
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-rendition
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-rendition
-PORTVERSION=	4.2.4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org rendition display driver
-
-XORG_CAT=	driver
-USE_XORG=	xextproto
-MAN4=		rendition.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo
deleted file mode 100644
index 2b683b7..0000000
--- a/x11-drivers/xf86-video-rendition/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9
-SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573
diff --git a/x11-drivers/xf86-video-rendition/pkg-descr b/x11-drivers/xf86-video-rendition/pkg-descr
deleted file mode 100644
index 151ab6c..0000000
--- a/x11-drivers/xf86-video-rendition/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-rendition driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
deleted file mode 100644
index e276591..0000000
--- a/x11-drivers/xf86-video-rendition/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/xorg/modules/drivers/rendition_drv.la
-lib/xorg/modules/drivers/rendition_drv.so
-lib/xorg/modules/v10002d.uc
-lib/xorg/modules/v20002d.uc
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
deleted file mode 100644
index 5397647..0000000
--- a/x11-drivers/xf86-video-s3/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-video-s3
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-s3
-PORTVERSION=	0.6.3
-PORTREVISION=	2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org s3 display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		s3.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo
deleted file mode 100644
index b8cd9c2..0000000
--- a/x11-drivers/xf86-video-s3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 5eb06d88533fb327d067928faeb20860
-SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
-SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148
diff --git a/x11-drivers/xf86-video-s3/pkg-descr b/x11-drivers/xf86-video-s3/pkg-descr
deleted file mode 100644
index 0f0e0ff..0000000
--- a/x11-drivers/xf86-video-s3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-s3 driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
deleted file mode 100644
index 0f96af8..0000000
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/s3_drv.la
-lib/xorg/modules/drivers/s3_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
deleted file mode 100644
index bd879ee..0000000
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-video-s3virge
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-s3virge
-PORTVERSION=	1.10.4
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org s3virge display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		s3virge.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo
deleted file mode 100644
index d196e28..0000000
--- a/x11-drivers/xf86-video-s3virge/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 6517bbbf808c700502d51acdc44662f8
-SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
-SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224
diff --git a/x11-drivers/xf86-video-s3virge/pkg-descr b/x11-drivers/xf86-video-s3virge/pkg-descr
deleted file mode 100644
index 305f6b3..0000000
--- a/x11-drivers/xf86-video-s3virge/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-s3virge driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
deleted file mode 100644
index 0db60dc..0000000
--- a/x11-drivers/xf86-video-s3virge/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/s3virge_drv.la
-lib/xorg/modules/drivers/s3virge_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
deleted file mode 100644
index 2cad8e1..0000000
--- a/x11-drivers/xf86-video-savage/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-savage
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-savage
-PORTVERSION=	2.3.2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org savage display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto videoproto xextproto glproto
-MAN4=		savage.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo
deleted file mode 100644
index 5c16f9c..0000000
--- a/x11-drivers/xf86-video-savage/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 54bde0077a2369fbdd42b0b25803f3c7147a58792997b14e45ee0b856199ddf1
-SIZE (xorg/driver/xf86-video-savage-2.3.2.tar.bz2) = 366731
diff --git a/x11-drivers/xf86-video-savage/pkg-descr b/x11-drivers/xf86-video-savage/pkg-descr
deleted file mode 100644
index 909ad78..0000000
--- a/x11-drivers/xf86-video-savage/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-savage driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
deleted file mode 100644
index 6969a64..0000000
--- a/x11-drivers/xf86-video-savage/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/savage_drv.la
-lib/xorg/modules/drivers/savage_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
deleted file mode 100644
index cfa486f..0000000
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-siliconmotion
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-siliconmotion
-PORTVERSION=	1.7.3
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org siliconmotion display driver
-
-XORG_CAT=	driver
-USE_XORG=	videoproto xextproto
-MAN4=		siliconmotion.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo
deleted file mode 100644
index 5d477f0..0000000
--- a/x11-drivers/xf86-video-siliconmotion/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
-SIZE (xorg/driver/xf86-video-siliconmotion-1.7.3.tar.bz2) = 330623
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-descr b/x11-drivers/xf86-video-siliconmotion/pkg-descr
deleted file mode 100644
index 6816f93..0000000
--- a/x11-drivers/xf86-video-siliconmotion/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-siliconmotion driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
deleted file mode 100644
index 199eda7..0000000
--- a/x11-drivers/xf86-video-siliconmotion/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/siliconmotion_drv.la
-lib/xorg/modules/drivers/siliconmotion_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
deleted file mode 100644
index c51eec5..0000000
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	xf86-video-sis-intel
-# Date Created:				30 May 2008
-# Whom:					Alexey Illarionov <littlesavage@orionet.ru>
-# Based on:             		x11-drivers/xf86-video-sis by flz@FreeBSD.org
-#
-# $FreeBSD: ports/x11-drivers/xf86-video-sis-intel/Makefile,v 1.6 2010/05/01 11:40:47 miwi Exp $
-#
-
-PORTNAME=	xf86-video-sis-intel
-PORTVERSION=	300407
-PORTREVISION=	4
-CATEGORIES=	x11-drivers
-MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
-DISTNAME=	sis_drv_src_300407
-
-MAINTAINER=	littlesavage@orionet.ru
-COMMENT=	X.Org sis display driver provided by Intel
-
-IGNORE=		requires pciVideoPtr typedef
-
-CONFLICTS=	xf86-video-sis-[0-9]*
-WRKSRC=		${WRKDIR}/2d-driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4=		sis.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis-intel/distinfo b/x11-drivers/xf86-video-sis-intel/distinfo
deleted file mode 100644
index c97e03d..0000000
--- a/x11-drivers/xf86-video-sis-intel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/sis_drv_src_300407.tar.bz2) = 6b2289ea047f02f7649b853329217a76
-SHA256 (xorg/driver/sis_drv_src_300407.tar.bz2) = 98bab5fe714d2eb0c1fbdde81581e3af0195c2500357de85362b8717edff24ee
-SIZE (xorg/driver/sis_drv_src_300407.tar.bz2) = 756990
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h
deleted file mode 100644
index 853d652..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis.h
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/sis.h.orig	2007-05-02 05:13:01.000000000 +0400
-+++ src/sis.h	2008-06-10 19:44:21.000000000 +0400
-@@ -60,7 +60,6 @@
- #define TWDEBUG    
- #endif
- 
--#include "xf86_ansic.h"
- #include "compiler.h"
- #include "xf86Pci.h"
- #include "xf86Priv.h"
-@@ -88,16 +87,16 @@
- 	(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
- #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0)
- #endif
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SIS_HAVE_RR_FUNC
- #ifdef HaveDriverFuncs
- #undef  SIS_HaveDriverFuncs
- #define SIS_HaveDriverFuncs HaveDriverFuncs
- #define SIS_HAVE_DRIVER_FUNC
- #endif /* HaveDriverFuncs */
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISISXORG6899900
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISISXORG6899901
- #ifdef RANDR
- #define SIS_HAVE_RR_GET_MODE_MM
-@@ -181,7 +180,6 @@
- #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,14,0)
- #define SISNEWDRI
- #endif
--#define SIS315DRI		/* define this if dri is adapted for 315/330 series */
- #include "xf86drm.h"
- #include "sarea.h"
- #define _XF86DRI_SERVER_
-@@ -230,14 +228,14 @@
- 
- #undef SISCHECKOSSSE
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISCHECKOSSSE		/* Automatic check OS for SSE; requires SigIll facility */
- #endif
- #endif
- 
- #undef SISGAMMARAMP
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #define SISGAMMARAMP		/* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
- #endif
- #endif
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c
deleted file mode 100644
index dc4b9d9..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis300_accel.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/sis300_accel.c.orig	2008-06-06 00:43:06.000000000 +0400
-+++ src/sis300_accel.c	2008-05-27 02:53:37.000000000 +0400
-@@ -1231,7 +1231,7 @@
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
- 	   if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-          
- 	      if(pSiS->scrnOffset < 8192) {
- 	         int obase = 0;
-@@ -1253,7 +1253,7 @@
- 			"Not enough video RAM for offscreen memory manager. Xv disabled\n");
- 		 }
- 		 
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-                  pSiS->EXADriverPtr->card.offscreenByteAlign = 16;	/* src/dst: double quad word boundary */
- 		 pSiS->EXADriverPtr->card.offscreenPitch = 4;	
- #else
-@@ -1430,7 +1430,7 @@
- 	      pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
- 						SiSScratchSave, pSiS);
-     
--    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-               if(pSiS->exa_scratch) {
- 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
- 		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c
deleted file mode 100644
index d64ac0a..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis310_accel.c
+++ /dev/null
@@ -1,122 +0,0 @@
---- src/sis310_accel.c.orig	2007-05-02 05:12:57.000000000 +0400
-+++ src/sis310_accel.c	2008-06-09 22:15:56.000000000 +0400
-@@ -65,7 +65,7 @@
- #  define SIS_NEED_ARRAY
- #  undef SISNEWRENDER
- #  ifdef XORG_VERSION_CURRENT
--#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+#   if (XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0))
- #    define SISNEWRENDER
- #   endif
- #  endif
-@@ -1099,13 +1099,13 @@
- 
- 	SiSOccpyCmdQue(pSiS);
- #ifdef SISVRAMQ
--	if(op > SiSRenderOpsMAX) return FALSE;
--	if(!SiSRenderOps[op])    return FALSE;
-+	if(op > SiSRenderOpsMAX) {SiSReleaseCmdQue(pSiS); return FALSE;}
-+	if(!SiSRenderOps[op]) {SiSReleaseCmdQue(pSiS); return FALSE;}
- #else
--	if(op != PictOpOver) return FALSE;
-+	if(op != PictOpOver) {SiSReleaseCmdQue(pSiS); return FALSE;}
- #endif
- 
--	if((width > 2048) || (height > 2048)) return FALSE;
-+	if((width > 2048) || (height > 2048)) { SiSReleaseCmdQue(pSiS); return FALSE;}
- 
- 	pitch = (width + 31) & ~31;
- 	sizeNeeded = (pitch << bppshift) * height;
-@@ -1115,8 +1115,10 @@
- 		texType, op, width, height, texPitch, sizeNeeded, sbpp, sbppshift, bppshift);
- #endif
- 
--	if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift))
-+	if(!SiSAllocateLinear(pScrn, (sizeNeeded + sbpp - 1) >> sbppshift)) {
-+	   SiSReleaseCmdQue(pSiS);
- 	   return FALSE;
-+	}
- 
- 	width <<= bppshift;  /* -> bytes (for engine and memcpy) */
- 	pitch <<= bppshift;  /* -> bytes */
-@@ -1159,6 +1161,7 @@
- 	   SiSSetupCMDFlag(ALPHA_BLEND | SRCVIDEO | A_PERPIXELALPHA)
- 	   break;
- 	default:
-+	   SiSReleaseCmdQue(pSiS);
- 	   return FALSE;
-  	}
-         SiSSyncWP
-@@ -1463,11 +1466,11 @@
- 
- 	w = pSrc->drawable.width;
- 
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- 		     pSiS->EXADriverPtr->card.offscreenPitch - 1) &
- 		    ~(pSiS->EXADriverPtr->card.offscreenPitch - 1);
--#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#elif XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- 		     pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) &
- 		    ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1);
-@@ -1482,11 +1485,11 @@
- 	if(size > pSiS->exa_scratch->size)
- 	   return FALSE;
- 
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- 				  pSiS->EXADriverPtr->card.offscreenByteAlign - 1) &
- 				  ~(pSiS->EXADriverPtr->card.offscreenByteAlign - 1);
--#elif  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#elif  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- 				  pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) &
- 				  ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1);
-@@ -1496,7 +1499,7 @@
- 				  ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1);
- #endif
- 
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	if(pSiS->exa_scratch_next + size >
- 	   pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
- 	   (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0);
-@@ -1513,7 +1516,7 @@
- 	memcpy(pDst, pSrc, sizeof(*pDst));
- 	pDst->devKind = dst_pitch;
- 
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
- #else
- 	pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next;
-@@ -1755,7 +1758,7 @@
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
- 	   if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 
- 	      int obase = 0;
- 
-@@ -1776,7 +1779,7 @@
- 			"Not enough video RAM for offscreen memory manager. Xv disabled\n");
- 	      }
- 
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	      pSiS->EXADriverPtr->card.offscreenByteAlign = 16;	/* src/dst: double quad word boundary */
- 	      pSiS->EXADriverPtr->card.offscreenPitch = 4;	/* pitch:   double word boundary      */
- #else
-@@ -1945,7 +1948,7 @@
- 						SiSScratchSave, pSiS);
- 	      if(pSiS->exa_scratch) {
- 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
--        #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+        #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
- 	#else
-                  pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c
deleted file mode 100644
index b9dd8ce..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_3daccel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_3daccel.c.orig	2008-06-06 00:41:57.000000000 +0400
-+++ src/sis_3daccel.c	2008-05-27 02:54:55.000000000 +0400
-@@ -64,7 +64,7 @@
- #  define SIS_NEED_ARRAY
- #  undef SISNEWRENDER
- #  ifdef XORG_VERSION_CURRENT
--#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
- #    define SISNEWRENDER
- #   endif
- #  endif
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c
deleted file mode 100644
index 9fb21f3..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_accel.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/sis_accel.c.orig	2008-06-06 00:41:32.000000000 +0400
-+++ src/sis_accel.c	2008-05-27 02:53:54.000000000 +0400
-@@ -781,7 +781,7 @@
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
-        if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 
- 	  /* data */
- 	  pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
-@@ -795,7 +795,7 @@
- 	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 		"Not enough video RAM for offscreen memory manager. Xv disabled\n");
- 	  }
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- 	  pSiS->EXADriverPtr->card.offscreenByteAlign = 8;	/* src/dst: double quad word boundary */
- 	  pSiS->EXADriverPtr->card.offscreenPitch = 1;
- #else
-@@ -946,7 +946,7 @@
- 						SiSScratchSave, pSiS);
- 	  if(pSiS->exa_scratch) {
- 	     pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
--       #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+       #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
-              pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
-        #else
-              pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c
deleted file mode 100644
index c70fb33..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_dri.c.orig	2007-05-02 05:13:00.000000000 +0400
-+++ src/sis_dri.c	2008-06-06 01:17:19.000000000 +0400
-@@ -56,7 +56,7 @@
- 
- #ifdef XORG_VERSION_CURRENT
- #define SISHAVECREATEBUSID
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) && XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(4,0,0,0,0)
- extern char *DRICreatePCIBusID(pciVideoPtr PciInfo);
- #endif
- #else
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h
deleted file mode 100644
index 8d77d4b..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_dri.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sis_dri.h.orig	2008-06-06 01:29:26.000000000 +0400
-+++ src/sis_dri.h	2008-06-06 01:29:01.000000000 +0400
-@@ -116,7 +116,7 @@
-   int dummy;
- } SISDRIContextRec, *SISDRIContextPtr;
- 
--#ifdef XFree86Server
-+#if defined(XFree86Server) || defined(XORG_VERSION_CURRENT)
- 
- #include "screenint.h"
- 
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c
deleted file mode 100644
index 619fc14..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_driver.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sis_driver.c.orig	2007-05-02 05:13:00.000000000 +0400
-+++ src/sis_driver.c	2008-05-27 03:31:36.000000000 +0400
-@@ -559,9 +559,7 @@
- 	    pScrn->FreeScreen       = SISFreeScreen;
- 	    pScrn->ValidMode        = SISValidMode;
- #ifdef X_XF86MiscPassMessage
--	    if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
- 	       pScrn->HandleMessage = SISHandleMessage;
--	    }
- #endif
- 	    foundScreen = TRUE;
- 	}
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c
deleted file mode 100644
index ea09af0..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_memcpy.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sis_memcpy.c.orig	2007-05-02 05:13:01.000000000 +0400
-+++ src/sis_memcpy.c	2008-05-27 03:01:00.000000000 +0400
-@@ -844,9 +844,7 @@
- 
- #ifdef SISCHECKOSSSE
- 
--#ifndef XFree86LOADER
- #include <setjmp.h>
--#endif
- 
- static jmp_buf sigill_return;
- 
diff --git a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c b/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c
deleted file mode 100644
index b0f4c02..0000000
--- a/x11-drivers/xf86-video-sis-intel/files/patch-src-sis_mergedfb.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sis_mergedfb.c.orig	2008-06-06 00:39:10.000000000 +0400
-+++ src/sis_mergedfb.c	2008-06-06 00:32:21.000000000 +0400
-@@ -2631,13 +2631,13 @@
- 
-     REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
- 
--    pWin = SecurityLookupWindow(stuff->window, client, SecurityWriteAccess);
-+    pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess);
-     if(!pWin)
-        return BadWindow;
- 
-     pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
- 						 pWin->drawable.id, EventType,
--						 SecurityWriteAccess);
-+						 DixWriteAccess);
- 
-     if(stuff->enable & (XineramaLayoutChangeNotifyMask)) {
- 
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-descr b/x11-drivers/xf86-video-sis-intel/pkg-descr
deleted file mode 100644
index 81e087a..0000000
--- a/x11-drivers/xf86-video-sis-intel/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the X.Org SiS driver provided by Intel for their 
-D201GLY/D201GLY2 motherboards
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-plist b/x11-drivers/xf86-video-sis-intel/pkg-plist
deleted file mode 100644
index e1daba8..0000000
--- a/x11-drivers/xf86-video-sis-intel/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/sis_drv.la
-lib/xorg/modules/drivers/sis_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
deleted file mode 100644
index 8140572..0000000
--- a/x11-drivers/xf86-video-sis/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	xf86-video-sis
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-sis
-PORTVERSION=	0.10.2
-PORTREVISION=	2
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org sis display driver
-
-CONFLICTS=	xf86-video-sis-intel-[0-9]*
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4=		sis.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo
deleted file mode 100644
index f792633..0000000
--- a/x11-drivers/xf86-video-sis/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = f04baa307e49e9f0e5a5c3d2e89a5576
-SHA256 (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
-SIZE (xorg/driver/xf86-video-sis-0.10.2.tar.bz2) = 642160
diff --git a/x11-drivers/xf86-video-sis/pkg-descr b/x11-drivers/xf86-video-sis/pkg-descr
deleted file mode 100644
index 506af9c..0000000
--- a/x11-drivers/xf86-video-sis/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-sis driver.
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
deleted file mode 100644
index e1daba8..0000000
--- a/x11-drivers/xf86-video-sis/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/sis_drv.la
-lib/xorg/modules/drivers/sis_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
deleted file mode 100644
index 97c017d..0000000
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	xf86-video-sunffb
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-sunffb
-PORTVERSION=	1.2.1
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org sunffb display driver
-
-USE_GL=		gl
-
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xextproto glproto
-MAN4=		sunffb.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-sunffb/distinfo b/x11-drivers/xf86-video-sunffb/distinfo
deleted file mode 100644
index d2b2ba1..0000000
--- a/x11-drivers/xf86-video-sunffb/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-sunffb-1.2.1.tar.bz2) = 1bb374fe5ab3ed780d353b2b12ba6255
-SHA256 (xorg/driver/xf86-video-sunffb-1.2.1.tar.bz2) = fd377af6e366e8e3a77c8ff825a009138c8343c0007bbf070ad605a649577e11
-SIZE (xorg/driver/xf86-video-sunffb-1.2.1.tar.bz2) = 283427
diff --git a/x11-drivers/xf86-video-sunffb/files/patch-VISmoveImage.s b/x11-drivers/xf86-video-sunffb/files/patch-VISmoveImage.s
deleted file mode 100644
index f58ddad..0000000
--- a/x11-drivers/xf86-video-sunffb/files/patch-VISmoveImage.s
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/VISmoveImage.s.orig	2008-08-15 19:49:00.000000000 +0000
-+++ src/VISmoveImage.s	2009-03-29 14:08:42.000000000 +0000
-@@ -779,7 +779,11 @@
- 	 sub			%tmp3, %rightw, %curw
- 
- return: return			%i7+8
-+#if defined(__FreeBSD__)
-+	 nop
-+#else
- 	 wr			%g0, 0, %fprs
-+#endif
- 
- narrowst:
- 	and			%leftw, 0x38, %tmp1
-@@ -2174,7 +2178,11 @@
- 	 sub			%curw, %rightw, %curw
- 
- rreturn:return			%i7+8
-+#if defined(__FreeBSD__)
-+	 nop
-+#else
- 	 wr			%g0, 0, %fprs
-+#endif
- 
- narrowstr:
- 	cmp			%rightw, 64
diff --git a/x11-drivers/xf86-video-sunffb/pkg-descr b/x11-drivers/xf86-video-sunffb/pkg-descr
deleted file mode 100644
index 4d4bd0b..0000000
--- a/x11-drivers/xf86-video-sunffb/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-sunffb driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist
deleted file mode 100644
index ca5a836..0000000
--- a/x11-drivers/xf86-video-sunffb/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/sunffb_drv.la
-lib/xorg/modules/drivers/sunffb_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
deleted file mode 100644
index 9e80c3b..0000000
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	xf86-video-tdfx
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-tdfx
-PORTVERSION=	1.4.3
-PORTREVISION=	1
-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
deleted file mode 100644
index 23751ea..0000000
--- a/x11-drivers/xf86-video-tdfx/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 8161bbf2b100c21b609163f0010766b3
-SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
-SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172
diff --git a/x11-drivers/xf86-video-tdfx/pkg-descr b/x11-drivers/xf86-video-tdfx/pkg-descr
deleted file mode 100644
index 43f01e1..0000000
--- a/x11-drivers/xf86-video-tdfx/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 97d1e6d..0000000
--- a/x11-drivers/xf86-video-tdfx/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 5acd2d1..0000000
--- a/x11-drivers/xf86-video-tga/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-tga
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-tga
-PORTVERSION=	1.2.1
-PORTREVISION=	1
-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
deleted file mode 100644
index 1647a5c..0000000
--- a/x11-drivers/xf86-video-tga/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = bcbceda78395de74544c83b46a7700cd
-SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855
-SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334
diff --git a/x11-drivers/xf86-video-tga/pkg-descr b/x11-drivers/xf86-video-tga/pkg-descr
deleted file mode 100644
index 4b6648a..0000000
--- a/x11-drivers/xf86-video-tga/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 342702c..0000000
--- a/x11-drivers/xf86-video-tga/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index f768d3c..0000000
--- a/x11-drivers/xf86-video-trident/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-trident
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-trident
-PORTVERSION=	1.3.4
-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
deleted file mode 100644
index 80d0901..0000000
--- a/x11-drivers/xf86-video-trident/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
-SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898
diff --git a/x11-drivers/xf86-video-trident/pkg-descr b/x11-drivers/xf86-video-trident/pkg-descr
deleted file mode 100644
index b8727f4..0000000
--- a/x11-drivers/xf86-video-trident/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index a2348ba..0000000
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 06ee427..0000000
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-tseng
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-tseng
-PORTVERSION=	1.2.4
-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
deleted file mode 100644
index 475278a..0000000
--- a/x11-drivers/xf86-video-tseng/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d
-SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314
diff --git a/x11-drivers/xf86-video-tseng/pkg-descr b/x11-drivers/xf86-video-tseng/pkg-descr
deleted file mode 100644
index 2956770..0000000
--- a/x11-drivers/xf86-video-tseng/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 62decd9..0000000
--- a/x11-drivers/xf86-video-tseng/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-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-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
deleted file mode 100644
index a2fccaf..0000000
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for:	xf86-video-vesa
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-vesa
-PORTVERSION=	2.3.0
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org vesa display driver
-
-XORG_CAT=	driver
-USE_XORG=	xextproto
-MAN4=		vesa.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo
deleted file mode 100644
index 4bd2425..0000000
--- a/x11-drivers/xf86-video-vesa/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 07fa32958aff9b463dd3af5481ef6626
-SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
-SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539
diff --git a/x11-drivers/xf86-video-vesa/pkg-descr b/x11-drivers/xf86-video-vesa/pkg-descr
deleted file mode 100644
index 5d851fe..0000000
--- a/x11-drivers/xf86-video-vesa/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-vesa driver.
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
deleted file mode 100644
index 5a9cf2e..0000000
--- a/x11-drivers/xf86-video-vesa/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/vesa_drv.la
-lib/xorg/modules/drivers/vesa_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile
deleted file mode 100644
index c769d95..0000000
--- a/x11-drivers/xf86-video-via/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	xf86-video-via
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-via
-PORTVERSION=	0.2.2
-PORTREVISION=	8
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org via display driver
-
-IGNORE=		requires pciVideoPtr typedef
-
-USE_GL=		gl
-XORG_CAT=	driver
-USE_XORG=	xvmc xf86driproto xextproto x11 glproto
-
-MAN4=		via.4x
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-IGNORE=		does not install on sparc64
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-via/distinfo b/x11-drivers/xf86-video-via/distinfo
deleted file mode 100644
index b05a46c..0000000
--- a/x11-drivers/xf86-video-via/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = d5fe25d3cfa0a64cc77681f15f9c3159
-SHA256 (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = 5026bdaf644178fee66a26190453b0dddb99558b8c97c4a592a482a2434dc862
-SIZE (xorg/driver/xf86-video-via-0.2.2.tar.bz2) = 397641
diff --git a/x11-drivers/xf86-video-via/pkg-descr b/x11-drivers/xf86-video-via/pkg-descr
deleted file mode 100644
index bdff896..0000000
--- a/x11-drivers/xf86-video-via/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-via driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-via/pkg-plist b/x11-drivers/xf86-video-via/pkg-plist
deleted file mode 100644
index 06c919d..0000000
--- a/x11-drivers/xf86-video-via/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-lib/libviaXvMC.la
-lib/libviaXvMC.so
-lib/libviaXvMC.so.1
-lib/libviaXvMCPro.la
-lib/libviaXvMCPro.so
-lib/libviaXvMCPro.so.1
-lib/xorg/modules/drivers/via_drv.la
-lib/xorg/modules/drivers/via_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
deleted file mode 100644
index f337625..0000000
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	xf86-video-vmware
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-vmware
-PORTVERSION=	11.0.3
-PORTREVISION=	1
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org vmware display driver
-
-XORG_CAT=	driver
-USE_XORG=	xextproto xineramaproto videoproto
-
-MAN4=		vmware.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo
deleted file mode 100644
index 3e94099..0000000
--- a/x11-drivers/xf86-video-vmware/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = b24a7cb2d87e416561e25122eab2cd48fc64a2ba105238456eefef16f29f38a3
-SIZE (xorg/driver/xf86-video-vmware-11.0.3.tar.bz2) = 313656
diff --git a/x11-drivers/xf86-video-vmware/pkg-descr b/x11-drivers/xf86-video-vmware/pkg-descr
deleted file mode 100644
index c8d7317..0000000
--- a/x11-drivers/xf86-video-vmware/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the X.Org xf86-video-vmware driver.
-
-WWW: http://www.x.org
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
deleted file mode 100644
index 36a55a3..0000000
--- a/x11-drivers/xf86-video-vmware/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/xorg/modules/drivers/vmware_drv.la
-lib/xorg/modules/drivers/vmware_drv.so
-lib/xorg/modules/drivers/vmwlegacy_drv.so
-lib/xorg/modules/drivers/vmwlegacy_drv.la
-@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
deleted file mode 100644
index 86eef10..0000000
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for:	xf86-video-voodoo
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xf86-video-voodoo
-PORTVERSION=	1.2.4
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org voodoo display driver
-
-XORG_CAT=	driver
-USE_XORG=	xf86dgaproto xextproto
-MAN4=		voodoo.4x
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo
deleted file mode 100644
index 20eff8e..0000000
--- a/x11-drivers/xf86-video-voodoo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741
-SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523
diff --git a/x11-drivers/xf86-video-voodoo/pkg-descr b/x11-drivers/xf86-video-voodoo/pkg-descr
deleted file mode 100644
index 49fc9d9..0000000
--- a/x11-drivers/xf86-video-voodoo/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-voodoo driver.
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
deleted file mode 100644
index 98df906..0000000
--- a/x11-drivers/xf86-video-voodoo/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xorg/modules/drivers/voodoo_drv.la
-lib/xorg/modules/drivers/voodoo_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
deleted file mode 100644
index 3508268..0000000
--- a/x11-drivers/xorg-drivers/Makefile
+++ /dev/null
@@ -1,127 +0,0 @@
-# New ports collection makefile for:    xorg-drivers
-# Date created:				Jun 22 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD: ports/x11-drivers/xorg-drivers/Makefile,v 1.20 2010/05/01 11:40:49 miwi Exp $
-#
-
-PORTNAME=	xorg-drivers
-PORTVERSION=	7.5.1
-CATEGORIES=	x11-drivers
-MASTER_SITES=	# none
-DISTFILES=	# none
-EXTRACT_ONLY=	# none
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.org drivers meta-port
-
-VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
-INPUTDIR=	${PREFIX}/lib/xorg/modules/input
-
-NO_BUILD=	yes
-
-.if !defined(ARCH)
-ARCH!=  /usr/bin/uname -p
-.endif
-
-VIDEO_ON=	ati \
-		mach64 \
-		nv \
-		r128 \
-		radeonhd \
-		vesa
-
-.if ${ARCH} == "sparc64"
-VIDEO_ON+=	sunffb
-.elif ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
-VIDEO_ON+=	openchrome
-.endif
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-VIDEO_ON+=	intel
-.endif
-
-VIDEO_OFF=	apm ark \
-		chips cirrus cyrix \
-		dummy \
-		fbdev \
-		glint \
-		i128 i740 imstt \
-		mga \
-		neomagic newport \
-		rendition \
-		s3 s3virge savage siliconmotion	sis \
-		tdfx tga trident tseng \
-		via vmware voodoo
-
-VIDEO_EXCL=	via:openchrome
-
-INPUT_ON=	mouse \
-		keyboard
-INPUT_OFF=	acecad \
-		citron \
-		elographics \
-		fpit \
-		hyperpen \
-		joystick \
-		magictouch mutouch \
-		penmount \
-		synaptics \
-				vmmouse void
-
-QUIRKS=		keyboard:kbd jamstudio:js_x
-
-.if defined(XORG_COMPLETE)
-. for type in input video
-${type:U}_ON:=	${${type:U}_ON} ${${type:U}_OFF}
-${type:U}_OFF=	# nil
-.  for i in ${${type:U}_EXCL}
-B=	${i:C/.*://}
-${type:U}_ON:=	${${type:U}_ON:C/${B}//}
-${type:U}_OFF:=	${${type:U}_OFF} ${B}
-.  endfor
-. endfor
-.endif
-
-.for default in on off
-. for type in input video
-.  for i in ${${type:U}_${default:U}}
-OPTIONS+=	${i:U} "Install ${i} ${type} driver" ${default}
-.  endfor
-. endfor
-.endfor
-
-.include <bsd.port.pre.mk>
-
-.for i in ${VIDEO_EXCL}
-A=	${i:C/:.*//}
-B=	${i:C/.*://}
-. if defined(WITH_${B:U}) && !defined(WITHOUT_${A:U})
-DRV_CONFLICTS+=	${i}
-. endif
-.endfor
-
-.if defined(DRV_CONFLICTS)
-IGNORE=		can't be installed because of conflicting drivers (${DRV_CONFLICTS}). Re-run make config.
-.endif
-
-.for default in on off
-. for type in input video
-.  for i in ${${type:U}_${default:U}}
-DEFAULT=${default}
-.   if (${DEFAULT} == "on" && !defined(WITHOUT_${i:U})) || (${DEFAULT} == "off" && defined(WITH_${i:U}))
-.    if ${QUIRKS:M${i}\:*:C/.*://} != ""
-RUN_DEPENDS+=	${${type:U}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
-.    else
-RUN_DEPENDS+=	${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
-.    endif
-.   endif
-.  endfor
-. endfor
-.endfor
-
-do-install:
-		${MKDIR} ${PREFIX}/libdata/xorg
-		${TOUCH} ${PREFIX}/libdata/xorg/drivers
-
-.include <bsd.port.post.mk>
diff --git a/x11-drivers/xorg-drivers/pkg-descr b/x11-drivers/xorg-drivers/pkg-descr
deleted file mode 100644
index 0f06964..0000000
--- a/x11-drivers/xorg-drivers/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains X.Org shared libraries, headers, and related files.
-
-WWW: http://www.x.org/
diff --git a/x11-drivers/xorg-drivers/pkg-plist b/x11-drivers/xorg-drivers/pkg-plist
deleted file mode 100644
index d5bf804..0000000
--- a/x11-drivers/xorg-drivers/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-libdata/xorg/drivers
-@dirrmtry libdata/xorg
author	miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09>	2011-03-10 01:40:31 +0800
committer	miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09>	2011-03-10 01:40:31 +0800
commit	6fedf9a374de58685de001c1c7c89a9c5fd732a0 (patch)
tree	4ffdd234a99b30c66bf31d43392baba1d6c0c01a
parent	e068131583dea29440897d77171f4e3163ec78e7 (diff)
download	xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.gz xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.bz2 xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.lz xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.xz xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.tar.zst xorg-devel-ports-6fedf9a374de58685de001c1c7c89a9c5fd732a0.zip