Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't

quite work yet for me, but this clearly is a huge project and not having it
quite work on the first pass is hardly unexpected.  We definately want this
stuff in buildroot.

543 files changed, 7224 insertions, 12 deletions

diff --git a/package/Config.in b/package/Config.in
index b180962e4..09617df9c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -306,11 +306,16 @@ prompt "X Window System server"
 
 config BR2_PACKAGE_XSERVER_none
 	bool "none"
+config BR2_PACKAGE_XSERVER_x11r7
+	bool "x11r7"
 config BR2_PACKAGE_XSERVER_xorg
 	bool "xorg"
 config BR2_PACKAGE_XSERVER_tinyx
 	bool "tinyx"
 endchoice
+if BR2_PACKAGE_XSERVER_x11r7
+source "package/x11r7/Config.in"
+endif
 if BR2_PACKAGE_XSERVER_xorg
 source "package/xorg/Config.in"
 endif
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
new file mode 100644
index 000000000..a6d356ffa
--- /dev/null
+++ b/package/Makefile.autotools.in
@@ -0,0 +1,363 @@
+################################################################################
+#
+# Makefile.autotools.in --
+#
+# Implicit and Generated Rules for easily creating autotools-compatible 
+# buildroot packages
+#
+## Example minimal makefile for a package named 'foo'
+# 
+# | FOO_VERSION = 1.0
+# | FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+# | FOO_SITE = http://www.libfoo.org/dist
+# | $(eval $(call AUTOTARGETS,foo))
+# 
+## The following targets can be called from the shell:
+#
+# foo, foo-source, foo-patch, foo-configure, foo-build, foo-install,
+# foo-install-target, foo-install-staging, foo-uninstall, foo-clean, 
+# foo-dirclean
+#
+## The following variables which can be (re)defined in the package makefile:
+#
+# FOO_VERSION [mandatory]
+#	version string of the package
+# FOO_SOURCE [default foo-$(FOO_VERSION).tar.gz]
+#	file name of the package source
+# FOO_SITE [default sourceforge project "foo"]
+#	URL under wich $(FOO_SOURCE) can be found
+# FOO_DEPENDANCIES [default empty]
+#	list of (package) targets that must be built before foo
+# FOO_AUTORECONF [YES/NO, default NO]
+#	run <autoreconf> before <configure>
+# FOO_CONF_ENV [default empty]
+#	environment passed to the <configure> script
+# FOO_CONF_OPT [default empty]
+#	arguments passed to the <configure> script
+# FOO_MAKE_ENV [default empty]
+#	environment passed to all calls to <make> in the package source 
+#	directory
+# FOO_MAKE_OPT [default empty]
+#	arguments passed to <make> while building
+# FOO_INSTALL_STAGING [YES/NO, default NO]
+#	install the package to the staging directory
+# FOO_INSTALL_TARGET [YES/NO, default YES]
+#	install the package to the target directory
+# FOO_INSTALL_STAGING_OPT [default DESTDIR=$(STAGING_DIR)/usr install]
+#	arguments passed to <make> while installing to the staging directory
+# FOO_INSTALL_TARGET_OPT [default DESTDIR=$(STAGING_DIR)/usr install-exec]
+#	arguments passed to <make> while installing to the target directory
+# FOO_CLEAN_OPT [default clean]
+#	arguments passed to <make> while installing to the staging directory
+# FOO_UNINSTALL_STAGING_OPT  [default DESTDIR=$(STAGING_DIR)/usr uninstall]
+#	arguments passed to <make> while uninstalling from the staging 
+#	directory
+# FOO_UNINSTALL_TARGET_OPT [default DESTDIR=$(STAGING_DIR)/usr uninstall]
+#	arguments passed to <make> while uninstalling from the target 
+#	directory
+# FOO_SUBDIR [default empty]
+#	relative path in the package source from which to run configure and
+#	make
+#
+## The following variables contain hook target names;
+## by default they do nothing, they can be overriden in package makefiles
+#
+# FOO_HOOK_POST_BUILD, FOO_HOOK_POST_INSTALL
+#
+## The following variables contain targets that can be overriden
+#
+# FOO_TARGET_INSTALL_TARGET FOO_TARGET_INSTALL_STAGING FOO_TARGET_BUILD
+# FOO_TARGET_CONFIGURE FOO_TARGET_PATCH FOO_TARGET_EXTRACT FOO_TARGET_SOURCE
+# FOO_TARGET_UNINSTALL FOO_TARGET_CLEAN FOO_TARGET_DIRCLEAN
+#
+# E.g. if your package has a no <configure> script you can place the following 
+# in your package makefile:
+#
+# | $(FOO_TARGET_INSTALL):
+# | 	touch $@
+# 
+## The following variables are defined automatically and can be used in
+## overriden targets:
+#
+# PKG
+#	is always the current package name ("foo" in the example)
+# FOO_DIR
+#	the directory in which the package source is extracted.
+#	the base name will always be foo-$(FOO_VERSION), no matter what the
+#	archive name or the directory-in-archive name are.
+# MESSAGE
+#	macro that outputs a pretty message to stdout, e.g. use
+#	$(call MESSAGE,"Hello World")
+# 	in a target.
+#
+# Caveats:
+# - the 'eval' line (final line in the example) must be placed
+#   after all variable settings, but before all target re-definition
+#   (including hooks)
+################################################################################
+
+# UPPERCASE Macro -- transform its argument to uppercase and replace dots and 
+# hyphens to underscores
+UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
+
+# Define extrators for different archive suffixes
+INFLATE.bz2 = $(BZCAT)
+INFLATE.gz  = $(ZCAT)
+INFLATE.tbz = $(BZCAT)
+INFLATE.tgz = $(ZCAT)
+INFLATE.tar = cat
+
+# MESSAGE Macro -- display a message in bold type
+MESSAGE = @echo $(TERM_BOLD) ; \
+	echo ">>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(shell tput rmso)" ; \
+	echo $(TERM_RESET)
+TERM_BOLD = $(shell tput bold)
+TERM_RESET = $(shell tput rmso)
+
+# Utility programs used to build packages
+TAR ?= tar
+#ACLOCAL_STAGING_DIR ?= $(STAGING_DIR)/usr/share/aclocal
+#ACLOCAL ?= aclocal -I $(ACLOCAL_STAGING_DIR)
+#AUTORECONF ?= autoreconf -v -i -f -I $(ACLOCAL_STAGING_DIR)
+#	ACLOCAL="$(ACLOCAL)" 
+
+
+################################################################################
+# Implicit targets -- produce a stamp file for each step of a package build
+################################################################################
+
+# Retrieve and unpack the archive
+$(BUILD_DIR)/%/.stamp_downloaded:
+	$(call MESSAGE,"Downloading")
+	test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
+	mkdir -p $(@D)
+	touch $@
+
+# Retrieve and unpack the archive
+$(BUILD_DIR)/%/.stamp_extracted:
+	$(call MESSAGE,"Extracting")
+	mkdir -p $(@D)
+	$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
+	$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
+	touch $@
+
+# Patch
+$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $($(PKG)_NAME)-$($(PKG)_VERSION)
+$(BUILD_DIR)/%/.stamp_patched:
+	$(call MESSAGE,"Patching")
+	(if test -d package/$($(PKG)_NAME) ; then \
+	  if test "$(wildcard package/$($(PKG)_NAME)/$(NAMEVER)*.patch)" ; then \
+	    toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $(NAMEVER)\*.patch || exit 1 ; \
+	  else \
+	    toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME) $($(PKG)_NAME)\*.patch || exit 1 ; \
+	    if test -d package/$($(PKG)_NAME)/$(NAMEVER) ; then \
+	      toolchain/patch-kernel.sh $(@D) package/$($(PKG)_NAME)/$(NAMEVER) \*.patch || exit 1 ; \
+	    fi; \
+	  fi; \
+	fi)
+ifeq ($(strip $(BR2_UPDATE_CONFIG)),y)
+	@(for file in config.guess config.sub; do \
+		for i in $$(find $(@D) -name $$file); do \
+			cp package/gnuconfig/$$file $$i; \
+		done;\
+	done)
+endif
+	touch $@
+
+# Running autoreconf
+$(BUILD_DIR)/%/.stamp_autoconfigured:
+	$(call MESSAGE,"Running autoreconf")
+	cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF)
+	touch $@
+
+# Configuring
+$(BUILD_DIR)/%/.stamp_configured:
+	$(call MESSAGE,"Configuring")
+	if test "$($(PKG)_AUTORECONF)" = "YES" ; then \
+		cd $(@D)/$($(PKG)_SUBDIR) && \
+		$(AUTORECONF) ; \
+	fi
+	cd $(@D)/$($(PKG)_SUBDIR) && \
+	rm -f config.cache && \
+	$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$($(PKG)_CONF_ENV) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		$($(PKG)_CONF_OPT)
+	touch $@;
+
+# Build
+$(BUILD_DIR)/%/.stamp_built:
+	$(call MESSAGE,"Building")
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	touch $@
+
+# Install to staging dir
+$(BUILD_DIR)/%/.stamp_staging_installed:
+	$(call MESSAGE,'Installing to host (staging directory)')
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+#	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
+	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la") ; do \
+		cp $$i $$i~ ; \
+		$(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:" $$i ; \
+	done
+	touch $@
+
+# Install to target dir
+$(BUILD_DIR)/%/.stamp_target_installed:
+	$(call MESSAGE,"Installing to target")
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	for d in man include info share/info ; do \
+		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d ; \
+	done
+	find $(TARGET_DIR) -name '*.a' -o -name '*.la' -delete
+	touch $@
+
+$(BUILD_DIR)/%/.stamp_cleaned:
+	$(call MESSAGE,"Cleaning up")
+	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+
+$(BUILD_DIR)/%/.stamp_uninstalled:
+	$(call MESSAGE,"Uninstalling")
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+
+$(BUILD_DIR)/%/.stamp_dircleaned:
+	rm -Rf $(@D)
+
+
+################################################################################
+# AUTOTARGETS -- the target generator macro; define a set of human-readable 
+# make targets, stamps, and default per-package variables.
+# Argument 1 is the (lowercase) package name.
+################################################################################
+
+define AUTOTARGETS
+$(call AUTOTARGETS_INNER,$(1),$(call UPPERCASE,$(1)))
+endef
+      
+# AUTOTARGETS_INNER -- does the job for AUTOTARGETS; argument 1 is the
+# lowercase package name, argument 2 the uppercase package name
+define AUTOTARGETS_INNER
+
+# define package-specific variables to default values
+$(2)_NAME			=  $(1)
+$(2)_VERSION			?= undefined
+$(2)_DIR			=  $$(BUILD_DIR)/$(1)-$$($(2)_VERSION)
+$(2)_SOURCE			?= $(1)-$$($(2)_VERSION).tar.gz
+$(2)_SITE			?= \
+	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
+$(2)_DEPENDANCIES		?=
+$(2)_AUTORECONF			?= NO
+$(2)_CONF_ENV			?=
+$(2)_CONF_OPT			?=
+$(2)_MAKE_ENV			?= 
+$(2)_MAKE_OPT			?=
+$(2)_INSTALL_STAGING		?= NO
+$(2)_INSTALL_TARGET		?= YES
+$(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install-exec
+$(2)_CLEAN_OPT			?= clean
+$(2)_UNINSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) uninstall
+$(2)_UNINSTALL_TARGET_OPT	?= DESTDIR=$$(TARGET_DIR)  uninstall
+$(2)_SUBDIR			?=
+
+
+# define sub-target stamps
+$(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed
+$(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
+$(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_AUTORECONF =	$$($(2)_DIR)/.stamp_autoconfigured
+$(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
+$(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
+$(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
+$(2)_TARGET_UNINSTALL =		$$($(2)_DIR)/.stamp_uninstalled
+$(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned
+$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
+
+$(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build
+$(2)_HOOK_POST_INSTALL =	$$($(2)_DIR)/.stamp_hook_post_install
+
+# human-friendly targets and target sequencing
+$(1): 			$(1)-install
+$(1)-install: 		$(1)-install-staging $(1)-install-target \
+			$$($(2)_HOOK_POST_INSTALL)
+			
+ifeq ($$($(2)_INSTALL_TARGET),YES)
+$(1)-install-target:	$(1)-build $$($(2)_TARGET_INSTALL_TARGET)
+else
+$(1)-install-target:
+endif
+
+ifeq ($$($(2)_INSTALL_STAGING),YES)
+$(1)-install-staging:	$(1)-build $$($(2)_TARGET_INSTALL_STAGING)
+else
+$(1)-install-staging:
+endif
+
+$(1)-build:		$(1)-configure $$($(2)_TARGET_BUILD) \
+			$$($(2)_HOOK_POST_BUILD)
+
+$(1)-configure:		$(1)-autoreconf $$($(2)_TARGET_CONFIGURE)
+
+ifeq ($$($(2)_AUTORECONF),YES)
+$(1)-autoreconf:	$(1)-patch $$($(2)_TARGET_AUTORECONF)
+$(2)_DEPENDANCIES += host-automake host-autoconf host-libtool
+else
+$(1)-autoreconf:	$(1)-patch
+endif
+
+$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
+
+$(1)-extract:		$(1)-depends $$($(2)_TARGET_EXTRACT)
+
+$(1)-depends:		$(1)-source $$($(2)_DEPENDANCIES)
+
+$(1)-source:		$$($(2)_TARGET_SOURCE)
+
+# non-build targets
+$(1)-uninstall: 	$(1)-configure $$($(2)_TARGET_UNINSTALL)
+
+$(1)-clean:		$$($(2)_TARGET_CLEAN)
+
+$(1)-dirclean:		$$($(2)_TARGET_DIRCLEAN)
+
+# define the PKG variable for all targets, containing the
+# uppercase package variable prefix
+$$($(2)_TARGET_INSTALL_TARGET):		PKG=$(2)
+$$($(2)_TARGET_INSTALL_STAGING):	PKG=$(2)
+$$($(2)_TARGET_BUILD):			PKG=$(2)
+$$($(2)_TARGET_CONFIGURE):		PKG=$(2)
+$$($(2)_TARGET_AUTORECONF):		PKG=$(2)
+$$($(2)_TARGET_PATCH):			PKG=$(2)
+$$($(2)_TARGET_EXTRACT):		PKG=$(2)
+$$($(2)_TARGET_SOURCE):			PKG=$(2)
+$$($(2)_TARGET_UNINSTALL):		PKG=$(2)
+$$($(2)_TARGET_CLEAN):			PKG=$(2)
+$$($(2)_TARGET_DIRCLEAN):		PKG=$(2)
+$$($(2)_HOOK_POST_BUILD):		PKG=$(2)
+$$($(2)_HOOK_POST_INSTALL):		PKG=$(2)
+
+# define hook targets
+# default hook behaviour: do nothing
+$$($(2)_HOOK_POST_BUILD):
+$$($(2)_HOOK_POST_INSTALL):
+
+# add package to the general list if targets if requested by the buildroot
+# configuration
+ifeq ($$(BR2_PACKAGE_$(2)),y)
+TARGETS += $(1)
+endif
+endef
+
+# :mode=makefile:
+
diff --git a/package/Makefile.in b/package/Makefile.in
index d7a817d8d..1589cf14b 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -60,11 +60,13 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 TARGET_CFLAGS+=-msoft-float
 endif
 
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 
 # else it's an external toolchain
 #########################################################################
 else
 TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 endif
 #########################################################################
@@ -130,6 +132,7 @@ TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 endif
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CXX=$(TARGET_CROSS)g++
+TARGET_AR=$(TARGET_CROSS)ar
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
 TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
 INSTALL=/usr/bin/install
@@ -175,9 +178,14 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		CXX_FOR_BUILD="$(HOSTCXX)" \
 		LD_FOR_BUILD="$(HOSTLD)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+		CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
-		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config"
+		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+		STAGING_DIR="$(STAGING_DIR)"
 
 HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		AR_FOR_BUILD="$(HOSTAR)" \
@@ -265,3 +273,5 @@ ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
 XSERVER+=xggi
 endif
 
+include package/Makefile.autotools.in
+
diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 0af4ad213..ad4a62ae6 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_CAIRO
 	default n
 	select BR2_PACKAGE_PKGCONFIG
 	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_XORG
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include
diff --git a/package/dillo/Config.in b/package/dillo/Config.in
index 41ae5abbb..eeddee298 100644
--- a/package/dillo/Config.in
+++ b/package/dillo/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_DILLO
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBGLIB12
 	select BR2_PACKAGE_LIBGTK12
-	select BR2_PACKAGE_XORG
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBPNG
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
 	  Dillo is a small GTK+ based web browser written in C.
 
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index a0a7c9c46..37fd8c264 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -153,7 +153,7 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 
 $(TARGET_DIR)/usr/lib/libintl.a: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 	cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.a $(TARGET_DIR)/usr/lib/
-	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a 	$(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a    $(TARGET_DIR)/usr/lib/
 	touch -c $@
 
 libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
diff --git a/package/gnuconfig/Config.in b/package/gnuconfig/Config.in
new file mode 100644
index 000000000..9f5711e93
--- /dev/null
+++ b/package/gnuconfig/Config.in
@@ -0,0 +1,8 @@
+config BR2_UPDATE_CONFIG
+	bool "update config.sub and config.guess"
+	default n
+	help
+		This just exists to easily update the config.sub / config.guess
+		files in packages to the latest version (since many bundled ones
+		don't support the latest possible targets)
+
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
new file mode 100644
index 000000000..3ef309971
--- /dev/null
+++ b/package/libdrm/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBDRM
+	bool "libdrm"
+	default n
+	help
+
+	http://dri.freedesktop.org/libdrm/
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
new file mode 100644
index 000000000..5425bd3d6
--- /dev/null
+++ b/package/libdrm/libdrm.mk
@@ -0,0 +1,79 @@
+#############################################################
+#
+# libdrm
+#
+#############################################################
+LIBDRM_VERSION:=2.3.0
+LIBDRM_SOURCE:=libdrm-$(LIBDRM_VERSION).tar.bz2
+LIBDRM_SITE:=http://dri.freedesktop.org/libdrm/
+LIBDRM_CAT:=$(BZCAT)
+LIBDRM_DIR:=$(BUILD_DIR)/libdrm-$(LIBDRM_VERSION)
+
+$(DL_DIR)/$(LIBDRM_SOURCE):
+	$(WGET) -P $(DL_DIR) $(LIBDRM_SITE)/$(LIBDRM_SOURCE)
+
+libdrm-source: $(DL_DIR)/$(LIBDRM_SOURCE)
+
+$(LIBDRM_DIR)/.unpacked: $(DL_DIR)/$(LIBDRM_SOURCE)
+	$(LIBDRM_CAT) $(DL_DIR)/$(LIBDRM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(LIBDRM_DIR)/.unpacked
+
+$(LIBDRM_DIR)/.configured: $(LIBDRM_DIR)/.unpacked
+	(cd $(LIBDRM_DIR); \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS) " \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--includedir=/include \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+	);
+	touch $(LIBDRM_DIR)/.configured
+
+$(LIBDRM_DIR)/.compiled: $(LIBDRM_DIR)/.configured
+	$(MAKE) CCexe="$(HOSTCC)" -C $(LIBDRM_DIR)
+	touch $(LIBDRM_DIR)/.compiled
+
+$(STAGING_DIR)/lib/libdrm.so: $(LIBDRM_DIR)/.compiled
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBDRM_DIR) install
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libdrm.la
+	#$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
+	#	-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
+	#	-e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/include\',g" \
+	#	-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
+	#	$(STAGING_DIR)/usr/bin/libdrm-config
+	touch -c $(STAGING_DIR)/lib/libdrm.so
+
+$(TARGET_DIR)/lib/libdrm.so: $(STAGING_DIR)/lib/libdrm.so
+	cp -dpf $(STAGING_DIR)/lib/libdrm.so* $(TARGET_DIR)/lib/
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdrm.so
+
+libdrm: uclibc pkgconfig $(TARGET_DIR)/lib/libdrm.so
+
+libdrm-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LIBDRM_DIR) uninstall
+	-$(MAKE) -C $(LIBDRM_DIR) clean
+
+libdrm-dirclean:
+	rm -rf $(LIBDRM_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_LIBDRM)),y)
+TARGETS+=libdrm
+endif
diff --git a/package/libgtk12/Config.in b/package/libgtk12/Config.in
index 19e01ce9f..e9ecf257e 100644
--- a/package/libgtk12/Config.in
+++ b/package/libgtk12/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGTK12
 	bool "libgtk12"
 	default n
 	select BR2_PACKAGE_LIBGLIB12
-	select BR2_PACKAGE_XORG
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
 	  The GTK+ graphical user interface library
 
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index fb7b92c5e..8c6b5f70c 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_XORG
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	help
 	  The GTK+ version 2 graphical user interface library
 
diff --git a/package/metacity/Config.in b/package/metacity/Config.in
index 5b9bff778..71c21b4ad 100644
--- a/package/metacity/Config.in
+++ b/package/metacity/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_METACITY
 	bool "metacity"
-	select BR2_PACKAGE_XORG
 	select BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	default n
 	help
 	  Metacity is a window manager for the X Window System.
diff --git a/package/rdesktop/Config.in b/package/rdesktop/Config.in
index c0af3bfa0..ca00f36b0 100644
--- a/package/rdesktop/Config.in
+++ b/package/rdesktop/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_RDESKTOP
 	bool "rdesktop"
-	select BR2_PACKAGE_XORG
 	select BR2_PACKAGE_OPENSSL
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
 	default n
 	help
 	  rdesktop is an open source client for Windows NT Terminal
diff --git a/package/tinyx/Config.in b/package/tinyx/Config.in
index 6b240776b..b26401c1a 100644
--- a/package/tinyx/Config.in
+++ b/package/tinyx/Config.in
@@ -3,3 +3,7 @@ config BR2_PACKAGE_TINYX
 	default y if BR2_PACKAGE_XSERVER_tinyx
 	help
 	  A tiny X server.  Also known as 'Xfbdev' and 'kdrive'.
+
+comment "tinyx X Window System disabled"
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
new file mode 100644
index 000000000..1d6aa17ae
--- /dev/null
+++ b/package/x11r7/Config.in
@@ -0,0 +1,282 @@
+menuconfig BR2_PACKAGE_XORG7
+bool "X.org X Window System, X11R7, release 7.2"
+default n
+default y if BR2_PACKAGE_XSERVER_x11r7
+select BR2_PACKAGE_ZLIB
+select BR2_PACKAGE_LIBPNG
+select BR2_PACKAGE_EXPAT
+select BR2_PACKAGE_FONTCONFIG
+select BR2_PACKAGE_PKGCONFIG
+help
+	Support for X11R7 libraries, servers, drivers, and/or applications in the target
+if BR2_PACKAGE_XORG7
+	menu "X11R7 Servers"
+		source package/x11r7/xserver_xorg-server/Config.in
+	endmenu
+	menu "X11R7 Libraries"
+		source package/x11r7/libdrm/Config.in
+		source package/x11r7/libxcb/Config.in
+		source package/x11r7/mesa3d/Config.in
+		source package/x11r7/pthread-stubs/Config.in
+		source package/x11r7/xlib_libFS/Config.in
+		source package/x11r7/xlib_libICE/Config.in
+		source package/x11r7/xlib_libSM/Config.in
+		source package/x11r7/xlib_libX11/Config.in
+		source package/x11r7/xlib_libXScrnSaver/Config.in
+		source package/x11r7/xlib_libXTrap/Config.in
+		source package/x11r7/xlib_libXau/Config.in
+		source package/x11r7/xlib_libXaw/Config.in
+		source package/x11r7/xlib_libXcomposite/Config.in
+		source package/x11r7/xlib_libXcursor/Config.in
+		source package/x11r7/xlib_libXdamage/Config.in
+		source package/x11r7/xlib_libXdmcp/Config.in
+		source package/x11r7/xlib_libXevie/Config.in
+		source package/x11r7/xlib_libXext/Config.in
+		source package/x11r7/xlib_libXfixes/Config.in
+		source package/x11r7/xlib_libXfont/Config.in
+		source package/x11r7/xlib_libXfontcache/Config.in
+		source package/x11r7/xlib_libXft/Config.in
+		source package/x11r7/xlib_libXi/Config.in
+		source package/x11r7/xlib_libXinerama/Config.in
+		source package/x11r7/xlib_libXmu/Config.in
+		source package/x11r7/xlib_libXp/Config.in
+		source package/x11r7/xlib_libXpm/Config.in
+		source package/x11r7/xlib_libXprintAppUtil/Config.in
+		source package/x11r7/xlib_libXprintUtil/Config.in
+		source package/x11r7/xlib_libXrandr/Config.in
+		source package/x11r7/xlib_libXrender/Config.in
+		source package/x11r7/xlib_libXres/Config.in
+		source package/x11r7/xlib_libXt/Config.in
+		source package/x11r7/xlib_libXtst/Config.in
+		source package/x11r7/xlib_libXv/Config.in
+		source package/x11r7/xlib_libXvMC/Config.in
+		source package/x11r7/xlib_libXxf86dga/Config.in
+		source package/x11r7/xlib_libXxf86misc/Config.in
+		source package/x11r7/xlib_libXxf86vm/Config.in
+		source package/x11r7/xlib_libdmx/Config.in
+		source package/x11r7/xlib_libfontenc/Config.in
+		source package/x11r7/xlib_liblbxutil/Config.in
+		source package/x11r7/xlib_liboldX/Config.in
+		source package/x11r7/xlib_libxkbfile/Config.in
+		source package/x11r7/xlib_libxkbui/Config.in
+		source package/x11r7/xlib_xtrans/Config.in
+	endmenu
+	menu "X11R7 Applications"
+		source package/x11r7/xapp_appres/Config.in
+		source package/x11r7/xapp_bdftopcf/Config.in
+		source package/x11r7/xapp_beforelight/Config.in
+		source package/x11r7/xapp_bitmap/Config.in
+		source package/x11r7/xapp_editres/Config.in
+		source package/x11r7/xapp_fonttosfnt/Config.in
+		source package/x11r7/xapp_fslsfonts/Config.in
+		source package/x11r7/xapp_fstobdf/Config.in
+		source package/x11r7/xapp_iceauth/Config.in
+		source package/x11r7/xapp_ico/Config.in
+		source package/x11r7/xapp_lbxproxy/Config.in
+		source package/x11r7/xapp_listres/Config.in
+		source package/x11r7/xapp_luit/Config.in
+		source package/x11r7/xapp_mkfontdir/Config.in
+		source package/x11r7/xapp_mkfontscale/Config.in
+		source package/x11r7/xapp_oclock/Config.in
+		source package/x11r7/xapp_proxymngr/Config.in
+		source package/x11r7/xapp_rgb/Config.in
+		source package/x11r7/xapp_rstart/Config.in
+		source package/x11r7/xapp_scripts/Config.in
+		source package/x11r7/xapp_sessreg/Config.in
+		source package/x11r7/xapp_setxkbmap/Config.in
+		source package/x11r7/xapp_showfont/Config.in
+		source package/x11r7/xapp_smproxy/Config.in
+		source package/x11r7/xapp_twm/Config.in
+		source package/x11r7/xapp_viewres/Config.in
+		source package/x11r7/xapp_x11perf/Config.in
+		source package/x11r7/xapp_xauth/Config.in
+		source package/x11r7/xapp_xbiff/Config.in
+		source package/x11r7/xapp_xcalc/Config.in
+		source package/x11r7/xapp_xclipboard/Config.in
+		source package/x11r7/xapp_xclock/Config.in
+		source package/x11r7/xapp_xcmsdb/Config.in
+		source package/x11r7/xapp_xcursorgen/Config.in
+		source package/x11r7/xapp_xdbedizzy/Config.in
+		source package/x11r7/xapp_xditview/Config.in
+		source package/x11r7/xapp_xdm/Config.in
+		source package/x11r7/xapp_xdpyinfo/Config.in
+		source package/x11r7/xapp_xdriinfo/Config.in
+		source package/x11r7/xapp_xedit/Config.in
+		source package/x11r7/xapp_xev/Config.in
+		source package/x11r7/xapp_xeyes/Config.in
+		source package/x11r7/xapp_xf86dga/Config.in
+		source package/x11r7/xapp_xfd/Config.in
+		source package/x11r7/xapp_xfindproxy/Config.in
+		source package/x11r7/xapp_xfontsel/Config.in
+		source package/x11r7/xapp_xfs/Config.in
+		source package/x11r7/xapp_xfsinfo/Config.in
+		source package/x11r7/xapp_xfwp/Config.in
+		source package/x11r7/xapp_xgamma/Config.in
+		source package/x11r7/xapp_xgc/Config.in
+		source package/x11r7/xapp_xhost/Config.in
+		source package/x11r7/xapp_xinit/Config.in
+		source package/x11r7/xapp_xkbcomp/Config.in
+		source package/x11r7/xapp_xkbevd/Config.in
+		source package/x11r7/xapp_xkbprint/Config.in
+		source package/x11r7/xapp_xkbutils/Config.in
+		source package/x11r7/xapp_xkill/Config.in
+		source package/x11r7/xapp_xload/Config.in
+		source package/x11r7/xapp_xlogo/Config.in
+		source package/x11r7/xapp_xlsatoms/Config.in
+		source package/x11r7/xapp_xlsclients/Config.in
+		source package/x11r7/xapp_xlsfonts/Config.in
+		source package/x11r7/xapp_xmag/Config.in
+		source package/x11r7/xapp_xmessage/Config.in
+		source package/x11r7/xapp_xmh/Config.in
+		source package/x11r7/xapp_xmodmap/Config.in
+		source package/x11r7/xapp_xmore/Config.in
+		source package/x11r7/xapp_xphelloworld/Config.in
+		source package/x11r7/xapp_xplsprinters/Config.in
+		source package/x11r7/xapp_xpr/Config.in
+		source package/x11r7/xapp_xprehashprinterlist/Config.in
+		source package/x11r7/xapp_xprop/Config.in
+		source package/x11r7/xapp_xrandr/Config.in
+		source package/x11r7/xapp_xrdb/Config.in
+		source package/x11r7/xapp_xrefresh/Config.in
+		source package/x11r7/xapp_xrx/Config.in
+		source package/x11r7/xapp_xset/Config.in
+		source package/x11r7/xapp_xsetmode/Config.in
+		source package/x11r7/xapp_xsetpointer/Config.in
+		source package/x11r7/xapp_xsetroot/Config.in
+		source package/x11r7/xapp_xsm/Config.in
+		source package/x11r7/xapp_xstdcmap/Config.in
+		source package/x11r7/xapp_xtrap/Config.in
+		source package/x11r7/xapp_xvidtune/Config.in
+		source package/x11r7/xapp_xvinfo/Config.in
+		source package/x11r7/xapp_xwd/Config.in
+		source package/x11r7/xapp_xwininfo/Config.in
+		source package/x11r7/xapp_xwud/Config.in
+	endmenu
+	menu "X11R7 Drivers"
+		source package/x11r7/openchrome/Config.in
+		source package/x11r7/xdriver_xf86-input-acecad/Config.in
+		source package/x11r7/xdriver_xf86-input-aiptek/Config.in
+		source package/x11r7/xdriver_xf86-input-calcomp/Config.in
+		source package/x11r7/xdriver_xf86-input-citron/Config.in
+		source package/x11r7/xdriver_xf86-input-digitaledge/Config.in
+		source package/x11r7/xdriver_xf86-input-dmc/Config.in
+		source package/x11r7/xdriver_xf86-input-dynapro/Config.in
+		source package/x11r7/xdriver_xf86-input-elo2300/Config.in
+		source package/x11r7/xdriver_xf86-input-elographics/Config.in
+		source package/x11r7/xdriver_xf86-input-evdev/Config.in
+		source package/x11r7/xdriver_xf86-input-fpit/Config.in
+		source package/x11r7/xdriver_xf86-input-hyperpen/Config.in
+		source package/x11r7/xdriver_xf86-input-jamstudio/Config.in
+		source package/x11r7/xdriver_xf86-input-joystick/Config.in
+		source package/x11r7/xdriver_xf86-input-keyboard/Config.in
+		source package/x11r7/xdriver_xf86-input-magellan/Config.in
+		source package/x11r7/xdriver_xf86-input-magictouch/Config.in
+		source package/x11r7/xdriver_xf86-input-microtouch/Config.in
+		source package/x11r7/xdriver_xf86-input-mouse/Config.in
+		source package/x11r7/xdriver_xf86-input-mutouch/Config.in
+		source package/x11r7/xdriver_xf86-input-palmax/Config.in
+		source package/x11r7/xdriver_xf86-input-penmount/Config.in
+		source package/x11r7/xdriver_xf86-input-spaceorb/Config.in
+		source package/x11r7/xdriver_xf86-input-summa/Config.in
+		source package/x11r7/xdriver_xf86-input-tek4957/Config.in
+		source package/x11r7/xdriver_xf86-input-ur98/Config.in
+		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
+		source package/x11r7/xdriver_xf86-input-void/Config.in
+		source package/x11r7/xdriver_xf86-video-apm/Config.in
+		source package/x11r7/xdriver_xf86-video-ark/Config.in
+		source package/x11r7/xdriver_xf86-video-ast/Config.in
+		source package/x11r7/xdriver_xf86-video-ati/Config.in
+		source package/x11r7/xdriver_xf86-video-chips/Config.in
+		source package/x11r7/xdriver_xf86-video-cirrus/Config.in
+		source package/x11r7/xdriver_xf86-video-cyrix/Config.in
+		source package/x11r7/xdriver_xf86-video-dummy/Config.in
+		source package/x11r7/xdriver_xf86-video-fbdev/Config.in
+		source package/x11r7/xdriver_xf86-video-glint/Config.in
+		source package/x11r7/xdriver_xf86-video-i128/Config.in
+		source package/x11r7/xdriver_xf86-video-i740/Config.in
+		source package/x11r7/xdriver_xf86-video-i810/Config.in
+		source package/x11r7/xdriver_xf86-video-imstt/Config.in
+		source package/x11r7/xdriver_xf86-video-mga/Config.in
+		source package/x11r7/xdriver_xf86-video-neomagic/Config.in
+		source package/x11r7/xdriver_xf86-video-newport/Config.in
+		source package/x11r7/xdriver_xf86-video-nsc/Config.in
+		source package/x11r7/xdriver_xf86-video-nv/Config.in
+		source package/x11r7/xdriver_xf86-video-rendition/Config.in
+		source package/x11r7/xdriver_xf86-video-s3/Config.in
+		source package/x11r7/xdriver_xf86-video-s3virge/Config.in
+		source package/x11r7/xdriver_xf86-video-savage/Config.in
+		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
+		source package/x11r7/xdriver_xf86-video-sis/Config.in
+		source package/x11r7/xdriver_xf86-video-sisusb/Config.in
+		source package/x11r7/xdriver_xf86-video-sunbw2/Config.in
+		source package/x11r7/xdriver_xf86-video-suncg14/Config.in
+		source package/x11r7/xdriver_xf86-video-suncg3/Config.in
+		source package/x11r7/xdriver_xf86-video-suncg6/Config.in
+		source package/x11r7/xdriver_xf86-video-sunffb/Config.in
+		source package/x11r7/xdriver_xf86-video-sunleo/Config.in
+		source package/x11r7/xdriver_xf86-video-suntcx/Config.in
+		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
+		source package/x11r7/xdriver_xf86-video-tga/Config.in
+		source package/x11r7/xdriver_xf86-video-trident/Config.in
+		source package/x11r7/xdriver_xf86-video-tseng/Config.in
+		source package/x11r7/xdriver_xf86-video-v4l/Config.in
+		source package/x11r7/xdriver_xf86-video-vesa/Config.in
+		source package/x11r7/xdriver_xf86-video-vga/Config.in
+		source package/x11r7/xdriver_xf86-video-via/Config.in
+		source package/x11r7/xdriver_xf86-video-vmware/Config.in
+		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
+	endmenu
+	menu "X11R7 Fonts"
+		source package/x11r7/xfont_encodings/Config.in
+		source package/x11r7/xfont_font-adobe-utopia-type1/Config.in
+		source package/x11r7/xfont_font-bitstream-type1/Config.in
+		source package/x11r7/xfont_font-ibm-type1/Config.in
+		source package/x11r7/xfont_font-xfree86-type1/Config.in
+	endmenu
+	menu "X11R7 X protocols"
+		source package/x11r7/xcb-proto/Config.in
+		source package/x11r7/xproto_applewmproto/Config.in
+		source package/x11r7/xproto_bigreqsproto/Config.in
+		source package/x11r7/xproto_compositeproto/Config.in
+		source package/x11r7/xproto_damageproto/Config.in
+		source package/x11r7/xproto_dmxproto/Config.in
+		source package/x11r7/xproto_evieext/Config.in
+		source package/x11r7/xproto_fixesproto/Config.in
+		source package/x11r7/xproto_fontcacheproto/Config.in
+		source package/x11r7/xproto_fontsproto/Config.in
+		source package/x11r7/xproto_glproto/Config.in
+		source package/x11r7/xproto_inputproto/Config.in
+		source package/x11r7/xproto_kbproto/Config.in
+		source package/x11r7/xproto_printproto/Config.in
+		source package/x11r7/xproto_randrproto/Config.in
+		source package/x11r7/xproto_recordproto/Config.in
+		source package/x11r7/xproto_renderproto/Config.in
+		source package/x11r7/xproto_resourceproto/Config.in
+		source package/x11r7/xproto_scrnsaverproto/Config.in
+		source package/x11r7/xproto_trapproto/Config.in
+		source package/x11r7/xproto_videoproto/Config.in
+		source package/x11r7/xproto_windowswmproto/Config.in
+		source package/x11r7/xproto_xcmiscproto/Config.in
+		source package/x11r7/xproto_xextproto/Config.in
+		source package/x11r7/xproto_xf86bigfontproto/Config.in
+		source package/x11r7/xproto_xf86dgaproto/Config.in
+		source package/x11r7/xproto_xf86driproto/Config.in
+		source package/x11r7/xproto_xf86miscproto/Config.in
+		source package/x11r7/xproto_xf86rushproto/Config.in
+		source package/x11r7/xproto_xf86vidmodeproto/Config.in
+		source package/x11r7/xproto_xineramaproto/Config.in
+		source package/x11r7/xproto_xproto/Config.in
+		source package/x11r7/xproto_xproxymanagementprotocol/Config.in
+	endmenu
+	menu "X11R7 Utilities"
+		source package/x11r7/xutil_makedepend/Config.in
+		source package/x11r7/xutil_util-macros/Config.in
+	endmenu
+	menu "X11R7 Other data"
+		source package/x11r7/xdata_xbitmaps/Config.in
+	endmenu
+endif
+
+comment "X11R7 X Window System disabled"
+	depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG
+
diff --git a/package/x11r7/libdrm/Config.in b/package/x11r7/libdrm/Config.in
new file mode 100644
index 000000000..68b91fd6e
--- /dev/null
+++ b/package/x11r7/libdrm/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBDRM
+	bool "libdrm"
+	default n
+	help
+		Direct Rendering Manager
+		
+		http://dri.freedesktop.org/
+
diff --git a/package/x11r7/libdrm/libdrm.mk b/package/x11r7/libdrm/libdrm.mk
new file mode 100644
index 000000000..8e7fffc13
--- /dev/null
+++ b/package/x11r7/libdrm/libdrm.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# libdrm
+#
+#############################################################
+LIBDRM_VERSION = 2.3.0
+LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
+LIBDRM_SITE = http://dri.freedesktop.org/libdrm/
+
+LIBDRM_INSTALL_STAGING = YES
+
+LIBDRM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,libdrm))
+
diff --git a/package/x11r7/libxcb/Config.in b/package/x11r7/libxcb/Config.in
new file mode 100644
index 000000000..8f7d38494
--- /dev/null
+++ b/package/x11r7/libxcb/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBXCB
+	bool "libxcb"
+	default n
+	select BR2_PACKAGE_PTHREAD_STUBS
+	select BR2_PACKAGE_XCB_PROTO
+	select BR2_PACKAGE_XLIB_LIBXDMCP
+	select BR2_PACKAGE_XLIB_LIBXAU
+	help
+		The X protocol C-language Binding (XCB) is a replacement for
+		Xlib featuring a small footprint, latency hiding, direct access
+		to the protocol, improved threading support, and extensibility.
+
+		http://xcb.freedesktop.org/
+
+
diff --git a/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch b/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch
new file mode 100644
index 000000000..5159459ff
--- /dev/null
+++ b/package/x11r7/libxcb/libxcb-1.0-xcbproto-xml-dir.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac.orig	2007-06-04 12:56:16.000000000 +0200
++++ a/configure.ac	2007-06-04 12:55:58.000000000 +0200
+@@ -50,7 +50,7 @@
+ 
+ # Find the xcb-proto protocol descriptions
+ AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
+-XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
++XCBPROTO_XCBINCLUDEDIR=$STAGING_DIR`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
+ AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
+ AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
+ 
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
new file mode 100644
index 000000000..24469329e
--- /dev/null
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -0,0 +1,17 @@
+#############################################################
+#
+# libxcb
+#
+#############################################################
+LIBXCB_VERSION = 1.0
+LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
+LIBXCB_SITE = http://xcb.freedesktop.org/dist/
+
+LIBXCB_INSTALL_STAGING = YES
+
+LIBXCB_AUTORECONF = YES
+LIBXCB_DEPENDANCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
+LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
+
+$(eval $(call AUTOTARGETS,libxcb))
+
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
new file mode 100644
index 000000000..c1f4ab542
--- /dev/null
+++ b/package/x11r7/mesa3d/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MESA3D
+	bool "Mesa 3D Graphics Library"
+	default n
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	help
+	  Mesa 3D, an open-source implementation of the OpenGL specification.
+
diff --git a/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch b/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch
new file mode 100644
index 000000000..22b511168
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch
@@ -0,0 +1,11 @@
+--- Mesa-6.5.3/src/mesa/x86/Makefile.orig	2007-06-09 06:23:46.000000000 +0200
++++ Mesa-6.5.3/src/mesa/x86/Makefile	2007-06-09 06:24:53.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ 
+ gen_matypes: gen_matypes.c
+-	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
++	$(CC_FOR_BUILD) $(INCLUDE_DIRS) $(CFLAGS_FOR_BUILD) gen_matypes.c -o gen_matypes
+ 
+ # need some special rules here, unfortunately
+ matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
new file mode 100644
index 000000000..fab4670ff
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -0,0 +1,85 @@
+#############################################################
+#
+# mesa3d
+#
+#############################################################
+MESA3D_VERSION:=6.5.3
+#MESA3D_VERSION:=6.4.2
+MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mesa3d
+MESA3D_DIR:=$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)
+MESA_TARGET=linux-dri-x86
+MESA_BUILD_ENV=$(TARGET_CONFIGURE_OPTS)
+MESA_CONFIG_FILE=$(MESA3D_DIR)/configs/$(MESA_TARGET)
+#MESA_DRIVERS= i810 i915 i965 mga mach64 r128 r200 r300 s3v savage sis ffb tdfx trident unichrome
+MESA_DRIVERS=
+
+$(DL_DIR)/$(MESA3D_SOURCE):
+	$(WGET) -P $(DL_DIR) $(MESA3D_SITE)/$(MESA3D_SOURCE)
+
+$(MESA3D_DIR)/.extracted: $(DL_DIR)/$(MESA3D_SOURCE)
+	$(ZCAT) $(DL_DIR)/$(MESA3D_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(MESA3D_DIR) package/mesa3d/ mesa3d\*.patch
+	touch $@
+
+$(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
+	( export $(TARGET_CONFIGURE_OPTS) ; \
+		echo "DRI_DIRS = $(MESA_DRIVERS)" && \
+		echo "OPT_FLAGS = $(TARGET_CFLAGS)" && \
+		echo "CC = $(TARGET_CC)" && \
+		echo "CXX = $(TARGET_CXX)" && \
+		echo "PIC_FLAGS = -fPIC" && \
+		echo "SRC_DIRS = glx/x11 mesa glu glut/glx" && \
+		echo "USING_EGL = 0" && \
+		echo "X11_INCLUDES = " && \
+		echo "EXTRA_LIB_PATH = " && \
+		echo "PROGRAM_DIRS =" \
+	) >> $(MESA_CONFIG_FILE)
+	touch $@
+
+$(MESA3D_DIR)/.built: BR2_JLEVEL=1
+$(MESA3D_DIR)/.built: $(MESA3D_DIR)/.configured
+	gccinc=$$($(TARGET_CC) -print-search-dirs | grep '^install:' | sed 's@^install: @@')include ; \
+	rm -f $(MESA3D_DIR)/config/current
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		MKDEP="makedepend -I$$gccinc" \
+		CC=$(TARGET_CC) CXX=$(TARGET_CXX) CC_FOR_BUILD=/usr/bin/gcc \
+		-C $(MESA3D_DIR) $(MESA_TARGET)
+	touch $@
+
+$(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		INSTALL_DIR=$(STAGING_DIR)/usr \
+		DRI_DRIVER_INSTALL_DIR=$(STAGING_DIR)/usr/lib/dri \
+		-C $(MESA3D_DIR) install
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		INSTALL_DIR=$(TARGET_DIR)/usr \
+		DRI_DRIVER_INSTALL_DIR=$(TARGET_DIR)/usr/lib/dri \
+		-C $(MESA3D_DIR) install
+	rm -Rf $(TARGET_DIR)/usr/include/GL
+	touch $@
+
+mesa3d-depends:   xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm
+mesa3d-source:    $(MESA3D_DIR)/.extracted
+mesa3d-configure: $(MESA3D_DIR)/.configured
+mesa3d-build:     $(MESA3D_DIR)/.built
+mesa3d:           mesa3d-depends $(MESA3D_DIR)/.installed	
+
+mesa3d-clean:
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(MESA3D_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr  -C $(MESA3D_DIR) uninstall
+	-$(MAKE) -C $(MESA3D_DIR) clean
+
+mesa3d-dirclean:
+	rm -rf $(MESA3D_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_MESA3D)),y)
+TARGETS+=mesa3d
+endif
+# :mode=makefile:
+
diff --git a/package/x11r7/openchrome/Config.in b/package/x11r7/openchrome/Config.in
new file mode 100644
index 000000000..1f90a7644
--- /dev/null
+++ b/package/x11r7/openchrome/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OPENCHROME
+	bool "openchrome"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXVMC
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  Openchrome, A free and Open Source video driver for the VIA/S3G
+	  UniChrome and UniChrome Pro graphics chipsets.
diff --git a/package/x11r7/openchrome/openchrome-r355-cross-compile.patch b/package/x11r7/openchrome/openchrome-r355-cross-compile.patch
new file mode 100644
index 000000000..de12e5493
--- /dev/null
+++ b/package/x11r7/openchrome/openchrome-r355-cross-compile.patch
@@ -0,0 +1,35 @@
+--- openchrome-r355/configure.ac.orig	2007-06-10 15:07:43.000000000 +0200
++++ openchrome-r355/configure.ac	2007-06-10 15:11:16.000000000 +0200
+@@ -69,12 +69,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
+@@ -113,8 +119,12 @@
+ 
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+ 
+-AC_CHECK_FILE([${sdkdir}/xf86Module.h],
++if test "$cross_compiling" = "no" ; then
++	AC_CHECK_FILE([${sdkdir}/xf86Module.h],
+               [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
++else
++	have_xf86Module_h="yes"
++fi
+ 
+ # Check the ABI_VIDEODRV_VERSION
+ SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/package/x11r7/openchrome/openchrome.mk b/package/x11r7/openchrome/openchrome.mk
new file mode 100644
index 000000000..713b68791
--- /dev/null
+++ b/package/x11r7/openchrome/openchrome.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# openchrome
+#
+#############################################################
+OPENCHROME_VERSION = r355
+OPENCHROME_SOURCE = openchrome-$(OPENCHROME_VERSION).tar.bz2
+OPENCHROME_SITE = http://bazaar.mezis.net/
+
+OPENCHROME_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+OPENCHROME_AUTORECONF = YES
+OPENCHROME_CONF_OPT = --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,openchrome))
diff --git a/package/x11r7/pthread-stubs/Config.in b/package/x11r7/pthread-stubs/Config.in
new file mode 100644
index 000000000..4215a4870
--- /dev/null
+++ b/package/x11r7/pthread-stubs/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PTHREAD_STUBS
+	bool "pthread-stubs"
+	default n
+	help
+		This library provides weak aliases for pthread functions not 
+		provided in libc or otherwise available by default.
+
+		http://xcb.freedesktop.org/
+
diff --git a/package/x11r7/pthread-stubs/pthread-stubs.mk b/package/x11r7/pthread-stubs/pthread-stubs.mk
new file mode 100644
index 000000000..90bb6cfa1
--- /dev/null
+++ b/package/x11r7/pthread-stubs/pthread-stubs.mk
@@ -0,0 +1,14 @@
+#############################################################
+#
+# pthread-stubs
+#
+#############################################################
+PTHREAD_STUBS_VERSION = 0.1
+PTHREAD_STUBS_SOURCE = libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2
+PTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
+
+PTHREAD_STUBS_DEPENDANCIES = uclibc
+PTHREAD_STUBS_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,pthread-stubs))
+
diff --git a/package/x11r7/xapp_appres/Config.in b/package/x11r7/xapp_appres/Config.in
new file mode 100644
index 000000000..e56211a36
--- /dev/null
+++ b/package/x11r7/xapp_appres/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_APPRES
+	bool "appres"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  appres 1.0.1
+	  list X application resource database
diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk
new file mode 100644
index 000000000..bce580bff
--- /dev/null
+++ b/package/x11r7/xapp_appres/xapp_appres.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_appres -- list X application resource database
+#
+################################################################################
+
+XAPP_APPRES_VERSION = 1.0.1
+XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2
+XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_APPRES_AUTORECONF = YES
+XAPP_APPRES_DEPENDANCIES = xlib_libX11 xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_appres))
diff --git a/package/x11r7/xapp_bdftopcf/Config.in b/package/x11r7/xapp_bdftopcf/Config.in
new file mode 100644
index 000000000..5b90dca89
--- /dev/null
+++ b/package/x11r7/xapp_bdftopcf/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_BDFTOPCF
+	bool "bdftopcf"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXFONT
+	help
+	  bdftopcf 1.0.0
+	  X.Org bdftopcf application
diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
new file mode 100644
index 000000000..38a8f406f
--- /dev/null
+++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_bdftopcf -- X.Org bdftopcf application
+#
+################################################################################
+
+XAPP_BDFTOPCF_VERSION = 1.0.0
+XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
+XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BDFTOPCF_AUTORECONF = YES
+XAPP_BDFTOPCF_DEPENDANCIES = xlib_libXfont
+
+$(eval $(call AUTOTARGETS,xapp_bdftopcf))
diff --git a/package/x11r7/xapp_beforelight/Config.in b/package/x11r7/xapp_beforelight/Config.in
new file mode 100644
index 000000000..207d0441c
--- /dev/null
+++ b/package/x11r7/xapp_beforelight/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_BEFORELIGHT
+	bool "beforelight"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  beforelight 1.0.2
+	  screen saver
diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
new file mode 100644
index 000000000..13454f20c
--- /dev/null
+++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_beforelight -- screen saver
+#
+################################################################################
+
+XAPP_BEFORELIGHT_VERSION = 1.0.2
+XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2
+XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BEFORELIGHT_AUTORECONF = YES
+XAPP_BEFORELIGHT_DEPENDANCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_beforelight))
diff --git a/package/x11r7/xapp_bitmap/Config.in b/package/x11r7/xapp_bitmap/Config.in
new file mode 100644
index 000000000..54d383e0a
--- /dev/null
+++ b/package/x11r7/xapp_bitmap/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_BITMAP
+	bool "bitmap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XDATA_XBITMAPS
+	help
+	  bitmap 1.0.2
+	  X.Org bitmap application
diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
new file mode 100644
index 000000000..e62e25404
--- /dev/null
+++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_bitmap -- X.Org bitmap application
+#
+################################################################################
+
+XAPP_BITMAP_VERSION = 1.0.2
+XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2
+XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_BITMAP_AUTORECONF = YES
+XAPP_BITMAP_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps
+
+$(eval $(call AUTOTARGETS,xapp_bitmap))
diff --git a/package/x11r7/xapp_editres/Config.in b/package/x11r7/xapp_editres/Config.in
new file mode 100644
index 000000000..75126d1ff
--- /dev/null
+++ b/package/x11r7/xapp_editres/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_EDITRES
+	bool "editres"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  editres 1.0.2
+	  a dynamic resource editor for X Toolkit applications
diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk
new file mode 100644
index 000000000..f2508405b
--- /dev/null
+++ b/package/x11r7/xapp_editres/xapp_editres.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_editres -- a dynamic resource editor for X Toolkit applications
+#
+################################################################################
+
+XAPP_EDITRES_VERSION = 1.0.2
+XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2
+XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_EDITRES_AUTORECONF = YES
+XAPP_EDITRES_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_editres))
diff --git a/package/x11r7/xapp_fonttosfnt/Config.in b/package/x11r7/xapp_fonttosfnt/Config.in
new file mode 100644
index 000000000..ce5f83737
--- /dev/null
+++ b/package/x11r7/xapp_fonttosfnt/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_FONTTOSFNT
+	bool "fonttosfnt"
+	default n
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	help
+	  fonttosfnt 1.0.3
+	  X.Org fonttosfnt application
diff --git a/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
new file mode 100644
index 000000000..efd153bb2
--- /dev/null
+++ b/package/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_fonttosfnt -- X.Org fonttosfnt application
+#
+################################################################################
+
+XAPP_FONTTOSFNT_VERSION = 1.0.3
+XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2
+XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FONTTOSFNT_AUTORECONF = YES
+XAPP_FONTTOSFNT_DEPENDANCIES = freetype xlib_libX11 xlib_libfontenc
+
+$(eval $(call AUTOTARGETS,xapp_fonttosfnt))
diff --git a/package/x11r7/xapp_fslsfonts/Config.in b/package/x11r7/xapp_fslsfonts/Config.in
new file mode 100644
index 000000000..b1562e12e
--- /dev/null
+++ b/package/x11r7/xapp_fslsfonts/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_FSLSFONTS
+	bool "fslsfonts"
+	default n
+	select BR2_PACKAGE_XLIB_LIBFS
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  fslsfonts 1.0.1
+	  list fonts served by X font server
diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
new file mode 100644
index 000000000..9327e83be
--- /dev/null
+++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_fslsfonts -- list fonts served by X font server
+#
+################################################################################
+
+XAPP_FSLSFONTS_VERSION = 1.0.1
+XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2
+XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FSLSFONTS_AUTORECONF = YES
+XAPP_FSLSFONTS_DEPENDANCIES = xlib_libFS xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_fslsfonts))
diff --git a/package/x11r7/xapp_fstobdf/Config.in b/package/x11r7/xapp_fstobdf/Config.in
new file mode 100644
index 000000000..fcbe359c1
--- /dev/null
+++ b/package/x11r7/xapp_fstobdf/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_FSTOBDF
+	bool "fstobdf"
+	default n
+	select BR2_PACKAGE_XLIB_LIBFS
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  fstobdf 1.0.2
+	  generate BDF font from X font server
diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
new file mode 100644
index 000000000..c45f8eb21
--- /dev/null
+++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_fstobdf -- generate BDF font from X font server
+#
+################################################################################
+
+XAPP_FSTOBDF_VERSION = 1.0.2
+XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2
+XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_FSTOBDF_AUTORECONF = YES
+XAPP_FSTOBDF_DEPENDANCIES = xlib_libFS xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_fstobdf))
diff --git a/package/x11r7/xapp_iceauth/Config.in b/package/x11r7/xapp_iceauth/Config.in
new file mode 100644
index 000000000..85af84027
--- /dev/null
+++ b/package/x11r7/xapp_iceauth/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_ICEAUTH
+	bool "iceauth"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  iceauth 1.0.1
+	  ICE authority file utility
diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
new file mode 100644
index 000000000..c98561065
--- /dev/null
+++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_iceauth -- ICE authority file utility
+#
+################################################################################
+
+XAPP_ICEAUTH_VERSION = 1.0.1
+XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2
+XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_ICEAUTH_AUTORECONF = YES
+XAPP_ICEAUTH_DEPENDANCIES = xlib_libICE xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_iceauth))
diff --git a/package/x11r7/xapp_ico/Config.in b/package/x11r7/xapp_ico/Config.in
new file mode 100644
index 000000000..5cd518b9d
--- /dev/null
+++ b/package/x11r7/xapp_ico/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_ICO
+	bool "ico"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  ico 1.0.1
+	  animate an icosahedron or other polyhedron
diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk
new file mode 100644
index 000000000..7d04ab239
--- /dev/null
+++ b/package/x11r7/xapp_ico/xapp_ico.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_ico -- animate an icosahedron or other polyhedron
+#
+################################################################################
+
+XAPP_ICO_VERSION = 1.0.1
+XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2
+XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_ICO_AUTORECONF = YES
+XAPP_ICO_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_ico))
diff --git a/package/x11r7/xapp_lbxproxy/Config.in b/package/x11r7/xapp_lbxproxy/Config.in
new file mode 100644
index 000000000..e3e71e16f
--- /dev/null
+++ b/package/x11r7/xapp_lbxproxy/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XAPP_LBXPROXY
+	bool "lbxproxy"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBLBXUTIL
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+	help
+	  lbxproxy 1.0.1
+	  Low BandWidth X proxy
diff --git a/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
new file mode 100644
index 000000000..4b4083d90
--- /dev/null
+++ b/package/x11r7/xapp_lbxproxy/xapp_lbxproxy.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_lbxproxy -- Low BandWidth X proxy
+#
+################################################################################
+
+XAPP_LBXPROXY_VERSION = 1.0.1
+XAPP_LBXPROXY_SOURCE = lbxproxy-$(XAPP_LBXPROXY_VERSION).tar.bz2
+XAPP_LBXPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_LBXPROXY_AUTORECONF = YES
+XAPP_LBXPROXY_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXext xlib_liblbxutil xlib_xtrans xproto_xproxymanagementprotocol
+
+$(eval $(call AUTOTARGETS,xapp_lbxproxy))
diff --git a/package/x11r7/xapp_listres/Config.in b/package/x11r7/xapp_listres/Config.in
new file mode 100644
index 000000000..16caf1688
--- /dev/null
+++ b/package/x11r7/xapp_listres/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_LISTRES
+	bool "listres"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  listres 1.0.1
+	  list resources in widgets
diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk
new file mode 100644
index 000000000..9f4476b4c
--- /dev/null
+++ b/package/x11r7/xapp_listres/xapp_listres.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_listres -- list resources in widgets
+#
+################################################################################
+
+XAPP_LISTRES_VERSION = 1.0.1
+XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2
+XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_LISTRES_AUTORECONF = YES
+XAPP_LISTRES_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_listres))
diff --git a/package/x11r7/xapp_luit/Config.in b/package/x11r7/xapp_luit/Config.in
new file mode 100644
index 000000000..fe35e5bab
--- /dev/null
+++ b/package/x11r7/xapp_luit/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_LUIT
+	bool "luit"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	help
+	  luit 1.0.2
+	  Locale and ISO 2022 support for Unicode terminals
diff --git a/package/x11r7/xapp_luit/xapp_luit.mk b/package/x11r7/xapp_luit/xapp_luit.mk
new file mode 100644
index 000000000..186eb620c
--- /dev/null
+++ b/package/x11r7/xapp_luit/xapp_luit.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_luit -- Locale and ISO 2022 support for Unicode terminals
+#
+################################################################################
+
+XAPP_LUIT_VERSION = 1.0.2
+XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2
+XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_LUIT_AUTORECONF = YES
+XAPP_LUIT_DEPENDANCIES = xlib_libX11 xlib_libfontenc
+
+$(eval $(call AUTOTARGETS,xapp_luit))
diff --git a/package/x11r7/xapp_mkfontdir/Config.in b/package/x11r7/xapp_mkfontdir/Config.in
new file mode 100644
index 000000000..19e65a741
--- /dev/null
+++ b/package/x11r7/xapp_mkfontdir/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_MKFONTDIR
+	bool "mkfontdir"
+	default n
+	select BR2_PACKAGE_XAPP_MKFONTSCALE
+	help
+	  mkfontdir 1.0.2
+	  create an index of X font files in a directory
diff --git a/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
new file mode 100644
index 000000000..94b59c163
--- /dev/null
+++ b/package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_mkfontdir -- create an index of X font files in a directory
+#
+################################################################################
+
+XAPP_MKFONTDIR_VERSION = 1.0.2
+XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2
+XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_MKFONTDIR_AUTORECONF = YES
+XAPP_MKFONTDIR_DEPENDANCIES = xapp_mkfontscale
+
+$(eval $(call AUTOTARGETS,xapp_mkfontdir))
diff --git a/package/x11r7/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in
new file mode 100644
index 000000000..7d6b878d3
--- /dev/null
+++ b/package/x11r7/xapp_mkfontscale/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_MKFONTSCALE
+	bool "mkfontscale"
+	default n
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	help
+	  mkfontscale 1.0.3
+	  create an index of scalable font files for X
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
new file mode 100644
index 000000000..94c017ec7
--- /dev/null
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_mkfontscale -- create an index of scalable font files for X
+#
+################################################################################
+
+XAPP_MKFONTSCALE_VERSION = 1.0.3
+XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
+XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_MKFONTSCALE_AUTORECONF = YES
+XAPP_MKFONTSCALE_DEPENDANCIES = freetype xlib_libX11 xlib_libfontenc
+
+$(eval $(call AUTOTARGETS,xapp_mkfontscale))
diff --git a/package/x11r7/xapp_oclock/Config.in b/package/x11r7/xapp_oclock/Config.in
new file mode 100644
index 000000000..cb9660d88
--- /dev/null
+++ b/package/x11r7/xapp_oclock/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_OCLOCK
+	bool "oclock"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  oclock 1.0.1
+	  round X clock
diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk
new file mode 100644
index 000000000..82893dd2e
--- /dev/null
+++ b/package/x11r7/xapp_oclock/xapp_oclock.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_oclock -- round X clock
+#
+################################################################################
+
+XAPP_OCLOCK_VERSION = 1.0.1
+XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2
+XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_OCLOCK_AUTORECONF = YES
+XAPP_OCLOCK_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_oclock))
diff --git a/package/x11r7/xapp_proxymngr/Config.in b/package/x11r7/xapp_proxymngr/Config.in
new file mode 100644
index 000000000..dec7e65c4
--- /dev/null
+++ b/package/x11r7/xapp_proxymngr/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_PROXYMNGR
+	bool "proxymngr"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+	help
+	  proxymngr 1.0.1
+	  proxy manager service
diff --git a/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
new file mode 100644
index 000000000..775a63f5d
--- /dev/null
+++ b/package/x11r7/xapp_proxymngr/xapp_proxymngr.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_proxymngr -- proxy manager service
+#
+################################################################################
+
+XAPP_PROXYMNGR_VERSION = 1.0.1
+XAPP_PROXYMNGR_SOURCE = proxymngr-$(XAPP_PROXYMNGR_VERSION).tar.bz2
+XAPP_PROXYMNGR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_PROXYMNGR_AUTORECONF = YES
+XAPP_PROXYMNGR_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXt xproto_xproxymanagementprotocol
+
+$(eval $(call AUTOTARGETS,xapp_proxymngr))
diff --git a/package/x11r7/xapp_rgb/Config.in b/package/x11r7/xapp_rgb/Config.in
new file mode 100644
index 000000000..d0395cb83
--- /dev/null
+++ b/package/x11r7/xapp_rgb/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_RGB
+	bool "rgb"
+	default n
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  rgb 1.0.1
+	  uncompile an rgb color-name database
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
new file mode 100644
index 000000000..32337f98d
--- /dev/null
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_rgb -- uncompile an rgb color-name database
+#
+################################################################################
+
+XAPP_RGB_VERSION = 1.0.1
+XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
+XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_RGB_AUTORECONF = YES
+XAPP_RGB_DEPENDANCIES = xproto_xproto
+
+$(eval $(call AUTOTARGETS,xapp_rgb))
diff --git a/package/x11r7/xapp_rstart/Config.in b/package/x11r7/xapp_rstart/Config.in
new file mode 100644
index 000000000..cdd629639
--- /dev/null
+++ b/package/x11r7/xapp_rstart/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_RSTART
+	bool "rstart"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  rstart 1.0.2
+	  X.Org rstart application
diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk
new file mode 100644
index 000000000..6ea0c0774
--- /dev/null
+++ b/package/x11r7/xapp_rstart/xapp_rstart.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_rstart -- X.Org rstart application
+#
+################################################################################
+
+XAPP_RSTART_VERSION = 1.0.2
+XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2
+XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_RSTART_AUTORECONF = YES
+XAPP_RSTART_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_rstart))
diff --git a/package/x11r7/xapp_scripts/Config.in b/package/x11r7/xapp_scripts/Config.in
new file mode 100644
index 000000000..d7734e8b4
--- /dev/null
+++ b/package/x11r7/xapp_scripts/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_SCRIPTS
+	bool "scripts"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  scripts 1.0.1
+	  start an X program on a remote machine
diff --git a/package/x11r7/xapp_scripts/xapp_scripts.mk b/package/x11r7/xapp_scripts/xapp_scripts.mk
new file mode 100644
index 000000000..da583ea51
--- /dev/null
+++ b/package/x11r7/xapp_scripts/xapp_scripts.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_scripts -- start an X program on a remote machine
+#
+################################################################################
+
+XAPP_SCRIPTS_VERSION = 1.0.1
+XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2
+XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SCRIPTS_AUTORECONF = YES
+XAPP_SCRIPTS_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_scripts))
diff --git a/package/x11r7/xapp_sessreg/Config.in b/package/x11r7/xapp_sessreg/Config.in
new file mode 100644
index 000000000..724fb7fa2
--- /dev/null
+++ b/package/x11r7/xapp_sessreg/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_SESSREG
+	bool "sessreg"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  sessreg 1.0.2
+	  manage utmp/wtmp entries for non-init clients
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
new file mode 100644
index 000000000..3610d1396
--- /dev/null
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_sessreg -- manage utmp/wtmp entries for non-init clients
+#
+################################################################################
+
+XAPP_SESSREG_VERSION = 1.0.2
+XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
+XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SESSREG_AUTORECONF = YES
+XAPP_SESSREG_DEPENDANCIES = xlib_libX11 xproto_xproto
+
+$(eval $(call AUTOTARGETS,xapp_sessreg))
diff --git a/package/x11r7/xapp_setxkbmap/Config.in b/package/x11r7/xapp_setxkbmap/Config.in
new file mode 100644
index 000000000..227db56de
--- /dev/null
+++ b/package/x11r7/xapp_setxkbmap/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_SETXKBMAP
+	bool "setxkbmap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  setxkbmap 1.0.3
+	  Controls the keyboard layout of a running X server.
diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
new file mode 100644
index 000000000..a9437a7f8
--- /dev/null
+++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_setxkbmap -- Controls the keyboard layout of a running X server.
+#
+################################################################################
+
+XAPP_SETXKBMAP_VERSION = 1.0.3
+XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2
+XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SETXKBMAP_AUTORECONF = YES
+XAPP_SETXKBMAP_DEPENDANCIES = xlib_libX11 xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_setxkbmap))
diff --git a/package/x11r7/xapp_showfont/Config.in b/package/x11r7/xapp_showfont/Config.in
new file mode 100644
index 000000000..ced18d5b2
--- /dev/null
+++ b/package/x11r7/xapp_showfont/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_SHOWFONT
+	bool "showfont"
+	default n
+	select BR2_PACKAGE_XLIB_LIBFS
+	help
+	  showfont 1.0.1
+	  font dumper for X font server
diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk
new file mode 100644
index 000000000..d5b1847bc
--- /dev/null
+++ b/package/x11r7/xapp_showfont/xapp_showfont.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_showfont -- font dumper for X font server
+#
+################################################################################
+
+XAPP_SHOWFONT_VERSION = 1.0.1
+XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2
+XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SHOWFONT_AUTORECONF = YES
+XAPP_SHOWFONT_DEPENDANCIES = xlib_libFS
+
+$(eval $(call AUTOTARGETS,xapp_showfont))
diff --git a/package/x11r7/xapp_smproxy/Config.in b/package/x11r7/xapp_smproxy/Config.in
new file mode 100644
index 000000000..50a44ffc9
--- /dev/null
+++ b/package/x11r7/xapp_smproxy/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_SMPROXY
+	bool "smproxy"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  smproxy 1.0.2
+	  Session Manager Proxy
diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
new file mode 100644
index 000000000..0729e2e86
--- /dev/null
+++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_smproxy -- Session Manager Proxy
+#
+################################################################################
+
+XAPP_SMPROXY_VERSION = 1.0.2
+XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2
+XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SMPROXY_AUTORECONF = YES
+XAPP_SMPROXY_DEPENDANCIES = xlib_libXmu xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_smproxy))
diff --git a/package/x11r7/xapp_twm/Config.in b/package/x11r7/xapp_twm/Config.in
new file mode 100644
index 000000000..b08d1623d
--- /dev/null
+++ b/package/x11r7/xapp_twm/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XAPP_TWM
+	bool "twm"
+	default n
+	help
+	  twm 1.0.3
+	  No description available
diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk
new file mode 100644
index 000000000..e1fca77e5
--- /dev/null
+++ b/package/x11r7/xapp_twm/xapp_twm.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xapp_twm -- No description available
+#
+################################################################################
+
+XAPP_TWM_VERSION = 1.0.3
+XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2
+XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_TWM_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS,xapp_twm))
diff --git a/package/x11r7/xapp_viewres/Config.in b/package/x11r7/xapp_viewres/Config.in
new file mode 100644
index 000000000..19e81c01a
--- /dev/null
+++ b/package/x11r7/xapp_viewres/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_VIEWRES
+	bool "viewres"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  viewres 1.0.1
+	  graphical class browser for Xt
diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk
new file mode 100644
index 000000000..6bffce4e7
--- /dev/null
+++ b/package/x11r7/xapp_viewres/xapp_viewres.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_viewres -- graphical class browser for Xt
+#
+################################################################################
+
+XAPP_VIEWRES_VERSION = 1.0.1
+XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2
+XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_VIEWRES_AUTORECONF = YES
+XAPP_VIEWRES_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_viewres))
diff --git a/package/x11r7/xapp_x11perf/Config.in b/package/x11r7/xapp_x11perf/Config.in
new file mode 100644
index 000000000..611c61a77
--- /dev/null
+++ b/package/x11r7/xapp_x11perf/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_X11PERF
+	bool "x11perf"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXFT
+	help
+	  x11perf 1.4.1
+	  summarize x11perf results
diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
new file mode 100644
index 000000000..f3d427200
--- /dev/null
+++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_x11perf -- summarize x11perf results
+#
+################################################################################
+
+XAPP_X11PERF_VERSION = 1.4.1
+XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2
+XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_X11PERF_AUTORECONF = YES
+XAPP_X11PERF_DEPENDANCIES = xlib_libX11 xlib_libXmu xlib_libXft
+
+$(eval $(call AUTOTARGETS,xapp_x11perf))
diff --git a/package/x11r7/xapp_xauth/Config.in b/package/x11r7/xapp_xauth/Config.in
new file mode 100644
index 000000000..a91d1436b
--- /dev/null
+++ b/package/x11r7/xapp_xauth/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_XAUTH
+	bool "xauth"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xauth 1.0.2
+	  X authority file utility
diff --git a/package/x11r7/xapp_xauth/xapp_xauth-1.0.2-xcb.patch b/package/x11r7/xapp_xauth/xapp_xauth-1.0.2-xcb.patch
new file mode 100644
index 000000000..45b374562
--- /dev/null
+++ b/package/x11r7/xapp_xauth/xapp_xauth-1.0.2-xcb.patch
@@ -0,0 +1,11 @@
+--- xauth-1.0.2/configure.ac.orig	2007-06-06 22:33:44.000000000 +0200
++++ xauth-1.0.2/configure.ac	2007-06-06 22:33:57.000000000 +0200
+@@ -40,7 +40,7 @@
+ AC_CHECK_HEADERS([net/errno.h])
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
++PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu xcb)
+ AC_SUBST(XAUTH_CFLAGS)
+ AC_SUBST(XAUTH_LIBS)
+ 
diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk
new file mode 100644
index 000000000..6b890ece9
--- /dev/null
+++ b/package/x11r7/xapp_xauth/xapp_xauth.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xauth -- X authority file utility
+#
+################################################################################
+
+XAPP_XAUTH_VERSION = 1.0.2
+XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2
+XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XAUTH_AUTORECONF = YES
+XAPP_XAUTH_DEPENDANCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xauth))
diff --git a/package/x11r7/xapp_xbiff/Config.in b/package/x11r7/xapp_xbiff/Config.in
new file mode 100644
index 000000000..e4d79967e
--- /dev/null
+++ b/package/x11r7/xapp_xbiff/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XBIFF
+	bool "xbiff"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XDATA_XBITMAPS
+	help
+	  xbiff 1.0.1
+	  mailbox flag for X
diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.mk b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
new file mode 100644
index 000000000..ba6241d44
--- /dev/null
+++ b/package/x11r7/xapp_xbiff/xapp_xbiff.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xbiff -- mailbox flag for X
+#
+################################################################################
+
+XAPP_XBIFF_VERSION = 1.0.1
+XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2
+XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XBIFF_AUTORECONF = YES
+XAPP_XBIFF_DEPENDANCIES = xlib_libXaw xdata_xbitmaps
+
+$(eval $(call AUTOTARGETS,xapp_xbiff))
diff --git a/package/x11r7/xapp_xcalc/Config.in b/package/x11r7/xapp_xcalc/Config.in
new file mode 100644
index 000000000..e08f52781
--- /dev/null
+++ b/package/x11r7/xapp_xcalc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XCALC
+	bool "xcalc"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xcalc 1.0.1
+	  scientific calculator for X
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
new file mode 100644
index 000000000..0ce9c8a5d
--- /dev/null
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xcalc -- scientific calculator for X
+#
+################################################################################
+
+XAPP_XCALC_VERSION = 1.0.1
+XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2
+XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCALC_AUTORECONF = YES
+XAPP_XCALC_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xcalc))
diff --git a/package/x11r7/xapp_xclipboard/Config.in b/package/x11r7/xapp_xclipboard/Config.in
new file mode 100644
index 000000000..e67935527
--- /dev/null
+++ b/package/x11r7/xapp_xclipboard/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XCLIPBOARD
+	bool "xclipboard"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xclipboard 1.0.1
+	  interchange between cut buffer and selection
diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
new file mode 100644
index 000000000..44ac7db4e
--- /dev/null
+++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xclipboard -- interchange between cut buffer and selection
+#
+################################################################################
+
+XAPP_XCLIPBOARD_VERSION = 1.0.1
+XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2
+XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCLIPBOARD_AUTORECONF = YES
+XAPP_XCLIPBOARD_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xclipboard))
diff --git a/package/x11r7/xapp_xclock/Config.in b/package/x11r7/xapp_xclock/Config.in
new file mode 100644
index 000000000..4a89e7622
--- /dev/null
+++ b/package/x11r7/xapp_xclock/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XAPP_XCLOCK
+	bool "xclock"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXFT
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  xclock 1.0.2
+	  analog / digital clock for X
diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk
new file mode 100644
index 000000000..45f5f15bc
--- /dev/null
+++ b/package/x11r7/xapp_xclock/xapp_xclock.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xclock -- analog / digital clock for X
+#
+################################################################################
+
+XAPP_XCLOCK_VERSION = 1.0.2
+XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2
+XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCLOCK_AUTORECONF = YES
+XAPP_XCLOCK_DEPENDANCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_xclock))
diff --git a/package/x11r7/xapp_xcmsdb/Config.in b/package/x11r7/xapp_xcmsdb/Config.in
new file mode 100644
index 000000000..2e36a7202
--- /dev/null
+++ b/package/x11r7/xapp_xcmsdb/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XCMSDB
+	bool "xcmsdb"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xcmsdb 1.0.1
+	  Device Color Characterization utility for X Color Management System
diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
new file mode 100644
index 000000000..5299fcc66
--- /dev/null
+++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xcmsdb -- Device Color Characterization utility for X Color Management System
+#
+################################################################################
+
+XAPP_XCMSDB_VERSION = 1.0.1
+XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2
+XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCMSDB_AUTORECONF = YES
+XAPP_XCMSDB_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xcmsdb))
diff --git a/package/x11r7/xapp_xcursorgen/Config.in b/package/x11r7/xapp_xcursorgen/Config.in
new file mode 100644
index 000000000..f57ac4153
--- /dev/null
+++ b/package/x11r7/xapp_xcursorgen/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XCURSORGEN
+	bool "xcursorgen"
+	default n
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXCURSOR
+	help
+	  xcursorgen 1.0.1
+	  create an X cursor file from a collection of PNG images
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
new file mode 100644
index 000000000..94d82744d
--- /dev/null
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xcursorgen -- create an X cursor file from a collection of PNG images
+#
+################################################################################
+
+XAPP_XCURSORGEN_VERSION = 1.0.1
+XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
+XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XCURSORGEN_AUTORECONF = YES
+XAPP_XCURSORGEN_DEPENDANCIES = libpng xlib_libX11 xlib_libXcursor
+
+$(eval $(call AUTOTARGETS,xapp_xcursorgen))
diff --git a/package/x11r7/xapp_xdbedizzy/Config.in b/package/x11r7/xapp_xdbedizzy/Config.in
new file mode 100644
index 000000000..818345984
--- /dev/null
+++ b/package/x11r7/xapp_xdbedizzy/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XDBEDIZZY
+	bool "xdbedizzy"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXP
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	help
+	  xdbedizzy 1.0.2
+	  X.Org xdbedizzy application
diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
new file mode 100644
index 000000000..6738ebf72
--- /dev/null
+++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xdbedizzy -- X.Org xdbedizzy application
+#
+################################################################################
+
+XAPP_XDBEDIZZY_VERSION = 1.0.2
+XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2
+XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDBEDIZZY_AUTORECONF = YES
+XAPP_XDBEDIZZY_DEPENDANCIES = xlib_libXext xlib_libXp xlib_libXprintUtil
+
+$(eval $(call AUTOTARGETS,xapp_xdbedizzy))
diff --git a/package/x11r7/xapp_xditview/Config.in b/package/x11r7/xapp_xditview/Config.in
new file mode 100644
index 000000000..bbff29fd6
--- /dev/null
+++ b/package/x11r7/xapp_xditview/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XDITVIEW
+	bool "xditview"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xditview 1.0.1
+	  display ditroff output
diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk
new file mode 100644
index 000000000..714d19562
--- /dev/null
+++ b/package/x11r7/xapp_xditview/xapp_xditview.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xditview -- display ditroff output
+#
+################################################################################
+
+XAPP_XDITVIEW_VERSION = 1.0.1
+XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2
+XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDITVIEW_AUTORECONF = YES
+XAPP_XDITVIEW_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xditview))
diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
new file mode 100644
index 000000000..0726fb5de
--- /dev/null
+++ b/package/x11r7/xapp_xdm/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_XAPP_XDM
+	bool "xdm"
+	default n
+	select BR2_PACKAGE_XAPP_XINIT
+	select BR2_PACKAGE_XAPP_SESSREG
+	select BR2_PACKAGE_XAPP_XRDB
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXDMCP
+	select BR2_PACKAGE_XLIB_LIBXINERAMA
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xdm 1.1.3
+	  X.Org xdm application
diff --git a/package/x11r7/xapp_xdm/xapp_xdm-1.1.3-urandom.patch b/package/x11r7/xapp_xdm/xapp_xdm-1.1.3-urandom.patch
new file mode 100644
index 000000000..ed51d8f81
--- /dev/null
+++ b/package/x11r7/xapp_xdm/xapp_xdm-1.1.3-urandom.patch
@@ -0,0 +1,15 @@
+--- xdm-1.1.3/configure.ac.orig	2007-06-10 15:34:10.000000000 +0200
++++ xdm-1.1.3/configure.ac	2007-06-10 15:38:33.000000000 +0200
+@@ -152,8 +152,12 @@
+ 	RANDOM_DEVICE="$withval", RANDOM_DEVICE="try")
+ 
+ if test x$RANDOM_DEVICE = xyes -o x$RANDOM_DEVICE = xtry ; then
++	if test "$cross_compiling" = "no" ; then
+ 	AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom],
+ 		AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random]))
++	else
++		RANDOM_DEVICE=/dev/urandom
++	fi
+ 	if test x$RANDOM_DEVICE = xyes ; then
+ 		AC_MSG_ERROR(["random device support requested, but no random device was found."])		
+ 	else 
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
new file mode 100644
index 000000000..db8532743
--- /dev/null
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xdm -- X.Org xdm application
+#
+################################################################################
+
+XAPP_XDM_VERSION = 1.1.3
+XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2
+XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDM_AUTORECONF = YES
+XAPP_XDM_DEPENDANCIES = xapp_xinit xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xapp_xdm))
diff --git a/package/x11r7/xapp_xdpyinfo/Config.in b/package/x11r7/xapp_xdpyinfo/Config.in
new file mode 100644
index 000000000..35feba23d
--- /dev/null
+++ b/package/x11r7/xapp_xdpyinfo/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_XAPP_XDPYINFO
+	bool "xdpyinfo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXP
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXXF86DGA
+	select BR2_PACKAGE_XLIB_LIBXXF86MISC
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_PRINTPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	help
+	  xdpyinfo 1.0.1
+	  display information utility for X
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
new file mode 100644
index 000000000..479675f59
--- /dev/null
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xdpyinfo -- display information utility for X
+#
+################################################################################
+
+XAPP_XDPYINFO_VERSION = 1.0.1
+XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2
+XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDPYINFO_AUTORECONF = YES
+XAPP_XDPYINFO_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXi  xlib_libXp xlib_libXrender xlib_libXtst xlib_libXxf86dga xlib_libXxf86misc xlib_libXxf86vm xproto_inputproto xproto_kbproto xproto_printproto xproto_renderproto xproto_xf86dgaproto xproto_xf86miscproto xproto_xf86vidmodeproto
+
+$(eval $(call AUTOTARGETS,xapp_xdpyinfo))
diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
new file mode 100644
index 000000000..21016c702
--- /dev/null
+++ b/package/x11r7/xapp_xdriinfo/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XDRIINFO
+	bool "xdriinfo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_MESA3D
+	help
+	  xdriinfo 1.0.1
+	  query configuration information of DRI drivers
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
new file mode 100644
index 000000000..57cd49793
--- /dev/null
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xdriinfo -- query configuration information of DRI drivers
+#
+################################################################################
+
+XAPP_XDRIINFO_VERSION = 1.0.1
+XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
+XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XDRIINFO_AUTORECONF = YES
+XAPP_XDRIINFO_DEPENDANCIES = xlib_libX11 xproto_glproto mesa3d
+
+$(eval $(call AUTOTARGETS,xapp_xdriinfo))
diff --git a/package/x11r7/xapp_xedit/Config.in b/package/x11r7/xapp_xedit/Config.in
new file mode 100644
index 000000000..39e69a057
--- /dev/null
+++ b/package/x11r7/xapp_xedit/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XEDIT
+	bool "xedit"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	help
+	  xedit 1.0.2
+	  simple text editor for X
diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk
new file mode 100644
index 000000000..c6ea58001
--- /dev/null
+++ b/package/x11r7/xapp_xedit/xapp_xedit.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xedit -- simple text editor for X
+#
+################################################################################
+
+XAPP_XEDIT_VERSION = 1.0.2
+XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2
+XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEDIT_AUTORECONF = YES
+XAPP_XEDIT_DEPENDANCIES = xlib_libXaw xlib_libXprintUtil
+
+$(eval $(call AUTOTARGETS,xapp_xedit))
diff --git a/package/x11r7/xapp_xev/Config.in b/package/x11r7/xapp_xev/Config.in
new file mode 100644
index 000000000..04e3edc4c
--- /dev/null
+++ b/package/x11r7/xapp_xev/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XEV
+	bool "xev"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xev 1.0.1
+	  print contents of X events
diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk
new file mode 100644
index 000000000..7e75a5dd7
--- /dev/null
+++ b/package/x11r7/xapp_xev/xapp_xev.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xev -- print contents of X events
+#
+################################################################################
+
+XAPP_XEV_VERSION = 1.0.1
+XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2
+XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEV_AUTORECONF = YES
+XAPP_XEV_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xev))
diff --git a/package/x11r7/xapp_xeyes/Config.in b/package/x11r7/xapp_xeyes/Config.in
new file mode 100644
index 000000000..b1e5ce7eb
--- /dev/null
+++ b/package/x11r7/xapp_xeyes/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_XEYES
+	bool "xeyes"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  xeyes 1.0.1
+	  X.Org xeyes application
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
new file mode 100644
index 000000000..fa74b2abb
--- /dev/null
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xeyes -- X.Org xeyes application
+#
+################################################################################
+
+XAPP_XEYES_VERSION = 1.0.1
+XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
+XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XEYES_AUTORECONF = YES
+XAPP_XEYES_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_xeyes))
diff --git a/package/x11r7/xapp_xf86dga/Config.in b/package/x11r7/xapp_xf86dga/Config.in
new file mode 100644
index 000000000..2011b96fc
--- /dev/null
+++ b/package/x11r7/xapp_xf86dga/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XF86DGA
+	bool "xf86dga"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXXF86DGA
+	help
+	  xf86dga 1.0.2
+	  test program for the XFree86-DGA extension
diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
new file mode 100644
index 000000000..404bc8e46
--- /dev/null
+++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xf86dga -- test program for the XFree86-DGA extension
+#
+################################################################################
+
+XAPP_XF86DGA_VERSION = 1.0.2
+XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2
+XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XF86DGA_AUTORECONF = YES
+XAPP_XF86DGA_DEPENDANCIES = xlib_libX11 xlib_libXxf86dga
+
+$(eval $(call AUTOTARGETS,xapp_xf86dga))
diff --git a/package/x11r7/xapp_xfd/Config.in b/package/x11r7/xapp_xfd/Config.in
new file mode 100644
index 000000000..626eb91f0
--- /dev/null
+++ b/package/x11r7/xapp_xfd/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_XFD
+	bool "xfd"
+	default n
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXFT
+	help
+	  xfd 1.0.1
+	  X.Org xfd application
diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk
new file mode 100644
index 000000000..722615f71
--- /dev/null
+++ b/package/x11r7/xapp_xfd/xapp_xfd.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfd -- X.Org xfd application
+#
+################################################################################
+
+XAPP_XFD_VERSION = 1.0.1
+XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2
+XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFD_AUTORECONF = YES
+XAPP_XFD_DEPENDANCIES = freetype fontconfig xlib_libXaw xlib_libXft
+
+$(eval $(call AUTOTARGETS,xapp_xfd))
diff --git a/package/x11r7/xapp_xfindproxy/Config.in b/package/x11r7/xapp_xfindproxy/Config.in
new file mode 100644
index 000000000..22c486ea9
--- /dev/null
+++ b/package/x11r7/xapp_xfindproxy/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XFINDPROXY
+	bool "xfindproxy"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  xfindproxy 1.0.1
+	  X.Org xfindproxy application
diff --git a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
new file mode 100644
index 000000000..519e2eae3
--- /dev/null
+++ b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfindproxy -- X.Org xfindproxy application
+#
+################################################################################
+
+XAPP_XFINDPROXY_VERSION = 1.0.1
+XAPP_XFINDPROXY_SOURCE = xfindproxy-$(XAPP_XFINDPROXY_VERSION).tar.bz2
+XAPP_XFINDPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFINDPROXY_AUTORECONF = YES
+XAPP_XFINDPROXY_DEPENDANCIES = xlib_libICE xlib_libX11 xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_xfindproxy))
diff --git a/package/x11r7/xapp_xfontsel/Config.in b/package/x11r7/xapp_xfontsel/Config.in
new file mode 100644
index 000000000..91543f0a8
--- /dev/null
+++ b/package/x11r7/xapp_xfontsel/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XFONTSEL
+	bool "xfontsel"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xfontsel 1.0.1
+	  point and click selection of X11 font names
diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
new file mode 100644
index 000000000..7a74b34ad
--- /dev/null
+++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfontsel -- point and click selection of X11 font names
+#
+################################################################################
+
+XAPP_XFONTSEL_VERSION = 1.0.1
+XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2
+XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFONTSEL_AUTORECONF = YES
+XAPP_XFONTSEL_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xfontsel))
diff --git a/package/x11r7/xapp_xfs/Config.in b/package/x11r7/xapp_xfs/Config.in
new file mode 100644
index 000000000..cdeb28de7
--- /dev/null
+++ b/package/x11r7/xapp_xfs/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XFS
+	bool "xfs"
+	default n
+	select BR2_PACKAGE_XLIB_LIBFS
+	select BR2_PACKAGE_XLIB_LIBXFONT
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	help
+	  xfs 1.0.4
+	  X font server
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
new file mode 100644
index 000000000..0c47f0229
--- /dev/null
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfs -- X font server
+#
+################################################################################
+
+XAPP_XFS_VERSION = 1.0.4
+XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
+XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFS_AUTORECONF = YES
+XAPP_XFS_DEPENDANCIES = xlib_libFS xlib_libXfont xproto_fontsproto
+
+$(eval $(call AUTOTARGETS,xapp_xfs))
diff --git a/package/x11r7/xapp_xfsinfo/Config.in b/package/x11r7/xapp_xfsinfo/Config.in
new file mode 100644
index 000000000..ca2fd948b
--- /dev/null
+++ b/package/x11r7/xapp_xfsinfo/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XFSINFO
+	bool "xfsinfo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBFS
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xfsinfo 1.0.1
+	  X font server information utility
diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
new file mode 100644
index 000000000..589120cff
--- /dev/null
+++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfsinfo -- X font server information utility
+#
+################################################################################
+
+XAPP_XFSINFO_VERSION = 1.0.1
+XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2
+XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFSINFO_AUTORECONF = YES
+XAPP_XFSINFO_DEPENDANCIES = xlib_libFS xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xfsinfo))
diff --git a/package/x11r7/xapp_xfwp/Config.in b/package/x11r7/xapp_xfwp/Config.in
new file mode 100644
index 000000000..2a0ab3fa4
--- /dev/null
+++ b/package/x11r7/xapp_xfwp/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XFWP
+	bool "xfwp"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+	help
+	  xfwp 1.0.1
+	  X.Org xfwp application
diff --git a/package/x11r7/xapp_xfwp/xapp_xfwp.mk b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
new file mode 100644
index 000000000..8e6c0bdd5
--- /dev/null
+++ b/package/x11r7/xapp_xfwp/xapp_xfwp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xfwp -- X.Org xfwp application
+#
+################################################################################
+
+XAPP_XFWP_VERSION = 1.0.1
+XAPP_XFWP_SOURCE = xfwp-$(XAPP_XFWP_VERSION).tar.bz2
+XAPP_XFWP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFWP_AUTORECONF = YES
+XAPP_XFWP_DEPENDANCIES = xlib_libICE xlib_libX11 xproto_xproxymanagementprotocol
+
+$(eval $(call AUTOTARGETS,xapp_xfwp))
diff --git a/package/x11r7/xapp_xgamma/Config.in b/package/x11r7/xapp_xgamma/Config.in
new file mode 100644
index 000000000..8f5c56814
--- /dev/null
+++ b/package/x11r7/xapp_xgamma/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XGAMMA
+	bool "xgamma"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	help
+	  xgamma 1.0.1
+	  Alter a monitor's gamma correction through the X server
diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
new file mode 100644
index 000000000..4244aa237
--- /dev/null
+++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xgamma -- Alter a monitor's gamma correction through the X server
+#
+################################################################################
+
+XAPP_XGAMMA_VERSION = 1.0.1
+XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2
+XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XGAMMA_AUTORECONF = YES
+XAPP_XGAMMA_DEPENDANCIES = xlib_libXxf86vm
+
+$(eval $(call AUTOTARGETS,xapp_xgamma))
diff --git a/package/x11r7/xapp_xgc/Config.in b/package/x11r7/xapp_xgc/Config.in
new file mode 100644
index 000000000..14f813872
--- /dev/null
+++ b/package/x11r7/xapp_xgc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XGC
+	bool "xgc"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xgc 1.0.1
+	  X graphics demo
diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk
new file mode 100644
index 000000000..bbd1f52f8
--- /dev/null
+++ b/package/x11r7/xapp_xgc/xapp_xgc.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xgc -- X graphics demo
+#
+################################################################################
+
+XAPP_XGC_VERSION = 1.0.1
+XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2
+XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XGC_AUTORECONF = YES
+XAPP_XGC_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xgc))
diff --git a/package/x11r7/xapp_xhost/Config.in b/package/x11r7/xapp_xhost/Config.in
new file mode 100644
index 000000000..cb49b5a02
--- /dev/null
+++ b/package/x11r7/xapp_xhost/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XHOST
+	bool "xhost"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xhost 1.0.1
+	  Controls host and/or user access to a running X server.
diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk
new file mode 100644
index 000000000..1c1637993
--- /dev/null
+++ b/package/x11r7/xapp_xhost/xapp_xhost.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xhost -- Controls host and/or user access to a running X server.
+#
+################################################################################
+
+XAPP_XHOST_VERSION = 1.0.1
+XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2
+XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XHOST_AUTORECONF = YES
+XAPP_XHOST_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xhost))
diff --git a/package/x11r7/xapp_xinit/Config.in b/package/x11r7/xapp_xinit/Config.in
new file mode 100644
index 000000000..d6ebd9a5c
--- /dev/null
+++ b/package/x11r7/xapp_xinit/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XINIT
+	bool "xinit"
+	default n
+	select BR2_PACKAGE_XAPP_XAUTH
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xinit 1.0.3
+	  X Window System initializer
diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk
new file mode 100644
index 000000000..2953dba4d
--- /dev/null
+++ b/package/x11r7/xapp_xinit/xapp_xinit.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xinit -- X Window System initializer
+#
+################################################################################
+
+XAPP_XINIT_VERSION = 1.0.3
+XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2
+XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XINIT_AUTORECONF = YES
+XAPP_XINIT_DEPENDANCIES = xapp_xauth xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xinit))
diff --git a/package/x11r7/xapp_xkbcomp/Config.in b/package/x11r7/xapp_xkbcomp/Config.in
new file mode 100644
index 000000000..170baccf3
--- /dev/null
+++ b/package/x11r7/xapp_xkbcomp/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XKBCOMP
+	bool "xkbcomp"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  xkbcomp 1.0.3
+	  compile XKB keyboard description
diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
new file mode 100644
index 000000000..be1a08cb3
--- /dev/null
+++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xkbcomp -- compile XKB keyboard description
+#
+################################################################################
+
+XAPP_XKBCOMP_VERSION = 1.0.3
+XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
+XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBCOMP_AUTORECONF = YES
+XAPP_XKBCOMP_DEPENDANCIES = xlib_libX11 xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_xkbcomp))
diff --git a/package/x11r7/xapp_xkbevd/Config.in b/package/x11r7/xapp_xkbevd/Config.in
new file mode 100644
index 000000000..f61c98d44
--- /dev/null
+++ b/package/x11r7/xapp_xkbevd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XKBEVD
+	bool "xkbevd"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  xkbevd 1.0.2
+	  XKB event daemon
diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
new file mode 100644
index 000000000..3f05c063d
--- /dev/null
+++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xkbevd -- XKB event daemon
+#
+################################################################################
+
+XAPP_XKBEVD_VERSION = 1.0.2
+XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2
+XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBEVD_AUTORECONF = YES
+XAPP_XKBEVD_DEPENDANCIES = xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_xkbevd))
diff --git a/package/x11r7/xapp_xkbprint/Config.in b/package/x11r7/xapp_xkbprint/Config.in
new file mode 100644
index 000000000..507357768
--- /dev/null
+++ b/package/x11r7/xapp_xkbprint/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XKBPRINT
+	bool "xkbprint"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  xkbprint 1.0.1
+	  print an XKB keyboard description
diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
new file mode 100644
index 000000000..d4ba26cb1
--- /dev/null
+++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xkbprint -- print an XKB keyboard description
+#
+################################################################################
+
+XAPP_XKBPRINT_VERSION = 1.0.1
+XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2
+XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBPRINT_AUTORECONF = YES
+XAPP_XKBPRINT_DEPENDANCIES = xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_xkbprint))
diff --git a/package/x11r7/xapp_xkbutils/Config.in b/package/x11r7/xapp_xkbutils/Config.in
new file mode 100644
index 000000000..fc2d01213
--- /dev/null
+++ b/package/x11r7/xapp_xkbutils/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XKBUTILS
+	bool "xkbutils"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	help
+	  xkbutils 1.0.1
+	  X.Org xkbutils application
diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
new file mode 100644
index 000000000..11fa30a0a
--- /dev/null
+++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xkbutils -- X.Org xkbutils application
+#
+################################################################################
+
+XAPP_XKBUTILS_VERSION = 1.0.1
+XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2
+XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKBUTILS_AUTORECONF = YES
+XAPP_XKBUTILS_DEPENDANCIES = xlib_libXaw xlib_libxkbfile
+
+$(eval $(call AUTOTARGETS,xapp_xkbutils))
diff --git a/package/x11r7/xapp_xkill/Config.in b/package/x11r7/xapp_xkill/Config.in
new file mode 100644
index 000000000..9c20cd812
--- /dev/null
+++ b/package/x11r7/xapp_xkill/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XKILL
+	bool "xkill"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xkill 1.0.1
+	  kill a client by its X resource
diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk
new file mode 100644
index 000000000..a92750791
--- /dev/null
+++ b/package/x11r7/xapp_xkill/xapp_xkill.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xkill -- kill a client by its X resource
+#
+################################################################################
+
+XAPP_XKILL_VERSION = 1.0.1
+XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2
+XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XKILL_AUTORECONF = YES
+XAPP_XKILL_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xkill))
diff --git a/package/x11r7/xapp_xload/Config.in b/package/x11r7/xapp_xload/Config.in
new file mode 100644
index 000000000..590059c4b
--- /dev/null
+++ b/package/x11r7/xapp_xload/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XLOAD
+	bool "xload"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xload 1.0.1
+	  system load average display for X
diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk
new file mode 100644
index 000000000..ce0a1338e
--- /dev/null
+++ b/package/x11r7/xapp_xload/xapp_xload.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xload -- system load average display for X
+#
+################################################################################
+
+XAPP_XLOAD_VERSION = 1.0.1
+XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2
+XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLOAD_AUTORECONF = YES
+XAPP_XLOAD_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xload))
diff --git a/package/x11r7/xapp_xlogo/Config.in b/package/x11r7/xapp_xlogo/Config.in
new file mode 100644
index 000000000..ed0ea168d
--- /dev/null
+++ b/package/x11r7/xapp_xlogo/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XLOGO
+	bool "xlogo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	help
+	  xlogo 1.0.1
+	  X Window System logo
diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
new file mode 100644
index 000000000..106f4a21d
--- /dev/null
+++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xlogo -- X Window System logo
+#
+################################################################################
+
+XAPP_XLOGO_VERSION = 1.0.1
+XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2
+XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLOGO_AUTORECONF = YES
+XAPP_XLOGO_DEPENDANCIES = xlib_libXaw xlib_libXprintUtil xlib_libXrender
+
+$(eval $(call AUTOTARGETS,xapp_xlogo))
diff --git a/package/x11r7/xapp_xlsatoms/Config.in b/package/x11r7/xapp_xlsatoms/Config.in
new file mode 100644
index 000000000..aaf4851a2
--- /dev/null
+++ b/package/x11r7/xapp_xlsatoms/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XLSATOMS
+	bool "xlsatoms"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xlsatoms 1.0.1
+	  list interned atoms defined on server
diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
new file mode 100644
index 000000000..571dbf054
--- /dev/null
+++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xlsatoms -- list interned atoms defined on server
+#
+################################################################################
+
+XAPP_XLSATOMS_VERSION = 1.0.1
+XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2
+XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSATOMS_AUTORECONF = YES
+XAPP_XLSATOMS_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xlsatoms))
diff --git a/package/x11r7/xapp_xlsclients/Config.in b/package/x11r7/xapp_xlsclients/Config.in
new file mode 100644
index 000000000..eb8854c2d
--- /dev/null
+++ b/package/x11r7/xapp_xlsclients/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XLSCLIENTS
+	bool "xlsclients"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xlsclients 1.0.1
+	  X.Org xlsclients application
diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
new file mode 100644
index 000000000..f42b12ca7
--- /dev/null
+++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xlsclients -- X.Org xlsclients application
+#
+################################################################################
+
+XAPP_XLSCLIENTS_VERSION = 1.0.1
+XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2
+XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSCLIENTS_AUTORECONF = YES
+XAPP_XLSCLIENTS_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xlsclients))
diff --git a/package/x11r7/xapp_xlsfonts/Config.in b/package/x11r7/xapp_xlsfonts/Config.in
new file mode 100644
index 000000000..c5f537cd8
--- /dev/null
+++ b/package/x11r7/xapp_xlsfonts/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XLSFONTS
+	bool "xlsfonts"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xlsfonts 1.0.1
+	  X.Org xlsfonts application
diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
new file mode 100644
index 000000000..f9a77cf1d
--- /dev/null
+++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xlsfonts -- X.Org xlsfonts application
+#
+################################################################################
+
+XAPP_XLSFONTS_VERSION = 1.0.1
+XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2
+XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XLSFONTS_AUTORECONF = YES
+XAPP_XLSFONTS_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xlsfonts))
diff --git a/package/x11r7/xapp_xmag/Config.in b/package/x11r7/xapp_xmag/Config.in
new file mode 100644
index 000000000..4fca0bf42
--- /dev/null
+++ b/package/x11r7/xapp_xmag/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XMAG
+	bool "xmag"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xmag 1.0.1
+	  X.Org xmag application
diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk
new file mode 100644
index 000000000..41239971e
--- /dev/null
+++ b/package/x11r7/xapp_xmag/xapp_xmag.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xmag -- X.Org xmag application
+#
+################################################################################
+
+XAPP_XMAG_VERSION = 1.0.1
+XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2
+XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMAG_AUTORECONF = YES
+XAPP_XMAG_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xmag))
diff --git a/package/x11r7/xapp_xman/Config.in b/package/x11r7/xapp_xman/Config.in
new file mode 100644
index 000000000..02dc38958
--- /dev/null
+++ b/package/x11r7/xapp_xman/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XAPP_XMAN
+        bool "xapp_xman"
+        default n
+        help
+	  Manual page display program for the X Window System
+
diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk
new file mode 100644
index 000000000..2780c6365
--- /dev/null
+++ b/package/x11r7/xapp_xman/xapp_xman.mk
@@ -0,0 +1,85 @@
+#############################################################
+#
+# xapp_xman - Manual page display program for the X Window System
+#
+#############################################################
+XAPP_XMAN_VERSION:=1.0.2
+XAPP_XMAN_SOURCE:=xman-$(XAPP_XMAN_VERSION).tar.bz2
+XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMAN_DIR:=$(BUILD_DIR)/xman-$(XAPP_XMAN_VERSION)
+
+$(DL_DIR)/$(XAPP_XMAN_SOURCE):
+	$(WGET) -P $(DL_DIR) $(XAPP_XMAN_SITE)/$(XAPP_XMAN_SOURCE)
+
+$(XAPP_XMAN_DIR)/.extracted: $(DL_DIR)/$(XAPP_XMAN_SOURCE)
+	$(BZCAT) $(DL_DIR)/$(XAPP_XMAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $@
+
+$(XAPP_XMAN_DIR)/.patched: $(XAPP_XMAN_DIR)/.extracted
+	toolchain/patch-kernel.sh $(XAPP_XMAN_DIR) package/xapp_xman/ xapp_xman\*.patch
+	touch $@
+
+$(XAPP_XMAN_DIR)/.configured: $(XAPP_XMAN_DIR)/.patched
+	(cd $(XAPP_XMAN_DIR) && \
+		aclocal -I. -I$(STAGING_DIR)/usr/share/aclocal --install && \
+		autoconf -I$(STAGING_DIR)/usr/share/aclocal && \
+		automake -ac && \
+		rm -rf config.cache && \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		STAGING_DIR=$(STAGING_DIR) \
+		 \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-shared \
+		--disable-static \
+		--disable-IPv6 \
+		$(DISABLE_NLS) \
+		 \
+	);
+	touch $@
+
+$(XAPP_XMAN_DIR)/.built: $(XAPP_XMAN_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC)  -C $(XAPP_XMAN_DIR)
+	touch $@
+
+$(XAPP_XMAN_DIR)/.installed: $(XAPP_XMAN_DIR)/.built
+	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XAPP_XMAN_DIR) install-exec
+	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XAPP_XMAN_DIR) install
+	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
+	find $(TARGET_DIR)/usr -name '*.la' -print -delete
+	touch $@
+
+xapp_xman-clean:
+	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XAPP_XMAN_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XAPP_XMAN_DIR) uninstall
+	-$(MAKE) -C $(XAPP_XMAN_DIR) clean
+	-rm $(XAPP_XMAN_DIR)/.installed
+	-rm $(XAPP_XMAN_DIR)/.built
+
+xapp_xman-dirclean:
+	rm -rf $(XAPP_XMAN_DIR)
+
+xapp_xman-depends:   xlib_libXprintUtil xlib_libXprintUtil
+xapp_xman-source:    $(XAPP_XMAN_DIR)/.extracted
+xapp_xman-patch:     $(XAPP_XMAN_DIR)/.patched
+xapp_xman-configure: $(XAPP_XMAN_DIR)/.configured
+xapp_xman-build:     $(XAPP_XMAN_DIR)/.built
+
+xapp_xman: xapp_xman-depends $(XAPP_XMAN_DIR)/.installed
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_XAPP_XMAN)),y)
+TARGETS+=xapp_xman
+endif
+
+# :mode=makefile:
diff --git a/package/x11r7/xapp_xmessage/Config.in b/package/x11r7/xapp_xmessage/Config.in
new file mode 100644
index 000000000..30c3026b8
--- /dev/null
+++ b/package/x11r7/xapp_xmessage/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XMESSAGE
+	bool "xmessage"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xmessage 1.0.1
+	  display a message or query in a window (X-based /bin/echo)
diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
new file mode 100644
index 000000000..113d472b5
--- /dev/null
+++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xmessage -- display a message or query in a window (X-based /bin/echo)
+#
+################################################################################
+
+XAPP_XMESSAGE_VERSION = 1.0.1
+XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2
+XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMESSAGE_AUTORECONF = YES
+XAPP_XMESSAGE_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xmessage))
diff --git a/package/x11r7/xapp_xmh/Config.in b/package/x11r7/xapp_xmh/Config.in
new file mode 100644
index 000000000..a01a03bc2
--- /dev/null
+++ b/package/x11r7/xapp_xmh/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XMH
+	bool "xmh"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xmh 1.0.1
+	  send and read mail with an X interface to MH
diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk
new file mode 100644
index 000000000..bd40518fb
--- /dev/null
+++ b/package/x11r7/xapp_xmh/xapp_xmh.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xmh -- send and read mail with an X interface to MH
+#
+################################################################################
+
+XAPP_XMH_VERSION = 1.0.1
+XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2
+XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMH_AUTORECONF = YES
+XAPP_XMH_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xmh))
diff --git a/package/x11r7/xapp_xmodmap/Config.in b/package/x11r7/xapp_xmodmap/Config.in
new file mode 100644
index 000000000..792fa3adc
--- /dev/null
+++ b/package/x11r7/xapp_xmodmap/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XMODMAP
+	bool "xmodmap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xmodmap 1.0.2
+	  utility for modifying keymaps and pointer button mappings in X
diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
new file mode 100644
index 000000000..e7636119a
--- /dev/null
+++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xmodmap -- utility for modifying keymaps and pointer button mappings in X
+#
+################################################################################
+
+XAPP_XMODMAP_VERSION = 1.0.2
+XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2
+XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMODMAP_AUTORECONF = YES
+XAPP_XMODMAP_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xmodmap))
diff --git a/package/x11r7/xapp_xmore/Config.in b/package/x11r7/xapp_xmore/Config.in
new file mode 100644
index 000000000..2551bf440
--- /dev/null
+++ b/package/x11r7/xapp_xmore/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XMORE
+	bool "xmore"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	help
+	  xmore 1.0.1
+	  plain text display program for the X Window System
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
new file mode 100644
index 000000000..6ca081d5a
--- /dev/null
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xmore -- plain text display program for the X Window System
+#
+################################################################################
+
+XAPP_XMORE_VERSION = 1.0.1
+XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
+XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XMORE_AUTORECONF = YES
+XAPP_XMORE_DEPENDANCIES = xlib_libXprintUtil xlib_libXprintUtil
+
+$(eval $(call AUTOTARGETS,xapp_xmore))
diff --git a/package/x11r7/xapp_xphelloworld/Config.in b/package/x11r7/xapp_xphelloworld/Config.in
new file mode 100644
index 000000000..da814dfb5
--- /dev/null
+++ b/package/x11r7/xapp_xphelloworld/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XAPP_XPHELLOWORLD
+	bool "xphelloworld"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  xphelloworld 1.0.1
+	  X.Org xphelloworld application
diff --git a/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
new file mode 100644
index 000000000..4d9725fcd
--- /dev/null
+++ b/package/x11r7/xapp_xphelloworld/xapp_xphelloworld.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xphelloworld -- X.Org xphelloworld application
+#
+################################################################################
+
+XAPP_XPHELLOWORLD_VERSION = 1.0.1
+XAPP_XPHELLOWORLD_SOURCE = xphelloworld-$(XAPP_XPHELLOWORLD_VERSION).tar.bz2
+XAPP_XPHELLOWORLD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPHELLOWORLD_AUTORECONF = YES
+XAPP_XPHELLOWORLD_DEPENDANCIES = xlib_libXaw xlib_libXprintAppUtil xlib_libXprintUtil xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_xphelloworld))
diff --git a/package/x11r7/xapp_xplsprinters/Config.in b/package/x11r7/xapp_xplsprinters/Config.in
new file mode 100644
index 000000000..852866e4f
--- /dev/null
+++ b/package/x11r7/xapp_xplsprinters/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XPLSPRINTERS
+	bool "xplsprinters"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXP
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	help
+	  xplsprinters 1.0.1
+	  shows a list of Xprint printers and it's attributes
diff --git a/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
new file mode 100644
index 000000000..e35941a0a
--- /dev/null
+++ b/package/x11r7/xapp_xplsprinters/xapp_xplsprinters.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xplsprinters -- shows a list of Xprint printers and it's attributes
+#
+################################################################################
+
+XAPP_XPLSPRINTERS_VERSION = 1.0.1
+XAPP_XPLSPRINTERS_SOURCE = xplsprinters-$(XAPP_XPLSPRINTERS_VERSION).tar.bz2
+XAPP_XPLSPRINTERS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPLSPRINTERS_AUTORECONF = YES
+XAPP_XPLSPRINTERS_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
+
+$(eval $(call AUTOTARGETS,xapp_xplsprinters))
diff --git a/package/x11r7/xapp_xpr/Config.in b/package/x11r7/xapp_xpr/Config.in
new file mode 100644
index 000000000..ee7ff3b5a
--- /dev/null
+++ b/package/x11r7/xapp_xpr/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XPR
+	bool "xpr"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xpr 1.0.1
+	  X.Org xpr application
diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk
new file mode 100644
index 000000000..3935fb50e
--- /dev/null
+++ b/package/x11r7/xapp_xpr/xapp_xpr.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xpr -- X.Org xpr application
+#
+################################################################################
+
+XAPP_XPR_VERSION = 1.0.1
+XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2
+XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPR_AUTORECONF = YES
+XAPP_XPR_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xpr))
diff --git a/package/x11r7/xapp_xprehashprinterlist/Config.in b/package/x11r7/xapp_xprehashprinterlist/Config.in
new file mode 100644
index 000000000..29ec3d883
--- /dev/null
+++ b/package/x11r7/xapp_xprehashprinterlist/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XPREHASHPRINTERLIST
+	bool "xprehashprinterlist"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXP
+	help
+	  xprehashprinterlist 1.0.1
+	  Recomputes the list of available printers.
diff --git a/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
new file mode 100644
index 000000000..c6c93f620
--- /dev/null
+++ b/package/x11r7/xapp_xprehashprinterlist/xapp_xprehashprinterlist.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xprehashprinterlist -- Recomputes the list of available printers.
+#
+################################################################################
+
+XAPP_XPREHASHPRINTERLIST_VERSION = 1.0.1
+XAPP_XPREHASHPRINTERLIST_SOURCE = xprehashprinterlist-$(XAPP_XPREHASHPRINTERLIST_VERSION).tar.bz2
+XAPP_XPREHASHPRINTERLIST_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPREHASHPRINTERLIST_AUTORECONF = YES
+XAPP_XPREHASHPRINTERLIST_DEPENDANCIES = xlib_libX11 xlib_libXp
+
+$(eval $(call AUTOTARGETS,xapp_xprehashprinterlist))
diff --git a/package/x11r7/xapp_xprop/Config.in b/package/x11r7/xapp_xprop/Config.in
new file mode 100644
index 000000000..4f28c4f9a
--- /dev/null
+++ b/package/x11r7/xapp_xprop/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XPROP
+	bool "xprop"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xprop 1.0.2
+	  property displayer for X
diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk
new file mode 100644
index 000000000..bf8a227a1
--- /dev/null
+++ b/package/x11r7/xapp_xprop/xapp_xprop.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xprop -- property displayer for X
+#
+################################################################################
+
+XAPP_XPROP_VERSION = 1.0.2
+XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2
+XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XPROP_AUTORECONF = YES
+XAPP_XPROP_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xprop))
diff --git a/package/x11r7/xapp_xrandr/Config.in b/package/x11r7/xapp_xrandr/Config.in
new file mode 100644
index 000000000..8f1810144
--- /dev/null
+++ b/package/x11r7/xapp_xrandr/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XRANDR
+	bool "xrandr"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXRANDR
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xrandr 1.0.2
+	  primitive command line interface to RandR extension
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
new file mode 100644
index 000000000..7ffc1f60d
--- /dev/null
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xapp_xrandr -- primitive command line interface to RandR extension
+#
+################################################################################
+
+XAPP_XRANDR_VERSION = 1.0.2
+XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2
+XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XRANDR_AUTORECONF = YES
+XAPP_XRANDR_DEPENDANCIES = xlib_libXrandr xlib_libX11
+XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
+
+$(eval $(call AUTOTARGETS,xapp_xrandr))
diff --git a/package/x11r7/xapp_xrdb/Config.in b/package/x11r7/xapp_xrdb/Config.in
new file mode 100644
index 000000000..ffe6780e7
--- /dev/null
+++ b/package/x11r7/xapp_xrdb/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XRDB
+	bool "xrdb"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xrdb 1.0.2
+	  X server resource database utility
diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
new file mode 100644
index 000000000..3d13b3a5a
--- /dev/null
+++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xrdb -- X server resource database utility
+#
+################################################################################
+
+XAPP_XRDB_VERSION = 1.0.2
+XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2
+XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XRDB_AUTORECONF = YES
+XAPP_XRDB_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xrdb))
diff --git a/package/x11r7/xapp_xrefresh/Config.in b/package/x11r7/xapp_xrefresh/Config.in
new file mode 100644
index 000000000..3a61e7c84
--- /dev/null
+++ b/package/x11r7/xapp_xrefresh/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XREFRESH
+	bool "xrefresh"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xrefresh 1.0.2
+	  refresh all or part of an X screen
diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
new file mode 100644
index 000000000..2fcad03bc
--- /dev/null
+++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xrefresh -- refresh all or part of an X screen
+#
+################################################################################
+
+XAPP_XREFRESH_VERSION = 1.0.2
+XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2
+XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XREFRESH_AUTORECONF = YES
+XAPP_XREFRESH_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xrefresh))
diff --git a/package/x11r7/xapp_xrx/Config.in b/package/x11r7/xapp_xrx/Config.in
new file mode 100644
index 000000000..2cf963281
--- /dev/null
+++ b/package/x11r7/xapp_xrx/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XRX
+	bool "xrx"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXT
+	help
+	  xrx 1.0.1
+	  X.Org xrx application
diff --git a/package/x11r7/xapp_xrx/xapp_xrx.mk b/package/x11r7/xapp_xrx/xapp_xrx.mk
new file mode 100644
index 000000000..a53e6d8da
--- /dev/null
+++ b/package/x11r7/xapp_xrx/xapp_xrx.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xrx -- X.Org xrx application
+#
+################################################################################
+
+XAPP_XRX_VERSION = 1.0.1
+XAPP_XRX_SOURCE = xrx-$(XAPP_XRX_VERSION).tar.bz2
+XAPP_XRX_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XRX_AUTORECONF = YES
+XAPP_XRX_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt
+
+$(eval $(call AUTOTARGETS,xapp_xrx))
diff --git a/package/x11r7/xapp_xset/Config.in b/package/x11r7/xapp_xset/Config.in
new file mode 100644
index 000000000..ef49a3e69
--- /dev/null
+++ b/package/x11r7/xapp_xset/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XSET
+	bool "xset"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXFONTCACHE
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xset 1.0.2
+	  X.Org xset application
diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk
new file mode 100644
index 000000000..16f311b81
--- /dev/null
+++ b/package/x11r7/xapp_xset/xapp_xset.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xset -- X.Org xset application
+#
+################################################################################
+
+XAPP_XSET_VERSION = 1.0.2
+XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2
+XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSET_AUTORECONF = YES
+XAPP_XSET_DEPENDANCIES = xlib_libXfontcache xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xset))
diff --git a/package/x11r7/xapp_xsetmode/Config.in b/package/x11r7/xapp_xsetmode/Config.in
new file mode 100644
index 000000000..67dc0c34a
--- /dev/null
+++ b/package/x11r7/xapp_xsetmode/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XSETMODE
+	bool "xsetmode"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXI
+	help
+	  xsetmode 1.0.0
+	  set the mode for an X Input device
diff --git a/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
new file mode 100644
index 000000000..0e8970e8d
--- /dev/null
+++ b/package/x11r7/xapp_xsetmode/xapp_xsetmode.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xsetmode -- set the mode for an X Input device
+#
+################################################################################
+
+XAPP_XSETMODE_VERSION = 1.0.0
+XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2
+XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETMODE_AUTORECONF = YES
+XAPP_XSETMODE_DEPENDANCIES = xlib_libX11 xlib_libXi
+
+$(eval $(call AUTOTARGETS,xapp_xsetmode))
diff --git a/package/x11r7/xapp_xsetpointer/Config.in b/package/x11r7/xapp_xsetpointer/Config.in
new file mode 100644
index 000000000..7b725fc75
--- /dev/null
+++ b/package/x11r7/xapp_xsetpointer/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XSETPOINTER
+	bool "xsetpointer"
+	default n
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXI
+	help
+	  xsetpointer 1.0.0
+	  set an X Input device as the main pointer
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
new file mode 100644
index 000000000..829714d42
--- /dev/null
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xsetpointer -- set an X Input device as the main pointer
+#
+################################################################################
+
+XAPP_XSETPOINTER_VERSION = 1.0.0
+XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
+XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETPOINTER_AUTORECONF = YES
+XAPP_XSETPOINTER_DEPENDANCIES = xproto_inputproto xlib_libX11 xlib_libXi
+
+$(eval $(call AUTOTARGETS,xapp_xsetpointer))
diff --git a/package/x11r7/xapp_xsetroot/Config.in b/package/x11r7/xapp_xsetroot/Config.in
new file mode 100644
index 000000000..f63fbb587
--- /dev/null
+++ b/package/x11r7/xapp_xsetroot/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XAPP_XSETROOT
+	bool "xsetroot"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XDATA_XBITMAPS
+	help
+	  xsetroot 1.0.1
+	  X.Org xsetroot application
diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
new file mode 100644
index 000000000..0adbdf365
--- /dev/null
+++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xsetroot -- X.Org xsetroot application
+#
+################################################################################
+
+XAPP_XSETROOT_VERSION = 1.0.1
+XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2
+XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSETROOT_AUTORECONF = YES
+XAPP_XSETROOT_DEPENDANCIES = xlib_libX11 xlib_libXmu xdata_xbitmaps
+
+$(eval $(call AUTOTARGETS,xapp_xsetroot))
diff --git a/package/x11r7/xapp_xsm/Config.in b/package/x11r7/xapp_xsm/Config.in
new file mode 100644
index 000000000..9f1c19a83
--- /dev/null
+++ b/package/x11r7/xapp_xsm/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XSM
+	bool "xsm"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	help
+	  xsm 1.0.1
+	  X Session Manager
diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk
new file mode 100644
index 000000000..1d9be2f1a
--- /dev/null
+++ b/package/x11r7/xapp_xsm/xapp_xsm.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xsm -- X Session Manager
+#
+################################################################################
+
+XAPP_XSM_VERSION = 1.0.1
+XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2
+XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSM_AUTORECONF = YES
+XAPP_XSM_DEPENDANCIES = xlib_libXaw
+
+$(eval $(call AUTOTARGETS,xapp_xsm))
diff --git a/package/x11r7/xapp_xstdcmap/Config.in b/package/x11r7/xapp_xstdcmap/Config.in
new file mode 100644
index 000000000..f9b9e857e
--- /dev/null
+++ b/package/x11r7/xapp_xstdcmap/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XSTDCMAP
+	bool "xstdcmap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xstdcmap 1.0.1
+	  X standard colormap utility
diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
new file mode 100644
index 000000000..ad53a8a1d
--- /dev/null
+++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xstdcmap -- X standard colormap utility
+#
+################################################################################
+
+XAPP_XSTDCMAP_VERSION = 1.0.1
+XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2
+XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XSTDCMAP_AUTORECONF = YES
+XAPP_XSTDCMAP_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xstdcmap))
diff --git a/package/x11r7/xapp_xtrap/Config.in b/package/x11r7/xapp_xtrap/Config.in
new file mode 100644
index 000000000..c7ffd1859
--- /dev/null
+++ b/package/x11r7/xapp_xtrap/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XTRAP
+	bool "xtrap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXTRAP
+	help
+	  xtrap 1.0.2
+	  X.Org xtrap application
diff --git a/package/x11r7/xapp_xtrap/xapp_xtrap.mk b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
new file mode 100644
index 000000000..1c59c284b
--- /dev/null
+++ b/package/x11r7/xapp_xtrap/xapp_xtrap.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xtrap -- X.Org xtrap application
+#
+################################################################################
+
+XAPP_XTRAP_VERSION = 1.0.2
+XAPP_XTRAP_SOURCE = xtrap-$(XAPP_XTRAP_VERSION).tar.bz2
+XAPP_XTRAP_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XTRAP_AUTORECONF = YES
+XAPP_XTRAP_DEPENDANCIES = xlib_libX11 xlib_libXTrap
+
+$(eval $(call AUTOTARGETS,xapp_xtrap))
diff --git a/package/x11r7/xapp_xvidtune/Config.in b/package/x11r7/xapp_xvidtune/Config.in
new file mode 100644
index 000000000..98ff26d34
--- /dev/null
+++ b/package/x11r7/xapp_xvidtune/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XVIDTUNE
+	bool "xvidtune"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	help
+	  xvidtune 1.0.1
+	  video mode tuner for Xorg
diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
new file mode 100644
index 000000000..0372634df
--- /dev/null
+++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xvidtune -- video mode tuner for Xorg
+#
+################################################################################
+
+XAPP_XVIDTUNE_VERSION = 1.0.1
+XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2
+XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XVIDTUNE_AUTORECONF = YES
+XAPP_XVIDTUNE_DEPENDANCIES = xlib_libXaw xlib_libXxf86vm
+
+$(eval $(call AUTOTARGETS,xapp_xvidtune))
diff --git a/package/x11r7/xapp_xvinfo/Config.in b/package/x11r7/xapp_xvinfo/Config.in
new file mode 100644
index 000000000..937ac044f
--- /dev/null
+++ b/package/x11r7/xapp_xvinfo/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XVINFO
+	bool "xvinfo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXV
+	help
+	  xvinfo 1.0.1
+	  Print out X-Video extension adaptor information
diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
new file mode 100644
index 000000000..916bb8df3
--- /dev/null
+++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xvinfo -- Print out X-Video extension adaptor information
+#
+################################################################################
+
+XAPP_XVINFO_VERSION = 1.0.1
+XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2
+XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XVINFO_AUTORECONF = YES
+XAPP_XVINFO_DEPENDANCIES = xlib_libX11 xlib_libXv
+
+$(eval $(call AUTOTARGETS,xapp_xvinfo))
diff --git a/package/x11r7/xapp_xwd/Config.in b/package/x11r7/xapp_xwd/Config.in
new file mode 100644
index 000000000..d70e32257
--- /dev/null
+++ b/package/x11r7/xapp_xwd/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XWD
+	bool "xwd"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xwd 1.0.1
+	  dump an image of an X window
diff --git a/package/x11r7/xapp_xwd/xapp_xwd.mk b/package/x11r7/xapp_xwd/xapp_xwd.mk
new file mode 100644
index 000000000..9c71c7c9f
--- /dev/null
+++ b/package/x11r7/xapp_xwd/xapp_xwd.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xwd -- dump an image of an X window
+#
+################################################################################
+
+XAPP_XWD_VERSION = 1.0.1
+XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2
+XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWD_AUTORECONF = YES
+XAPP_XWD_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xwd))
diff --git a/package/x11r7/xapp_xwininfo/Config.in b/package/x11r7/xapp_xwininfo/Config.in
new file mode 100644
index 000000000..9655a9dbb
--- /dev/null
+++ b/package/x11r7/xapp_xwininfo/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XAPP_XWININFO
+	bool "xwininfo"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	help
+	  xwininfo 1.0.2
+	  window information utility for X
diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
new file mode 100644
index 000000000..9bd0cebb7
--- /dev/null
+++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xwininfo -- window information utility for X
+#
+################################################################################
+
+XAPP_XWININFO_VERSION = 1.0.2
+XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2
+XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWININFO_AUTORECONF = YES
+XAPP_XWININFO_DEPENDANCIES = xlib_libX11 xlib_libXmu
+
+$(eval $(call AUTOTARGETS,xapp_xwininfo))
diff --git a/package/x11r7/xapp_xwud/Config.in b/package/x11r7/xapp_xwud/Config.in
new file mode 100644
index 000000000..1553ccdb7
--- /dev/null
+++ b/package/x11r7/xapp_xwud/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XAPP_XWUD
+	bool "xwud"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  xwud 1.0.1
+	  image displayer for X
diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk
new file mode 100644
index 000000000..dd4f9cd11
--- /dev/null
+++ b/package/x11r7/xapp_xwud/xapp_xwud.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xapp_xwud -- image displayer for X
+#
+################################################################################
+
+XAPP_XWUD_VERSION = 1.0.1
+XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2
+XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XWUD_AUTORECONF = YES
+XAPP_XWUD_DEPENDANCIES = xlib_libX11
+
+$(eval $(call AUTOTARGETS,xapp_xwud))
diff --git a/package/x11r7/xcb-proto/Config.in b/package/x11r7/xcb-proto/Config.in
new file mode 100644
index 000000000..cc89717f4
--- /dev/null
+++ b/package/x11r7/xcb-proto/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XCB_PROTO
+	bool "xcb-proto"
+	default n
+	help
+		The protocol headers that define XCB.
+
+		http://xcb.freedesktop.org/
+
diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk
new file mode 100644
index 000000000..3bce18afe
--- /dev/null
+++ b/package/x11r7/xcb-proto/xcb-proto.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# xcb-proto
+#
+#############################################################
+XCB_PROTO_VERSION = 1.0
+XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
+XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/
+
+XCB_PROTO_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,xcb-proto))
+
diff --git a/package/x11r7/xcb-util/Config.in b/package/x11r7/xcb-util/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/x11r7/xcb-util/Config.in
diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk
new file mode 100644
index 000000000..07537847d
--- /dev/null
+++ b/package/x11r7/xcb-util/xcb-util.mk
@@ -0,0 +1,11 @@
+#############################################################
+#
+# xcb-util
+#
+#############################################################
+XCB_UTIL_VERSION = 0.2
+XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2
+XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/
+
+$(eval $(call AUTOTARGETS,xcb-util))
+
diff --git a/package/x11r7/xdata_xbitmaps/Config.in b/package/x11r7/xdata_xbitmaps/Config.in
new file mode 100644
index 000000000..cbe3874e5
--- /dev/null
+++ b/package/x11r7/xdata_xbitmaps/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XDATA_XBITMAPS
+	bool "xbitmaps"
+	default n
+	help
+	  xbitmaps 1.0.1
+	  No description available
diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
new file mode 100644
index 000000000..ba9315418
--- /dev/null
+++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xdata_xbitmaps -- No description available
+#
+################################################################################
+
+XDATA_XBITMAPS_VERSION = 1.0.1
+XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2
+XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data
+XDATA_XBITMAPS_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS,xdata_xbitmaps))
diff --git a/package/x11r7/xdata_xcursor-themes/Config.in b/package/x11r7/xdata_xcursor-themes/Config.in
new file mode 100644
index 000000000..2d1f90d58
--- /dev/null
+++ b/package/x11r7/xdata_xcursor-themes/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XDATA_XCURSOR_THEMES
+        bool "xdata_xcursor-themes"
+        default n
+        help
+	  No description available
+
diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
new file mode 100644
index 000000000..24a098d7b
--- /dev/null
+++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk
@@ -0,0 +1,85 @@
+#############################################################
+#
+# xdata_xcursor-themes - No description available
+#
+#############################################################
+XDATA_XCURSOR_THEMES_VERSION:=1.0.1
+XDATA_XCURSOR_THEMES_SOURCE:=xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2
+XDATA_XCURSOR_THEMES_SITE:=http://xorg.freedesktop.org/releases/individual/data
+XDATA_XCURSOR_THEMES_DIR:=$(BUILD_DIR)/xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION)
+
+$(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE):
+	$(WGET) -P $(DL_DIR) $(XDATA_XCURSOR_THEMES_SITE)/$(XDATA_XCURSOR_THEMES_SOURCE)
+
+$(XDATA_XCURSOR_THEMES_DIR)/.extracted: $(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE)
+	$(BZCAT) $(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $@
+
+$(XDATA_XCURSOR_THEMES_DIR)/.patched: $(XDATA_XCURSOR_THEMES_DIR)/.extracted
+	toolchain/patch-kernel.sh $(XDATA_XCURSOR_THEMES_DIR) package/xdata_xcursor-themes/ xdata_xcursor-themes\*.patch
+	touch $@
+
+$(XDATA_XCURSOR_THEMES_DIR)/.configured: $(XDATA_XCURSOR_THEMES_DIR)/.patched
+	(cd $(XDATA_XCURSOR_THEMES_DIR) && \
+		aclocal -I. -I$(STAGING_DIR)/usr/share/aclocal --install && \
+		autoconf -I$(STAGING_DIR)/usr/share/aclocal && \
+		automake -ac && \
+		rm -rf config.cache && \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		STAGING_DIR=$(STAGING_DIR) \
+		 \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-shared \
+		--disable-static \
+		--disable-IPv6 \
+		$(DISABLE_NLS) \
+		 \
+	);
+	touch $@
+
+$(XDATA_XCURSOR_THEMES_DIR)/.built: $(XDATA_XCURSOR_THEMES_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CC)  -C $(XDATA_XCURSOR_THEMES_DIR)
+	touch $@
+
+$(XDATA_XCURSOR_THEMES_DIR)/.installed: $(XDATA_XCURSOR_THEMES_DIR)/.built
+	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XDATA_XCURSOR_THEMES_DIR) install-exec
+	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XDATA_XCURSOR_THEMES_DIR) install
+	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
+	find $(TARGET_DIR)/usr -name '*.la' -print -delete
+	touch $@
+
+xdata_xcursor-themes-clean:
+	$(MAKE) prefix=$(STAGING_DIR)/usr  -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr    -C $(XDATA_XCURSOR_THEMES_DIR) uninstall
+	-$(MAKE) -C $(XDATA_XCURSOR_THEMES_DIR) clean
+	-rm $(XDATA_XCURSOR_THEMES_DIR)/.installed
+	-rm $(XDATA_XCURSOR_THEMES_DIR)/.built
+
+xdata_xcursor-themes-dirclean:
+	rm -rf $(XDATA_XCURSOR_THEMES_DIR)
+
+xdata_xcursor-themes-depends:   
+xdata_xcursor-themes-source:    $(XDATA_XCURSOR_THEMES_DIR)/.extracted
+xdata_xcursor-themes-patch:     $(XDATA_XCURSOR_THEMES_DIR)/.patched
+xdata_xcursor-themes-configure: $(XDATA_XCURSOR_THEMES_DIR)/.configured
+xdata_xcursor-themes-build:     $(XDATA_XCURSOR_THEMES_DIR)/.built
+
+xdata_xcursor-themes: xdata_xcursor-themes-depends $(XDATA_XCURSOR_THEMES_DIR)/.installed
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_XDATA_XCURSOR_THEMES)),y)
+TARGETS+=xdata_xcursor-themes
+endif
+
+# :mode=makefile:
diff --git a/package/x11r7/xdriver_xf86-input-acecad/Config.in b/package/x11r7/xdriver_xf86-input-acecad/Config.in
new file mode 100644
index 000000000..0ec77b53d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-acecad/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_ACECAD
+	bool "xf86-input-acecad"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-acecad 1.1.0
+	  Acecad Flair input driver
diff --git a/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
new file mode 100644
index 000000000..342f5fb3b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-acecad/xdriver_xf86-input-acecad.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-acecad -- Acecad Flair input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_ACECAD_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_ACECAD_SOURCE = xf86-input-acecad-$(XDRIVER_XF86_INPUT_ACECAD_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_ACECAD_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_ACECAD_AUTORECONF = YES
+XDRIVER_XF86_INPUT_ACECAD_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-acecad))
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/Config.in b/package/x11r7/xdriver_xf86-input-aiptek/Config.in
new file mode 100644
index 000000000..16718ba15
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-aiptek/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_AIPTEK
+	bool "xf86-input-aiptek"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-aiptek 1.0.1
+	  Aiptek USB Digital Tablet Input Driver for Linux
diff --git a/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
new file mode 100644
index 000000000..5efc09385
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-aiptek/xdriver_xf86-input-aiptek.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-aiptek -- Aiptek USB Digital Tablet Input Driver for Linux
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_AIPTEK_VERSION = 1.0.1
+XDRIVER_XF86_INPUT_AIPTEK_SOURCE = xf86-input-aiptek-$(XDRIVER_XF86_INPUT_AIPTEK_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_AIPTEK_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_AIPTEK_AUTORECONF = YES
+XDRIVER_XF86_INPUT_AIPTEK_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-aiptek))
diff --git a/package/x11r7/xdriver_xf86-input-calcomp/Config.in b/package/x11r7/xdriver_xf86-input-calcomp/Config.in
new file mode 100644
index 000000000..13299a9af
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-calcomp/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_CALCOMP
+	bool "xf86-input-calcomp"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-calcomp 1.1.0
+	  Calcomp input driver
diff --git a/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
new file mode 100644
index 000000000..6efd6669d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-calcomp/xdriver_xf86-input-calcomp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-calcomp -- Calcomp input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_CALCOMP_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_CALCOMP_SOURCE = xf86-input-calcomp-$(XDRIVER_XF86_INPUT_CALCOMP_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_CALCOMP_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_CALCOMP_AUTORECONF = YES
+XDRIVER_XF86_INPUT_CALCOMP_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-calcomp))
diff --git a/package/x11r7/xdriver_xf86-input-citron/Config.in b/package/x11r7/xdriver_xf86-input-citron/Config.in
new file mode 100644
index 000000000..42788c54d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-citron/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_CITRON
+	bool "xf86-input-citron"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-citron 2.2.0
+	  X.Org driver for citron input devices
diff --git a/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
new file mode 100644
index 000000000..01ca2219e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-citron/xdriver_xf86-input-citron.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-citron -- X.Org driver for citron input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_CITRON_VERSION = 2.2.0
+XDRIVER_XF86_INPUT_CITRON_SOURCE = xf86-input-citron-$(XDRIVER_XF86_INPUT_CITRON_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_CITRON_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_CITRON_AUTORECONF = YES
+XDRIVER_XF86_INPUT_CITRON_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-citron))
diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/Config.in b/package/x11r7/xdriver_xf86-input-digitaledge/Config.in
new file mode 100644
index 000000000..4280ebdf8
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-digitaledge/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_DIGITALEDGE
+	bool "xf86-input-digitaledge"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-digitaledge 1.1.0
+	  X.Org driver for digitaledge input devices
diff --git a/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
new file mode 100644
index 000000000..75ca404bb
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-digitaledge/xdriver_xf86-input-digitaledge.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-digitaledge -- X.Org driver for digitaledge input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_DIGITALEDGE_SOURCE = xf86-input-digitaledge-$(XDRIVER_XF86_INPUT_DIGITALEDGE_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_DIGITALEDGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_DIGITALEDGE_AUTORECONF = YES
+XDRIVER_XF86_INPUT_DIGITALEDGE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-digitaledge))
diff --git a/package/x11r7/xdriver_xf86-input-dmc/Config.in b/package/x11r7/xdriver_xf86-input-dmc/Config.in
new file mode 100644
index 000000000..38490c42e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-dmc/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_DMC
+	bool "xf86-input-dmc"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-dmc 1.1.0
+	  DMC input driver
diff --git a/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
new file mode 100644
index 000000000..262d78d06
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-dmc/xdriver_xf86-input-dmc.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-dmc -- DMC input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_DMC_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_DMC_SOURCE = xf86-input-dmc-$(XDRIVER_XF86_INPUT_DMC_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_DMC_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_DMC_AUTORECONF = YES
+XDRIVER_XF86_INPUT_DMC_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-dmc))
diff --git a/package/x11r7/xdriver_xf86-input-dynapro/Config.in b/package/x11r7/xdriver_xf86-input-dynapro/Config.in
new file mode 100644
index 000000000..8b207c402
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-dynapro/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_DYNAPRO
+	bool "xf86-input-dynapro"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-dynapro 1.1.0
+	  Dynapro input driver
diff --git a/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
new file mode 100644
index 000000000..86efc68c3
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-dynapro/xdriver_xf86-input-dynapro.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-dynapro -- Dynapro input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_DYNAPRO_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_DYNAPRO_SOURCE = xf86-input-dynapro-$(XDRIVER_XF86_INPUT_DYNAPRO_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_DYNAPRO_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_DYNAPRO_AUTORECONF = YES
+XDRIVER_XF86_INPUT_DYNAPRO_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-dynapro))
diff --git a/package/x11r7/xdriver_xf86-input-elo2300/Config.in b/package/x11r7/xdriver_xf86-input-elo2300/Config.in
new file mode 100644
index 000000000..44c07f312
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-elo2300/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELO2300
+	bool "xf86-input-elo2300"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-elo2300 1.1.0
+	  X.Org driver for elo2300 input devices
diff --git a/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
new file mode 100644
index 000000000..f10df6f77
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-elo2300/xdriver_xf86-input-elo2300.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-elo2300 -- X.Org driver for elo2300 input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_ELO2300_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_ELO2300_SOURCE = xf86-input-elo2300-$(XDRIVER_XF86_INPUT_ELO2300_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_ELO2300_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_ELO2300_AUTORECONF = YES
+XDRIVER_XF86_INPUT_ELO2300_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-elo2300))
diff --git a/package/x11r7/xdriver_xf86-input-elographics/Config.in b/package/x11r7/xdriver_xf86-input-elographics/Config.in
new file mode 100644
index 000000000..7f84bb08f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-elographics/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_ELOGRAPHICS
+	bool "xf86-input-elographics"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-elographics 1.0.0.5
+	  Elographics input driver
diff --git a/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
new file mode 100644
index 000000000..b17575225
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-elographics/xdriver_xf86-input-elographics.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-elographics -- Elographics input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION = 1.0.0.5
+XDRIVER_XF86_INPUT_ELOGRAPHICS_SOURCE = xf86-input-elographics-$(XDRIVER_XF86_INPUT_ELOGRAPHICS_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_ELOGRAPHICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_ELOGRAPHICS_AUTORECONF = YES
+XDRIVER_XF86_INPUT_ELOGRAPHICS_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-elographics))
diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
new file mode 100644
index 000000000..abd18f4e0
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
+	bool "xf86-input-evdev"
+	default n
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-evdev 1.1.2
+	  Generic Linux input driver
diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
new file mode 100644
index 000000000..3ed6b715c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-evdev -- Generic Linux input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_EVDEV_VERSION = 1.1.2
+XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = YES
+XDRIVER_XF86_INPUT_EVDEV_DEPENDANCIES = xproto_inputproto xserver_xorg-server xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-evdev))
diff --git a/package/x11r7/xdriver_xf86-input-fpit/Config.in b/package/x11r7/xdriver_xf86-input-fpit/Config.in
new file mode 100644
index 000000000..7f225e4fd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-fpit/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_FPIT
+	bool "xf86-input-fpit"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-fpit 1.1.0
+	  Fujitsu Stylistic input driver
diff --git a/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
new file mode 100644
index 000000000..2a680ee09
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-fpit/xdriver_xf86-input-fpit.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-fpit -- Fujitsu Stylistic input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_FPIT_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_FPIT_SOURCE = xf86-input-fpit-$(XDRIVER_XF86_INPUT_FPIT_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_FPIT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_FPIT_AUTORECONF = YES
+XDRIVER_XF86_INPUT_FPIT_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-fpit))
diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/Config.in b/package/x11r7/xdriver_xf86-input-hyperpen/Config.in
new file mode 100644
index 000000000..352bc24a2
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-hyperpen/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_HYPERPEN
+	bool "xf86-input-hyperpen"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-hyperpen 1.1.0
+	  X.Org driver for hyperpen input devices
diff --git a/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
new file mode 100644
index 000000000..e2aae7f93
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-hyperpen/xdriver_xf86-input-hyperpen.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-hyperpen -- X.Org driver for hyperpen input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_HYPERPEN_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_HYPERPEN_SOURCE = xf86-input-hyperpen-$(XDRIVER_XF86_INPUT_HYPERPEN_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_HYPERPEN_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_HYPERPEN_AUTORECONF = YES
+XDRIVER_XF86_INPUT_HYPERPEN_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-hyperpen))
diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/Config.in b/package/x11r7/xdriver_xf86-input-jamstudio/Config.in
new file mode 100644
index 000000000..eb5d1f47a
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-jamstudio/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_JAMSTUDIO
+	bool "xf86-input-jamstudio"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-jamstudio 1.1.0
+	  X.Org driver for jamstudio input devices
diff --git a/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
new file mode 100644
index 000000000..00819cff1
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-jamstudio/xdriver_xf86-input-jamstudio.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-jamstudio -- X.Org driver for jamstudio input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_JAMSTUDIO_SOURCE = xf86-input-jamstudio-$(XDRIVER_XF86_INPUT_JAMSTUDIO_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_JAMSTUDIO_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_JAMSTUDIO_AUTORECONF = YES
+XDRIVER_XF86_INPUT_JAMSTUDIO_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-jamstudio))
diff --git a/package/x11r7/xdriver_xf86-input-joystick/Config.in b/package/x11r7/xdriver_xf86-input-joystick/Config.in
new file mode 100644
index 000000000..56198f2e3
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-joystick/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_JOYSTICK
+	bool "xf86-input-joystick"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-joystick 1.1.0
+	  X.Org driver for joystick input devices
diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
new file mode 100644
index 000000000..62ad6bfb3
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-joystick -- X.Org driver for joystick input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES
+XDRIVER_XF86_INPUT_JOYSTICK_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-joystick))
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
new file mode 100644
index 000000000..0eb94e220
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD
+	bool "xf86-input-keyboard"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-keyboard 1.1.1
+	  Keyboard input driver
diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
new file mode 100644
index 000000000..dc3038e23
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-keyboard -- Keyboard input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.1.1
+XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_KEYBOARD_AUTORECONF = YES
+XDRIVER_XF86_INPUT_KEYBOARD_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-keyboard))
diff --git a/package/x11r7/xdriver_xf86-input-magellan/Config.in b/package/x11r7/xdriver_xf86-input-magellan/Config.in
new file mode 100644
index 000000000..a8b1c5316
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-magellan/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGELLAN
+	bool "xf86-input-magellan"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-magellan 1.1.0
+	  X.Org driver for magellan input devices
diff --git a/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
new file mode 100644
index 000000000..966a1117d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-magellan/xdriver_xf86-input-magellan.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-magellan -- X.Org driver for magellan input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_MAGELLAN_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MAGELLAN_SOURCE = xf86-input-magellan-$(XDRIVER_XF86_INPUT_MAGELLAN_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_MAGELLAN_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MAGELLAN_AUTORECONF = YES
+XDRIVER_XF86_INPUT_MAGELLAN_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-magellan))
diff --git a/package/x11r7/xdriver_xf86-input-magictouch/Config.in b/package/x11r7/xdriver_xf86-input-magictouch/Config.in
new file mode 100644
index 000000000..04aafe699
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-magictouch/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_MAGICTOUCH
+	bool "xf86-input-magictouch"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-magictouch 1.0.0.5
+	  MagicTouch input driver
diff --git a/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
new file mode 100644
index 000000000..ab3a18520
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-magictouch/xdriver_xf86-input-magictouch.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-magictouch -- MagicTouch input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION = 1.0.0.5
+XDRIVER_XF86_INPUT_MAGICTOUCH_SOURCE = xf86-input-magictouch-$(XDRIVER_XF86_INPUT_MAGICTOUCH_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_MAGICTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MAGICTOUCH_AUTORECONF = YES
+XDRIVER_XF86_INPUT_MAGICTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-magictouch))
diff --git a/package/x11r7/xdriver_xf86-input-microtouch/Config.in b/package/x11r7/xdriver_xf86-input-microtouch/Config.in
new file mode 100644
index 000000000..73d8b653e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-microtouch/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_MICROTOUCH
+	bool "xf86-input-microtouch"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-microtouch 1.1.0
+	  MicroTouch input driver
diff --git a/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
new file mode 100644
index 000000000..ca5094d28
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-microtouch/xdriver_xf86-input-microtouch.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-microtouch -- MicroTouch input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_MICROTOUCH_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MICROTOUCH_SOURCE = xf86-input-microtouch-$(XDRIVER_XF86_INPUT_MICROTOUCH_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_MICROTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MICROTOUCH_AUTORECONF = YES
+XDRIVER_XF86_INPUT_MICROTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-microtouch))
diff --git a/package/x11r7/xdriver_xf86-input-mouse/Config.in b/package/x11r7/xdriver_xf86-input-mouse/Config.in
new file mode 100644
index 000000000..033d0e90c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-mouse/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE
+	bool "xf86-input-mouse"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-mouse 1.1.2
+	  X.Org driver for mouse input devices
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
new file mode 100644
index 000000000..42699a74b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-mouse -- X.Org driver for mouse input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.1.2
+XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES
+XDRIVER_XF86_INPUT_MOUSE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-mouse))
diff --git a/package/x11r7/xdriver_xf86-input-mutouch/Config.in b/package/x11r7/xdriver_xf86-input-mutouch/Config.in
new file mode 100644
index 000000000..409dab908
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-mutouch/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_MUTOUCH
+	bool "xf86-input-mutouch"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-mutouch 1.1.0
+	  Microtouch input driver
diff --git a/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
new file mode 100644
index 000000000..7edf110d5
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-mutouch/xdriver_xf86-input-mutouch.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-mutouch -- Microtouch input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_MUTOUCH_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_MUTOUCH_SOURCE = xf86-input-mutouch-$(XDRIVER_XF86_INPUT_MUTOUCH_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_MUTOUCH_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_MUTOUCH_AUTORECONF = YES
+XDRIVER_XF86_INPUT_MUTOUCH_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-mutouch))
diff --git a/package/x11r7/xdriver_xf86-input-palmax/Config.in b/package/x11r7/xdriver_xf86-input-palmax/Config.in
new file mode 100644
index 000000000..310bdf542
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-palmax/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_PALMAX
+	bool "xf86-input-palmax"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-palmax 1.1.0
+	  Palmax (TR88L803) touchscreen driver
diff --git a/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
new file mode 100644
index 000000000..006cb2881
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-palmax/xdriver_xf86-input-palmax.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-palmax -- Palmax (TR88L803) touchscreen driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_PALMAX_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_PALMAX_SOURCE = xf86-input-palmax-$(XDRIVER_XF86_INPUT_PALMAX_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_PALMAX_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_PALMAX_AUTORECONF = YES
+XDRIVER_XF86_INPUT_PALMAX_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-palmax))
diff --git a/package/x11r7/xdriver_xf86-input-penmount/Config.in b/package/x11r7/xdriver_xf86-input-penmount/Config.in
new file mode 100644
index 000000000..5c320a071
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-penmount/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_PENMOUNT
+	bool "xf86-input-penmount"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-penmount 1.2.0
+	  PenMount input driver
diff --git a/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
new file mode 100644
index 000000000..e510b1380
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-penmount/xdriver_xf86-input-penmount.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-penmount -- PenMount input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_PENMOUNT_VERSION = 1.2.0
+XDRIVER_XF86_INPUT_PENMOUNT_SOURCE = xf86-input-penmount-$(XDRIVER_XF86_INPUT_PENMOUNT_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_PENMOUNT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_PENMOUNT_AUTORECONF = YES
+XDRIVER_XF86_INPUT_PENMOUNT_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-penmount))
diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/Config.in b/package/x11r7/xdriver_xf86-input-spaceorb/Config.in
new file mode 100644
index 000000000..30a749356
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-spaceorb/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_SPACEORB
+	bool "xf86-input-spaceorb"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-spaceorb 1.1.0
+	  X.Org driver for spaceorb input devices
diff --git a/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
new file mode 100644
index 000000000..8beeb8399
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-spaceorb/xdriver_xf86-input-spaceorb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-spaceorb -- X.Org driver for spaceorb input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_SPACEORB_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_SPACEORB_SOURCE = xf86-input-spaceorb-$(XDRIVER_XF86_INPUT_SPACEORB_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_SPACEORB_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_SPACEORB_AUTORECONF = YES
+XDRIVER_XF86_INPUT_SPACEORB_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-spaceorb))
diff --git a/package/x11r7/xdriver_xf86-input-summa/Config.in b/package/x11r7/xdriver_xf86-input-summa/Config.in
new file mode 100644
index 000000000..fb79e0bcf
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-summa/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_SUMMA
+	bool "xf86-input-summa"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-summa 1.1.0
+	  X.Org driver for summa input devices
diff --git a/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
new file mode 100644
index 000000000..6785b5eb0
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-summa/xdriver_xf86-input-summa.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-summa -- X.Org driver for summa input devices
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_SUMMA_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_SUMMA_SOURCE = xf86-input-summa-$(XDRIVER_XF86_INPUT_SUMMA_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_SUMMA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_SUMMA_AUTORECONF = YES
+XDRIVER_XF86_INPUT_SUMMA_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-summa))
diff --git a/package/x11r7/xdriver_xf86-input-tek4957/Config.in b/package/x11r7/xdriver_xf86-input-tek4957/Config.in
new file mode 100644
index 000000000..dfcfdea14
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tek4957/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_TEK4957
+	bool "xf86-input-tek4957"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-tek4957 1.1.0
+	  Tektronix 4957 input driver
diff --git a/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
new file mode 100644
index 000000000..52d2e0c54
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-tek4957/xdriver_xf86-input-tek4957.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-tek4957 -- Tektronix 4957 input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_TEK4957_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_TEK4957_SOURCE = xf86-input-tek4957-$(XDRIVER_XF86_INPUT_TEK4957_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_TEK4957_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_TEK4957_AUTORECONF = YES
+XDRIVER_XF86_INPUT_TEK4957_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-tek4957))
diff --git a/package/x11r7/xdriver_xf86-input-ur98/Config.in b/package/x11r7/xdriver_xf86-input-ur98/Config.in
new file mode 100644
index 000000000..386d7c705
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-ur98/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_UR98
+	bool "xf86-input-ur98"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-ur98 1.1.0
+	  UR98 (TR88L803) head tracker driver
diff --git a/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
new file mode 100644
index 000000000..861a25daf
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-ur98/xdriver_xf86-input-ur98.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-ur98 -- UR98 (TR88L803) head tracker driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_UR98_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_UR98_SOURCE = xf86-input-ur98-$(XDRIVER_XF86_INPUT_UR98_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_UR98_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_UR98_AUTORECONF = YES
+XDRIVER_XF86_INPUT_UR98_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-ur98))
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
new file mode 100644
index 000000000..f4c486825
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE
+	bool "xf86-input-vmmouse"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-vmmouse 12.4.0
+	  VMWare mouse input driver
diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
new file mode 100644
index 000000000..1c154c6cf
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-vmmouse -- VMWare mouse input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 12.4.0
+XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_VMMOUSE_AUTORECONF = YES
+XDRIVER_XF86_INPUT_VMMOUSE_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-vmmouse))
diff --git a/package/x11r7/xdriver_xf86-input-void/Config.in b/package/x11r7/xdriver_xf86-input-void/Config.in
new file mode 100644
index 000000000..43aba5976
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-void/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID
+	bool "xf86-input-void"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-input-void 1.1.0
+	  null input driver
diff --git a/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
new file mode 100644
index 000000000..eeb9e59a6
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-input-void/xdriver_xf86-input-void.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-input-void -- null input driver
+#
+################################################################################
+
+XDRIVER_XF86_INPUT_VOID_VERSION = 1.1.0
+XDRIVER_XF86_INPUT_VOID_SOURCE = xf86-input-void-$(XDRIVER_XF86_INPUT_VOID_VERSION).tar.bz2
+XDRIVER_XF86_INPUT_VOID_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_INPUT_VOID_AUTORECONF = YES
+XDRIVER_XF86_INPUT_VOID_DEPENDANCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-input-void))
diff --git a/package/x11r7/xdriver_xf86-video-apm/Config.in b/package/x11r7/xdriver_xf86-video-apm/Config.in
new file mode 100644
index 000000000..cba4c4c51
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-apm/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_APM
+	bool "xf86-video-apm"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-apm 1.1.1
+	  Alliance ProMotion video driver
diff --git a/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
new file mode 100644
index 000000000..c710cb79a
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-apm/xdriver_xf86-video-apm.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-apm -- Alliance ProMotion video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_APM_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_APM_SOURCE = xf86-video-apm-$(XDRIVER_XF86_VIDEO_APM_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_APM_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_APM_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_APM_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86rushproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-apm))
diff --git a/package/x11r7/xdriver_xf86-video-ark/Config.in b/package/x11r7/xdriver_xf86-video-ark/Config.in
new file mode 100644
index 000000000..5f20df163
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ark/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ARK
+	bool "xf86-video-ark"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-ark 0.6.0
+	  X.Org driver for ark cards
diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
new file mode 100644
index 000000000..053edaf4f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-ark -- X.Org driver for ark cards
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_ARK_VERSION = 0.6.0
+XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_ARK_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_ARK_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-ark))
diff --git a/package/x11r7/xdriver_xf86-video-ast/Config.in b/package/x11r7/xdriver_xf86-video-ast/Config.in
new file mode 100644
index 000000000..825623ed2
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ast/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AST
+	bool "xf86-video-ast"
+	default n
+	help
+	  xf86-video-ast 0.81.0
+	  No description available
diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
new file mode 100644
index 000000000..5b828eba0
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# xdriver_xf86-video-ast -- No description available
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_AST_VERSION = 0.81.0
+XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_AST_AUTORECONF = YES
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-ast))
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
new file mode 100644
index 000000000..6ec1ca6c9
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
+	bool "xf86-video-ati"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-ati 6.6.3
+	  ATI video driver
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch
new file mode 100644
index 000000000..ba05f8841
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati-6.6.3.patch
@@ -0,0 +1,23 @@
+--- xf86-video-ati-6.6.3/configure.ac.orig	2007-06-10 12:02:12.000000000 +0200
++++ xf86-video-ati-6.6.3/configure.ac	2007-06-10 12:02:31.000000000 +0200
+@@ -84,13 +84,19 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" != xno; then
++	if test "$cross_compiling" = no; then
+ 	AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+ 	AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+ 	AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
new file mode 100644
index 000000000..177145b11
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-ati -- ATI video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_ATI_VERSION = 6.6.3
+XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_ATI_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_ATI_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-ati))
diff --git a/package/x11r7/xdriver_xf86-video-chips/Config.in b/package/x11r7/xdriver_xf86-video-chips/Config.in
new file mode 100644
index 000000000..581805238
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-chips/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CHIPS
+	bool "xf86-video-chips"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-chips 1.1.1
+	  Chips and Technologies video driver
diff --git a/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
new file mode 100644
index 000000000..32bd74d7c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-chips/xdriver_xf86-video-chips.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-chips -- Chips and Technologies video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_CHIPS_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_CHIPS_SOURCE = xf86-video-chips-$(XDRIVER_XF86_VIDEO_CHIPS_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_CHIPS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_CHIPS_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_CHIPS_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-chips))
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/Config.in b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
new file mode 100644
index 000000000..a2db74466
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS
+	bool "xf86-video-cirrus"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-cirrus 1.1.0
+	  Cirrus Logic video driver
diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
new file mode 100644
index 000000000..95dbc5f03
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-cirrus -- Cirrus Logic video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_CIRRUS_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_CIRRUS_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-cirrus))
diff --git a/package/x11r7/xdriver_xf86-video-cyrix/Config.in b/package/x11r7/xdriver_xf86-video-cyrix/Config.in
new file mode 100644
index 000000000..59804f52a
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-cyrix/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CYRIX
+	bool "xf86-video-cyrix"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-cyrix 1.1.0
+	  Cyrix video driver
diff --git a/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
new file mode 100644
index 000000000..4b67dacb2
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-cyrix/xdriver_xf86-video-cyrix.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-cyrix -- Cyrix video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_CYRIX_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_CYRIX_SOURCE = xf86-video-cyrix-$(XDRIVER_XF86_VIDEO_CYRIX_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_CYRIX_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_CYRIX_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_CYRIX_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-cyrix))
diff --git a/package/x11r7/xdriver_xf86-video-dummy/Config.in b/package/x11r7/xdriver_xf86-video-dummy/Config.in
new file mode 100644
index 000000000..93670ef20
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-dummy/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY
+	bool "xf86-video-dummy"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-dummy 0.2.0
+	  X.Org driver for dummy cards
diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
new file mode 100644
index 000000000..2ba6de61a
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-dummy -- X.Org driver for dummy cards
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.2.0
+XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_DUMMY_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_DUMMY_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-dummy))
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/Config.in b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
new file mode 100644
index 000000000..2b2988203
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV
+	bool "xf86-video-fbdev"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-fbdev 0.3.1
+	  video driver for framebuffer device
diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
new file mode 100644
index 000000000..42fa3ed8d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-fbdev -- video driver for framebuffer device
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.3.1
+XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_FBDEV_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_FBDEV_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-fbdev))
diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
new file mode 100644
index 000000000..b7363105e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
+	bool "xf86-video-glint"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-glint 1.1.1
+	  GLINT/Permedia video driver
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch
new file mode 100644
index 000000000..437e06bb1
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint-1.1.1.patch
@@ -0,0 +1,21 @@
+--- xf86-video-glint-1.1.1/configure.ac.orig	2007-06-10 20:58:34.000000000 +0200
++++ xf86-video-glint-1.1.1/configure.ac	2007-06-10 20:58:58.000000000 +0200
+@@ -69,12 +69,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
new file mode 100644
index 000000000..c3cc89c4f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-glint -- GLINT/Permedia video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_GLINT_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_GLINT_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-glint))
diff --git a/package/x11r7/xdriver_xf86-video-i128/Config.in b/package/x11r7/xdriver_xf86-video-i128/Config.in
new file mode 100644
index 000000000..6841c468c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i128/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128
+	bool "xf86-video-i128"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-i128 1.2.1
+	  Number 9 I128 video driver
diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
new file mode 100644
index 000000000..07e864e0e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-i128 -- Number 9 I128 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_I128_VERSION = 1.2.1
+XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_I128_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_I128_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-i128))
diff --git a/package/x11r7/xdriver_xf86-video-i740/Config.in b/package/x11r7/xdriver_xf86-video-i740/Config.in
new file mode 100644
index 000000000..3c080cbac
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i740/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I740
+	bool "xf86-video-i740"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-i740 1.1.0
+	  Intel i740 video driver
diff --git a/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
new file mode 100644
index 000000000..4192b85d8
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i740/xdriver_xf86-video-i740.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-i740 -- Intel i740 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_I740_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_I740_SOURCE = xf86-video-i740-$(XDRIVER_XF86_VIDEO_I740_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_I740_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_I740_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_I740_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-i740))
diff --git a/package/x11r7/xdriver_xf86-video-i810/Config.in b/package/x11r7/xdriver_xf86-video-i810/Config.in
new file mode 100644
index 000000000..527a3be56
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i810/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I810
+	bool "xf86-video-i810"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXVMC
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-i810 1.6.5
+	  X.Org driver for Intel cards
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch
new file mode 100644
index 000000000..9f0179d59
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810-1.6.5.patch
@@ -0,0 +1,21 @@
+--- xf86-video-i810-1.6.5/configure.ac.orig	2007-06-10 20:59:27.000000000 +0200
++++ xf86-video-i810-1.6.5/configure.ac	2007-06-10 20:59:50.000000000 +0200
+@@ -80,12 +80,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
new file mode 100644
index 000000000..92c7476bf
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-i810/xdriver_xf86-video-i810.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-i810 -- X.Org driver for Intel cards
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_I810_VERSION = 1.6.5
+XDRIVER_XF86_VIDEO_I810_SOURCE = xf86-video-i810-$(XDRIVER_XF86_VIDEO_I810_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_I810_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_I810_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_I810_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-i810))
diff --git a/package/x11r7/xdriver_xf86-video-imstt/Config.in b/package/x11r7/xdriver_xf86-video-imstt/Config.in
new file mode 100644
index 000000000..f47fdb59b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imstt/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMSTT
+	bool "xf86-video-imstt"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-imstt 1.1.0
+	  Integrated Micro Solutions Twin Turbo 128 driver
diff --git a/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
new file mode 100644
index 000000000..67ee8abe9
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-imstt/xdriver_xf86-video-imstt.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-imstt -- Integrated Micro Solutions Twin Turbo 128 driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_IMSTT_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_IMSTT_SOURCE = xf86-video-imstt-$(XDRIVER_XF86_VIDEO_IMSTT_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_IMSTT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_IMSTT_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_IMSTT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-imstt))
diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
new file mode 100644
index 000000000..97bda90ce
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
+	bool "xf86-video-mga"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-mga 1.4.6.1
+	  Matrox video driver
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch
new file mode 100644
index 000000000..34cc1330c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga-1.4.6.1.patch
@@ -0,0 +1,21 @@
+--- xf86-video-mga-1.4.6.1/configure.ac.orig	2007-06-10 11:55:24.000000000 +0200
++++ xf86-video-mga-1.4.6.1/configure.ac	2007-06-10 12:00:37.000000000 +0200
+@@ -77,12 +77,18 @@
+ AC_HEADER_STDC
+ 
+ if test "x$DRI" != xno; then
++	if test "$cross_compiling" = no; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
new file mode 100644
index 000000000..9281f64df
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-mga -- Matrox video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_MGA_VERSION = 1.4.6.1
+XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_MGA_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-mga))
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/Config.in b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
new file mode 100644
index 000000000..9d1880b8f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC
+	bool "xf86-video-neomagic"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-neomagic 1.1.1
+	  Neomagic video driver
diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
new file mode 100644
index 000000000..66e4e9c0a
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-neomagic -- Neomagic video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NEOMAGIC_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-neomagic))
diff --git a/package/x11r7/xdriver_xf86-video-newport/Config.in b/package/x11r7/xdriver_xf86-video-newport/Config.in
new file mode 100644
index 000000000..6c62a38b3
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-newport/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEWPORT
+	bool "xf86-video-newport"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-newport 0.2.1
+	  Newport video driver
diff --git a/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
new file mode 100644
index 000000000..f7c5166d7
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-newport/xdriver_xf86-video-newport.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-newport -- Newport video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NEWPORT_VERSION = 0.2.1
+XDRIVER_XF86_VIDEO_NEWPORT_SOURCE = xf86-video-newport-$(XDRIVER_XF86_VIDEO_NEWPORT_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NEWPORT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NEWPORT_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_NEWPORT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-newport))
diff --git a/package/x11r7/xdriver_xf86-video-nsc/Config.in b/package/x11r7/xdriver_xf86-video-nsc/Config.in
new file mode 100644
index 000000000..9ab3d97e0
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-nsc/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NSC
+	bool "xf86-video-nsc"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-nsc 2.8.2
+	  Nsc video driver
diff --git a/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
new file mode 100644
index 000000000..72e05da3f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-nsc/xdriver_xf86-video-nsc.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-nsc -- Nsc video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NSC_VERSION = 2.8.2
+XDRIVER_XF86_VIDEO_NSC_SOURCE = xf86-video-nsc-$(XDRIVER_XF86_VIDEO_NSC_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NSC_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NSC_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_NSC_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-nsc))
diff --git a/package/x11r7/xdriver_xf86-video-nv/Config.in b/package/x11r7/xdriver_xf86-video-nv/Config.in
new file mode 100644
index 000000000..b7ef365fb
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-nv/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV
+	bool "xf86-video-nv"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-nv 1.2.2.1
+	  NVIDIA video driver
diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
new file mode 100644
index 000000000..f7db11032
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-nv -- NVIDIA video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_NV_VERSION = 1.2.2.1
+XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_NV_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_NV_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-nv))
diff --git a/package/x11r7/xdriver_xf86-video-rendition/Config.in b/package/x11r7/xdriver_xf86-video-rendition/Config.in
new file mode 100644
index 000000000..3afdfa9bd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-rendition/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_RENDITION
+	bool "xf86-video-rendition"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-rendition 4.1.3
+	  Rendition video driver
diff --git a/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
new file mode 100644
index 000000000..2e8753636
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-rendition/xdriver_xf86-video-rendition.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-rendition -- Rendition video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_RENDITION_VERSION = 4.1.3
+XDRIVER_XF86_VIDEO_RENDITION_SOURCE = xf86-video-rendition-$(XDRIVER_XF86_VIDEO_RENDITION_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_RENDITION_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_RENDITION_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_RENDITION_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-rendition))
diff --git a/package/x11r7/xdriver_xf86-video-s3/Config.in b/package/x11r7/xdriver_xf86-video-s3/Config.in
new file mode 100644
index 000000000..64b0c5c00
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-s3/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3
+	bool "xf86-video-s3"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-s3 0.5.0
+	  X.Org driver for s3 cards
diff --git a/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
new file mode 100644
index 000000000..df0634402
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-s3/xdriver_xf86-video-s3.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-s3 -- X.Org driver for s3 cards
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_S3_VERSION = 0.5.0
+XDRIVER_XF86_VIDEO_S3_SOURCE = xf86-video-s3-$(XDRIVER_XF86_VIDEO_S3_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_S3_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_S3_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_S3_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-s3))
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/Config.in b/package/x11r7/xdriver_xf86-video-s3virge/Config.in
new file mode 100644
index 000000000..4650103b4
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-s3virge/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3VIRGE
+	bool "xf86-video-s3virge"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-s3virge 1.9.1
+	  S3 ViRGE video driver
diff --git a/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
new file mode 100644
index 000000000..a4e12966b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-s3virge/xdriver_xf86-video-s3virge.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-s3virge -- S3 ViRGE video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_S3VIRGE_VERSION = 1.9.1
+XDRIVER_XF86_VIDEO_S3VIRGE_SOURCE = xf86-video-s3virge-$(XDRIVER_XF86_VIDEO_S3VIRGE_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_S3VIRGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_S3VIRGE_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_S3VIRGE_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-s3virge))
diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
new file mode 100644
index 000000000..68da08345
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
+	bool "xf86-video-savage"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-savage 2.1.2
+	  S3 Savage video driver
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.1.2.patch b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.1.2.patch
new file mode 100644
index 000000000..e84ddeec8
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage-2.1.2.patch
@@ -0,0 +1,21 @@
+--- xf86-video-savage-2.1.2/configure.ac.orig	2007-06-10 11:51:23.000000000 +0200
++++ xf86-video-savage-2.1.2/configure.ac	2007-06-10 11:52:46.000000000 +0200
+@@ -68,12 +68,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
++	if test "$cross_compiling" = no; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
new file mode 100644
index 000000000..98cebad76
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-savage -- S3 Savage video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.1.2
+XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SAVAGE_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-savage))
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
new file mode 100644
index 000000000..808f3a1f7
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SILICONMOTION
+	bool "xf86-video-siliconmotion"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-siliconmotion 1.4.2
+	  Silicon Motion video driver
diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
new file mode 100644
index 000000000..e103b114f
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-siliconmotion -- Silicon Motion video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.4.2
+XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SILICONMOTION_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-siliconmotion))
diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
new file mode 100644
index 000000000..ad64ef16c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
+	bool "xf86-video-sis"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-sis 0.9.3
+	  SiS and XGI video driver
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch
new file mode 100644
index 000000000..9e06480d4
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis-0.9.3.patch
@@ -0,0 +1,21 @@
+--- xf86-video-sis-0.9.3/configure.ac.orig	2007-06-10 21:00:29.000000000 +0200
++++ xf86-video-sis-0.9.3/configure.ac	2007-06-10 21:00:45.000000000 +0200
+@@ -71,12 +71,18 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
new file mode 100644
index 000000000..9a2440571
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-sis -- SiS and XGI video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.9.3
+XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SIS_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-sis))
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/Config.in b/package/x11r7/xdriver_xf86-video-sisusb/Config.in
new file mode 100644
index 000000000..47f90063b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sisusb/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SISUSB
+	bool "xf86-video-sisusb"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-sisusb 0.8.1
+	  SiS USB video driver
diff --git a/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
new file mode 100644
index 000000000..b9a468bb6
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sisusb/xdriver_xf86-video-sisusb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-sisusb -- SiS USB video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SISUSB_VERSION = 0.8.1
+XDRIVER_XF86_VIDEO_SISUSB_SOURCE = xf86-video-sisusb-$(XDRIVER_XF86_VIDEO_SISUSB_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SISUSB_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SISUSB_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SISUSB_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86miscproto xproto_xineramaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-sisusb))
diff --git a/package/x11r7/xdriver_xf86-video-sunbw2/Config.in b/package/x11r7/xdriver_xf86-video-sunbw2/Config.in
new file mode 100644
index 000000000..52e82e496
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunbw2/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNBW2
+	bool "xf86-video-sunbw2"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-sunbw2 1.1.0
+	  BW2 video driver
diff --git a/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
new file mode 100644
index 000000000..c401383d9
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunbw2/xdriver_xf86-video-sunbw2.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-sunbw2 -- BW2 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNBW2_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNBW2_SOURCE = xf86-video-sunbw2-$(XDRIVER_XF86_VIDEO_SUNBW2_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNBW2_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNBW2_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNBW2_DEPENDANCIES = xserver_xorg-server xproto_randrproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunbw2))
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/Config.in b/package/x11r7/xdriver_xf86-video-suncg14/Config.in
new file mode 100644
index 000000000..013eec2ba
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg14/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG14
+	bool "xf86-video-suncg14"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-suncg14 1.1.0
+	  CG14 video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
new file mode 100644
index 000000000..2010ff34c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg14/xdriver_xf86-video-suncg14.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-suncg14 -- CG14 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNCG14_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNCG14_SOURCE = xf86-video-suncg14-$(XDRIVER_XF86_VIDEO_SUNCG14_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNCG14_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNCG14_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNCG14_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg14))
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/Config.in b/package/x11r7/xdriver_xf86-video-suncg3/Config.in
new file mode 100644
index 000000000..9647c6c9b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg3/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG3
+	bool "xf86-video-suncg3"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-suncg3 1.1.0
+	  CG3 video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
new file mode 100644
index 000000000..07cae1f95
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg3/xdriver_xf86-video-suncg3.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-suncg3 -- CG3 video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNCG3_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNCG3_SOURCE = xf86-video-suncg3-$(XDRIVER_XF86_VIDEO_SUNCG3_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNCG3_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNCG3_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNCG3_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg3))
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/Config.in b/package/x11r7/xdriver_xf86-video-suncg6/Config.in
new file mode 100644
index 000000000..501578a33
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg6/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNCG6
+	bool "xf86-video-suncg6"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-suncg6 1.1.0
+	  GX/Turbo GX video driver
diff --git a/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
new file mode 100644
index 000000000..0b5110c8b
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suncg6/xdriver_xf86-video-suncg6.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-suncg6 -- GX/Turbo GX video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNCG6_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNCG6_SOURCE = xf86-video-suncg6-$(XDRIVER_XF86_VIDEO_SUNCG6_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNCG6_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNCG6_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNCG6_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-suncg6))
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/Config.in b/package/x11r7/xdriver_xf86-video-sunffb/Config.in
new file mode 100644
index 000000000..030b214f2
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunffb/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNFFB
+	bool "xf86-video-sunffb"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-sunffb 1.1.0
+	  SUNFFB video driver
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.1.0.patch b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.1.0.patch
new file mode 100644
index 000000000..7dceabef4
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb-1.1.0.patch
@@ -0,0 +1,24 @@
+--- xf86-video-sunffb-1.1.0/configure.ac.orig	2007-06-10 21:01:18.000000000 +0200
++++ xf86-video-sunffb-1.1.0/configure.ac	2007-06-10 21:01:34.000000000 +0200
+@@ -72,13 +72,20 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" != xno; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++		AC_CHECK_HEADER
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
new file mode 100644
index 000000000..be4ea66d8
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunffb/xdriver_xf86-video-sunffb.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-sunffb -- SUNFFB video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNFFB_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNFFB_SOURCE = xf86-video-sunffb-$(XDRIVER_XF86_VIDEO_SUNFFB_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNFFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNFFB_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNFFB_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunffb))
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/Config.in b/package/x11r7/xdriver_xf86-video-sunleo/Config.in
new file mode 100644
index 000000000..0a62cfd91
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunleo/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNLEO
+	bool "xf86-video-sunleo"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-sunleo 1.1.0
+	  Leo video driver
diff --git a/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
new file mode 100644
index 000000000..b27425ebd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sunleo/xdriver_xf86-video-sunleo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-sunleo -- Leo video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNLEO_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNLEO_SOURCE = xf86-video-sunleo-$(XDRIVER_XF86_VIDEO_SUNLEO_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNLEO_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNLEO_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNLEO_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-sunleo))
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/Config.in b/package/x11r7/xdriver_xf86-video-suntcx/Config.in
new file mode 100644
index 000000000..4f0945132
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suntcx/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SUNTCX
+	bool "xf86-video-suntcx"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-suntcx 1.1.0
+	  TCX video driver
diff --git a/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
new file mode 100644
index 000000000..493e1f2c1
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-suntcx/xdriver_xf86-video-suntcx.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-suntcx -- TCX video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_SUNTCX_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_SUNTCX_SOURCE = xf86-video-suntcx-$(XDRIVER_XF86_VIDEO_SUNTCX_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_SUNTCX_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_SUNTCX_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_SUNTCX_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-suntcx))
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
new file mode 100644
index 000000000..d6ae1fc22
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
+	bool "xf86-video-tdfx"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-tdfx 1.3.0
+	  3Dfx video driver
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch
new file mode 100644
index 000000000..e53591bb0
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx-1.3.0.patch
@@ -0,0 +1,24 @@
+--- xf86-video-tdfx-1.3.0/configure.ac.orig	2007-06-10 21:01:54.000000000 +0200
++++ xf86-video-tdfx-1.3.0/configure.ac	2007-06-10 21:02:06.000000000 +0200
+@@ -67,13 +67,20 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-if test "$DRI" != no; then
++if test "x$DRI" != xno; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
++		AC_CHECK_HEADER
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
new file mode 100644
index 000000000..f51522e91
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-tdfx -- 3Dfx video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.3.0
+XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_TDFX_DEPENDANCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-tdfx))
diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in
new file mode 100644
index 000000000..d113a9002
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tga/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA
+	bool "xf86-video-tga"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-tga 1.1.0
+	  X.Org driver for tga cards
diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
new file mode 100644
index 000000000..4c70a360c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-tga -- X.Org driver for tga cards
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_TGA_VERSION = 1.1.0
+XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TGA_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_TGA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-tga))
diff --git a/package/x11r7/xdriver_xf86-video-trident/Config.in b/package/x11r7/xdriver_xf86-video-trident/Config.in
new file mode 100644
index 000000000..90d9ce73e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-trident/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TRIDENT
+	bool "xf86-video-trident"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-trident 1.2.3
+	  Trident video driver
diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
new file mode 100644
index 000000000..2055f09b4
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-trident -- Trident video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.2.3
+XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TRIDENT_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_TRIDENT_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-trident))
diff --git a/package/x11r7/xdriver_xf86-video-tseng/Config.in b/package/x11r7/xdriver_xf86-video-tseng/Config.in
new file mode 100644
index 000000000..3e3e24741
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tseng/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TSENG
+	bool "xf86-video-tseng"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-tseng 1.1.1
+	  Tseng Labs video driver
diff --git a/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
new file mode 100644
index 000000000..8f2080c9d
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-tseng/xdriver_xf86-video-tseng.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-tseng -- Tseng Labs video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_TSENG_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_TSENG_SOURCE = xf86-video-tseng-$(XDRIVER_XF86_VIDEO_TSENG_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_TSENG_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_TSENG_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_TSENG_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-tseng))
diff --git a/package/x11r7/xdriver_xf86-video-v4l/Config.in b/package/x11r7/xdriver_xf86-video-v4l/Config.in
new file mode 100644
index 000000000..a528815fd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-v4l/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L
+	bool "xf86-video-v4l"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-v4l 0.1.1
+	  video4linux driver
diff --git a/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
new file mode 100644
index 000000000..53ea31b70
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-v4l -- video4linux driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_V4L_VERSION = 0.1.1
+XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_V4L_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_V4L_DEPENDANCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-v4l))
diff --git a/package/x11r7/xdriver_xf86-video-vesa/Config.in b/package/x11r7/xdriver_xf86-video-vesa/Config.in
new file mode 100644
index 000000000..649b29cf9
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vesa/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA
+	bool "xf86-video-vesa"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-vesa 1.3.0
+	  Generic VESA video driver
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-1.3.0.patch b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-1.3.0.patch
new file mode 100644
index 000000000..89dc6d7b4
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa-1.3.0.patch
@@ -0,0 +1,13 @@
+--- xf86-video-vesa-1.3.0/configure.ac.orig	2007-06-11 13:10:35.000000000 +0200
++++ xf86-video-vesa-1.3.0/configure.ac	2007-06-11 14:16:45.000000000 +0200
+@@ -56,8 +56,8 @@
+ PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES)
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+ 
+-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
++CFLAGS="$CFLAGS $XORG_CFLAGS "'-I$(top_srcdir)/src'
++INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src'
+ AC_SUBST([CFLAGS])
+ AC_SUBST([INCLUDES])
+ 
diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
new file mode 100644
index 000000000..9a1e2bcdd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-vesa -- Generic VESA video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VESA_VERSION = 1.3.0
+XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VESA_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_VESA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-vesa))
diff --git a/package/x11r7/xdriver_xf86-video-vga/Config.in b/package/x11r7/xdriver_xf86-video-vga/Config.in
new file mode 100644
index 000000000..ac37784ea
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vga/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VGA
+	bool "xf86-video-vga"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-vga 4.1.0
+	  Generic VGA video driver
diff --git a/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
new file mode 100644
index 000000000..0b429e50e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vga/xdriver_xf86-video-vga.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-vga -- Generic VGA video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VGA_VERSION = 4.1.0
+XDRIVER_XF86_VIDEO_VGA_SOURCE = xf86-video-vga-$(XDRIVER_XF86_VIDEO_VGA_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VGA_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_VGA_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-vga))
diff --git a/package/x11r7/xdriver_xf86-video-via/Config.in b/package/x11r7/xdriver_xf86-video-via/Config.in
new file mode 100644
index 000000000..142188b94
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-via/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VIA
+	bool "xf86-video-via"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXVMC
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-via 0.2.2
+	  VIA unichrome graphics driver
diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch
new file mode 100644
index 000000000..5ebdd9b28
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via-0.2.2.patch
@@ -0,0 +1,22 @@
+--- xf86-video-via-0.2.2/configure.ac.orig	2007-06-10 14:41:40.000000000 +0200
++++ xf86-video-via-0.2.2/configure.ac	2007-06-10 14:41:48.000000000 +0200
+@@ -71,6 +71,7 @@
+ 
+ 
+ if test "x$DRI" != xno; then
++	if test "$cross_compiling" = "no" ; then
+         AC_CHECK_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+         AC_CHECK_FILE([${sdkdir}/sarea.h],
+@@ -78,6 +79,11 @@
+         AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+         AC_CHECK_HEADER
++	else
++		have_dri_h="yes"
++		have_sarea_h="yes"
++		have_dristruct_h="yes"
++	fi
+ fi
+ 
+ AC_MSG_CHECKING([whether to include DRI support])
diff --git a/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
new file mode 100644
index 000000000..5dea3dc79
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-via/xdriver_xf86-video-via.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-via -- VIA unichrome graphics driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VIA_VERSION = 0.2.2
+XDRIVER_XF86_VIDEO_VIA_SOURCE = xf86-video-via-$(XDRIVER_XF86_VIDEO_VIA_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VIA_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VIA_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_VIA_DEPENDANCIES = xserver_xorg-server libdrm xlib_libX11 xlib_libXvMC xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86driproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-via))
diff --git a/package/x11r7/xdriver_xf86-video-vmware/Config.in b/package/x11r7/xdriver_xf86-video-vmware/Config.in
new file mode 100644
index 000000000..3af56ec3e
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vmware/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
+	bool "xf86-video-vmware"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-vmware 10.14.1
+	  VMware SVGA video driver
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
new file mode 100644
index 000000000..b9bf1d1cf
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-vmware -- VMware SVGA video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 10.14.1
+XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VMWARE_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_VMWARE_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-vmware))
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/Config.in b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
new file mode 100644
index 000000000..c44949920
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO
+	bool "xf86-video-voodoo"
+	default n
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xf86-video-voodoo 1.1.1
+	  Voodoo video driver
diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
new file mode 100644
index 000000000..93f9599c1
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xdriver_xf86-video-voodoo -- Voodoo video driver
+#
+################################################################################
+
+XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.1.1
+XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.bz2
+XDRIVER_XF86_VIDEO_VOODOO_SITE = http://xorg.freedesktop.org/releases/individual/driver
+XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES
+XDRIVER_XF86_VIDEO_VOODOO_DEPENDANCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+
+$(eval $(call AUTOTARGETS,xdriver_xf86-video-voodoo))
diff --git a/package/x11r7/xfont_encodings/Config.in b/package/x11r7/xfont_encodings/Config.in
new file mode 100644
index 000000000..937a1f066
--- /dev/null
+++ b/package/x11r7/xfont_encodings/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XFONT_ENCODINGS
+	bool "encodings"
+	default n
+	help
+	  encodings 1.0.2
+	  No description available
diff --git a/package/x11r7/xfont_encodings/xfont_encodings-1.0.2-mkfontscale-bug.patch b/package/x11r7/xfont_encodings/xfont_encodings-1.0.2-mkfontscale-bug.patch
new file mode 100644
index 000000000..507554918
--- /dev/null
+++ b/package/x11r7/xfont_encodings/xfont_encodings-1.0.2-mkfontscale-bug.patch
@@ -0,0 +1,21 @@
+--- encodings-1.0.2/large/Makefile.am.orig	2007-06-08 16:28:01.000000000 +0200
++++ encodings-1.0.2/large/Makefile.am	2007-06-08 16:28:15.000000000 +0200
+@@ -37,6 +37,6 @@
+ 	@GZIP@ -c < $< > $@
+ 
+ encodings.dir: $(DATA_FILES)
+-	@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
++	$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .
+ 
+ encodings_DATA = $(DATA_FILES) encodings.dir
+--- encodings-1.0.2/Makefile.am.orig	2007-06-08 16:28:36.000000000 +0200
++++ encodings-1.0.2/Makefile.am	2007-06-08 16:28:43.000000000 +0200
+@@ -56,7 +56,7 @@
+ 	@GZIP@ -c < $< > $@
+ 
+ encodings.dir: $(DATA_FILES)
+-	@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
++	$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large .
+ 
+ encodings_DATA = $(DATA_FILES) encodings.dir
+ 
diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk
new file mode 100644
index 000000000..808f992c1
--- /dev/null
+++ b/package/x11r7/xfont_encodings/xfont_encodings.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xfont_encodings -- No description available
+#
+################################################################################
+
+XFONT_ENCODINGS_VERSION = 1.0.2
+XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
+XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_ENCODINGS_AUTORECONF = YES
+XFONT_ENCODINGS_MAKE_OPT = 
+
+$(eval $(call AUTOTARGETS,xfont_encodings))
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/Config.in b/package/x11r7/xfont_font-adobe-utopia-type1/Config.in
new file mode 100644
index 000000000..0f3bf14c3
--- /dev/null
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XFONT_FONT_ADOBE_UTOPIA_TYPE1
+	bool "font-adobe-utopia-type1"
+	default n
+	help
+	  font-adobe-utopia-type1 1.0.1
+	  No description available
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
new file mode 100644
index 000000000..7217427ff
--- /dev/null
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xfont_font-adobe-utopia-type1 -- No description available
+#
+################################################################################
+
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.1
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_AUTORECONF = YES
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
+
+$(eval $(call AUTOTARGETS,xfont_font-adobe-utopia-type1))
diff --git a/package/x11r7/xfont_font-bitstream-type1/Config.in b/package/x11r7/xfont_font-bitstream-type1/Config.in
new file mode 100644
index 000000000..8cb4674d5
--- /dev/null
+++ b/package/x11r7/xfont_font-bitstream-type1/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XFONT_FONT_BITSTREAM_TYPE1
+	bool "font-bitstream-type1"
+	default n
+	help
+	  font-bitstream-type1 1.0.0
+	  No description available
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
new file mode 100644
index 000000000..b27f3e7f0
--- /dev/null
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xfont_font-bitstream-type1 -- No description available
+#
+################################################################################
+
+XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.0
+XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2
+XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_BITSTREAM_TYPE1_AUTORECONF = YES
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
+
+$(eval $(call AUTOTARGETS,xfont_font-bitstream-type1))
diff --git a/package/x11r7/xfont_font-ibm-type1/Config.in b/package/x11r7/xfont_font-ibm-type1/Config.in
new file mode 100644
index 000000000..71fe0e2cf
--- /dev/null
+++ b/package/x11r7/xfont_font-ibm-type1/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XFONT_FONT_IBM_TYPE1
+	bool "font-ibm-type1"
+	default n
+	help
+	  font-ibm-type1 1.0.0
+	  No description available
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
new file mode 100644
index 000000000..72eeccc06
--- /dev/null
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xfont_font-ibm-type1 -- No description available
+#
+################################################################################
+
+XFONT_FONT_IBM_TYPE1_VERSION = 1.0.0
+XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2
+XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_IBM_TYPE1_AUTORECONF = YES
+XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
+XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
+
+$(eval $(call AUTOTARGETS,xfont_font-ibm-type1))
diff --git a/package/x11r7/xfont_font-xfree86-type1/Config.in b/package/x11r7/xfont_font-xfree86-type1/Config.in
new file mode 100644
index 000000000..e993105ea
--- /dev/null
+++ b/package/x11r7/xfont_font-xfree86-type1/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XFONT_FONT_XFREE86_TYPE1
+	bool "font-xfree86-type1"
+	default n
+	help
+	  font-xfree86-type1 1.0.0
+	  No description available
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
new file mode 100644
index 000000000..d8fc47f44
--- /dev/null
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xfont_font-xfree86-type1 -- No description available
+#
+################################################################################
+
+XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.0
+XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2
+XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
+XFONT_FONT_XFREE86_TYPE1_AUTORECONF = YES
+XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install
+XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data
+
+$(eval $(call AUTOTARGETS,xfont_font-xfree86-type1))
diff --git a/package/x11r7/xlib_libFS/Config.in b/package/x11r7/xlib_libFS/Config.in
new file mode 100644
index 000000000..be191fcc7
--- /dev/null
+++ b/package/x11r7/xlib_libFS/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBFS
+	bool "libFS"
+	default n
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	help
+	  libFS 1.0.0
+	  X.Org FS library
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
new file mode 100644
index 000000000..9b1f2ef22
--- /dev/null
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libFS -- X.Org FS library
+#
+################################################################################
+
+XLIB_LIBFS_VERSION = 1.0.0
+XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2
+XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBFS_AUTORECONF = YES
+XLIB_LIBFS_INSTALL_STAGING = YES
+XLIB_LIBFS_DEPENDANCIES = xlib_xtrans xproto_xproto xproto_fontsproto
+XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libFS))
diff --git a/package/x11r7/xlib_libICE/Config.in b/package/x11r7/xlib_libICE/Config.in
new file mode 100644
index 000000000..12b4161f0
--- /dev/null
+++ b/package/x11r7/xlib_libICE/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XLIB_LIBICE
+	bool "libICE"
+	default n
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libICE 1.0.3
+	  X.Org ICE library
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
new file mode 100644
index 000000000..1bfd39556
--- /dev/null
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libICE -- X.Org ICE library
+#
+################################################################################
+
+XLIB_LIBICE_VERSION = 1.0.3
+XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2
+XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBICE_AUTORECONF = YES
+XLIB_LIBICE_INSTALL_STAGING = YES
+XLIB_LIBICE_DEPENDANCIES = xlib_xtrans xproto_xproto
+XLIB_LIBICE_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libICE))
diff --git a/package/x11r7/xlib_libSM/Config.in b/package/x11r7/xlib_libSM/Config.in
new file mode 100644
index 000000000..fad252306
--- /dev/null
+++ b/package/x11r7/xlib_libSM/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBSM
+	bool "libSM"
+	default n
+	select BR2_PACKAGE_XLIB_LIBICE
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libSM 1.0.2
+	  X.Org SM library
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
new file mode 100644
index 000000000..2bbf2dcfd
--- /dev/null
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libSM -- X.Org SM library
+#
+################################################################################
+
+XLIB_LIBSM_VERSION = 1.0.2
+XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2
+XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBSM_AUTORECONF = YES
+XLIB_LIBSM_INSTALL_STAGING = YES
+XLIB_LIBSM_DEPENDANCIES = xlib_libICE xlib_xtrans xproto_xproto
+XLIB_LIBSM_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libSM))
diff --git a/package/x11r7/xlib_libX11/Config.in b/package/x11r7/xlib_libX11/Config.in
new file mode 100644
index 000000000..b8720921e
--- /dev/null
+++ b/package/x11r7/xlib_libX11/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_XLIB_LIBX11
+	bool "libX11"
+	default n
+	select BR2_PACKAGE_LIBXCB
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXDMCP
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+	select BR2_PACKAGE_XPROTO_BIGREQSPROTO
+	select BR2_PACKAGE_XPROTO_XCMISCPROTO
+	help
+	  libX11 1.1.1
+	  X.Org X11 library
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
new file mode 100644
index 000000000..b08cafae6
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
@@ -0,0 +1,46 @@
+--- libX11-1.1.1/configure.ac.orig	2006-12-01 02:50:11.000000000 +0100
++++ libX11-1.1.1/configure.ac	2007-06-08 15:20:02.000000000 +0200
+@@ -7,6 +7,8 @@
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+         libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+ 
+ AM_MAINTAINER_MODE
+@@ -18,6 +20,15 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+ 
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++    CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+ 
+ # Build with XCB support?
+--- libX11-1.1.1/src/util/Makefile.am.orig	2006-10-04 19:43:17.000000000 +0200
++++ libX11-1.1.1/src/util/Makefile.am	2007-06-08 15:20:42.000000000 +0200
+@@ -5,7 +5,15 @@
+ makekeys_CFLAGS=$(X11_CFLAGS)
+ 
+ #override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/makekeys-makekeys.o:
++	$(COMPILE) -c $< -o $@
++
++$(srcdir)/makekeys: $(srcdir)/makekeys-makekeys.o
++	$(LINK) $< -o $@
+ 
+ EXTRA_DIST = mkks.sh
+ 
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
new file mode 100644
index 000000000..0e458ed59
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# xlib_libX11 -- X.Org X11 library
+#
+################################################################################
+
+XLIB_LIBX11_VERSION = 1.1.1
+XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
+XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBX11_AUTORECONF = YES
+XLIB_LIBX11_INSTALL_STAGING = YES
+XLIB_LIBX11_DEPENDANCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
+XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
+XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libX11))
diff --git a/package/x11r7/xlib_libXScrnSaver/Config.in b/package/x11r7/xlib_libXScrnSaver/Config.in
new file mode 100644
index 000000000..420308a59
--- /dev/null
+++ b/package/x11r7/xlib_libXScrnSaver/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXSCRNSAVER
+	bool "libXScrnSaver"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
+	help
+	  libXScrnSaver 1.1.2
+	  X.Org XScrnSaver library
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
new file mode 100644
index 000000000..127137d41
--- /dev/null
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXScrnSaver -- X.Org XScrnSaver library
+#
+################################################################################
+
+XLIB_LIBXSCRNSAVER_VERSION = 1.1.2
+XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2
+XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXSCRNSAVER_AUTORECONF = YES
+XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
+XLIB_LIBXSCRNSAVER_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
+XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXScrnSaver))
diff --git a/package/x11r7/xlib_libXTrap/Config.in b/package/x11r7/xlib_libXTrap/Config.in
new file mode 100644
index 000000000..10571c6f0
--- /dev/null
+++ b/package/x11r7/xlib_libXTrap/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXTRAP
+	bool "libXTrap"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_TRAPPROTO
+	help
+	  libXTrap 1.0.0
+	  X.Org XTrap library
diff --git a/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
new file mode 100644
index 000000000..1ed7a62f0
--- /dev/null
+++ b/package/x11r7/xlib_libXTrap/xlib_libXTrap.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXTrap -- X.Org XTrap library
+#
+################################################################################
+
+XLIB_LIBXTRAP_VERSION = 1.0.0
+XLIB_LIBXTRAP_SOURCE = libXTrap-$(XLIB_LIBXTRAP_VERSION).tar.bz2
+XLIB_LIBXTRAP_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXTRAP_AUTORECONF = YES
+XLIB_LIBXTRAP_INSTALL_STAGING = YES
+XLIB_LIBXTRAP_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXext xproto_trapproto
+XLIB_LIBXTRAP_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXTrap))
diff --git a/package/x11r7/xlib_libXau/Config.in b/package/x11r7/xlib_libXau/Config.in
new file mode 100644
index 000000000..2b9783dc9
--- /dev/null
+++ b/package/x11r7/xlib_libXau/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXAU
+	bool "libXau"
+	default n
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
+	help
+	  libXau 1.0.3
+	  X.Org Xau library
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
new file mode 100644
index 000000000..fd62c5e57
--- /dev/null
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXau -- X.Org Xau library
+#
+################################################################################
+
+XLIB_LIBXAU_VERSION = 1.0.3
+XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2
+XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXAU_AUTORECONF = YES
+XLIB_LIBXAU_INSTALL_STAGING = YES
+XLIB_LIBXAU_DEPENDANCIES = xproto_xproto xproto_xproto xutil_util-macros
+XLIB_LIBXAU_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXau))
diff --git a/package/x11r7/xlib_libXaw/Config.in b/package/x11r7/xlib_libXaw/Config.in
new file mode 100644
index 000000000..47efd8335
--- /dev/null
+++ b/package/x11r7/xlib_libXaw/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XLIB_LIBXAW
+	bool "libXaw"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXPM
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XLIB_LIBXP
+	help
+	  libXaw 1.0.2
+	  X.Org Xaw library
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
new file mode 100644
index 000000000..6eacaa761
--- /dev/null
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXaw -- X.Org Xaw library
+#
+################################################################################
+
+XLIB_LIBXAW_VERSION = 1.0.2
+XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2
+XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXAW_AUTORECONF = YES
+XLIB_LIBXAW_INSTALL_STAGING = YES
+XLIB_LIBXAW_DEPENDANCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto xlib_libXp
+XLIB_LIBXAW_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXaw))
diff --git a/package/x11r7/xlib_libXcomposite/Config.in b/package/x11r7/xlib_libXcomposite/Config.in
new file mode 100644
index 000000000..ed54cee7d
--- /dev/null
+++ b/package/x11r7/xlib_libXcomposite/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XLIB_LIBXCOMPOSITE
+	bool "libXcomposite"
+	default n
+	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXcomposite 0.3.1
+	  X.Org Xcomposite library
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
new file mode 100644
index 000000000..0c0748635
--- /dev/null
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXcomposite -- X.Org Xcomposite library
+#
+################################################################################
+
+XLIB_LIBXCOMPOSITE_VERSION = 0.3.1
+XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2
+XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXCOMPOSITE_AUTORECONF = YES
+XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
+XLIB_LIBXCOMPOSITE_DEPENDANCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
+XLIB_LIBXCOMPOSITE_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXcomposite))
diff --git a/package/x11r7/xlib_libXcursor/Config.in b/package/x11r7/xlib_libXcursor/Config.in
new file mode 100644
index 000000000..fb58e218f
--- /dev/null
+++ b/package/x11r7/xlib_libXcursor/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXCURSOR
+	bool "libXcursor"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXcursor 1.1.8
+	  X.Org Xcursor library
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
new file mode 100644
index 000000000..681aa6853
--- /dev/null
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXcursor -- X.Org Xcursor library
+#
+################################################################################
+
+XLIB_LIBXCURSOR_VERSION = 1.1.8
+XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2
+XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXCURSOR_AUTORECONF = YES
+XLIB_LIBXCURSOR_INSTALL_STAGING = YES
+XLIB_LIBXCURSOR_DEPENDANCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
+XLIB_LIBXCURSOR_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXcursor))
diff --git a/package/x11r7/xlib_libXdamage/Config.in b/package/x11r7/xlib_libXdamage/Config.in
new file mode 100644
index 000000000..d893e4811
--- /dev/null
+++ b/package/x11r7/xlib_libXdamage/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXDAMAGE
+	bool "libXdamage"
+	default n
+	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXdamage 1.0.4
+	  X.Org Xdamage library
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
new file mode 100644
index 000000000..8f6b61a36
--- /dev/null
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXdamage -- X.Org Xdamage library
+#
+################################################################################
+
+XLIB_LIBXDAMAGE_VERSION = 1.0.4
+XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2
+XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXDAMAGE_AUTORECONF = YES
+XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
+XLIB_LIBXDAMAGE_DEPENDANCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
+XLIB_LIBXDAMAGE_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXdamage))
diff --git a/package/x11r7/xlib_libXdmcp/Config.in b/package/x11r7/xlib_libXdmcp/Config.in
new file mode 100644
index 000000000..a28838b6c
--- /dev/null
+++ b/package/x11r7/xlib_libXdmcp/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XLIB_LIBXDMCP
+	bool "libXdmcp"
+	default n
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXdmcp 1.0.2
+	  X.Org Xdmcp library
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
new file mode 100644
index 000000000..ba191e5dc
--- /dev/null
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXdmcp -- X.Org Xdmcp library
+#
+################################################################################
+
+XLIB_LIBXDMCP_VERSION = 1.0.2
+XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2
+XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXDMCP_AUTORECONF = YES
+XLIB_LIBXDMCP_INSTALL_STAGING = YES
+XLIB_LIBXDMCP_DEPENDANCIES = xutil_util-macros xproto_xproto
+XLIB_LIBXDMCP_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXdmcp))
diff --git a/package/x11r7/xlib_libXevie/Config.in b/package/x11r7/xlib_libXevie/Config.in
new file mode 100644
index 000000000..b75617b79
--- /dev/null
+++ b/package/x11r7/xlib_libXevie/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXEVIE
+	bool "libXevie"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_EVIEEXT
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXevie 1.0.2
+	  X.Org Xevie library
diff --git a/package/x11r7/xlib_libXevie/xlib_libXevie.mk b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
new file mode 100644
index 000000000..2d4c78075
--- /dev/null
+++ b/package/x11r7/xlib_libXevie/xlib_libXevie.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXevie -- X.Org Xevie library
+#
+################################################################################
+
+XLIB_LIBXEVIE_VERSION = 1.0.2
+XLIB_LIBXEVIE_SOURCE = libXevie-$(XLIB_LIBXEVIE_VERSION).tar.bz2
+XLIB_LIBXEVIE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXEVIE_AUTORECONF = YES
+XLIB_LIBXEVIE_INSTALL_STAGING = YES
+XLIB_LIBXEVIE_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_evieext xproto_xproto
+XLIB_LIBXEVIE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXevie))
diff --git a/package/x11r7/xlib_libXext/Config.in b/package/x11r7/xlib_libXext/Config.in
new file mode 100644
index 000000000..ac40d3e40
--- /dev/null
+++ b/package/x11r7/xlib_libXext/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXEXT
+	bool "libXext"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXext 1.0.2
+	  X.Org Xext library
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
new file mode 100644
index 000000000..abad40f28
--- /dev/null
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXext -- X.Org Xext library
+#
+################################################################################
+
+XLIB_LIBXEXT_VERSION = 1.0.2
+XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2
+XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXEXT_AUTORECONF = YES
+XLIB_LIBXEXT_INSTALL_STAGING = YES
+XLIB_LIBXEXT_DEPENDANCIES = xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXext))
diff --git a/package/x11r7/xlib_libXfixes/Config.in b/package/x11r7/xlib_libXfixes/Config.in
new file mode 100644
index 000000000..8d3a9c2f0
--- /dev/null
+++ b/package/x11r7/xlib_libXfixes/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXFIXES
+	bool "libXfixes"
+	default n
+	select BR2_PACKAGE_XPROTO_FIXESPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXfixes 4.0.3
+	  X.Org Xfixes library
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
new file mode 100644
index 000000000..b7694063c
--- /dev/null
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXfixes -- X.Org Xfixes library
+#
+################################################################################
+
+XLIB_LIBXFIXES_VERSION = 4.0.3
+XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2
+XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFIXES_AUTORECONF = YES
+XLIB_LIBXFIXES_INSTALL_STAGING = YES
+XLIB_LIBXFIXES_DEPENDANCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXFIXES_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXfixes))
diff --git a/package/x11r7/xlib_libXfont/Config.in b/package/x11r7/xlib_libXfont/Config.in
new file mode 100644
index 000000000..559c5148d
--- /dev/null
+++ b/package/x11r7/xlib_libXfont/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_XLIB_LIBXFONT
+	bool "libXfont"
+	default n
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBFONTENC
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XFONT_ENCODINGS
+	help
+	  libXfont 1.2.7
+	  X.Org Xfont library
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
new file mode 100644
index 000000000..eef50e863
--- /dev/null
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXfont -- X.Org Xfont library
+#
+################################################################################
+
+XLIB_LIBXFONT_VERSION = 1.2.7
+XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
+XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONT_AUTORECONF = YES
+XLIB_LIBXFONT_INSTALL_STAGING = YES
+XLIB_LIBXFONT_DEPENDANCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings
+XLIB_LIBXFONT_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXfont))
diff --git a/package/x11r7/xlib_libXfontcache/Config.in b/package/x11r7/xlib_libXfontcache/Config.in
new file mode 100644
index 000000000..141e7aaba
--- /dev/null
+++ b/package/x11r7/xlib_libXfontcache/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXFONTCACHE
+	bool "libXfontcache"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_FONTCACHEPROTO
+	help
+	  libXfontcache 1.0.4
+	  X.Org Xfontcache library
diff --git a/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
new file mode 100644
index 000000000..99b702935
--- /dev/null
+++ b/package/x11r7/xlib_libXfontcache/xlib_libXfontcache.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXfontcache -- X.Org Xfontcache library
+#
+################################################################################
+
+XLIB_LIBXFONTCACHE_VERSION = 1.0.4
+XLIB_LIBXFONTCACHE_SOURCE = libXfontcache-$(XLIB_LIBXFONTCACHE_VERSION).tar.bz2
+XLIB_LIBXFONTCACHE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFONTCACHE_AUTORECONF = YES
+XLIB_LIBXFONTCACHE_INSTALL_STAGING = YES
+XLIB_LIBXFONTCACHE_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_fontcacheproto
+XLIB_LIBXFONTCACHE_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXfontcache))
diff --git a/package/x11r7/xlib_libXft/Config.in b/package/x11r7/xlib_libXft/Config.in
new file mode 100644
index 000000000..3a4b6fd5c
--- /dev/null
+++ b/package/x11r7/xlib_libXft/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XLIB_LIBXFT
+	bool "libXft"
+	default n
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXft 2.1.12
+	  X.Org Xft library
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
new file mode 100644
index 000000000..77afd4a72
--- /dev/null
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXft -- X.Org Xft library
+#
+################################################################################
+
+XLIB_LIBXFT_VERSION = 2.1.12
+XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
+XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXFT_AUTORECONF = YES
+XLIB_LIBXFT_INSTALL_STAGING = YES
+XLIB_LIBXFT_DEPENDANCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
+XLIB_LIBXFT_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXft))
diff --git a/package/x11r7/xlib_libXi/Config.in b/package/x11r7/xlib_libXi/Config.in
new file mode 100644
index 000000000..e1646c46e
--- /dev/null
+++ b/package/x11r7/xlib_libXi/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXI
+	bool "libXi"
+	default n
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXi 1.0.2
+	  X.Org Xi library
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
new file mode 100644
index 000000000..b2b6a9e54
--- /dev/null
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXi -- X.Org Xi library
+#
+################################################################################
+
+XLIB_LIBXI_VERSION = 1.0.2
+XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2
+XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXI_AUTORECONF = YES
+XLIB_LIBXI_INSTALL_STAGING = YES
+XLIB_LIBXI_DEPENDANCIES = xproto_inputproto xlib_libX11 xlib_libXext xproto_xproto
+XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXi))
diff --git a/package/x11r7/xlib_libXinerama/Config.in b/package/x11r7/xlib_libXinerama/Config.in
new file mode 100644
index 000000000..e60601f68
--- /dev/null
+++ b/package/x11r7/xlib_libXinerama/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXINERAMA
+	bool "libXinerama"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	help
+	  libXinerama 1.0.1
+	  X.Org Xinerama library
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
new file mode 100644
index 000000000..80d5c6ff6
--- /dev/null
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXinerama -- X.Org Xinerama library
+#
+################################################################################
+
+XLIB_LIBXINERAMA_VERSION = 1.0.1
+XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2
+XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXINERAMA_AUTORECONF = YES
+XLIB_LIBXINERAMA_INSTALL_STAGING = YES
+XLIB_LIBXINERAMA_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
+XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXinerama))
diff --git a/package/x11r7/xlib_libXmu/Config.in b/package/x11r7/xlib_libXmu/Config.in
new file mode 100644
index 000000000..b919ffba1
--- /dev/null
+++ b/package/x11r7/xlib_libXmu/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXMU
+	bool "libXmu"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXmu 1.0.3
+	  X.Org Xmu library
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
new file mode 100644
index 000000000..18c4b2d34
--- /dev/null
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXmu -- X.Org Xmu library
+#
+################################################################################
+
+XLIB_LIBXMU_VERSION = 1.0.3
+XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2
+XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXMU_AUTORECONF = YES
+XLIB_LIBXMU_INSTALL_STAGING = YES
+XLIB_LIBXMU_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXMU_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXmu))
diff --git a/package/x11r7/xlib_libXp/Config.in b/package/x11r7/xlib_libXp/Config.in
new file mode 100644
index 000000000..7b7dd1807
--- /dev/null
+++ b/package/x11r7/xlib_libXp/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXP
+	bool "libXp"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_PRINTPROTO
+	help
+	  libXp 1.0.0
+	  X.Org Xp library
diff --git a/package/x11r7/xlib_libXp/xlib_libXp.mk b/package/x11r7/xlib_libXp/xlib_libXp.mk
new file mode 100644
index 000000000..38cae343d
--- /dev/null
+++ b/package/x11r7/xlib_libXp/xlib_libXp.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXp -- X.Org Xp library
+#
+################################################################################
+
+XLIB_LIBXP_VERSION = 1.0.0
+XLIB_LIBXP_SOURCE = libXp-$(XLIB_LIBXP_VERSION).tar.bz2
+XLIB_LIBXP_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXP_AUTORECONF = YES
+XLIB_LIBXP_INSTALL_STAGING = YES
+XLIB_LIBXP_DEPENDANCIES = xlib_libX11 xlib_libXau xlib_libXext xproto_printproto
+XLIB_LIBXP_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXp))
diff --git a/package/x11r7/xlib_libXpm/Config.in b/package/x11r7/xlib_libXpm/Config.in
new file mode 100644
index 000000000..e579677ea
--- /dev/null
+++ b/package/x11r7/xlib_libXpm/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXPM
+	bool "libXpm"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXpm 3.5.6
+	  X.Org Xpm library
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
new file mode 100644
index 000000000..aa00a6697
--- /dev/null
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXpm -- X.Org Xpm library
+#
+################################################################################
+
+XLIB_LIBXPM_VERSION = 3.5.6
+XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2
+XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXPM_AUTORECONF = YES
+XLIB_LIBXPM_INSTALL_STAGING = YES
+XLIB_LIBXPM_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXPM_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXpm))
diff --git a/package/x11r7/xlib_libXprintAppUtil/Config.in b/package/x11r7/xlib_libXprintAppUtil/Config.in
new file mode 100644
index 000000000..013287655
--- /dev/null
+++ b/package/x11r7/xlib_libXprintAppUtil/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXPRINTAPPUTIL
+	bool "libXprintAppUtil"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXP
+	select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	help
+	  libXprintAppUtil 1.0.1
+	  X.Org XprintAppUtil library
diff --git a/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
new file mode 100644
index 000000000..3c69c190e
--- /dev/null
+++ b/package/x11r7/xlib_libXprintAppUtil/xlib_libXprintAppUtil.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXprintAppUtil -- X.Org XprintAppUtil library
+#
+################################################################################
+
+XLIB_LIBXPRINTAPPUTIL_VERSION = 1.0.1
+XLIB_LIBXPRINTAPPUTIL_SOURCE = libXprintAppUtil-$(XLIB_LIBXPRINTAPPUTIL_VERSION).tar.bz2
+XLIB_LIBXPRINTAPPUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXPRINTAPPUTIL_AUTORECONF = YES
+XLIB_LIBXPRINTAPPUTIL_INSTALL_STAGING = YES
+XLIB_LIBXPRINTAPPUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXprintUtil
+XLIB_LIBXPRINTAPPUTIL_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXprintAppUtil))
diff --git a/package/x11r7/xlib_libXprintUtil/Config.in b/package/x11r7/xlib_libXprintUtil/Config.in
new file mode 100644
index 000000000..be59e42f5
--- /dev/null
+++ b/package/x11r7/xlib_libXprintUtil/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+	bool "libXprintUtil"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXP
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_PRINTPROTO
+	help
+	  libXprintUtil 1.0.1
+	  X.Org XprintUtil library
diff --git a/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
new file mode 100644
index 000000000..5eed49754
--- /dev/null
+++ b/package/x11r7/xlib_libXprintUtil/xlib_libXprintUtil.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXprintUtil -- X.Org XprintUtil library
+#
+################################################################################
+
+XLIB_LIBXPRINTUTIL_VERSION = 1.0.1
+XLIB_LIBXPRINTUTIL_SOURCE = libXprintUtil-$(XLIB_LIBXPRINTUTIL_VERSION).tar.bz2
+XLIB_LIBXPRINTUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXPRINTUTIL_AUTORECONF = YES
+XLIB_LIBXPRINTUTIL_INSTALL_STAGING = YES
+XLIB_LIBXPRINTUTIL_DEPENDANCIES = xlib_libX11 xlib_libXp xlib_libXt xproto_printproto
+XLIB_LIBXPRINTUTIL_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXprintUtil))
diff --git a/package/x11r7/xlib_libXrandr/Config.in b/package/x11r7/xlib_libXrandr/Config.in
new file mode 100644
index 000000000..9ba144517
--- /dev/null
+++ b/package/x11r7/xlib_libXrandr/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XLIB_LIBXRANDR
+	bool "libXrandr"
+	default n
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXrandr 1.1.2
+	  X.Org Xrandr library
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
new file mode 100644
index 000000000..69285e184
--- /dev/null
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXrandr -- X.Org Xrandr library
+#
+################################################################################
+
+XLIB_LIBXRANDR_VERSION = 1.1.2
+XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2
+XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRANDR_AUTORECONF = YES
+XLIB_LIBXRANDR_INSTALL_STAGING = YES
+XLIB_LIBXRANDR_DEPENDANCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
+XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXrandr))
diff --git a/package/x11r7/xlib_libXrender/Config.in b/package/x11r7/xlib_libXrender/Config.in
new file mode 100644
index 000000000..bf6fd3531
--- /dev/null
+++ b/package/x11r7/xlib_libXrender/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXRENDER
+	bool "libXrender"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXrender 0.9.2
+	  X.Org Xrender library
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
new file mode 100644
index 000000000..2e3858b9f
--- /dev/null
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXrender -- X.Org Xrender library
+#
+################################################################################
+
+XLIB_LIBXRENDER_VERSION = 0.9.2
+XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2
+XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRENDER_AUTORECONF = YES
+XLIB_LIBXRENDER_INSTALL_STAGING = YES
+XLIB_LIBXRENDER_DEPENDANCIES = xlib_libX11 xproto_renderproto xproto_xproto
+XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXrender))
diff --git a/package/x11r7/xlib_libXres/Config.in b/package/x11r7/xlib_libXres/Config.in
new file mode 100644
index 000000000..0049d9456
--- /dev/null
+++ b/package/x11r7/xlib_libXres/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXRES
+	bool "libXres"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_RESOURCEPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXres 1.0.3
+	  X.Org XRes library
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
new file mode 100644
index 000000000..53bd6327c
--- /dev/null
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXres -- X.Org XRes library
+#
+################################################################################
+
+XLIB_LIBXRES_VERSION = 1.0.3
+XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
+XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXRES_AUTORECONF = YES
+XLIB_LIBXRES_INSTALL_STAGING = YES
+XLIB_LIBXRES_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
+XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXres))
diff --git a/package/x11r7/xlib_libXt/Config.in b/package/x11r7/xlib_libXt/Config.in
new file mode 100644
index 000000000..2623f99d7
--- /dev/null
+++ b/package/x11r7/xlib_libXt/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XLIB_LIBXT
+	bool "libXt"
+	default n
+	select BR2_PACKAGE_XLIB_LIBSM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XCB_PROTO
+	select BR2_PACKAGE_LIBXCB
+	help
+	  libXt 1.0.4
+	  X.Org Xt library
diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
new file mode 100644
index 000000000..3669b83bb
--- /dev/null
+++ b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
@@ -0,0 +1,38 @@
+--- libXt-1.0.4/configure.ac.orig	2006-11-08 15:15:56.000000000 +0100
++++ libXt-1.0.4/configure.ac	2007-06-08 16:41:59.000000000 +0200
+@@ -37,6 +37,16 @@
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++    CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
++
+ PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
+ 
+ # Needed for including Xalloca.h
+--- libXt-1.0.4/util/Makefile.am.orig	2006-10-27 21:10:56.000000000 +0200
++++ libXt-1.0.4/util/Makefile.am	2007-06-08 16:44:13.000000000 +0200
+@@ -4,6 +4,16 @@
+ noinst_PROGRAMS = makestrs
+ endif
+ 
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/makestrs-makestrs.o:
++	$(COMPILE) -c $< -o $@
++
++$(srcdir)/makestrs: $(srcdir)/makestrs-makestrs.o
++	$(LINK) $< -o $@
++
+ EXTRA_DIST = \
+ 	Shell.ht \
+ 	StrDefs.ct \
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
new file mode 100644
index 000000000..828e3810b
--- /dev/null
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# xlib_libXt -- X.Org Xt library
+#
+################################################################################
+
+XLIB_LIBXT_VERSION = 1.0.4
+XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
+XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXT_AUTORECONF = YES
+XLIB_LIBXT_INSTALL_STAGING = YES
+XLIB_LIBXT_DEPENDANCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb
+XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
+XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXt))
diff --git a/package/x11r7/xlib_libXtst/Config.in b/package/x11r7/xlib_libXtst/Config.in
new file mode 100644
index 000000000..5a9986a11
--- /dev/null
+++ b/package/x11r7/xlib_libXtst/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXTST
+	bool "libXtst"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_RECORDPROTO
+	help
+	  libXtst 1.0.1
+	  X.Org Xtst library
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
new file mode 100644
index 000000000..d27b5321d
--- /dev/null
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXtst -- X.Org Xtst library
+#
+################################################################################
+
+XLIB_LIBXTST_VERSION = 1.0.1
+XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2
+XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXTST_AUTORECONF = YES
+XLIB_LIBXTST_INSTALL_STAGING = YES
+XLIB_LIBXTST_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_recordproto
+XLIB_LIBXTST_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXtst))
diff --git a/package/x11r7/xlib_libXv/Config.in b/package/x11r7/xlib_libXv/Config.in
new file mode 100644
index 000000000..325c3f8d8
--- /dev/null
+++ b/package/x11r7/xlib_libXv/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXV
+	bool "libXv"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXv 1.0.3
+	  X.Org Xv library
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
new file mode 100644
index 000000000..9b2b44dd0
--- /dev/null
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXv -- X.Org Xv library
+#
+################################################################################
+
+XLIB_LIBXV_VERSION = 1.0.3
+XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2
+XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXV_AUTORECONF = YES
+XLIB_LIBXV_INSTALL_STAGING = YES
+XLIB_LIBXV_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
+XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXv))
diff --git a/package/x11r7/xlib_libXvMC/Config.in b/package/x11r7/xlib_libXvMC/Config.in
new file mode 100644
index 000000000..bab6420c6
--- /dev/null
+++ b/package/x11r7/xlib_libXvMC/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XLIB_LIBXVMC
+	bool "libXvMC"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXV
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXvMC 1.0.4
+	  X.Org XvMC library
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
new file mode 100644
index 000000000..79392e425
--- /dev/null
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXvMC -- X.Org XvMC library
+#
+################################################################################
+
+XLIB_LIBXVMC_VERSION = 1.0.4
+XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2
+XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXVMC_AUTORECONF = YES
+XLIB_LIBXVMC_INSTALL_STAGING = YES
+XLIB_LIBXVMC_DEPENDANCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
+XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXvMC))
diff --git a/package/x11r7/xlib_libXxf86dga/Config.in b/package/x11r7/xlib_libXxf86dga/Config.in
new file mode 100644
index 000000000..dc0bddf87
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXXF86DGA
+	bool "libXxf86dga"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXxf86dga 1.0.1
+	  X.Org Xxf86dga library
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
new file mode 100644
index 000000000..a38e24d46
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXxf86dga -- X.Org Xxf86dga library
+#
+################################################################################
+
+XLIB_LIBXXF86DGA_VERSION = 1.0.1
+XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
+XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXXF86DGA_AUTORECONF = YES
+XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
+XLIB_LIBXXF86DGA_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
+XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXxf86dga))
diff --git a/package/x11r7/xlib_libXxf86misc/Config.in b/package/x11r7/xlib_libXxf86misc/Config.in
new file mode 100644
index 000000000..5e3653ef5
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86misc/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXXF86MISC
+	bool "libXxf86misc"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXxf86misc 1.0.1
+	  X.Org Xxf86misc library
diff --git a/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
new file mode 100644
index 000000000..441b6f79d
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86misc/xlib_libXxf86misc.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXxf86misc -- X.Org Xxf86misc library
+#
+################################################################################
+
+XLIB_LIBXXF86MISC_VERSION = 1.0.1
+XLIB_LIBXXF86MISC_SOURCE = libXxf86misc-$(XLIB_LIBXXF86MISC_VERSION).tar.bz2
+XLIB_LIBXXF86MISC_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXXF86MISC_AUTORECONF = YES
+XLIB_LIBXXF86MISC_INSTALL_STAGING = YES
+XLIB_LIBXXF86MISC_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86miscproto xproto_xproto
+XLIB_LIBXXF86MISC_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXxf86misc))
diff --git a/package/x11r7/xlib_libXxf86vm/Config.in b/package/x11r7/xlib_libXxf86vm/Config.in
new file mode 100644
index 000000000..4a9005056
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86vm/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XLIB_LIBXXF86VM
+	bool "libXxf86vm"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libXxf86vm 1.0.1
+	  X.Org Xxf86vm library
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
new file mode 100644
index 000000000..538613116
--- /dev/null
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libXxf86vm -- X.Org Xxf86vm library
+#
+################################################################################
+
+XLIB_LIBXXF86VM_VERSION = 1.0.1
+XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2
+XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXXF86VM_AUTORECONF = YES
+XLIB_LIBXXF86VM_INSTALL_STAGING = YES
+XLIB_LIBXXF86VM_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
+XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXxf86vm))
diff --git a/package/x11r7/xlib_libdmx/Config.in b/package/x11r7/xlib_libdmx/Config.in
new file mode 100644
index 000000000..36d725034
--- /dev/null
+++ b/package/x11r7/xlib_libdmx/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBDMX
+	bool "libdmx"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XPROTO_DMXPROTO
+	help
+	  libdmx 1.0.2
+	  X.Org dmx library
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
new file mode 100644
index 000000000..3b72c8d2d
--- /dev/null
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libdmx -- X.Org dmx library
+#
+################################################################################
+
+XLIB_LIBDMX_VERSION = 1.0.2
+XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2
+XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBDMX_AUTORECONF = YES
+XLIB_LIBDMX_INSTALL_STAGING = YES
+XLIB_LIBDMX_DEPENDANCIES = xlib_libX11 xlib_libXext xproto_dmxproto
+XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libdmx))
diff --git a/package/x11r7/xlib_libfontenc/Config.in b/package/x11r7/xlib_libfontenc/Config.in
new file mode 100644
index 000000000..f05bceb19
--- /dev/null
+++ b/package/x11r7/xlib_libfontenc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XLIB_LIBFONTENC
+	bool "libfontenc"
+	default n
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  libfontenc 1.0.4
+	  X.Org fontenc library
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
new file mode 100644
index 000000000..6e8e1e544
--- /dev/null
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libfontenc -- X.Org fontenc library
+#
+################################################################################
+
+XLIB_LIBFONTENC_VERSION = 1.0.4
+XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2
+XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBFONTENC_AUTORECONF = YES
+XLIB_LIBFONTENC_INSTALL_STAGING = YES
+XLIB_LIBFONTENC_DEPENDANCIES = xproto_xproto
+XLIB_LIBFONTENC_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libfontenc))
diff --git a/package/x11r7/xlib_liblbxutil/Config.in b/package/x11r7/xlib_liblbxutil/Config.in
new file mode 100644
index 000000000..97d264ccc
--- /dev/null
+++ b/package/x11r7/xlib_liblbxutil/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XLIB_LIBLBXUTIL
+	bool "liblbxutil"
+	default n
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	help
+	  liblbxutil 1.0.1
+	  X.Org lbxutil library
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch
new file mode 100644
index 000000000..9a35ac221
--- /dev/null
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch
@@ -0,0 +1,37 @@
+--- liblbxutil-1.0.1/configure.ac.orig	2007-06-08 21:57:50.000000000 +0200
++++ liblbxutil-1.0.1/configure.ac	2007-06-08 21:58:06.000000000 +0200
+@@ -49,6 +49,15 @@
+ 
+ XORG_RELEASE_VERSION
+ 
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++    CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
+ 	   lbxutil.pc])
+--- liblbxutil-1.0.1/src/Makefile.am.orig	2007-06-08 21:57:50.000000000 +0200
++++ liblbxutil-1.0.1/src/Makefile.am	2007-06-08 22:00:24.000000000 +0200
+@@ -5,6 +5,16 @@
+ mkg3states_SOURCES =				\
+ 	$(srcdir)/image/mkg3states.c
+ 
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/mkg3states.o:
++	$(COMPILE) -c $< -o $@
++
++$(srcdir)/mkg3states: $(srcdir)/mkg3states.o
++	$(LINK) $< -o $@
++
+ liblbxutil_la_SOURCES =				\
+ 	$(srcdir)/lbx_zlib/reqstats.h		\
+ 	$(srcdir)/lbx_zlib/lbx_zlib_io.c	\
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
new file mode 100644
index 000000000..2f505c4c5
--- /dev/null
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_liblbxutil -- X.Org lbxutil library
+#
+################################################################################
+
+XLIB_LIBLBXUTIL_VERSION = 1.0.1
+XLIB_LIBLBXUTIL_SOURCE = liblbxutil-$(XLIB_LIBLBXUTIL_VERSION).tar.bz2
+XLIB_LIBLBXUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBLBXUTIL_AUTORECONF = YES
+XLIB_LIBLBXUTIL_INSTALL_STAGING = YES
+XLIB_LIBLBXUTIL_DEPENDANCIES = xproto_xextproto
+XLIB_LIBLBXUTIL_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_liblbxutil))
diff --git a/package/x11r7/xlib_liboldX/Config.in b/package/x11r7/xlib_liboldX/Config.in
new file mode 100644
index 000000000..cfb9b86f9
--- /dev/null
+++ b/package/x11r7/xlib_liboldX/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XLIB_LIBOLDX
+	bool "liboldX"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  liboldX 1.0.1
+	  X.Org oldX library
diff --git a/package/x11r7/xlib_liboldX/xlib_liboldX.mk b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
new file mode 100644
index 000000000..1b70041ac
--- /dev/null
+++ b/package/x11r7/xlib_liboldX/xlib_liboldX.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_liboldX -- X.Org oldX library
+#
+################################################################################
+
+XLIB_LIBOLDX_VERSION = 1.0.1
+XLIB_LIBOLDX_SOURCE = liboldX-$(XLIB_LIBOLDX_VERSION).tar.bz2
+XLIB_LIBOLDX_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBOLDX_AUTORECONF = YES
+XLIB_LIBOLDX_INSTALL_STAGING = YES
+XLIB_LIBOLDX_DEPENDANCIES = xlib_libX11
+XLIB_LIBOLDX_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_liboldX))
diff --git a/package/x11r7/xlib_libxkbfile/Config.in b/package/x11r7/xlib_libxkbfile/Config.in
new file mode 100644
index 000000000..991ee500f
--- /dev/null
+++ b/package/x11r7/xlib_libxkbfile/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_XLIB_LIBXKBFILE
+	bool "libxkbfile"
+	default n
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	help
+	  libxkbfile 1.0.4
+	  X.Org xkbfile library
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
new file mode 100644
index 000000000..fe195477c
--- /dev/null
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libxkbfile -- X.Org xkbfile library
+#
+################################################################################
+
+XLIB_LIBXKBFILE_VERSION = 1.0.4
+XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2
+XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXKBFILE_AUTORECONF = YES
+XLIB_LIBXKBFILE_INSTALL_STAGING = YES
+XLIB_LIBXKBFILE_DEPENDANCIES = xlib_libX11 xproto_kbproto
+XLIB_LIBXKBFILE_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libxkbfile))
diff --git a/package/x11r7/xlib_libxkbui/Config.in b/package/x11r7/xlib_libxkbui/Config.in
new file mode 100644
index 000000000..66765735e
--- /dev/null
+++ b/package/x11r7/xlib_libxkbui/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_XLIB_LIBXKBUI
+	bool "libxkbui"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	select BR2_PACKAGE_XLIB_LIBXT
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	help
+	  libxkbui 1.0.2
+	  X.Org xkbui library
diff --git a/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
new file mode 100644
index 000000000..25643647f
--- /dev/null
+++ b/package/x11r7/xlib_libxkbui/xlib_libxkbui.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libxkbui -- X.Org xkbui library
+#
+################################################################################
+
+XLIB_LIBXKBUI_VERSION = 1.0.2
+XLIB_LIBXKBUI_SOURCE = libxkbui-$(XLIB_LIBXKBUI_VERSION).tar.bz2
+XLIB_LIBXKBUI_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXKBUI_AUTORECONF = YES
+XLIB_LIBXKBUI_INSTALL_STAGING = YES
+XLIB_LIBXKBUI_DEPENDANCIES = xlib_libxkbfile xlib_libXt xproto_kbproto
+XLIB_LIBXKBUI_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libxkbui))
diff --git a/package/x11r7/xlib_xtrans/Config.in b/package/x11r7/xlib_xtrans/Config.in
new file mode 100644
index 000000000..8e8fe9f25
--- /dev/null
+++ b/package/x11r7/xlib_xtrans/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XLIB_XTRANS
+	bool "xtrans"
+	default n
+	help
+	  xtrans 1.0.3
+	  X.Org xtrans library
diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.mk b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
new file mode 100644
index 000000000..7d4c3e388
--- /dev/null
+++ b/package/x11r7/xlib_xtrans/xlib_xtrans.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xlib_xtrans -- X.Org xtrans library
+#
+################################################################################
+
+XLIB_XTRANS_VERSION = 1.0.3
+XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2
+XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_XTRANS_AUTORECONF = YES
+XLIB_XTRANS_INSTALL_STAGING = YES
+XLIB_XTRANS_CONF_OPT =  --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_xtrans))
diff --git a/package/x11r7/xproto_applewmproto/Config.in b/package/x11r7/xproto_applewmproto/Config.in
new file mode 100644
index 000000000..c1da79394
--- /dev/null
+++ b/package/x11r7/xproto_applewmproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_APPLEWMPROTO
+	bool "applewmproto"
+	default n
+	help
+	  applewmproto 1.0.3
+	  No description available
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
new file mode 100644
index 000000000..f3a9c99a2
--- /dev/null
+++ b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_applewmproto -- No description available
+#
+################################################################################
+
+XPROTO_APPLEWMPROTO_VERSION = 1.0.3
+XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
+XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_APPLEWMPROTO_AUTORECONF = YES
+XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
+XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_applewmproto))
diff --git a/package/x11r7/xproto_bigreqsproto/Config.in b/package/x11r7/xproto_bigreqsproto/Config.in
new file mode 100644
index 000000000..851a9024d
--- /dev/null
+++ b/package/x11r7/xproto_bigreqsproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_BIGREQSPROTO
+	bool "bigreqsproto"
+	default n
+	help
+	  bigreqsproto 1.0.2
+	  X.Org BigReqs protocol headers
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
new file mode 100644
index 000000000..455480ea2
--- /dev/null
+++ b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_bigreqsproto -- X.Org BigReqs protocol headers
+#
+################################################################################
+
+XPROTO_BIGREQSPROTO_VERSION = 1.0.2
+XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
+XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_BIGREQSPROTO_AUTORECONF = YES
+XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
+XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_bigreqsproto))
diff --git a/package/x11r7/xproto_compositeproto/Config.in b/package/x11r7/xproto_compositeproto/Config.in
new file mode 100644
index 000000000..372375a9e
--- /dev/null
+++ b/package/x11r7/xproto_compositeproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+	bool "compositeproto"
+	default n
+	help
+	  compositeproto 0.3.1
+	  X.Org Composite protocol headers
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
new file mode 100644
index 000000000..1726c168e
--- /dev/null
+++ b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_compositeproto -- X.Org Composite protocol headers
+#
+################################################################################
+
+XPROTO_COMPOSITEPROTO_VERSION = 0.3.1
+XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2
+XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_COMPOSITEPROTO_AUTORECONF = YES
+XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
+XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_compositeproto))
diff --git a/package/x11r7/xproto_damageproto/Config.in b/package/x11r7/xproto_damageproto/Config.in
new file mode 100644
index 000000000..6ce050696
--- /dev/null
+++ b/package/x11r7/xproto_damageproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_DAMAGEPROTO
+	bool "damageproto"
+	default n
+	help
+	  damageproto 1.0.3
+	  X.Org Damage protocol headers
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
new file mode 100644
index 000000000..84589f641
--- /dev/null
+++ b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_damageproto -- X.Org Damage protocol headers
+#
+################################################################################
+
+XPROTO_DAMAGEPROTO_VERSION = 1.0.3
+XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2
+XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_DAMAGEPROTO_AUTORECONF = YES
+XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
+XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_damageproto))
diff --git a/package/x11r7/xproto_dmxproto/Config.in b/package/x11r7/xproto_dmxproto/Config.in
new file mode 100644
index 000000000..ae7b1f4cf
--- /dev/null
+++ b/package/x11r7/xproto_dmxproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_DMXPROTO
+	bool "dmxproto"
+	default n
+	help
+	  dmxproto 2.2.2
+	  X.Org DMX protocol headers
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
new file mode 100644
index 000000000..f85e54e0f
--- /dev/null
+++ b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_dmxproto -- X.Org DMX protocol headers
+#
+################################################################################
+
+XPROTO_DMXPROTO_VERSION = 2.2.2
+XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2
+XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_DMXPROTO_AUTORECONF = YES
+XPROTO_DMXPROTO_INSTALL_STAGING = YES
+XPROTO_DMXPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_dmxproto))
diff --git a/package/x11r7/xproto_evieext/Config.in b/package/x11r7/xproto_evieext/Config.in
new file mode 100644
index 000000000..e00da3c23
--- /dev/null
+++ b/package/x11r7/xproto_evieext/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_EVIEEXT
+	bool "evieext"
+	default n
+	help
+	  evieext 1.0.2
+	  X.Org EvIE protocol headers
diff --git a/package/x11r7/xproto_evieext/xproto_evieext.mk b/package/x11r7/xproto_evieext/xproto_evieext.mk
new file mode 100644
index 000000000..8d48b1d87
--- /dev/null
+++ b/package/x11r7/xproto_evieext/xproto_evieext.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_evieext -- X.Org EvIE protocol headers
+#
+################################################################################
+
+XPROTO_EVIEEXT_VERSION = 1.0.2
+XPROTO_EVIEEXT_SOURCE = evieext-$(XPROTO_EVIEEXT_VERSION).tar.bz2
+XPROTO_EVIEEXT_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_EVIEEXT_AUTORECONF = YES
+XPROTO_EVIEEXT_INSTALL_STAGING = YES
+XPROTO_EVIEEXT_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_evieext))
diff --git a/package/x11r7/xproto_fixesproto/Config.in b/package/x11r7/xproto_fixesproto/Config.in
new file mode 100644
index 000000000..7ce198ece
--- /dev/null
+++ b/package/x11r7/xproto_fixesproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_FIXESPROTO
+	bool "fixesproto"
+	default n
+	help
+	  fixesproto 4.0
+	  X.Org Fixes protocol headers
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
new file mode 100644
index 000000000..ac8debc4b
--- /dev/null
+++ b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_fixesproto -- X.Org Fixes protocol headers
+#
+################################################################################
+
+XPROTO_FIXESPROTO_VERSION = 4.0
+XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2
+XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FIXESPROTO_AUTORECONF = YES
+XPROTO_FIXESPROTO_INSTALL_STAGING = YES
+XPROTO_FIXESPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_fixesproto))
diff --git a/package/x11r7/xproto_fontcacheproto/Config.in b/package/x11r7/xproto_fontcacheproto/Config.in
new file mode 100644
index 000000000..86e814e28
--- /dev/null
+++ b/package/x11r7/xproto_fontcacheproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
+	bool "fontcacheproto"
+	default n
+	help
+	  fontcacheproto 0.1.2
+	  X.Org Fontcache protocol headers
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
new file mode 100644
index 000000000..35f34cbd2
--- /dev/null
+++ b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_fontcacheproto -- X.Org Fontcache protocol headers
+#
+################################################################################
+
+XPROTO_FONTCACHEPROTO_VERSION = 0.1.2
+XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2
+XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FONTCACHEPROTO_AUTORECONF = YES
+XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
+XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_fontcacheproto))
diff --git a/package/x11r7/xproto_fontsproto/Config.in b/package/x11r7/xproto_fontsproto/Config.in
new file mode 100644
index 000000000..696abcd8e
--- /dev/null
+++ b/package/x11r7/xproto_fontsproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_FONTSPROTO
+	bool "fontsproto"
+	default n
+	help
+	  fontsproto 2.0.2
+	  X.Org Fonts protocol headers
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
new file mode 100644
index 000000000..ae4c9d051
--- /dev/null
+++ b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_fontsproto -- X.Org Fonts protocol headers
+#
+################################################################################
+
+XPROTO_FONTSPROTO_VERSION = 2.0.2
+XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
+XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_FONTSPROTO_AUTORECONF = YES
+XPROTO_FONTSPROTO_INSTALL_STAGING = YES
+XPROTO_FONTSPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_fontsproto))
diff --git a/package/x11r7/xproto_glproto/Config.in b/package/x11r7/xproto_glproto/Config.in
new file mode 100644
index 000000000..92741bb4a
--- /dev/null
+++ b/package/x11r7/xproto_glproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_GLPROTO
+	bool "glproto"
+	default n
+	help
+	  glproto 1.4.8
+	  X.Org GL protocol headers
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
new file mode 100644
index 000000000..411effea8
--- /dev/null
+++ b/package/x11r7/xproto_glproto/xproto_glproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_glproto -- X.Org GL protocol headers
+#
+################################################################################
+
+XPROTO_GLPROTO_VERSION = 1.4.8
+XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
+XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_GLPROTO_AUTORECONF = YES
+XPROTO_GLPROTO_INSTALL_STAGING = YES
+XPROTO_GLPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_glproto))
diff --git a/package/x11r7/xproto_inputproto/Config.in b/package/x11r7/xproto_inputproto/Config.in
new file mode 100644
index 000000000..11bcb3a88
--- /dev/null
+++ b/package/x11r7/xproto_inputproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_INPUTPROTO
+	bool "inputproto"
+	default n
+	help
+	  inputproto 1.3.2
+	  X.Org Input protocol headers
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
new file mode 100644
index 000000000..bfc8ac11f
--- /dev/null
+++ b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_inputproto -- X.Org Input protocol headers
+#
+################################################################################
+
+XPROTO_INPUTPROTO_VERSION = 1.3.2
+XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
+XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_INPUTPROTO_AUTORECONF = YES
+XPROTO_INPUTPROTO_INSTALL_STAGING = YES
+XPROTO_INPUTPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_inputproto))
diff --git a/package/x11r7/xproto_kbproto/Config.in b/package/x11r7/xproto_kbproto/Config.in
new file mode 100644
index 000000000..9ad01d66a
--- /dev/null
+++ b/package/x11r7/xproto_kbproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_KBPROTO
+	bool "kbproto"
+	default n
+	help
+	  kbproto 1.0.3
+	  X.Org KB protocol headers
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
new file mode 100644
index 000000000..1492a29c1
--- /dev/null
+++ b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_kbproto -- X.Org KB protocol headers
+#
+################################################################################
+
+XPROTO_KBPROTO_VERSION = 1.0.3
+XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
+XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_KBPROTO_AUTORECONF = YES
+XPROTO_KBPROTO_INSTALL_STAGING = YES
+XPROTO_KBPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_kbproto))
diff --git a/package/x11r7/xproto_printproto/Config.in b/package/x11r7/xproto_printproto/Config.in
new file mode 100644
index 000000000..0d7e56950
--- /dev/null
+++ b/package/x11r7/xproto_printproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_PRINTPROTO
+	bool "printproto"
+	default n
+	help
+	  printproto 1.0.3
+	  X.Org Print protocol headers
diff --git a/package/x11r7/xproto_printproto/xproto_printproto.mk b/package/x11r7/xproto_printproto/xproto_printproto.mk
new file mode 100644
index 000000000..5d1c81b23
--- /dev/null
+++ b/package/x11r7/xproto_printproto/xproto_printproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_printproto -- X.Org Print protocol headers
+#
+################################################################################
+
+XPROTO_PRINTPROTO_VERSION = 1.0.3
+XPROTO_PRINTPROTO_SOURCE = printproto-$(XPROTO_PRINTPROTO_VERSION).tar.bz2
+XPROTO_PRINTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_PRINTPROTO_AUTORECONF = YES
+XPROTO_PRINTPROTO_INSTALL_STAGING = YES
+XPROTO_PRINTPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_printproto))
diff --git a/package/x11r7/xproto_randrproto/Config.in b/package/x11r7/xproto_randrproto/Config.in
new file mode 100644
index 000000000..7a7b581e3
--- /dev/null
+++ b/package/x11r7/xproto_randrproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_RANDRPROTO
+	bool "randrproto"
+	default n
+	help
+	  randrproto 1.1.2
+	  X.Org Randr protocol headers
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
new file mode 100644
index 000000000..ef92ab5d6
--- /dev/null
+++ b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_randrproto -- X.Org Randr protocol headers
+#
+################################################################################
+
+XPROTO_RANDRPROTO_VERSION = 1.1.2
+XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
+XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RANDRPROTO_AUTORECONF = YES
+XPROTO_RANDRPROTO_INSTALL_STAGING = YES
+XPROTO_RANDRPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_randrproto))
diff --git a/package/x11r7/xproto_recordproto/Config.in b/package/x11r7/xproto_recordproto/Config.in
new file mode 100644
index 000000000..ab42d418e
--- /dev/null
+++ b/package/x11r7/xproto_recordproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_RECORDPROTO
+	bool "recordproto"
+	default n
+	help
+	  recordproto 1.13.2
+	  X.Org Record protocol headers
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
new file mode 100644
index 000000000..74537f705
--- /dev/null
+++ b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_recordproto -- X.Org Record protocol headers
+#
+################################################################################
+
+XPROTO_RECORDPROTO_VERSION = 1.13.2
+XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
+XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RECORDPROTO_AUTORECONF = YES
+XPROTO_RECORDPROTO_INSTALL_STAGING = YES
+XPROTO_RECORDPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_recordproto))
diff --git a/package/x11r7/xproto_renderproto/Config.in b/package/x11r7/xproto_renderproto/Config.in
new file mode 100644
index 000000000..ccb67cf18
--- /dev/null
+++ b/package/x11r7/xproto_renderproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_RENDERPROTO
+	bool "renderproto"
+	default n
+	help
+	  renderproto 0.9.2
+	  X.Org Render protocol headers
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
new file mode 100644
index 000000000..d101a8ff7
--- /dev/null
+++ b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_renderproto -- X.Org Render protocol headers
+#
+################################################################################
+
+XPROTO_RENDERPROTO_VERSION = 0.9.2
+XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2
+XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RENDERPROTO_AUTORECONF = YES
+XPROTO_RENDERPROTO_INSTALL_STAGING = YES
+XPROTO_RENDERPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_renderproto))
diff --git a/package/x11r7/xproto_resourceproto/Config.in b/package/x11r7/xproto_resourceproto/Config.in
new file mode 100644
index 000000000..cc0c2bf3c
--- /dev/null
+++ b/package/x11r7/xproto_resourceproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_RESOURCEPROTO
+	bool "resourceproto"
+	default n
+	help
+	  resourceproto 1.0.2
+	  X.Org Resource protocol headers
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
new file mode 100644
index 000000000..4999708c5
--- /dev/null
+++ b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_resourceproto -- X.Org Resource protocol headers
+#
+################################################################################
+
+XPROTO_RESOURCEPROTO_VERSION = 1.0.2
+XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
+XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_RESOURCEPROTO_AUTORECONF = YES
+XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
+XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_resourceproto))
diff --git a/package/x11r7/xproto_scrnsaverproto/Config.in b/package/x11r7/xproto_scrnsaverproto/Config.in
new file mode 100644
index 000000000..c77588100
--- /dev/null
+++ b/package/x11r7/xproto_scrnsaverproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
+	bool "scrnsaverproto"
+	default n
+	help
+	  scrnsaverproto 1.1.0
+	  X.Org ScrnSaver protocol headers
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
new file mode 100644
index 000000000..aa566a8c3
--- /dev/null
+++ b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_scrnsaverproto -- X.Org ScrnSaver protocol headers
+#
+################################################################################
+
+XPROTO_SCRNSAVERPROTO_VERSION = 1.1.0
+XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
+XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_SCRNSAVERPROTO_AUTORECONF = YES
+XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
+XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_scrnsaverproto))
diff --git a/package/x11r7/xproto_trapproto/Config.in b/package/x11r7/xproto_trapproto/Config.in
new file mode 100644
index 000000000..451220421
--- /dev/null
+++ b/package/x11r7/xproto_trapproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_TRAPPROTO
+	bool "trapproto"
+	default n
+	help
+	  trapproto 3.4.3
+	  X.Org Trap protocol headers
diff --git a/package/x11r7/xproto_trapproto/xproto_trapproto.mk b/package/x11r7/xproto_trapproto/xproto_trapproto.mk
new file mode 100644
index 000000000..f074f255a
--- /dev/null
+++ b/package/x11r7/xproto_trapproto/xproto_trapproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_trapproto -- X.Org Trap protocol headers
+#
+################################################################################
+
+XPROTO_TRAPPROTO_VERSION = 3.4.3
+XPROTO_TRAPPROTO_SOURCE = trapproto-$(XPROTO_TRAPPROTO_VERSION).tar.bz2
+XPROTO_TRAPPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_TRAPPROTO_AUTORECONF = YES
+XPROTO_TRAPPROTO_INSTALL_STAGING = YES
+XPROTO_TRAPPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_trapproto))
diff --git a/package/x11r7/xproto_videoproto/Config.in b/package/x11r7/xproto_videoproto/Config.in
new file mode 100644
index 000000000..e5dea9bd6
--- /dev/null
+++ b/package/x11r7/xproto_videoproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_VIDEOPROTO
+	bool "videoproto"
+	default n
+	help
+	  videoproto 2.2.2
+	  X.Org Video protocol headers
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
new file mode 100644
index 000000000..84b34b233
--- /dev/null
+++ b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_videoproto -- X.Org Video protocol headers
+#
+################################################################################
+
+XPROTO_VIDEOPROTO_VERSION = 2.2.2
+XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2
+XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_VIDEOPROTO_AUTORECONF = YES
+XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
+XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_videoproto))
diff --git a/package/x11r7/xproto_windowswmproto/Config.in b/package/x11r7/xproto_windowswmproto/Config.in
new file mode 100644
index 000000000..341177630
--- /dev/null
+++ b/package/x11r7/xproto_windowswmproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO
+	bool "windowswmproto"
+	default n
+	help
+	  windowswmproto 1.0.3
+	  No description available
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
new file mode 100644
index 000000000..234cdf484
--- /dev/null
+++ b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_windowswmproto -- No description available
+#
+################################################################################
+
+XPROTO_WINDOWSWMPROTO_VERSION = 1.0.3
+XPROTO_WINDOWSWMPROTO_SOURCE = windowswmproto-$(XPROTO_WINDOWSWMPROTO_VERSION).tar.bz2
+XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_WINDOWSWMPROTO_AUTORECONF = YES
+XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
+XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_windowswmproto))
diff --git a/package/x11r7/xproto_xcmiscproto/Config.in b/package/x11r7/xproto_xcmiscproto/Config.in
new file mode 100644
index 000000000..a2779be2e
--- /dev/null
+++ b/package/x11r7/xproto_xcmiscproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XCMISCPROTO
+	bool "xcmiscproto"
+	default n
+	help
+	  xcmiscproto 1.1.2
+	  X.Org XCMisc protocol headers
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
new file mode 100644
index 000000000..f0fe3ccc7
--- /dev/null
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xcmiscproto -- X.Org XCMisc protocol headers
+#
+################################################################################
+
+XPROTO_XCMISCPROTO_VERSION = 1.1.2
+XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
+XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XCMISCPROTO_AUTORECONF = YES
+XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
+XPROTO_XCMISCPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xcmiscproto))
diff --git a/package/x11r7/xproto_xextproto/Config.in b/package/x11r7/xproto_xextproto/Config.in
new file mode 100644
index 000000000..8fefc924c
--- /dev/null
+++ b/package/x11r7/xproto_xextproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XEXTPROTO
+	bool "xextproto"
+	default n
+	help
+	  xextproto 7.0.2
+	  X.Org XExt protocol headers
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
new file mode 100644
index 000000000..cce0311ee
--- /dev/null
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xextproto -- X.Org XExt protocol headers
+#
+################################################################################
+
+XPROTO_XEXTPROTO_VERSION = 7.0.2
+XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
+XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XEXTPROTO_AUTORECONF = YES
+XPROTO_XEXTPROTO_INSTALL_STAGING = YES
+XPROTO_XEXTPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xextproto))
diff --git a/package/x11r7/xproto_xf86bigfontproto/Config.in b/package/x11r7/xproto_xf86bigfontproto/Config.in
new file mode 100644
index 000000000..e2dbd5a55
--- /dev/null
+++ b/package/x11r7/xproto_xf86bigfontproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+	bool "xf86bigfontproto"
+	default n
+	help
+	  xf86bigfontproto 1.1.2
+	  X.Org XF86BigFont protocol headers
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
new file mode 100644
index 000000000..27c651247
--- /dev/null
+++ b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86bigfontproto -- X.Org XF86BigFont protocol headers
+#
+################################################################################
+
+XPROTO_XF86BIGFONTPROTO_VERSION = 1.1.2
+XPROTO_XF86BIGFONTPROTO_SOURCE = xf86bigfontproto-$(XPROTO_XF86BIGFONTPROTO_VERSION).tar.bz2
+XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86BIGFONTPROTO_AUTORECONF = YES
+XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
+XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86bigfontproto))
diff --git a/package/x11r7/xproto_xf86dgaproto/Config.in b/package/x11r7/xproto_xf86dgaproto/Config.in
new file mode 100644
index 000000000..06a1903e0
--- /dev/null
+++ b/package/x11r7/xproto_xf86dgaproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	bool "xf86dgaproto"
+	default n
+	help
+	  xf86dgaproto 2.0.2
+	  X.Org XF86DGA protocol headers
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
new file mode 100644
index 000000000..3c8fc1969
--- /dev/null
+++ b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86dgaproto -- X.Org XF86DGA protocol headers
+#
+################################################################################
+
+XPROTO_XF86DGAPROTO_VERSION = 2.0.2
+XPROTO_XF86DGAPROTO_SOURCE = xf86dgaproto-$(XPROTO_XF86DGAPROTO_VERSION).tar.bz2
+XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86DGAPROTO_AUTORECONF = YES
+XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
+XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86dgaproto))
diff --git a/package/x11r7/xproto_xf86driproto/Config.in b/package/x11r7/xproto_xf86driproto/Config.in
new file mode 100644
index 000000000..c7a7d7f3d
--- /dev/null
+++ b/package/x11r7/xproto_xf86driproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	bool "xf86driproto"
+	default n
+	help
+	  xf86driproto 2.0.3
+	  X.Org XF86DRI protocol headers
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
new file mode 100644
index 000000000..18aacc3fe
--- /dev/null
+++ b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86driproto -- X.Org XF86DRI protocol headers
+#
+################################################################################
+
+XPROTO_XF86DRIPROTO_VERSION = 2.0.3
+XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
+XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86DRIPROTO_AUTORECONF = YES
+XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
+XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86driproto))
diff --git a/package/x11r7/xproto_xf86miscproto/Config.in b/package/x11r7/xproto_xf86miscproto/Config.in
new file mode 100644
index 000000000..78a5564b5
--- /dev/null
+++ b/package/x11r7/xproto_xf86miscproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	bool "xf86miscproto"
+	default n
+	help
+	  xf86miscproto 0.9.2
+	  X.Org XF86Misc protocol headers
diff --git a/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
new file mode 100644
index 000000000..58f95fffb
--- /dev/null
+++ b/package/x11r7/xproto_xf86miscproto/xproto_xf86miscproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86miscproto -- X.Org XF86Misc protocol headers
+#
+################################################################################
+
+XPROTO_XF86MISCPROTO_VERSION = 0.9.2
+XPROTO_XF86MISCPROTO_SOURCE = xf86miscproto-$(XPROTO_XF86MISCPROTO_VERSION).tar.bz2
+XPROTO_XF86MISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86MISCPROTO_AUTORECONF = YES
+XPROTO_XF86MISCPROTO_INSTALL_STAGING = YES
+XPROTO_XF86MISCPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86miscproto))
diff --git a/package/x11r7/xproto_xf86rushproto/Config.in b/package/x11r7/xproto_xf86rushproto/Config.in
new file mode 100644
index 000000000..8088f2268
--- /dev/null
+++ b/package/x11r7/xproto_xf86rushproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86RUSHPROTO
+	bool "xf86rushproto"
+	default n
+	help
+	  xf86rushproto 1.1.2
+	  X.Org XF86Rush protocol headers
diff --git a/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
new file mode 100644
index 000000000..5fafaad2b
--- /dev/null
+++ b/package/x11r7/xproto_xf86rushproto/xproto_xf86rushproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86rushproto -- X.Org XF86Rush protocol headers
+#
+################################################################################
+
+XPROTO_XF86RUSHPROTO_VERSION = 1.1.2
+XPROTO_XF86RUSHPROTO_SOURCE = xf86rushproto-$(XPROTO_XF86RUSHPROTO_VERSION).tar.bz2
+XPROTO_XF86RUSHPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86RUSHPROTO_AUTORECONF = YES
+XPROTO_XF86RUSHPROTO_INSTALL_STAGING = YES
+XPROTO_XF86RUSHPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86rushproto))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/Config.in b/package/x11r7/xproto_xf86vidmodeproto/Config.in
new file mode 100644
index 000000000..59171bcbc
--- /dev/null
+++ b/package/x11r7/xproto_xf86vidmodeproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	bool "xf86vidmodeproto"
+	default n
+	help
+	  xf86vidmodeproto 2.2.2
+	  X.Org XF86VidMode protocol headers
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
new file mode 100644
index 000000000..64d3c0a22
--- /dev/null
+++ b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xf86vidmodeproto -- X.Org XF86VidMode protocol headers
+#
+################################################################################
+
+XPROTO_XF86VIDMODEPROTO_VERSION = 2.2.2
+XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2
+XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XF86VIDMODEPROTO_AUTORECONF = YES
+XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
+XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xf86vidmodeproto))
diff --git a/package/x11r7/xproto_xineramaproto/Config.in b/package/x11r7/xproto_xineramaproto/Config.in
new file mode 100644
index 000000000..05466455a
--- /dev/null
+++ b/package/x11r7/xproto_xineramaproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XINERAMAPROTO
+	bool "xineramaproto"
+	default n
+	help
+	  xineramaproto 1.1.2
+	  X.Org Xinerama protocol headers
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
new file mode 100644
index 000000000..ae209a724
--- /dev/null
+++ b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xineramaproto -- X.Org Xinerama protocol headers
+#
+################################################################################
+
+XPROTO_XINERAMAPROTO_VERSION = 1.1.2
+XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2
+XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XINERAMAPROTO_AUTORECONF = YES
+XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
+XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xineramaproto))
diff --git a/package/x11r7/xproto_xproto/Config.in b/package/x11r7/xproto_xproto/Config.in
new file mode 100644
index 000000000..afc72a0a7
--- /dev/null
+++ b/package/x11r7/xproto_xproto/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XPROTO
+	bool "xproto"
+	default n
+	help
+	  xproto 7.0.10
+	  X.Org xproto protocol headers
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
new file mode 100644
index 000000000..9398b18ac
--- /dev/null
+++ b/package/x11r7/xproto_xproto/xproto_xproto.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xproto -- X.Org xproto protocol headers
+#
+################################################################################
+
+XPROTO_XPROTO_VERSION = 7.0.10
+XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
+XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XPROTO_AUTORECONF = YES
+XPROTO_XPROTO_INSTALL_STAGING = YES
+XPROTO_XPROTO_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xproto))
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/Config.in b/package/x11r7/xproto_xproxymanagementprotocol/Config.in
new file mode 100644
index 000000000..c29e3756b
--- /dev/null
+++ b/package/x11r7/xproto_xproxymanagementprotocol/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+	bool "xproxymanagementprotocol"
+	default n
+	help
+	  xproxymanagementprotocol 1.0.2
+	  X.Org PM protocol headers
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
new file mode 100644
index 000000000..41ee26566
--- /dev/null
+++ b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xproto_xproxymanagementprotocol -- X.Org PM protocol headers
+#
+################################################################################
+
+XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION = 1.0.2
+XPROTO_XPROXYMANAGEMENTPROTOCOL_SOURCE = xproxymanagementprotocol-$(XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION).tar.bz2
+XPROTO_XPROXYMANAGEMENTPROTOCOL_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XPROTO_XPROXYMANAGEMENTPROTOCOL_AUTORECONF = YES
+XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_STAGING = YES
+XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xproto_xproxymanagementprotocol))
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
new file mode 100644
index 000000000..4961aded4
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -0,0 +1,52 @@
+config BR2_PACKAGE_XSERVER_XORG_SERVER
+	bool "xorg-server"
+	default n
+	select BR2_PACKAGE_XLIB_LIBXFONT
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_XLIB_LIBXKBUI
+	select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+	select BR2_PACKAGE_XPROTO_DAMAGEPROTO
+	select BR2_PACKAGE_XPROTO_FIXESPROTO
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_RANDRPROTO
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXAU
+	select BR2_PACKAGE_XLIB_LIBXAW
+	select BR2_PACKAGE_XLIB_LIBXDMCP
+	select BR2_PACKAGE_XLIB_LIBXEXT
+	select BR2_PACKAGE_XLIB_LIBXFIXES
+	select BR2_PACKAGE_XLIB_LIBXI
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_XLIB_LIBXPM
+	select BR2_PACKAGE_XLIB_LIBXRENDER
+	select BR2_PACKAGE_XLIB_LIBXRES
+	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXXF86MISC
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	select BR2_PACKAGE_XLIB_LIBLBXUTIL
+	select BR2_PACKAGE_XLIB_LIBXKBFILE
+	select BR2_PACKAGE_XLIB_XTRANS
+	select BR2_PACKAGE_XDATA_XBITMAPS
+	select BR2_PACKAGE_XPROTO_BIGREQSPROTO
+	select BR2_PACKAGE_XPROTO_EVIEEXT
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
+	select BR2_PACKAGE_XPROTO_INPUTPROTO
+	select BR2_PACKAGE_XPROTO_RECORDPROTO
+	select BR2_PACKAGE_XPROTO_RENDERPROTO
+	select BR2_PACKAGE_XPROTO_RESOURCEPROTO
+	select BR2_PACKAGE_XPROTO_TRAPPROTO
+	select BR2_PACKAGE_XPROTO_VIDEOPROTO
+	select BR2_PACKAGE_XPROTO_XCMISCPROTO
+	select BR2_PACKAGE_XPROTO_XEXTPROTO
+	select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+	select BR2_PACKAGE_XPROTO_XF86DGAPROTO
+	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+	select BR2_PACKAGE_XPROTO_XF86MISCPROTO
+	select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
+	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  xorg-server 1.2.0
+	  No description available
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch
new file mode 100644
index 000000000..145a6d54f
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server-1.2.0-xf86ScanPci-no-optimize.patch
@@ -0,0 +1,10 @@
+--- xserver_xorg-server-1.2.0/hw/xfree86/scanpci/Makefile.am.orig	2007-06-24 08:46:24.000000000 +0200
++++ xserver_xorg-server-1.2.0/hw/xfree86/scanpci/Makefile.am	2007-06-24 08:46:26.000000000 +0200
+@@ -9,6 +9,7 @@
+ INCLUDES = $(XORG_INCS)
+ 
+ AM_CFLAGS = $(XORG_CFLAGS)
++CFLAGS += -O0
+ 
+ BUILT_SOURCES = xf86PciIds.h
+ 
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
new file mode 100644
index 000000000..942456a68
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xserver_xorg-server -- No description available
+#
+################################################################################
+
+XSERVER_XORG_SERVER_VERSION = 1.2.0
+XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
+XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
+XSERVER_XORG_SERVER_AUTORECONF = YES
+XSERVER_XORG_SERVER_INSTALL_STAGING = YES
+XSERVER_XORG_SERVER_DEPENDANCIES = xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype  xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto  xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
+XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --enable-dri --disable-xdmcp --disable-screensaver
+
+$(eval $(call AUTOTARGETS,xserver_xorg-server))
diff --git a/package/x11r7/xutil_makedepend/Config.in b/package/x11r7/xutil_makedepend/Config.in
new file mode 100644
index 000000000..dfe51a2ee
--- /dev/null
+++ b/package/x11r7/xutil_makedepend/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XUTIL_MAKEDEPEND
+	bool "makedepend"
+	default n
+	help
+	  makedepend 1.0.0
+	  No description available
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
new file mode 100644
index 000000000..db89426ec
--- /dev/null
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xutil_makedepend -- No description available
+#
+################################################################################
+
+XUTIL_MAKEDEPEND_VERSION = 1.0.0
+XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2
+XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_MAKEDEPEND_AUTORECONF = YES
+XUTIL_MAKEDEPEND_INSTALL_STAGING = YES
+XUTIL_MAKEDEPEND_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xutil_makedepend))
diff --git a/package/x11r7/xutil_util-macros/Config.in b/package/x11r7/xutil_util-macros/Config.in
new file mode 100644
index 000000000..bc37314ab
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_XUTIL_UTIL_MACROS
+	bool "util-macros"
+	default n
+	help
+	  util-macros 1.1.5
+	  No description available
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch
new file mode 100644
index 000000000..9f7dfaabb
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5-linuxdoc.patch
@@ -0,0 +1,15 @@
+--- util-macros-1.1.5/xorg-macros.m4.in.orig	2007-06-08 22:23:00.000000000 +0200
++++ util-macros-1.1.5/xorg-macros.m4.in	2007-06-08 22:26:41.000000000 +0200
+@@ -194,7 +194,11 @@
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++if test "$cross_compiling" = no; then
++   AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
++else
++   HAVE_DEFS_ENT=no
++fi
+ 
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch
new file mode 100644
index 000000000..97a2dc4d1
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros-1.1.5.patch
@@ -0,0 +1,8 @@
+--- util-macros-1.1.5/xorg-macros.m4.in.orig	2007-06-10 11:34:17.000000000 +0200
++++ util-macros-1.1.5/xorg-macros.m4.in	2007-06-10 11:34:20.000000000 +0200
+@@ -423,3 +423,5 @@
+ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+ 
+ ]) # XORG_LINT_LIBRARY
++
++AC_SUBST(STAGING_DIR)
diff --git a/package/x11r7/xutil_util-macros/xutil_util-macros.mk b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
new file mode 100644
index 000000000..89452f42d
--- /dev/null
+++ b/package/x11r7/xutil_util-macros/xutil_util-macros.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# xutil_util-macros -- No description available
+#
+################################################################################
+
+XUTIL_UTIL_MACROS_VERSION = 1.1.5
+XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2
+XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util
+XUTIL_UTIL_MACROS_AUTORECONF = YES
+XUTIL_UTIL_MACROS_INSTALL_STAGING = YES
+XUTIL_UTIL_MACROS_INSTALL_TARGET = NO
+
+$(eval $(call AUTOTARGETS,xutil_util-macros))
diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index f868afdf1..a4fd012ec 100644
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@@ -9,7 +9,6 @@ config BR2_PACKAGE_XORG
 	help
 	  The official X Window system and server.
 
-comment "X.org X Window System disabled, tinyx selected"
-	depends on BR2_PACKAGE_TINYX
-
+comment "X.org 6.8.2 X Window System disabled"
+	depends on BR2_PACKAGE_TINYX||BR2_PACKAGE_XORG7
 
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 6dc3b0461..eaca344d6 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -204,7 +204,7 @@ $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/
 $(TARGET_DIR)/usr/bin/mcookie: package/xorg/mcookie.c
 	$(TARGET_CROSS)gcc -Wall -Os -s package/xorg/mcookie.c -o $(TARGET_DIR)/usr/bin/mcookie
 
-xorg: zlib png pkgconfig expat fontconfig $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \
+xorg: zlib png pkgconfig expat fontconfig libdrm $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 \
 	$(XORG_LIBX)/libX11.so.6.2 $(TARGET_DIR)/usr/bin/mcookie
 
 xorg-source: $(DL_DIR)/$(XORG_SOURCE) $(DL_DIR)/$(DEJAVU_SOURCE)