Radix cross Linux

Radix Linux distribution for embedded systems.

637 Commits   4 Branches   3 Tags
author: Andrey V.Kosteltsev <kx@radix.pro> 2016-11-19 11:04:36 +0000 committer: Andrey V.Kosteltsev <kx@radix.pro> 2016-11-19 11:04:36 +0000 commit: cb76f4de2909ef0020778685d59f8bc25f871313 parent: 88879abd151dace4b9f34fe02599ac6d7b8b8c77
Commit Summary:
MERGE(http://svn.radix.pro/svn/platform/trunk@454, http://svn.radix.pro/svn/platform/branches/radix-1.1@561)
Diffstat:
5262 files changed, 1658073 insertions, 12280 deletions
diff --git a/.svnignore b/.svnignore
index 7602e3517..500026507 100644
--- a/.svnignore
+++ b/.svnignore
@@ -5,6 +5,7 @@ dist/
 # local config & object files
 build-system/build-config.mk
 build-system/sbin/
+build-system/usr/
 build-system/progs/autom4te.cache/
 build-system/progs/.config
 build-system/progs/config.log
@@ -16,7 +17,9 @@ build-system/pkgtool/check-db-integrity
 build-system/pkgtool/check-package
 build-system/pkgtool/check-requires
 build-system/pkgtool/install-package
+build-system/pkgtool/make-package
 build-system/pkgtool/remove-package
+build-system/pkgtool/update-package
 
 # Target build dirs
 .a1x-newlib/
@@ -25,7 +28,7 @@ build-system/pkgtool/remove-package
 .at91sam7s-newlib/
 .lpc17xx-uclibc/
 
-.build/
+.build-machine/
 
 .i686-eglibc/
 .x86_64-eglibc/
@@ -36,78 +39,29 @@ build-system/pkgtool/remove-package
 .omap543x-eglibc/
 .bcm74x-eglibc/
 
-.i686-glibc/
-.x86_64-glibc/
 .a1x-glibc/
 .a2x-glibc/
+.bcm74x-glibc/
 .dm644x-glibc/
+.i686-glibc/
+.jz47xx-glibc/
 .omap35x-glibc/
 .omap543x-glibc/
-.bcm74x-glibc/
+.p5600-glibc/
+.rk328x-glibc/
+.x86_64-glibc/
 
 
 # Hidden files (each file)
 .makefile
-.b74.dist
-.b74.rootfs
-.beagle.dist
-.beagle.rootfs
-.cb1n.dist
-.cb1n.rootfs
-.cb1x.dist
-.cb1x.rootfs
-.cb2x.dist
-.cb2x.rootfs
-.cb3x.dist
-.cb3x.rootfs
-.at91sam7s.dist
-.at91sam7s.rootfs
-.host.dist
-.host.rootfs
-.l17uc.dist
-.l17uc.rootfs
-.omap5uevm.dist
-.omap5uevm.rootfs
-.pc32.dist
-.pc32.rootfs
-.pc64.dist
-.pc64.rootfs
-.vip1830.dist
-.vip1830.rootfs
-.vip1830n.dist
-.vip1830n.rootfs
+.dist
+.rootfs
 
 # src & hw requires
 .src_requires
-.src_requires_done
-.b74_requires
-.b74_requires_done
-.beagle_requires
-.beagle_requires_done
-.cb1n_requires
-.cb1n_requires_done
-.cb1x_requires
-.cb1x_requires_done
-.cb2x_requires
-.cb2x_requires_done
-.cb3x_requires
-.cb3x_requires_done
-.at91sam7s_requires
-.at91sam7s_requires_done
-.host_requires
-.host_requires_done
-.l17uc_requires
-.l17uc_requires_done
-.omap5uevm_requires
-.omap5uevm_requires_done
-.pc32_requires
-.pc32_requires_done
-.pc64_requires
-.pc64_requires_done
-.vip1830_requires
-.vip1830_requires_done
-.vip1830n_requires
-.vip1830n_requires_done
+.src_requires_depend
+.requires
+.requires_depend
 
 # Tarballs
 *.gz
diff --git a/Wayland/wayland/1.10.0-x86_32/Makefile b/Wayland/wayland/1.10.0-x86_32/Makefile
new file mode 100644
index 000000000..380c85509
--- /dev/null
+++ b/Wayland/wayland/1.10.0-x86_32/Makefile
@@ -0,0 +1,200 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/Wayland/wayland
+
+REQUIRES           = Wayland/wayland/1.10.0
+REQUIRES          += libs/expat/2.1.1-x86_32
+REQUIRES          += libs/libffi/3.2.1-x86_32
+REQUIRES          += libs/libxml2/2.9.3-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.10.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/Wayland/wayland/wayland-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/wayland-$(version)
+src_dir_name       = wayland-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = wayland
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+WAYLAND_32_PKG_NAME                = wayland-x32
+WAYLAND_32_PKG_VERSION             = 1.10.0
+WAYLAND_32_PKG_ARCH                = $(TOOLCHAIN)
+WAYLAND_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+WAYLAND_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+WAYLAND_32_PKG_GROUP               = $(PKG_GROUP)
+###                                 |---handy-ruler-------------------------------|
+WAYLAND_32_PKG_SHORT_DESCRIPTION   = C implementation of the Wayland protocol
+WAYLAND_32_PKG_URL                 = $(BUG_URL)
+WAYLAND_32_PKG_LICENSE             = custom
+WAYLAND_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(WAYLAND_32_PKG_NAME)-pkg-description
+WAYLAND_32_PKG_DESCRIPTION_FILE_IN = $(WAYLAND_32_PKG_NAME)-pkg-description.in
+WAYLAND_32_PKG_INSTALL_SCRIPT      = $(WAYLAND_32_PKG_NAME)-pkg-install.sh
+
+WAYLAND_32_PKG   = $(CURDIR)/$(TARGET_BUILD_DIR)/$(WAYLAND_32_PKG_NAME)-package
+
+pkg_basename     = $(WAYLAND_32_PKG_NAME)-$(WAYLAND_32_PKG_VERSION)-$(WAYLAND_32_PKG_ARCH)-$(WAYLAND_32_PKG_DISTRO_NAME)-$(WAYLAND_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(WAYLAND_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+
+extra_configure_switches += --bindir=/usr/bin/32
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(WAYLAND_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(WAYLAND_32_PKG)/usr/include
+	@rm -rf $(WAYLAND_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libwayland-client.la   \
+	                                    libwayland-cursor.la   \
+	                                    libwayland-server.la ; \
+	 )
+	# ======= create symbolic link to pkgconfig wayland-scanner.pc file  =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   ln -sf wayland-scanner.pc wayland_scanner.pc ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(WAYLAND_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libwayland-client.la   \
+	                                            libwayland-cursor.la   \
+	                                            libwayland-server.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libwayland-client.la   \
+	                                              libwayland-cursor.la   \
+	                                              libwayland-server.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" wayland-client.pc   \
+	                                            wayland-cursor.pc   \
+	                                            wayland-scanner.pc  \
+	                                            wayland-server.pc ; \
+	   sed -i "s,/bin/32/wayland-scanner,/bin/$(TARGET)-wayland-scanner,g" wayland-scanner.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(WAYLAND_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(WAYLAND_32_PKG)/usr/bin/32 ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(WAYLAND_32_PKG_DESCRIPTION_FILE): $(WAYLAND_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(WAYLAND_32_PKG_DESCRIPTION_FILE) $(WAYLAND_32_PKG_INSTALL_SCRIPT)
+	@cp $(WAYLAND_32_PKG_DESCRIPTION_FILE) $(WAYLAND_32_PKG)/.DESCRIPTION
+	@cp $(WAYLAND_32_PKG_INSTALL_SCRIPT) $(WAYLAND_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(WAYLAND_32_PKG)/.REQUIRES
+	@echo "pkgname=$(WAYLAND_32_PKG_NAME)"                            >  $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(WAYLAND_32_PKG_VERSION)"                          >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(WAYLAND_32_PKG_ARCH)"                               >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(WAYLAND_32_PKG_DISTRO_NAME)"                  >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(WAYLAND_32_PKG_DISTRO_VERSION)"                >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "group=$(WAYLAND_32_PKG_GROUP)"                             >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(WAYLAND_32_PKG_SHORT_DESCRIPTION)\"" >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "url=$(WAYLAND_32_PKG_URL)"                                 >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "license=$(WAYLAND_32_PKG_LICENSE)"                         >> $(WAYLAND_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(WAYLAND_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/Wayland/wayland/1.10.0-x86_32/PATCHES b/Wayland/wayland/1.10.0-x86_32/PATCHES
new file mode 100644
index 000000000..eff5c08b9
--- /dev/null
+++ b/Wayland/wayland/1.10.0-x86_32/PATCHES
@@ -0,0 +1,2 @@
+
+../../../sources/Wayland/wayland/patches/wayland-1.10.0-cross.patch -p0
diff --git a/Wayland/wayland/1.10.0-x86_32/wayland-x32-pkg-description.in b/Wayland/wayland/1.10.0-x86_32/wayland-x32-pkg-description.in
new file mode 100644
index 000000000..4fd2a9073
--- /dev/null
+++ b/Wayland/wayland/1.10.0-x86_32/wayland-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+wayland-x32: wayland-x32 @VERSION@ (x86_32 C implementation of the Wayland protocol)
+wayland-x32:
+wayland-x32: Wayland is a project to define a protocol for a compositor to talk
+wayland-x32: to its clients as well as a library implementation of the protocol.
+wayland-x32: The compositor can be a standalone display server running on Linux
+wayland-x32: kernel modesetting and evdev input devices, an X application, or a
+wayland-x32: wayland client itself. The clients can be traditional applications,
+wayland-x32: X servers (rootless or fullscreen) or other display servers.
+wayland-x32:
+wayland-x32:
+wayland-x32:
diff --git a/dev/check/0.9.13-x86_32/check-x32-pkg-install.sh b/Wayland/wayland/1.10.0-x86_32/wayland-x32-pkg-install.sh
similarity index 100%
rename from dev/check/0.9.13-x86_32/check-x32-pkg-install.sh
rename to Wayland/wayland/1.10.0-x86_32/wayland-x32-pkg-install.sh
diff --git a/Wayland/wayland/1.10.0/Makefile b/Wayland/wayland/1.10.0/Makefile
new file mode 100644
index 000000000..8fabbdcfa
--- /dev/null
+++ b/Wayland/wayland/1.10.0/Makefile
@@ -0,0 +1,251 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/Wayland/wayland
+
+REQUIRES           = libs/expat/2.1.1
+REQUIRES          += libs/libffi/3.2.1
+REQUIRES          += libs/libxml2/2.9.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.10.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/Wayland/wayland/wayland-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/wayland-$(version)
+src_dir_name       = wayland-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = wayland
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+WAYLAND_PKG_NAME                = wayland
+WAYLAND_PKG_VERSION             = 1.10.0
+WAYLAND_PKG_ARCH                = $(TOOLCHAIN)
+WAYLAND_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+WAYLAND_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+WAYLAND_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+WAYLAND_PKG_SHORT_DESCRIPTION   = C implementation of the Wayland protocol
+WAYLAND_PKG_URL                 = $(BUG_URL)
+WAYLAND_PKG_LICENSE             = custom
+WAYLAND_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(WAYLAND_PKG_NAME)-pkg-description
+WAYLAND_PKG_DESCRIPTION_FILE_IN = $(WAYLAND_PKG_NAME)-pkg-description.in
+WAYLAND_PKG_INSTALL_SCRIPT      = $(WAYLAND_PKG_NAME)-pkg-install.sh
+
+WAYLAND_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(WAYLAND_PKG_NAME)-package
+
+pkg_basename     = $(WAYLAND_PKG_NAME)-$(WAYLAND_PKG_VERSION)-$(WAYLAND_PKG_ARCH)-$(WAYLAND_PKG_DISTRO_NAME)-$(WAYLAND_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(WAYLAND_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(WAYLAND_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@cat $(CURDIR)/$(build_dir)/doc/doxygen/man/man3/wayland-util.h.3 | \
+	     sed "s,$(CURDIR)/$(SRC_DIR)/src/,,g" > $(WAYLAND_PKG)/usr/share/man/man3/wayland-util.h.3
+	@( cd $(WAYLAND_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(WAYLAND_PKG)/usr/share/man ]; then \
+	  ( cd $(WAYLAND_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(WAYLAND_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(WAYLAND_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING README TODO \
+	         $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libwayland-client.la   \
+	                                    libwayland-cursor.la   \
+	                                    libwayland-server.la ; \
+	 )
+	# ======= create symbolic link to pkgconfig wayland-scanner.pc file  =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   ln -sf wayland-scanner.pc wayland_scanner.pc ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(WAYLAND_PKG))
+	# ======= Install wayland-scanner into $(TARGET_DEST_DIR) =======
+	@cp -a $(build_dir)/build-wayland-scanner $(TARGET_DEST_DIR)/usr/bin/$(TARGET)-wayland-scanner
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libwayland-client.la   \
+	                                            libwayland-cursor.la   \
+	                                            libwayland-server.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libwayland-client.la   \
+	                                              libwayland-cursor.la   \
+	                                              libwayland-server.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" wayland-client.pc   \
+	                                            wayland-cursor.pc   \
+	                                            wayland-scanner.pc  \
+	                                            wayland-server.pc ; \
+	   sed -i "s,/bin/wayland-scanner,/bin/$(TARGET)-wayland-scanner,g" wayland-scanner.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(WAYLAND_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(WAYLAND_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(WAYLAND_PKG_DESCRIPTION_FILE): $(WAYLAND_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(WAYLAND_PKG_DESCRIPTION_FILE) $(WAYLAND_PKG_INSTALL_SCRIPT)
+	@cp $(WAYLAND_PKG_DESCRIPTION_FILE) $(WAYLAND_PKG)/.DESCRIPTION
+	@cp $(WAYLAND_PKG_INSTALL_SCRIPT) $(WAYLAND_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(WAYLAND_PKG)/.REQUIRES
+	@echo "pkgname=$(WAYLAND_PKG_NAME)"                            >  $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(WAYLAND_PKG_VERSION)"                          >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "arch=$(WAYLAND_PKG_ARCH)"                               >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "distroname=$(WAYLAND_PKG_DISTRO_NAME)"                  >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "distrover=$(WAYLAND_PKG_DISTRO_VERSION)"                >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "group=$(WAYLAND_PKG_GROUP)"                             >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(WAYLAND_PKG_SHORT_DESCRIPTION)\"" >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "url=$(WAYLAND_PKG_URL)"                                 >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "license=$(WAYLAND_PKG_LICENSE)"                         >> $(WAYLAND_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(WAYLAND_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/Wayland/wayland/1.10.0/PATCHES b/Wayland/wayland/1.10.0/PATCHES
new file mode 100644
index 000000000..eff5c08b9
--- /dev/null
+++ b/Wayland/wayland/1.10.0/PATCHES
@@ -0,0 +1,2 @@
+
+../../../sources/Wayland/wayland/patches/wayland-1.10.0-cross.patch -p0
diff --git a/Wayland/wayland/1.10.0/wayland-pkg-description.in b/Wayland/wayland/1.10.0/wayland-pkg-description.in
new file mode 100644
index 000000000..70bd78067
--- /dev/null
+++ b/Wayland/wayland/1.10.0/wayland-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+wayland: wayland @VERSION@ (C implementation of the Wayland protocol)
+wayland:
+wayland: Wayland is a project to define a protocol for a compositor to talk
+wayland: to its clients as well as a library implementation of the protocol.
+wayland: The compositor can be a standalone display server running on Linux
+wayland: kernel modesetting and evdev input devices, an X application, or a
+wayland: wayland client itself. The clients can be traditional applications,
+wayland: X servers (rootless or fullscreen) or other display servers.
+wayland:
+wayland:
+wayland:
diff --git a/Wayland/wayland/1.10.0/wayland-pkg-install.sh b/Wayland/wayland/1.10.0/wayland-pkg-install.sh
new file mode 100755
index 000000000..208ca180a
--- /dev/null
+++ b/Wayland/wayland/1.10.0/wayland-pkg-install.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  # Notice we use an absolute path below, rather than usr/bin/fc-cache. This is because
+  # we're testing to see if we are on the bootdisk, which will not have /usr/bin/fc-cache.
+  # The presence of "/etc/system-installer" is under consideration as a better test.
+  # Also we have to check that we are not in the installer mode on the target system
+  # ("/etc/system-installer"), and we have to be sure that we are on the working system
+  # on the target hardware ("proc/sys/kernel/osrelease" - relative path).
+  if [ -r proc/sys/kernel/osrelease -a ! -r /etc/system-installer -a -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache -f
+  fi
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/Wayland/wayland/1.11.0-x86_32/Makefile b/Wayland/wayland/1.11.0-x86_32/Makefile
new file mode 100644
index 000000000..3d55a6d2c
--- /dev/null
+++ b/Wayland/wayland/1.11.0-x86_32/Makefile
@@ -0,0 +1,200 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/Wayland/wayland
+
+REQUIRES           = Wayland/wayland/1.11.0
+REQUIRES          += libs/expat/2.1.1-x86_32
+REQUIRES          += libs/libffi/3.2.1-x86_32
+REQUIRES          += libs/libxml2/2.9.3-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.11.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/Wayland/wayland/wayland-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/wayland-$(version)
+src_dir_name       = wayland-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = wayland
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+WAYLAND_32_PKG_NAME                = wayland-x32
+WAYLAND_32_PKG_VERSION             = 1.11.0
+WAYLAND_32_PKG_ARCH                = $(TOOLCHAIN)
+WAYLAND_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+WAYLAND_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+WAYLAND_32_PKG_GROUP               = $(PKG_GROUP)
+###                                 |---handy-ruler-------------------------------|
+WAYLAND_32_PKG_SHORT_DESCRIPTION   = C implementation of the Wayland protocol
+WAYLAND_32_PKG_URL                 = $(BUG_URL)
+WAYLAND_32_PKG_LICENSE             = custom
+WAYLAND_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(WAYLAND_32_PKG_NAME)-pkg-description
+WAYLAND_32_PKG_DESCRIPTION_FILE_IN = $(WAYLAND_32_PKG_NAME)-pkg-description.in
+WAYLAND_32_PKG_INSTALL_SCRIPT      = $(WAYLAND_32_PKG_NAME)-pkg-install.sh
+
+WAYLAND_32_PKG   = $(CURDIR)/$(TARGET_BUILD_DIR)/$(WAYLAND_32_PKG_NAME)-package
+
+pkg_basename     = $(WAYLAND_32_PKG_NAME)-$(WAYLAND_32_PKG_VERSION)-$(WAYLAND_32_PKG_ARCH)-$(WAYLAND_32_PKG_DISTRO_NAME)-$(WAYLAND_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(WAYLAND_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+
+extra_configure_switches += --bindir=/usr/bin/32
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(WAYLAND_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(WAYLAND_32_PKG)/usr/include
+	@rm -rf $(WAYLAND_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libwayland-client.la   \
+	                                    libwayland-cursor.la   \
+	                                    libwayland-server.la ; \
+	 )
+	# ======= create symbolic link to pkgconfig wayland-scanner.pc file  =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   ln -sf wayland-scanner.pc wayland_scanner.pc ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(WAYLAND_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libwayland-client.la   \
+	                                            libwayland-cursor.la   \
+	                                            libwayland-server.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libwayland-client.la   \
+	                                              libwayland-cursor.la   \
+	                                              libwayland-server.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" wayland-client.pc   \
+	                                            wayland-cursor.pc   \
+	                                            wayland-scanner.pc  \
+	                                            wayland-server.pc ; \
+	   sed -i "s,/bin/32/wayland-scanner,/bin/$(TARGET)-wayland-scanner,g" wayland-scanner.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(WAYLAND_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(WAYLAND_32_PKG)/usr/bin/32 ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(WAYLAND_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(WAYLAND_32_PKG_DESCRIPTION_FILE): $(WAYLAND_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(WAYLAND_32_PKG_DESCRIPTION_FILE) $(WAYLAND_32_PKG_INSTALL_SCRIPT)
+	@cp $(WAYLAND_32_PKG_DESCRIPTION_FILE) $(WAYLAND_32_PKG)/.DESCRIPTION
+	@cp $(WAYLAND_32_PKG_INSTALL_SCRIPT) $(WAYLAND_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(WAYLAND_32_PKG)/.REQUIRES
+	@echo "pkgname=$(WAYLAND_32_PKG_NAME)"                            >  $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(WAYLAND_32_PKG_VERSION)"                          >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(WAYLAND_32_PKG_ARCH)"                               >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(WAYLAND_32_PKG_DISTRO_NAME)"                  >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(WAYLAND_32_PKG_DISTRO_VERSION)"                >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "group=$(WAYLAND_32_PKG_GROUP)"                             >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(WAYLAND_32_PKG_SHORT_DESCRIPTION)\"" >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "url=$(WAYLAND_32_PKG_URL)"                                 >> $(WAYLAND_32_PKG)/.PKGINFO ; \
+	 echo "license=$(WAYLAND_32_PKG_LICENSE)"                         >> $(WAYLAND_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(WAYLAND_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/Wayland/wayland/1.11.0-x86_32/PATCHES b/Wayland/wayland/1.11.0-x86_32/PATCHES
new file mode 100644
index 000000000..205af277d
--- /dev/null
+++ b/Wayland/wayland/1.11.0-x86_32/PATCHES
@@ -0,0 +1,2 @@
+
+../../../sources/Wayland/wayland/patches/wayland-1.11.0-cross.patch -p0
diff --git a/Wayland/wayland/1.11.0-x86_32/wayland-x32-pkg-description.in b/Wayland/wayland/1.11.0-x86_32/wayland-x32-pkg-description.in
new file mode 100644
index 000000000..4fd2a9073
--- /dev/null
+++ b/Wayland/wayland/1.11.0-x86_32/wayland-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+wayland-x32: wayland-x32 @VERSION@ (x86_32 C implementation of the Wayland protocol)
+wayland-x32:
+wayland-x32: Wayland is a project to define a protocol for a compositor to talk
+wayland-x32: to its clients as well as a library implementation of the protocol.
+wayland-x32: The compositor can be a standalone display server running on Linux
+wayland-x32: kernel modesetting and evdev input devices, an X application, or a
+wayland-x32: wayland client itself. The clients can be traditional applications,
+wayland-x32: X servers (rootless or fullscreen) or other display servers.
+wayland-x32:
+wayland-x32:
+wayland-x32:
diff --git a/dev/kernel/bcm74x/2.6.36-headers/kernel-headers-pkg-install.sh b/Wayland/wayland/1.11.0-x86_32/wayland-x32-pkg-install.sh
similarity index 100%
rename from dev/kernel/bcm74x/2.6.36-headers/kernel-headers-pkg-install.sh
rename to Wayland/wayland/1.11.0-x86_32/wayland-x32-pkg-install.sh
diff --git a/Wayland/wayland/1.11.0/Makefile b/Wayland/wayland/1.11.0/Makefile
new file mode 100644
index 000000000..2cec90ab9
--- /dev/null
+++ b/Wayland/wayland/1.11.0/Makefile
@@ -0,0 +1,257 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/Wayland/wayland
+
+REQUIRES           = libs/expat/2.1.1
+REQUIRES          += libs/libffi/3.2.1
+REQUIRES          += libs/libxml2/2.9.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.11.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/Wayland/wayland/wayland-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/wayland-$(version)
+src_dir_name       = wayland-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = wayland
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+WAYLAND_PKG_NAME                = wayland
+WAYLAND_PKG_VERSION             = 1.11.0
+WAYLAND_PKG_ARCH                = $(TOOLCHAIN)
+WAYLAND_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+WAYLAND_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+WAYLAND_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+WAYLAND_PKG_SHORT_DESCRIPTION   = C implementation of the Wayland protocol
+WAYLAND_PKG_URL                 = $(BUG_URL)
+WAYLAND_PKG_LICENSE             = custom
+WAYLAND_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(WAYLAND_PKG_NAME)-pkg-description
+WAYLAND_PKG_DESCRIPTION_FILE_IN = $(WAYLAND_PKG_NAME)-pkg-description.in
+WAYLAND_PKG_INSTALL_SCRIPT      = $(WAYLAND_PKG_NAME)-pkg-install.sh
+
+WAYLAND_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(WAYLAND_PKG_NAME)-package
+
+pkg_basename     = $(WAYLAND_PKG_NAME)-$(WAYLAND_PKG_VERSION)-$(WAYLAND_PKG_ARCH)-$(WAYLAND_PKG_DISTRO_NAME)-$(WAYLAND_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(WAYLAND_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(WAYLAND_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@for file in wayland-util.h.3 wayland-util.c.3     \
+	             wayland-server.h.3 wayland-server.c.3 \
+	             wayland-client.c.3   \
+	             wayland-server-core.h.3 wayland-client-core.h.3 \
+	             wayland-shm.c.3 ; do \
+	   cat $(CURDIR)/$(build_dir)/doc/doxygen/man/man3/$$file | \
+	       sed "s,$(CURDIR)/$(SRC_DIR)/src/,,g" > $(WAYLAND_PKG)/usr/share/man/man3/$$file ; \
+	 done
+	@( cd $(WAYLAND_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(WAYLAND_PKG)/usr/share/man ]; then \
+	  ( cd $(WAYLAND_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(WAYLAND_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(WAYLAND_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING README TODO \
+	         $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(WAYLAND_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libwayland-client.la   \
+	                                    libwayland-cursor.la   \
+	                                    libwayland-server.la ; \
+	 )
+	# ======= create symbolic link to pkgconfig wayland-scanner.pc file  =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   ln -sf wayland-scanner.pc wayland_scanner.pc ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(WAYLAND_PKG))
+	# ======= Install wayland-scanner into $(TARGET_DEST_DIR) =======
+	@cp -a $(build_dir)/build-wayland-scanner $(TARGET_DEST_DIR)/usr/bin/$(TARGET)-wayland-scanner
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libwayland-client.la   \
+	                                            libwayland-cursor.la   \
+	                                            libwayland-server.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libwayland-client.la   \
+	                                              libwayland-cursor.la   \
+	                                              libwayland-server.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" wayland-client.pc   \
+	                                            wayland-cursor.pc   \
+	                                            wayland-scanner.pc  \
+	                                            wayland-server.pc ; \
+	   sed -i "s,/bin/wayland-scanner,/bin/$(TARGET)-wayland-scanner,g" wayland-scanner.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(WAYLAND_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(WAYLAND_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(WAYLAND_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(WAYLAND_PKG_DESCRIPTION_FILE): $(WAYLAND_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(WAYLAND_PKG_DESCRIPTION_FILE) $(WAYLAND_PKG_INSTALL_SCRIPT)
+	@cp $(WAYLAND_PKG_DESCRIPTION_FILE) $(WAYLAND_PKG)/.DESCRIPTION
+	@cp $(WAYLAND_PKG_INSTALL_SCRIPT) $(WAYLAND_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(WAYLAND_PKG)/.REQUIRES
+	@echo "pkgname=$(WAYLAND_PKG_NAME)"                            >  $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(WAYLAND_PKG_VERSION)"                          >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "arch=$(WAYLAND_PKG_ARCH)"                               >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "distroname=$(WAYLAND_PKG_DISTRO_NAME)"                  >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "distrover=$(WAYLAND_PKG_DISTRO_VERSION)"                >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "group=$(WAYLAND_PKG_GROUP)"                             >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(WAYLAND_PKG_SHORT_DESCRIPTION)\"" >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "url=$(WAYLAND_PKG_URL)"                                 >> $(WAYLAND_PKG)/.PKGINFO ; \
+	 echo "license=$(WAYLAND_PKG_LICENSE)"                         >> $(WAYLAND_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(WAYLAND_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/Wayland/wayland/1.11.0/PATCHES b/Wayland/wayland/1.11.0/PATCHES
new file mode 100644
index 000000000..205af277d
--- /dev/null
+++ b/Wayland/wayland/1.11.0/PATCHES
@@ -0,0 +1,2 @@
+
+../../../sources/Wayland/wayland/patches/wayland-1.11.0-cross.patch -p0
diff --git a/Wayland/wayland/1.11.0/wayland-pkg-description.in b/Wayland/wayland/1.11.0/wayland-pkg-description.in
new file mode 100644
index 000000000..70bd78067
--- /dev/null
+++ b/Wayland/wayland/1.11.0/wayland-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+wayland: wayland @VERSION@ (C implementation of the Wayland protocol)
+wayland:
+wayland: Wayland is a project to define a protocol for a compositor to talk
+wayland: to its clients as well as a library implementation of the protocol.
+wayland: The compositor can be a standalone display server running on Linux
+wayland: kernel modesetting and evdev input devices, an X application, or a
+wayland: wayland client itself. The clients can be traditional applications,
+wayland: X servers (rootless or fullscreen) or other display servers.
+wayland:
+wayland:
+wayland:
diff --git a/Wayland/wayland/1.11.0/wayland-pkg-install.sh b/Wayland/wayland/1.11.0/wayland-pkg-install.sh
new file mode 100755
index 000000000..208ca180a
--- /dev/null
+++ b/Wayland/wayland/1.11.0/wayland-pkg-install.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  # Notice we use an absolute path below, rather than usr/bin/fc-cache. This is because
+  # we're testing to see if we are on the bootdisk, which will not have /usr/bin/fc-cache.
+  # The presence of "/etc/system-installer" is under consideration as a better test.
+  # Also we have to check that we are not in the installer mode on the target system
+  # ("/etc/system-installer"), and we have to be sure that we are on the working system
+  # on the target hardware ("proc/sys/kernel/osrelease" - relative path).
+  if [ -r proc/sys/kernel/osrelease -a ! -r /etc/system-installer -a -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache -f
+  fi
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/Wayland/wayland/1.6.0-x86_32/Makefile b/Wayland/wayland/1.6.0-x86_32/Makefile
index bc8dd1363..5f73700a6 100644
--- a/Wayland/wayland/1.6.0-x86_32/Makefile
+++ b/Wayland/wayland/1.6.0-x86_32/Makefile
@@ -13,8 +13,8 @@ include ../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/Wayland/wayland
 
 REQUIRES           = Wayland/wayland/1.6.0
-REQUIRES          += libs/expat/2.1.0-x86_32
-REQUIRES          += libs/libffi/3.0.13-x86_32
+REQUIRES          += libs/expat/2.1.1-x86_32
+REQUIRES          += libs/libffi/3.2.1-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -100,6 +100,9 @@ TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFI
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
 	$(UNPACK_SRC_ARCHIVE)
 	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
 	@touch $@
 
 $(build_target): $(src_done)
diff --git a/Wayland/wayland/1.6.0/Makefile b/Wayland/wayland/1.6.0/Makefile
index ace67fc2e..24706dc20 100644
--- a/Wayland/wayland/1.6.0/Makefile
+++ b/Wayland/wayland/1.6.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/Wayland/wayland
 
-REQUIRES           = libs/expat/2.1.0
-REQUIRES          += libs/libffi/3.0.13
+REQUIRES           = libs/expat/2.1.1
+REQUIRES          += libs/libffi/3.2.1
 
 # ======= __END_OF_REQUIRES__ =======
 
@@ -105,6 +108,9 @@ TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUF
 $(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
 	$(UNPACK_SRC_ARCHIVE)
 	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
 	@touch $@
 
 $(build_target): $(src_done)
diff --git a/X11/X.org/app-collection/Makefile b/X11/X.org/app-collection/Makefile
index a9709db32..002ef6063 100644
--- a/X11/X.org/app-collection/Makefile
+++ b/X11/X.org/app-collection/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,78 +24,78 @@ include ../../../build-system/constants.mk
 
 
 REQUIRES += X11/X.org/app/appres/1.0.4
-REQUIRES += X11/X.org/app/bdftopcf/1.0.4
+REQUIRES += X11/X.org/app/bdftopcf/1.0.5
 REQUIRES += X11/X.org/app/beforelight/1.0.5
-REQUIRES += X11/X.org/app/bitmap/1.0.7
+REQUIRES += X11/X.org/app/bitmap/1.0.8
 REQUIRES += X11/X.org/app/editres/1.0.6
 REQUIRES += X11/X.org/app/fonttosfnt/1.0.4
-REQUIRES += X11/X.org/app/fslsfonts/1.0.4
-REQUIRES += X11/X.org/app/fstobdf/1.0.5
-REQUIRES += X11/X.org/app/iceauth/1.0.6
+REQUIRES += X11/X.org/app/fslsfonts/1.0.5
+REQUIRES += X11/X.org/app/fstobdf/1.0.6
+REQUIRES += X11/X.org/app/iceauth/1.0.7
 REQUIRES += X11/X.org/app/ico/1.0.4
 REQUIRES += X11/X.org/app/listres/1.0.3
 REQUIRES += X11/X.org/app/luit/1.1.1
 REQUIRES += X11/X.org/app/mkcomposecache/1.2.1
 REQUIRES += X11/X.org/app/mkfontdir/1.0.7
-REQUIRES += X11/X.org/app/mkfontscale/1.1.1
+REQUIRES += X11/X.org/app/mkfontscale/1.1.2
 REQUIRES += X11/X.org/app/oclock/1.0.3
-REQUIRES += X11/X.org/app/rendercheck/1.4
+REQUIRES += X11/X.org/app/rendercheck/1.5
 REQUIRES += X11/X.org/app/rgb/1.0.6
-REQUIRES += X11/X.org/app/sessreg/1.0.8
-REQUIRES += X11/X.org/app/setxkbmap/1.3.0
-REQUIRES += X11/X.org/app/showfont/1.0.4
-REQUIRES += X11/X.org/app/smproxy/1.0.5
+REQUIRES += X11/X.org/app/sessreg/1.1.0
+REQUIRES += X11/X.org/app/setxkbmap/1.3.1
+REQUIRES += X11/X.org/app/showfont/1.0.5
+REQUIRES += X11/X.org/app/smproxy/1.0.6
 REQUIRES += X11/X.org/app/transset/1.0.1
-REQUIRES += X11/X.org/app/twm/1.0.8
+REQUIRES += X11/X.org/app/twm/1.0.9
 REQUIRES += X11/X.org/app/viewres/1.0.4
-REQUIRES += X11/X.org/app/x11perf/1.5.4
+REQUIRES += X11/X.org/app/x11perf/1.6.0
 REQUIRES += X11/X.org/app/xauth/1.0.9
 REQUIRES += X11/X.org/app/xbacklight/1.2.1
 REQUIRES += X11/X.org/app/xbiff/1.0.3
-REQUIRES += X11/X.org/app/xcalc/1.0.5
+REQUIRES += X11/X.org/app/xcalc/1.0.6
 REQUIRES += X11/X.org/app/xclipboard/1.1.3
 REQUIRES += X11/X.org/app/xclock/1.0.7
 REQUIRES += X11/X.org/app/xcm/0.5.3
-REQUIRES += X11/X.org/app/xcmsdb/1.0.4
-REQUIRES += X11/X.org/app/xcompmgr/1.1.6
+REQUIRES += X11/X.org/app/xcmsdb/1.0.5
+REQUIRES += X11/X.org/app/xcompmgr/1.1.7
 REQUIRES += X11/X.org/app/xconsole/1.0.6
 REQUIRES += X11/X.org/app/xcursorgen/1.0.6
 REQUIRES += X11/X.org/app/xdbedizzy/1.1.0
-REQUIRES += X11/X.org/app/xditview/1.0.3
-REQUIRES += X11/X.org/app/xdpyinfo/1.3.1
-REQUIRES += X11/X.org/app/xdriinfo/1.0.4
-REQUIRES += X11/X.org/app/xedit/1.2.1
-REQUIRES += X11/X.org/app/xev/1.2.1
+REQUIRES += X11/X.org/app/xditview/1.0.4
+REQUIRES += X11/X.org/app/xdpyinfo/1.3.2
+REQUIRES += X11/X.org/app/xdriinfo/1.0.5
+REQUIRES += X11/X.org/app/xedit/1.2.2
+REQUIRES += X11/X.org/app/xev/1.2.2
 REQUIRES += X11/X.org/app/xeyes/1.1.1
 REQUIRES += X11/X.org/app/xf86dga/1.0.3
 REQUIRES += X11/X.org/app/xfd/1.1.2
 REQUIRES += X11/X.org/app/xfontsel/1.0.5
 REQUIRES += X11/X.org/app/xfs/1.1.4
-REQUIRES += X11/X.org/app/xfsinfo/1.0.4
-REQUIRES += X11/X.org/app/xgamma/1.0.5
-REQUIRES += X11/X.org/app/xgc/1.0.4
-REQUIRES += X11/X.org/app/xhost/1.0.6
+REQUIRES += X11/X.org/app/xfsinfo/1.0.5
+REQUIRES += X11/X.org/app/xgamma/1.0.6
+REQUIRES += X11/X.org/app/xgc/1.0.5
+REQUIRES += X11/X.org/app/xhost/1.0.7
 REQUIRES += X11/X.org/app/xinit/1.3.4
-REQUIRES += X11/X.org/app/xinput/1.6.1
-REQUIRES += X11/X.org/app/xkbcomp/1.3.0
-REQUIRES += X11/X.org/app/xkbevd/1.1.3
-REQUIRES += X11/X.org/app/xkbprint/1.0.3
+REQUIRES += X11/X.org/app/xinput/1.6.2
+REQUIRES += X11/X.org/app/xkbcomp/1.3.1
+REQUIRES += X11/X.org/app/xkbevd/1.1.4
+REQUIRES += X11/X.org/app/xkbprint/1.0.4
 REQUIRES += X11/X.org/app/xkbutils/1.0.4
 REQUIRES += X11/X.org/app/xkill/1.0.4
 REQUIRES += X11/X.org/app/xload/1.1.2
 REQUIRES += X11/X.org/app/xlogo/1.0.4
-REQUIRES += X11/X.org/app/xlsatoms/1.1.1
+REQUIRES += X11/X.org/app/xlsatoms/1.1.2
 REQUIRES += X11/X.org/app/xlsclients/1.1.3
-REQUIRES += X11/X.org/app/xlsfonts/1.0.4
-REQUIRES += X11/X.org/app/xmag/1.0.5
-REQUIRES += X11/X.org/app/xman/1.1.3
+REQUIRES += X11/X.org/app/xlsfonts/1.0.5
+REQUIRES += X11/X.org/app/xmag/1.0.6
+REQUIRES += X11/X.org/app/xman/1.1.4
 REQUIRES += X11/X.org/app/xmessage/1.0.4
-REQUIRES += X11/X.org/app/xmh/1.0.2
-REQUIRES += X11/X.org/app/xmodmap/1.0.8
+REQUIRES += X11/X.org/app/xmh/1.0.3
+REQUIRES += X11/X.org/app/xmodmap/1.0.9
 REQUIRES += X11/X.org/app/xmore/1.0.2
 REQUIRES += X11/X.org/app/xpr/1.0.4
 REQUIRES += X11/X.org/app/xprop/1.2.2
-REQUIRES += X11/X.org/app/xrandr/1.4.3
+REQUIRES += X11/X.org/app/xrandr/1.5.0
 REQUIRES += X11/X.org/app/xrdb/1.1.0
 REQUIRES += X11/X.org/app/xrefresh/1.0.5
 REQUIRES += X11/X.org/app/xscope/1.4.1
@@ -101,7 +104,7 @@ REQUIRES += X11/X.org/app/xsetroot/1.1.1
 REQUIRES += X11/X.org/app/xsm/1.0.3
 REQUIRES += X11/X.org/app/xstdcmap/1.0.3
 REQUIRES += X11/X.org/app/xvidtune/1.0.3
-REQUIRES += X11/X.org/app/xvinfo/1.1.2
+REQUIRES += X11/X.org/app/xvinfo/1.1.3
 REQUIRES += X11/X.org/app/xwd/1.0.6
 REQUIRES += X11/X.org/app/xwininfo/1.1.3
 REQUIRES += X11/X.org/app/xwud/1.0.4
diff --git a/X11/X.org/app/appres/1.0.4/Makefile b/X11/X.org/app/appres/1.0.4/Makefile
index 50736b550..f043715b8 100644
--- a/X11/X.org/app/appres/1.0.4/Makefile
+++ b/X11/X.org/app/appres/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/appres
 
-REQUIRES           = X11/X.org/lib/libXt/1.1.4
+REQUIRES           = X11/X.org/lib/libXt/1.1.5
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/bdftopcf/1.0.4/Makefile b/X11/X.org/app/bdftopcf/1.0.4/Makefile
index a921c735c..18b7c47d7 100644
--- a/X11/X.org/app/bdftopcf/1.0.4/Makefile
+++ b/X11/X.org/app/bdftopcf/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/bdftopcf
 
-REQUIRES           = X11/X.org/lib/libXfont/1.5.0
+REQUIRES           = X11/X.org/lib/libXfont/1.5.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/bdftopcf/1.0.5/Makefile b/X11/X.org/app/bdftopcf/1.0.5/Makefile
new file mode 100644
index 000000000..fb9b53758
--- /dev/null
+++ b/X11/X.org/app/bdftopcf/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/bdftopcf
+
+REQUIRES           = X11/X.org/lib/libXfont/1.5.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/bdftopcf/bdftopcf-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/bdftopcf-$(version)
+src_dir_name       = bdftopcf-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = bdftopcf
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = font compiler for the X server
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/app/vim/7.4-373/PATCHES b/X11/X.org/app/bdftopcf/1.0.5/PATCHES
similarity index 100%
rename from app/vim/7.4-373/PATCHES
rename to X11/X.org/app/bdftopcf/1.0.5/PATCHES
diff --git a/X11/X.org/app/bdftopcf/1.0.5/bdftopcf-pkg-description.in b/X11/X.org/app/bdftopcf/1.0.5/bdftopcf-pkg-description.in
new file mode 100644
index 000000000..c66922501
--- /dev/null
+++ b/X11/X.org/app/bdftopcf/1.0.5/bdftopcf-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+bdftopcf: bdftopcf @VERSION@ (font compiler for the X server)
+bdftopcf:
+bdftopcf: bdftopcf is part of X11.
+bdftopcf:
+bdftopcf: For more information about the X.Org Foundation (the providers
+bdftopcf: of the X.Org implementation of the X Window System).
+bdftopcf:
+bdftopcf: See: http://www.x.org
+bdftopcf:
+bdftopcf:
+bdftopcf:
diff --git a/dev/kernel/dm644x/2.6.36-headers/kernel-headers-pkg-install.sh b/X11/X.org/app/bdftopcf/1.0.5/bdftopcf-pkg-install.sh
similarity index 100%
rename from dev/kernel/dm644x/2.6.36-headers/kernel-headers-pkg-install.sh
rename to X11/X.org/app/bdftopcf/1.0.5/bdftopcf-pkg-install.sh
diff --git a/X11/X.org/app/beforelight/1.0.5/Makefile b/X11/X.org/app/beforelight/1.0.5/Makefile
index 26f85587d..38102589a 100644
--- a/X11/X.org/app/beforelight/1.0.5/Makefile
+++ b/X11/X.org/app/beforelight/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/beforelight
 
-REQUIRES           = X11/X.org/lib/libXt/1.1.4
+REQUIRES           = X11/X.org/lib/libXt/1.1.5
 REQUIRES          += X11/X.org/lib/libXScrnSaver/1.2.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/bitmap/1.0.7/Makefile b/X11/X.org/app/bitmap/1.0.7/Makefile
index a1e58d581..5687fb071 100644
--- a/X11/X.org/app/bitmap/1.0.7/Makefile
+++ b/X11/X.org/app/bitmap/1.0.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/bitmap
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/bitmap/1.0.8/Makefile b/X11/X.org/app/bitmap/1.0.8/Makefile
new file mode 100644
index 000000000..b26fe725b
--- /dev/null
+++ b/X11/X.org/app/bitmap/1.0.8/Makefile
@@ -0,0 +1,190 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/bitmap
+
+REQUIRES           = X11/X.org/data/xbitmaps/1.1.1
+REQUIRES          += X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.8
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/bitmap/bitmap-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/bitmap-$(version)
+src_dir_name       = bitmap-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = bitmap
+XORG_PKG_VERSION             = 1.0.8
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X bitmap editor and converter
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man1 ; \
+	   for file in *.1 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/dev/check/0.9.13-x86_32/PATCHES b/X11/X.org/app/bitmap/1.0.8/PATCHES
similarity index 100%
rename from dev/check/0.9.13-x86_32/PATCHES
rename to X11/X.org/app/bitmap/1.0.8/PATCHES
diff --git a/X11/X.org/app/bitmap/1.0.8/bitmap-pkg-description.in b/X11/X.org/app/bitmap/1.0.8/bitmap-pkg-description.in
new file mode 100644
index 000000000..81dfab6c0
--- /dev/null
+++ b/X11/X.org/app/bitmap/1.0.8/bitmap-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+bitmap: bitmap @VERSION@ (X bitmap editor and converter)
+bitmap:
+bitmap: bitmap is part of X11.
+bitmap:
+bitmap: For more information about the X.Org Foundation (the providers
+bitmap: of the X.Org implementation of the X Window System).
+bitmap:
+bitmap: See: http://www.x.org
+bitmap:
+bitmap:
+bitmap:
diff --git a/dev/kernel/omap35x/2.6.36-headers/kernel-headers-pkg-install.sh b/X11/X.org/app/bitmap/1.0.8/bitmap-pkg-install.sh
similarity index 100%
rename from dev/kernel/omap35x/2.6.36-headers/kernel-headers-pkg-install.sh
rename to X11/X.org/app/bitmap/1.0.8/bitmap-pkg-install.sh
diff --git a/X11/X.org/app/editres/1.0.6/Makefile b/X11/X.org/app/editres/1.0.6/Makefile
index 6de8af2eb..313a7b2b4 100644
--- a/X11/X.org/app/editres/1.0.6/Makefile
+++ b/X11/X.org/app/editres/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/editres
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/fonttosfnt/1.0.4/Makefile b/X11/X.org/app/fonttosfnt/1.0.4/Makefile
index 3774f984d..07a729b2e 100644
--- a/X11/X.org/app/fonttosfnt/1.0.4/Makefile
+++ b/X11/X.org/app/fonttosfnt/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/fonttosfnt
 
-REQUIRES           = libs/freetype/2.5.3
-REQUIRES          += X11/X.org/lib/libfontenc/1.1.2
+REQUIRES           = libs/freetype/2.6.3
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/fslsfonts/1.0.4/Makefile b/X11/X.org/app/fslsfonts/1.0.4/Makefile
index eca02a4a6..58ff2e13c 100644
--- a/X11/X.org/app/fslsfonts/1.0.4/Makefile
+++ b/X11/X.org/app/fslsfonts/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/fslsfonts
 
-REQUIRES           = X11/X.org/lib/libFS/1.0.6
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/fslsfonts/1.0.5/Makefile b/X11/X.org/app/fslsfonts/1.0.5/Makefile
new file mode 100644
index 000000000..e2d79d9c9
--- /dev/null
+++ b/X11/X.org/app/fslsfonts/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/fslsfonts
+
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/fslsfonts/fslsfonts-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/fslsfonts-$(version)
+src_dir_name       = fslsfonts-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = fslsfonts
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = list of fonts from X font server
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/dev/check/0.9.13/PATCHES b/X11/X.org/app/fslsfonts/1.0.5/PATCHES
similarity index 100%
rename from dev/check/0.9.13/PATCHES
rename to X11/X.org/app/fslsfonts/1.0.5/PATCHES
diff --git a/X11/X.org/app/fslsfonts/1.0.5/fslsfonts-pkg-description.in b/X11/X.org/app/fslsfonts/1.0.5/fslsfonts-pkg-description.in
new file mode 100644
index 000000000..4409c8262
--- /dev/null
+++ b/X11/X.org/app/fslsfonts/1.0.5/fslsfonts-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+fslsfonts: fslsfonts @VERSION@ (list of fonts from X font server)
+fslsfonts:
+fslsfonts: fslsfonts is part of X11.
+fslsfonts:
+fslsfonts: For more information about the X.Org Foundation (the providers
+fslsfonts: of the X.Org implementation of the X Window System).
+fslsfonts:
+fslsfonts: See: http://www.x.org
+fslsfonts:
+fslsfonts:
+fslsfonts:
diff --git a/libs/eudev/1.9-x86_32/libeudev-x32-pkg-install.sh b/X11/X.org/app/fslsfonts/1.0.5/fslsfonts-pkg-install.sh
similarity index 100%
rename from libs/eudev/1.9-x86_32/libeudev-x32-pkg-install.sh
rename to X11/X.org/app/fslsfonts/1.0.5/fslsfonts-pkg-install.sh
diff --git a/X11/X.org/app/fstobdf/1.0.5/Makefile b/X11/X.org/app/fstobdf/1.0.5/Makefile
index 679018bca..8c4014b4b 100644
--- a/X11/X.org/app/fstobdf/1.0.5/Makefile
+++ b/X11/X.org/app/fstobdf/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/fstobdf
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
-REQUIRES          += X11/X.org/lib/libFS/1.0.6
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+REQUIRES          += X11/X.org/lib/libFS/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/fstobdf/1.0.6/Makefile b/X11/X.org/app/fstobdf/1.0.6/Makefile
new file mode 100644
index 000000000..c65a450dd
--- /dev/null
+++ b/X11/X.org/app/fstobdf/1.0.6/Makefile
@@ -0,0 +1,179 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/fstobdf
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+REQUIRES          += X11/X.org/lib/libFS/1.0.7
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/fstobdf/fstobdf-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/fstobdf-$(version)
+src_dir_name       = fstobdf-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = fstobdf
+XORG_PKG_VERSION             = 1.0.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = copy fonts from an X11 font server
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/dev/cmake/3.0.2/PATCHES b/X11/X.org/app/fstobdf/1.0.6/PATCHES
similarity index 100%
rename from dev/cmake/3.0.2/PATCHES
rename to X11/X.org/app/fstobdf/1.0.6/PATCHES
diff --git a/X11/X.org/app/fstobdf/1.0.6/fstobdf-pkg-description.in b/X11/X.org/app/fstobdf/1.0.6/fstobdf-pkg-description.in
new file mode 100644
index 000000000..075bb4bdb
--- /dev/null
+++ b/X11/X.org/app/fstobdf/1.0.6/fstobdf-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+fstobdf: fstobdf @VERSION@ (copy fonts from an X11 font server)
+fstobdf:
+fstobdf: fstobdf is part of X11.
+fstobdf:
+fstobdf: For more information about the X.Org Foundation (the providers
+fstobdf: of the X.Org implementation of the X Window System).
+fstobdf:
+fstobdf: See: http://www.x.org
+fstobdf:
+fstobdf:
+fstobdf:
diff --git a/libs/expat/2.1.0-x86_32/expat-x32-pkg-install.sh b/X11/X.org/app/fstobdf/1.0.6/fstobdf-pkg-install.sh
similarity index 100%
rename from libs/expat/2.1.0-x86_32/expat-x32-pkg-install.sh
rename to X11/X.org/app/fstobdf/1.0.6/fstobdf-pkg-install.sh
diff --git a/X11/X.org/app/iceauth/1.0.6/Makefile b/X11/X.org/app/iceauth/1.0.6/Makefile
index 3ea3a8547..086d36ac0 100644
--- a/X11/X.org/app/iceauth/1.0.6/Makefile
+++ b/X11/X.org/app/iceauth/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/iceauth/1.0.7/Makefile b/X11/X.org/app/iceauth/1.0.7/Makefile
new file mode 100644
index 000000000..a887e9a11
--- /dev/null
+++ b/X11/X.org/app/iceauth/1.0.7/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/iceauth
+
+REQUIRES           = X11/X.org/lib/libICE/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.7
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/iceauth/iceauth-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/iceauth-$(version)
+src_dir_name       = iceauth-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = iceauth
+XORG_PKG_VERSION             = 1.0.7
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = display/edit ICE authorization information
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/libs/expat/2.1.0-x86_32/PATCHES b/X11/X.org/app/iceauth/1.0.7/PATCHES
similarity index 100%
rename from libs/expat/2.1.0-x86_32/PATCHES
rename to X11/X.org/app/iceauth/1.0.7/PATCHES
diff --git a/X11/X.org/app/iceauth/1.0.7/iceauth-pkg-description.in b/X11/X.org/app/iceauth/1.0.7/iceauth-pkg-description.in
new file mode 100644
index 000000000..3e24ae1a2
--- /dev/null
+++ b/X11/X.org/app/iceauth/1.0.7/iceauth-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+iceauth: iceauth @VERSION@ (display/edit ICE authorization information)
+iceauth:
+iceauth: iceauth is part of X11.
+iceauth:
+iceauth: For more information about the X.Org Foundation (the providers
+iceauth: of the X.Org implementation of the X Window System).
+iceauth:
+iceauth: See: http://www.x.org
+iceauth:
+iceauth:
+iceauth:
diff --git a/libs/expat/2.1.0/expat-pkg-install.sh b/X11/X.org/app/iceauth/1.0.7/iceauth-pkg-install.sh
similarity index 100%
rename from libs/expat/2.1.0/expat-pkg-install.sh
rename to X11/X.org/app/iceauth/1.0.7/iceauth-pkg-install.sh
diff --git a/X11/X.org/app/ico/1.0.4/Makefile b/X11/X.org/app/ico/1.0.4/Makefile
index 4928a7f21..7df8c2580 100644
--- a/X11/X.org/app/ico/1.0.4/Makefile
+++ b/X11/X.org/app/ico/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/ico
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/listres/1.0.3/Makefile b/X11/X.org/app/listres/1.0.3/Makefile
index 886f12f75..da96c1e2e 100644
--- a/X11/X.org/app/listres/1.0.3/Makefile
+++ b/X11/X.org/app/listres/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/listres
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/luit/1.1.1/Makefile b/X11/X.org/app/luit/1.1.1/Makefile
index e2e275e0e..38d4d89d4 100644
--- a/X11/X.org/app/luit/1.1.1/Makefile
+++ b/X11/X.org/app/luit/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/luit
 
-REQUIRES           = X11/X.org/lib/libfontenc/1.1.2
+REQUIRES           = X11/X.org/lib/libfontenc/1.1.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/mkcomposecache/1.2.1/Makefile b/X11/X.org/app/mkcomposecache/1.2.1/Makefile
index 5baa859cb..2cb2cc53d 100644
--- a/X11/X.org/app/mkcomposecache/1.2.1/Makefile
+++ b/X11/X.org/app/mkcomposecache/1.2.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/mkcomposecache
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/mkfontdir/1.0.7/Makefile b/X11/X.org/app/mkfontdir/1.0.7/Makefile
index 62c94664b..694bb9006 100644
--- a/X11/X.org/app/mkfontdir/1.0.7/Makefile
+++ b/X11/X.org/app/mkfontdir/1.0.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/mkfontdir
 
 REQUIRES           = X11/X.org/util/util-macros/1.19.0
-REQUIRES          += X11/X.org/app/mkfontscale/1.1.1
+REQUIRES          += X11/X.org/app/mkfontscale/1.1.2
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/mkfontscale/1.1.1/Makefile b/X11/X.org/app/mkfontscale/1.1.1/Makefile
index 2a1981d9b..48bba2e37 100644
--- a/X11/X.org/app/mkfontscale/1.1.1/Makefile
+++ b/X11/X.org/app/mkfontscale/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/mkfontscale
 
-REQUIRES           = libs/freetype/2.5.3
-REQUIRES          += X11/X.org/lib/libfontenc/1.1.2
+REQUIRES           = libs/freetype/2.6.3
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/mkfontscale/1.1.2/Makefile b/X11/X.org/app/mkfontscale/1.1.2/Makefile
new file mode 100644
index 000000000..638574a0b
--- /dev/null
+++ b/X11/X.org/app/mkfontscale/1.1.2/Makefile
@@ -0,0 +1,179 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/mkfontscale
+
+REQUIRES           = libs/freetype/2.6.3
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/mkfontscale/mkfontscale-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/mkfontscale-$(version)
+src_dir_name       = mkfontscale-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = mkfontscale
+XORG_PKG_VERSION             = 1.1.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 font utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/libs/expat/2.1.0/PATCHES b/X11/X.org/app/mkfontscale/1.1.2/PATCHES
similarity index 100%
rename from libs/expat/2.1.0/PATCHES
rename to X11/X.org/app/mkfontscale/1.1.2/PATCHES
diff --git a/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-description.in b/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-description.in
new file mode 100644
index 000000000..76091dbb7
--- /dev/null
+++ b/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+mkfontscale: mkfontscale @VERSION@ (X11 font utility)
+mkfontscale:
+mkfontscale: mkfontscale is part of X11.
+mkfontscale:
+mkfontscale: For more information about the X.Org Foundation (the providers
+mkfontscale: of the X.Org implementation of the X Window System).
+mkfontscale:
+mkfontscale: See: http://www.x.org
+mkfontscale:
+mkfontscale:
+mkfontscale:
diff --git a/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-install.sh b/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/mkfontscale/1.1.2/mkfontscale-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/oclock/1.0.3/Makefile b/X11/X.org/app/oclock/1.0.3/Makefile
index 76f6d5aa6..6f12151f9 100644
--- a/X11/X.org/app/oclock/1.0.3/Makefile
+++ b/X11/X.org/app/oclock/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/oclock
 
 REQUIRES           = X11/X.org/lib/libXmu/1.1.2
-REQUIRES          += X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES          += X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/rendercheck/1.4/Makefile b/X11/X.org/app/rendercheck/1.4/Makefile
index 9a6020a6f..4699d4eb8 100644
--- a/X11/X.org/app/rendercheck/1.4/Makefile
+++ b/X11/X.org/app/rendercheck/1.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/rendercheck
 
-REQUIRES           = X11/X.org/lib/libXrender/0.9.8
+REQUIRES           = X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/rendercheck/1.5/Makefile b/X11/X.org/app/rendercheck/1.5/Makefile
new file mode 100644
index 000000000..2af47e6eb
--- /dev/null
+++ b/X11/X.org/app/rendercheck/1.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/rendercheck
+
+REQUIRES           = X11/X.org/lib/libXrender/0.9.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/rendercheck/rendercheck-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/rendercheck-$(version)
+src_dir_name       = rendercheck-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = rendercheck
+XORG_PKG_VERSION             = 1.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = test X11 Render support
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL NEWS README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/net/ca-certificates/32.0/PATCHES b/X11/X.org/app/rendercheck/1.5/PATCHES
similarity index 100%
rename from net/ca-certificates/32.0/PATCHES
rename to X11/X.org/app/rendercheck/1.5/PATCHES
diff --git a/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-description.in b/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-description.in
new file mode 100644
index 000000000..80d940311
--- /dev/null
+++ b/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+           |-----handy-ruler------------------------------------------------------|
+rendercheck: rendercheck @VERSION@ (test X11 Render support)
+rendercheck:
+rendercheck: rendercheck is part of X11.
+rendercheck:
+rendercheck: For more information about the X.Org Foundation (the providers
+rendercheck: of the X.Org implementation of the X Window System).
+rendercheck:
+rendercheck: See: http://www.x.org
+rendercheck:
+rendercheck:
+rendercheck:
diff --git a/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-install.sh b/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/rendercheck/1.5/rendercheck-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/rgb/1.0.6/Makefile b/X11/X.org/app/rgb/1.0.6/Makefile
index 25a5a5ce2..786f12dc5 100644
--- a/X11/X.org/app/rgb/1.0.6/Makefile
+++ b/X11/X.org/app/rgb/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/rgb
 
 REQUIRES           = X11/X.org/util/util-macros/1.19.0
-REQUIRES          += X11/X.org/proto/xproto/7.0.26
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/sessreg/1.0.8/Makefile b/X11/X.org/app/sessreg/1.0.8/Makefile
index fe2bd8269..24d7b6ed4 100644
--- a/X11/X.org/app/sessreg/1.0.8/Makefile
+++ b/X11/X.org/app/sessreg/1.0.8/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/sessreg
 
 REQUIRES           = X11/X.org/util/util-macros/1.19.0
-REQUIRES          += X11/X.org/proto/xproto/7.0.26
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/sessreg/1.1.0/Makefile b/X11/X.org/app/sessreg/1.1.0/Makefile
new file mode 100644
index 000000000..9cb2fca4a
--- /dev/null
+++ b/X11/X.org/app/sessreg/1.1.0/Makefile
@@ -0,0 +1,190 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/sessreg
+
+REQUIRES           = X11/X.org/util/util-macros/1.19.0
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/sessreg/sessreg-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/sessreg-$(version)
+src_dir_name       = sessreg-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = sessreg
+XORG_PKG_VERSION             = 1.1.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = utmp/wtmp entries management utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+#
+# NOTE:
+# ====
+#   GCC 5.3.0 changes line numeration in the CPP output. To prevent errors during generation
+#   man/filenames.sed from man/filenames.sed.c file we have to use -P option:
+#
+extra_environment  = CPPFLAGS='-P'
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   autoreconf -i ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) $(extra_environment) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/sessreg/1.1.0/PATCHES b/X11/X.org/app/sessreg/1.1.0/PATCHES
new file mode 100644
index 000000000..534319ab1
--- /dev/null
+++ b/X11/X.org/app/sessreg/1.1.0/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/sessreg/patches/sessreg-1.1.0-man.patch -p0
diff --git a/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-description.in b/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-description.in
new file mode 100644
index 000000000..aceb9b352
--- /dev/null
+++ b/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+sessreg: sessreg @VERSION@ (utmp/wtmp entries management utility)
+sessreg:
+sessreg: sessreg is part of X11.
+sessreg:
+sessreg: For more information about the X.Org Foundation (the providers
+sessreg: of the X.Org implementation of the X Window System).
+sessreg:
+sessreg: See: http://www.x.org
+sessreg:
+sessreg:
+sessreg:
diff --git a/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-install.sh b/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/sessreg/1.1.0/sessreg-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/setxkbmap/1.3.0/Makefile b/X11/X.org/app/setxkbmap/1.3.0/Makefile
index 7ecc8af65..8a614d68b 100644
--- a/X11/X.org/app/setxkbmap/1.3.0/Makefile
+++ b/X11/X.org/app/setxkbmap/1.3.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/setxkbmap
 
-REQUIRES           = X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/setxkbmap/1.3.1/Makefile b/X11/X.org/app/setxkbmap/1.3.1/Makefile
new file mode 100644
index 000000000..1ab763534
--- /dev/null
+++ b/X11/X.org/app/setxkbmap/1.3.1/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/setxkbmap
+
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.3.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/setxkbmap/setxkbmap-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/setxkbmap-$(version)
+src_dir_name       = setxkbmap-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = setxkbmap
+XORG_PKG_VERSION             = 1.3.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = change X11 keyboard layout
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/net/ca-certificates/40.0.2/PATCHES b/X11/X.org/app/setxkbmap/1.3.1/PATCHES
similarity index 100%
rename from net/ca-certificates/40.0.2/PATCHES
rename to X11/X.org/app/setxkbmap/1.3.1/PATCHES
diff --git a/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-description.in b/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-description.in
new file mode 100644
index 000000000..106a05111
--- /dev/null
+++ b/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+setxkbmap: setxkbmap @VERSION@ (change X11 keyboard layout)
+setxkbmap:
+setxkbmap: setxkbmap is part of X11.
+setxkbmap:
+setxkbmap: For more information about the X.Org Foundation (the providers
+setxkbmap: of the X.Org implementation of the X Window System).
+setxkbmap:
+setxkbmap: See: http://www.x.org
+setxkbmap:
+setxkbmap:
+setxkbmap:
diff --git a/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-install.sh b/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/setxkbmap/1.3.1/setxkbmap-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/showfont/1.0.4/Makefile b/X11/X.org/app/showfont/1.0.4/Makefile
index f0492b6eb..8181328b7 100644
--- a/X11/X.org/app/showfont/1.0.4/Makefile
+++ b/X11/X.org/app/showfont/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/showfont
 
-REQUIRES           = X11/X.org/lib/libFS/1.0.6
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/showfont/1.0.5/Makefile b/X11/X.org/app/showfont/1.0.5/Makefile
new file mode 100644
index 000000000..14eb84d13
--- /dev/null
+++ b/X11/X.org/app/showfont/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/showfont
+
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/showfont/showfont-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/showfont-$(version)
+src_dir_name       = showfont-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = showfont
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = font dumper
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/showfont/1.0.5/PATCHES b/X11/X.org/app/showfont/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/showfont/1.0.5/showfont-pkg-description.in b/X11/X.org/app/showfont/1.0.5/showfont-pkg-description.in
new file mode 100644
index 000000000..8edc9e3b5
--- /dev/null
+++ b/X11/X.org/app/showfont/1.0.5/showfont-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+showfont: showfont @VERSION@ (font dumper)
+showfont:
+showfont: showfont is part of X11.
+showfont:
+showfont: For more information about the X.Org Foundation (the providers
+showfont: of the X.Org implementation of the X Window System).
+showfont:
+showfont: See: http://www.x.org
+showfont:
+showfont:
+showfont:
diff --git a/X11/X.org/app/showfont/1.0.5/showfont-pkg-install.sh b/X11/X.org/app/showfont/1.0.5/showfont-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/showfont/1.0.5/showfont-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/smproxy/1.0.5/Makefile b/X11/X.org/app/smproxy/1.0.5/Makefile
index 2210c2380..cee23ae66 100644
--- a/X11/X.org/app/smproxy/1.0.5/Makefile
+++ b/X11/X.org/app/smproxy/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/smproxy
 
-REQUIRES           = X11/X.org/lib/libXt/1.1.4
+REQUIRES           = X11/X.org/lib/libXt/1.1.5
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/smproxy/1.0.6/Makefile b/X11/X.org/app/smproxy/1.0.6/Makefile
new file mode 100644
index 000000000..18dd6f9fd
--- /dev/null
+++ b/X11/X.org/app/smproxy/1.0.6/Makefile
@@ -0,0 +1,179 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/smproxy
+
+REQUIRES           = X11/X.org/lib/libXt/1.1.5
+REQUIRES          += X11/X.org/lib/libXmu/1.1.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/smproxy/smproxy-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/smproxy-$(version)
+src_dir_name       = smproxy-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = smproxy
+XORG_PKG_VERSION             = 1.0.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 session management proxy
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/smproxy/1.0.6/PATCHES b/X11/X.org/app/smproxy/1.0.6/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-description.in b/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-description.in
new file mode 100644
index 000000000..5cc8d239e
--- /dev/null
+++ b/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+smproxy: smproxy @VERSION@ (X11 session management proxy)
+smproxy:
+smproxy: smproxy is part of X11.
+smproxy:
+smproxy: For more information about the X.Org Foundation (the providers
+smproxy: of the X.Org implementation of the X Window System).
+smproxy:
+smproxy: See: http://www.x.org
+smproxy:
+smproxy:
+smproxy:
diff --git a/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-install.sh b/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/smproxy/1.0.6/smproxy-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/transset/1.0.1/Makefile b/X11/X.org/app/transset/1.0.1/Makefile
index c876133a6..e77a88b5d 100644
--- a/X11/X.org/app/transset/1.0.1/Makefile
+++ b/X11/X.org/app/transset/1.0.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/transset
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/twm/1.0.8/Makefile b/X11/X.org/app/twm/1.0.8/Makefile
index 436e5d1c1..bfc744957 100644
--- a/X11/X.org/app/twm/1.0.8/Makefile
+++ b/X11/X.org/app/twm/1.0.8/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/twm/1.0.9/Makefile b/X11/X.org/app/twm/1.0.9/Makefile
new file mode 100644
index 000000000..8bd8db0c6
--- /dev/null
+++ b/X11/X.org/app/twm/1.0.9/Makefile
@@ -0,0 +1,183 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/twm
+
+REQUIRES           = X11/X.org/lib/libXmu/1.1.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.9
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/twm/twm-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/twm-$(version)
+src_dir_name       = twm-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+xinitrc_twm        = $(CURDIR)/xinit/xinitrc.twm
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = twm
+XORG_PKG_VERSION             = 1.0.9
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Tab Window Manager for the X Window System
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@mkdir -p $(XORG_PKG)/etc/X11/xinit
+	@cp -a $(xinitrc_twm) $(XORG_PKG)/etc/X11/xinit/xinitrc.twm
+	@chmod 0755 $(XORG_PKG)/etc/X11/xinit/xinitrc.twm
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/twm/1.0.9/PATCHES b/X11/X.org/app/twm/1.0.9/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/twm/1.0.9/twm-pkg-description.in b/X11/X.org/app/twm/1.0.9/twm-pkg-description.in
new file mode 100644
index 000000000..f172b4a36
--- /dev/null
+++ b/X11/X.org/app/twm/1.0.9/twm-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+twm: twm @VERSION@ (Tab Window Manager for the X Window System)
+twm:
+twm: twm is part of X11.
+twm:
+twm: For more information about the X.Org Foundation (the providers
+twm: of the X.Org implementation of the X Window System).
+twm:
+twm: See: http://www.x.org
+twm:
+twm:
+twm:
diff --git a/X11/X.org/app/twm/1.0.9/twm-pkg-install.sh b/X11/X.org/app/twm/1.0.9/twm-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/twm/1.0.9/twm-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/twm/1.0.9/xinit/xinitrc.twm b/X11/X.org/app/twm/1.0.9/xinit/xinitrc.twm
new file mode 100644
index 000000000..fb97e2e27
--- /dev/null
+++ b/X11/X.org/app/twm/1.0.9/xinit/xinitrc.twm
@@ -0,0 +1,33 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    /usr/bin/xmodmap $usermodmap
+fi
+
+# start some nice programs
+
+/usr/bin/twm &
+/usr/bin/xclock -geometry 50x50-1+1 &
+/usr/bin/xterm -geometry 80x50+494+51 &
+/usr/bin/xterm -geometry 80x20+494-0 &
+exec /usr/bin/xterm -geometry 80x66+0+0 -name login
diff --git a/X11/X.org/app/viewres/1.0.4/Makefile b/X11/X.org/app/viewres/1.0.4/Makefile
index 640a2877f..0ec36affe 100644
--- a/X11/X.org/app/viewres/1.0.4/Makefile
+++ b/X11/X.org/app/viewres/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/viewres
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/x11perf/1.5.4/Makefile b/X11/X.org/app/x11perf/1.5.4/Makefile
index 6272f6ed7..97cea2369 100644
--- a/X11/X.org/app/x11perf/1.5.4/Makefile
+++ b/X11/X.org/app/x11perf/1.5.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/x11perf/1.6.0/Makefile b/X11/X.org/app/x11perf/1.6.0/Makefile
new file mode 100644
index 000000000..c369897cd
--- /dev/null
+++ b/X11/X.org/app/x11perf/1.6.0/Makefile
@@ -0,0 +1,179 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/x11perf
+
+REQUIRES           = X11/X.org/lib/libXmu/1.1.2
+REQUIRES          += X11/X.org/lib/libXft/2.3.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.6.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/x11perf/x11perf-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/x11perf-$(version)
+src_dir_name       = x11perf-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = x11perf
+XORG_PKG_VERSION             = 1.6.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 server performance test program
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/x11perf/1.6.0/PATCHES b/X11/X.org/app/x11perf/1.6.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-description.in b/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-description.in
new file mode 100644
index 000000000..5f3778895
--- /dev/null
+++ b/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+x11perf: x11perf @VERSION@ (X11 server performance test program)
+x11perf:
+x11perf: x11perf is part of X11.
+x11perf:
+x11perf: For more information about the X.Org Foundation (the providers
+x11perf: of the X.Org implementation of the X Window System).
+x11perf:
+x11perf: See: http://www.x.org
+x11perf:
+x11perf:
+x11perf:
diff --git a/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-install.sh b/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/x11perf/1.6.0/x11perf-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xauth/1.0.9/Makefile b/X11/X.org/app/xauth/1.0.9/Makefile
index 661df291e..66f312078 100644
--- a/X11/X.org/app/xauth/1.0.9/Makefile
+++ b/X11/X.org/app/xauth/1.0.9/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xbacklight/1.2.1/Makefile b/X11/X.org/app/xbacklight/1.2.1/Makefile
index 79ab89dcd..2af5cb646 100644
--- a/X11/X.org/app/xbacklight/1.2.1/Makefile
+++ b/X11/X.org/app/xbacklight/1.2.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xbiff/1.0.3/Makefile b/X11/X.org/app/xbiff/1.0.3/Makefile
index dea8b57e4..d235a97c6 100644
--- a/X11/X.org/app/xbiff/1.0.3/Makefile
+++ b/X11/X.org/app/xbiff/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xbiff
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xcalc/1.0.5/Makefile b/X11/X.org/app/xcalc/1.0.5/Makefile
index 7817b5a53..8ae43180e 100644
--- a/X11/X.org/app/xcalc/1.0.5/Makefile
+++ b/X11/X.org/app/xcalc/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xcalc
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xcalc/1.0.6/Makefile b/X11/X.org/app/xcalc/1.0.6/Makefile
new file mode 100644
index 000000000..c309fe04b
--- /dev/null
+++ b/X11/X.org/app/xcalc/1.0.6/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xcalc
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xcalc/xcalc-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xcalc-$(version)
+src_dir_name       = xcalc-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xcalc
+XORG_PKG_VERSION             = 1.0.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 calculator
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xcalc/1.0.6/PATCHES b/X11/X.org/app/xcalc/1.0.6/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-description.in b/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-description.in
new file mode 100644
index 000000000..be8827ddd
--- /dev/null
+++ b/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+xcalc: xcalc @VERSION@ (X11 calculator)
+xcalc:
+xcalc: xcalc is part of X11.
+xcalc:
+xcalc: For more information about the X.Org Foundation (the providers
+xcalc: of the X.Org implementation of the X Window System).
+xcalc:
+xcalc: See: http://www.x.org
+xcalc:
+xcalc:
+xcalc:
diff --git a/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-install.sh b/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xcalc/1.0.6/xcalc-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xclipboard/1.1.3/Makefile b/X11/X.org/app/xclipboard/1.1.3/Makefile
index 156e7d82d..c45dcf71a 100644
--- a/X11/X.org/app/xclipboard/1.1.3/Makefile
+++ b/X11/X.org/app/xclipboard/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xclipboard
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
-REQUIRES          += X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+REQUIRES          += X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xclock/1.0.7/Makefile b/X11/X.org/app/xclock/1.0.7/Makefile
index e58b68928..37debeec5 100644
--- a/X11/X.org/app/xclock/1.0.7/Makefile
+++ b/X11/X.org/app/xclock/1.0.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xclock
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
-REQUIRES          += X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+REQUIRES          += X11/X.org/lib/libxkbfile/1.0.9
 REQUIRES          += X11/X.org/lib/libXft/2.3.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/xcm/0.5.3/Makefile b/X11/X.org/app/xcm/0.5.3/Makefile
index 030e30313..8c132ae30 100644
--- a/X11/X.org/app/xcm/0.5.3/Makefile
+++ b/X11/X.org/app/xcm/0.5.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xcmsdb/1.0.4/Makefile b/X11/X.org/app/xcmsdb/1.0.4/Makefile
index 909127157..67fa731f6 100644
--- a/X11/X.org/app/xcmsdb/1.0.4/Makefile
+++ b/X11/X.org/app/xcmsdb/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xcmsdb
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xcmsdb/1.0.5/Makefile b/X11/X.org/app/xcmsdb/1.0.5/Makefile
new file mode 100644
index 000000000..4f73de030
--- /dev/null
+++ b/X11/X.org/app/xcmsdb/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xcmsdb
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xcmsdb/xcmsdb-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xcmsdb-$(version)
+src_dir_name       = xcmsdb-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xcmsdb
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 color utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README datafiles \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xcmsdb/1.0.5/PATCHES b/X11/X.org/app/xcmsdb/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-description.in b/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-description.in
new file mode 100644
index 000000000..90204f71b
--- /dev/null
+++ b/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xcmsdb: xcmsdb @VERSION@ (X11 color utility)
+xcmsdb:
+xcmsdb: xcmsdb is part of X11.
+xcmsdb:
+xcmsdb: For more information about the X.Org Foundation (the providers
+xcmsdb: of the X.Org implementation of the X Window System).
+xcmsdb:
+xcmsdb: See: http://www.x.org
+xcmsdb:
+xcmsdb:
+xcmsdb:
diff --git a/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-install.sh b/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xcmsdb/1.0.5/xcmsdb-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xcompmgr/1.1.6/Makefile b/X11/X.org/app/xcompmgr/1.1.6/Makefile
index 0823b033a..efbdd201f 100644
--- a/X11/X.org/app/xcompmgr/1.1.6/Makefile
+++ b/X11/X.org/app/xcompmgr/1.1.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -23,7 +26,7 @@ SOURCE_REQUIRES    = sources/X.org/app/xcompmgr
 REQUIRES           = X11/X.org/lib/libXext/1.3.3
 REQUIRES          += X11/X.org/lib/libXcomposite/0.4.4
 REQUIRES          += X11/X.org/lib/libXdamage/1.1.4
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xcompmgr/1.1.7/Makefile b/X11/X.org/app/xcompmgr/1.1.7/Makefile
new file mode 100644
index 000000000..4edeed3fe
--- /dev/null
+++ b/X11/X.org/app/xcompmgr/1.1.7/Makefile
@@ -0,0 +1,181 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xcompmgr
+
+REQUIRES           = X11/X.org/lib/libXext/1.3.3
+REQUIRES          += X11/X.org/lib/libXcomposite/0.4.4
+REQUIRES          += X11/X.org/lib/libXdamage/1.1.4
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.7
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xcompmgr/xcompmgr-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xcompmgr-$(version)
+src_dir_name       = xcompmgr-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xcompmgr
+XORG_PKG_VERSION             = 1.1.7
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 compositing manager
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xcompmgr/1.1.7/PATCHES b/X11/X.org/app/xcompmgr/1.1.7/PATCHES
new file mode 100644
index 000000000..4de267025
--- /dev/null
+++ b/X11/X.org/app/xcompmgr/1.1.7/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xcompmgr/patches/xcompmgr-1.1.7.patch -p0
diff --git a/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-description.in b/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-description.in
new file mode 100644
index 000000000..8f6073aa1
--- /dev/null
+++ b/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xcompmgr: xcompmgr @VERSION@ (X11 compositing manager)
+xcompmgr:
+xcompmgr: xcompmgr is part of X11.
+xcompmgr:
+xcompmgr: For more information about the X.Org Foundation (the providers
+xcompmgr: of the X.Org implementation of the X Window System).
+xcompmgr:
+xcompmgr: See: http://www.x.org
+xcompmgr:
+xcompmgr:
+xcompmgr:
diff --git a/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-install.sh b/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xcompmgr/1.1.7/xcompmgr-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xconsole/1.0.6/Makefile b/X11/X.org/app/xconsole/1.0.6/Makefile
index 60bbc33cf..749d9ee85 100644
--- a/X11/X.org/app/xconsole/1.0.6/Makefile
+++ b/X11/X.org/app/xconsole/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xconsole
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xcursorgen/1.0.6/Makefile b/X11/X.org/app/xcursorgen/1.0.6/Makefile
index a7d61aff0..58975db86 100644
--- a/X11/X.org/app/xcursorgen/1.0.6/Makefile
+++ b/X11/X.org/app/xcursorgen/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/xcursorgen
 
 REQUIRES           = X11/X.org/lib/libXcursor/1.1.14
-REQUIRES          += libs/libpng/libpng14/1.4.13
+REQUIRES          += libs/libpng/libpng14/1.4.19
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xdbedizzy/1.1.0/Makefile b/X11/X.org/app/xdbedizzy/1.1.0/Makefile
index 7f86ed00a..7814122fd 100644
--- a/X11/X.org/app/xdbedizzy/1.1.0/Makefile
+++ b/X11/X.org/app/xdbedizzy/1.1.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xditview/1.0.3/Makefile b/X11/X.org/app/xditview/1.0.3/Makefile
index 3bc3d0353..9c2df2e50 100644
--- a/X11/X.org/app/xditview/1.0.3/Makefile
+++ b/X11/X.org/app/xditview/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xditview
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xditview/1.0.4/Makefile b/X11/X.org/app/xditview/1.0.4/Makefile
new file mode 100644
index 000000000..7b90ad62a
--- /dev/null
+++ b/X11/X.org/app/xditview/1.0.4/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xditview
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xditview/xditview-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xditview-$(version)
+src_dir_name       = xditview-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xditview
+XORG_PKG_VERSION             = 1.0.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = displays ditroff output
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xditview/1.0.4/PATCHES b/X11/X.org/app/xditview/1.0.4/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xditview/1.0.4/xditview-pkg-description.in b/X11/X.org/app/xditview/1.0.4/xditview-pkg-description.in
new file mode 100644
index 000000000..0aeb02d8c
--- /dev/null
+++ b/X11/X.org/app/xditview/1.0.4/xditview-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xditview: xditview @VERSION@ (displays ditroff output)
+xditview:
+xditview: xditview is part of X11.
+xditview:
+xditview: For more information about the X.Org Foundation (the providers
+xditview: of the X.Org implementation of the X Window System).
+xditview:
+xditview: See: http://www.x.org
+xditview:
+xditview:
+xditview:
diff --git a/X11/X.org/app/xditview/1.0.4/xditview-pkg-install.sh b/X11/X.org/app/xditview/1.0.4/xditview-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xditview/1.0.4/xditview-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xdm/1.1.11/Makefile b/X11/X.org/app/xdm/1.1.11/Makefile
index eb470d7f9..54bd4f9b9 100644
--- a/X11/X.org/app/xdm/1.1.11/Makefile
+++ b/X11/X.org/app/xdm/1.1.11/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xdm
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 REQUIRES          += X11/X.org/lib/libXft/2.3.2
 REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
 REQUIRES          += secure/pam_unix2/2.9.1
diff --git a/X11/X.org/app/xdpyinfo/1.3.1/Makefile b/X11/X.org/app/xdpyinfo/1.3.1/Makefile
index 8b2cc0821..cb03258b7 100644
--- a/X11/X.org/app/xdpyinfo/1.3.1/Makefile
+++ b/X11/X.org/app/xdpyinfo/1.3.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -22,11 +25,11 @@ SOURCE_REQUIRES    = sources/X.org/app/xdpyinfo
 
 REQUIRES           = X11/X.org/lib/libXxf86dga/1.1.4
 REQUIRES          += X11/X.org/lib/libXxf86misc/1.0.3
-REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.3
+REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.4
 REQUIRES          += X11/X.org/lib/libdmx/1.1.3
 REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
 REQUIRES          += X11/X.org/lib/libXcomposite/0.4.4
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 REQUIRES          += X11/X.org/lib/libXtst/1.2.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/xdpyinfo/1.3.2/Makefile b/X11/X.org/app/xdpyinfo/1.3.2/Makefile
new file mode 100644
index 000000000..253dde444
--- /dev/null
+++ b/X11/X.org/app/xdpyinfo/1.3.2/Makefile
@@ -0,0 +1,185 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xdpyinfo
+
+REQUIRES           = X11/X.org/lib/libXxf86dga/1.1.4
+REQUIRES          += X11/X.org/lib/libXxf86misc/1.0.3
+REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.4
+REQUIRES          += X11/X.org/lib/libdmx/1.1.3
+REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
+REQUIRES          += X11/X.org/lib/libXcomposite/0.4.4
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
+REQUIRES          += X11/X.org/lib/libXtst/1.2.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.3.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xdpyinfo/xdpyinfo-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xdpyinfo-$(version)
+src_dir_name       = xdpyinfo-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xdpyinfo
+XORG_PKG_VERSION             = 1.3.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X server information displaying utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xdpyinfo/1.3.2/PATCHES b/X11/X.org/app/xdpyinfo/1.3.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-description.in b/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-description.in
new file mode 100644
index 000000000..7df96fa73
--- /dev/null
+++ b/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xdpyinfo: xdpyinfo @VERSION@ (X server information displaying utility)
+xdpyinfo:
+xdpyinfo: xdpyinfo is part of X11.
+xdpyinfo:
+xdpyinfo: For more information about the X.Org Foundation (the providers
+xdpyinfo: of the X.Org implementation of the X Window System).
+xdpyinfo:
+xdpyinfo: See: http://www.x.org
+xdpyinfo:
+xdpyinfo:
+xdpyinfo:
diff --git a/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-install.sh b/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xdpyinfo/1.3.2/xdpyinfo-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xdriinfo/1.0.4/Makefile b/X11/X.org/app/xdriinfo/1.0.4/Makefile
index 186f8d090..956c547e5 100644
--- a/X11/X.org/app/xdriinfo/1.0.4/Makefile
+++ b/X11/X.org/app/xdriinfo/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xdriinfo/1.0.5/Makefile b/X11/X.org/app/xdriinfo/1.0.5/Makefile
new file mode 100644
index 000000000..889cf80a3
--- /dev/null
+++ b/X11/X.org/app/xdriinfo/1.0.5/Makefile
@@ -0,0 +1,181 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xdriinfo
+
+
+REQUIRES           = X11/X.org/lib/libXext/1.3.3
+
+REQUIRES          += X11/libs/opengl-collection
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xdriinfo/xdriinfo-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xdriinfo-$(version)
+src_dir_name       = xdriinfo-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xdriinfo
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 DRI drivers information
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xdriinfo/1.0.5/PATCHES b/X11/X.org/app/xdriinfo/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-description.in b/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-description.in
new file mode 100644
index 000000000..a1f70fc63
--- /dev/null
+++ b/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xdriinfo: xdriinfo @VERSION@ (X11 DRI drivers information)
+xdriinfo:
+xdriinfo: xdriinfo is part of X11.
+xdriinfo:
+xdriinfo: For more information about the X.Org Foundation (the providers
+xdriinfo: of the X.Org implementation of the X Window System).
+xdriinfo:
+xdriinfo: See: http://www.x.org
+xdriinfo:
+xdriinfo:
+xdriinfo:
diff --git a/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-install.sh b/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xdriinfo/1.0.5/xdriinfo-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xedit/1.2.1/Makefile b/X11/X.org/app/xedit/1.2.1/Makefile
index 4e835687a..464ec116d 100644
--- a/X11/X.org/app/xedit/1.2.1/Makefile
+++ b/X11/X.org/app/xedit/1.2.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xedit
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xedit/1.2.2/Makefile b/X11/X.org/app/xedit/1.2.2/Makefile
new file mode 100644
index 000000000..e0bf15344
--- /dev/null
+++ b/X11/X.org/app/xedit/1.2.2/Makefile
@@ -0,0 +1,187 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xedit
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.2.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xedit/xedit-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xedit-$(version)
+src_dir_name       = xedit-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xedit
+XORG_PKG_VERSION             = 1.2.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = simple text editor for X
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@( cd $(build_dir) ; \
+	   sed -i 's,-Wall,,g'                Makefile ; \
+	   sed -i "s,^\(CWARNFLAGS =\).*,\1," Makefile ; \
+	   sed -i 's,_BSD_SOURCE,_DEFAULT_SOURCE,g' Makefile ; \
+	 )
+	@( cd $(build_dir)/man ; \
+	   sed -i 's,-Wall,,g'                Makefile ; \
+	   sed -i "s,^\(CWARNFLAGS =\).*,\1," Makefile ; \
+	 )
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xedit/1.2.2/PATCHES b/X11/X.org/app/xedit/1.2.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xedit/1.2.2/xedit-pkg-description.in b/X11/X.org/app/xedit/1.2.2/xedit-pkg-description.in
new file mode 100644
index 000000000..5152e8635
--- /dev/null
+++ b/X11/X.org/app/xedit/1.2.2/xedit-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+xedit: xedit @VERSION@ (simple text editor for X)
+xedit:
+xedit: xedit is part of X11.
+xedit:
+xedit: For more information about the X.Org Foundation (the providers
+xedit: of the X.Org implementation of the X Window System).
+xedit:
+xedit: See: http://www.x.org
+xedit:
+xedit:
+xedit:
diff --git a/X11/X.org/app/xedit/1.2.2/xedit-pkg-install.sh b/X11/X.org/app/xedit/1.2.2/xedit-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xedit/1.2.2/xedit-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xev/1.2.1/Makefile b/X11/X.org/app/xev/1.2.1/Makefile
index 8a2b0ca47..ac0ee578a 100644
--- a/X11/X.org/app/xev/1.2.1/Makefile
+++ b/X11/X.org/app/xev/1.2.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xev
 
-REQUIRES           = X11/X.org/lib/libXrandr/1.4.2
+REQUIRES           = X11/X.org/lib/libXrandr/1.5.0
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xev/1.2.2/Makefile b/X11/X.org/app/xev/1.2.2/Makefile
new file mode 100644
index 000000000..94839e9b3
--- /dev/null
+++ b/X11/X.org/app/xev/1.2.2/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xev
+
+REQUIRES           = X11/X.org/lib/libXrandr/1.5.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.2.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xev/xev-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xev-$(version)
+src_dir_name       = xev-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xev
+XORG_PKG_VERSION             = 1.2.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 event viewer
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xev/1.2.2/PATCHES b/X11/X.org/app/xev/1.2.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xev/1.2.2/xev-pkg-description.in b/X11/X.org/app/xev/1.2.2/xev-pkg-description.in
new file mode 100644
index 000000000..22a7786f4
--- /dev/null
+++ b/X11/X.org/app/xev/1.2.2/xev-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+xev: xev @VERSION@ (X11 event viewer)
+xev:
+xev: xev is part of X11.
+xev:
+xev: For more information about the X.Org Foundation (the providers
+xev: of the X.Org implementation of the X Window System).
+xev:
+xev: See: http://www.x.org
+xev:
+xev:
+xev:
diff --git a/X11/X.org/app/xev/1.2.2/xev-pkg-install.sh b/X11/X.org/app/xev/1.2.2/xev-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xev/1.2.2/xev-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xeyes/1.1.1/Makefile b/X11/X.org/app/xeyes/1.1.1/Makefile
index d69c79bff..61a0de4fa 100644
--- a/X11/X.org/app/xeyes/1.1.1/Makefile
+++ b/X11/X.org/app/xeyes/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/xeyes
 
 REQUIRES           = X11/X.org/lib/libXmu/1.1.2
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xf86dga/1.0.3/Makefile b/X11/X.org/app/xf86dga/1.0.3/Makefile
index c064bef95..3e58bf9a5 100644
--- a/X11/X.org/app/xf86dga/1.0.3/Makefile
+++ b/X11/X.org/app/xf86dga/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xfd/1.1.2/Makefile b/X11/X.org/app/xfd/1.1.2/Makefile
index d25dfda46..13ad68c0d 100644
--- a/X11/X.org/app/xfd/1.1.2/Makefile
+++ b/X11/X.org/app/xfd/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xfd
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 REQUIRES          += X11/X.org/lib/libXft/2.3.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/xfontsel/1.0.5/Makefile b/X11/X.org/app/xfontsel/1.0.5/Makefile
index 305ac6f81..d9c2bc122 100644
--- a/X11/X.org/app/xfontsel/1.0.5/Makefile
+++ b/X11/X.org/app/xfontsel/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xfontsel
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xfs/1.1.4/Makefile b/X11/X.org/app/xfs/1.1.4/Makefile
index 4b07eb58d..bb3fa3ee7 100644
--- a/X11/X.org/app/xfs/1.1.4/Makefile
+++ b/X11/X.org/app/xfs/1.1.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xfs
 
-REQUIRES           = X11/X.org/lib/libXfont/1.5.0
+REQUIRES           = X11/X.org/lib/libXfont/1.5.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xfsinfo/1.0.4/Makefile b/X11/X.org/app/xfsinfo/1.0.4/Makefile
index f568f8223..7d862d776 100644
--- a/X11/X.org/app/xfsinfo/1.0.4/Makefile
+++ b/X11/X.org/app/xfsinfo/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xfsinfo
 
-REQUIRES           = X11/X.org/lib/libFS/1.0.6
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xfsinfo/1.0.5/Makefile b/X11/X.org/app/xfsinfo/1.0.5/Makefile
new file mode 100644
index 000000000..25113b5d9
--- /dev/null
+++ b/X11/X.org/app/xfsinfo/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xfsinfo
+
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xfsinfo/xfsinfo-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xfsinfo-$(version)
+src_dir_name       = xfsinfo-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xfsinfo
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 font server utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xfsinfo/1.0.5/PATCHES b/X11/X.org/app/xfsinfo/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-description.in b/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-description.in
new file mode 100644
index 000000000..ec703a38c
--- /dev/null
+++ b/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+xfsinfo: xfsinfo @VERSION@ (X11 font server utility)
+xfsinfo:
+xfsinfo: xfsinfo is part of X11.
+xfsinfo:
+xfsinfo: For more information about the X.Org Foundation (the providers
+xfsinfo: of the X.Org implementation of the X Window System).
+xfsinfo:
+xfsinfo: See: http://www.x.org
+xfsinfo:
+xfsinfo:
+xfsinfo:
diff --git a/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-install.sh b/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xfsinfo/1.0.5/xfsinfo-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xgamma/1.0.5/Makefile b/X11/X.org/app/xgamma/1.0.5/Makefile
index ad1a7397a..d6dd15898 100644
--- a/X11/X.org/app/xgamma/1.0.5/Makefile
+++ b/X11/X.org/app/xgamma/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xgamma
 
-REQUIRES           = X11/X.org/lib/libXxf86vm/1.1.3
+REQUIRES           = X11/X.org/lib/libXxf86vm/1.1.4
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xgamma/1.0.6/Makefile b/X11/X.org/app/xgamma/1.0.6/Makefile
new file mode 100644
index 000000000..4f824d88b
--- /dev/null
+++ b/X11/X.org/app/xgamma/1.0.6/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xgamma
+
+REQUIRES           = X11/X.org/lib/libXxf86vm/1.1.4
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xgamma/xgamma-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xgamma-$(version)
+src_dir_name       = xgamma-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xgamma
+XORG_PKG_VERSION             = 1.0.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 gamma utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xgamma/1.0.6/PATCHES b/X11/X.org/app/xgamma/1.0.6/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-description.in b/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-description.in
new file mode 100644
index 000000000..d4b53e7f4
--- /dev/null
+++ b/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xgamma: xgamma @VERSION@ (X11 gamma utility)
+xgamma:
+xgamma: xgamma is part of X11.
+xgamma:
+xgamma: For more information about the X.Org Foundation (the providers
+xgamma: of the X.Org implementation of the X Window System).
+xgamma:
+xgamma: See: http://www.x.org
+xgamma:
+xgamma:
+xgamma:
diff --git a/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-install.sh b/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xgamma/1.0.6/xgamma-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xgc/1.0.4/Makefile b/X11/X.org/app/xgc/1.0.4/Makefile
index 6667d30a4..66b4cc0ff 100644
--- a/X11/X.org/app/xgc/1.0.4/Makefile
+++ b/X11/X.org/app/xgc/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xgc
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xgc/1.0.5/Makefile b/X11/X.org/app/xgc/1.0.5/Makefile
new file mode 100644
index 000000000..a554f55d0
--- /dev/null
+++ b/X11/X.org/app/xgc/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xgc
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xgc/xgc-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xgc-$(version)
+src_dir_name       = xgc-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xgc
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 demo client
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xgc/1.0.5/PATCHES b/X11/X.org/app/xgc/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xgc/1.0.5/xgc-pkg-description.in b/X11/X.org/app/xgc/1.0.5/xgc-pkg-description.in
new file mode 100644
index 000000000..a8a9bb509
--- /dev/null
+++ b/X11/X.org/app/xgc/1.0.5/xgc-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+xgc: xgc @VERSION@ (X11 demo client)
+xgc:
+xgc: xgc is part of X11.
+xgc:
+xgc: For more information about the X.Org Foundation (the providers
+xgc: of the X.Org implementation of the X Window System).
+xgc:
+xgc: See: http://www.x.org
+xgc:
+xgc:
+xgc:
diff --git a/X11/X.org/app/xgc/1.0.5/xgc-pkg-install.sh b/X11/X.org/app/xgc/1.0.5/xgc-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xgc/1.0.5/xgc-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xhost/1.0.6/Makefile b/X11/X.org/app/xhost/1.0.6/Makefile
index fafdf3b6a..2ab447164 100644
--- a/X11/X.org/app/xhost/1.0.6/Makefile
+++ b/X11/X.org/app/xhost/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xhost/1.0.7/Makefile b/X11/X.org/app/xhost/1.0.7/Makefile
new file mode 100644
index 000000000..a3f8c5c68
--- /dev/null
+++ b/X11/X.org/app/xhost/1.0.7/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xhost
+
+REQUIRES           = X11/X.org/lib/libXmu/1.1.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.7
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xhost/xhost-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xhost-$(version)
+src_dir_name       = xhost-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xhost
+XORG_PKG_VERSION             = 1.0.7
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 authorization utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xhost/1.0.7/PATCHES b/X11/X.org/app/xhost/1.0.7/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xhost/1.0.7/xhost-pkg-description.in b/X11/X.org/app/xhost/1.0.7/xhost-pkg-description.in
new file mode 100644
index 000000000..e1397d5fc
--- /dev/null
+++ b/X11/X.org/app/xhost/1.0.7/xhost-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+xhost: xhost @VERSION@ (X11 authorization utility)
+xhost:
+xhost: xhost is part of X11.
+xhost:
+xhost: For more information about the X.Org Foundation (the providers
+xhost: of the X.Org implementation of the X Window System).
+xhost:
+xhost: See: http://www.x.org
+xhost:
+xhost:
+xhost:
diff --git a/X11/X.org/app/xhost/1.0.7/xhost-pkg-install.sh b/X11/X.org/app/xhost/1.0.7/xhost-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xhost/1.0.7/xhost-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xinit/1.3.4/Makefile b/X11/X.org/app/xinit/1.3.4/Makefile
index d7de13a2d..c35641f6d 100644
--- a/X11/X.org/app/xinit/1.3.4/Makefile
+++ b/X11/X.org/app/xinit/1.3.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xinit
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xinit/1.3.4/PATCHES b/X11/X.org/app/xinit/1.3.4/PATCHES
index e69de29bb..c7d219d5b 100644
--- a/X11/X.org/app/xinit/1.3.4/PATCHES
+++ b/X11/X.org/app/xinit/1.3.4/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/app/xinit/patches/xinit-1.3.4-remove-systemd-kludge.patch -p0
diff --git a/X11/X.org/app/xinput/1.6.1/Makefile b/X11/X.org/app/xinput/1.6.1/Makefile
index 237d6bbbc..dd4060465 100644
--- a/X11/X.org/app/xinput/1.6.1/Makefile
+++ b/X11/X.org/app/xinput/1.6.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xinput
 
-REQUIRES           = X11/X.org/lib/libXi/1.7.4
-REQUIRES          += X11/X.org/lib/libXrandr/1.4.2
+REQUIRES           = X11/X.org/lib/libXi/1.7.6
+REQUIRES          += X11/X.org/lib/libXrandr/1.5.0
 REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/app/xinput/1.6.2/Makefile b/X11/X.org/app/xinput/1.6.2/Makefile
new file mode 100644
index 000000000..e7fb32148
--- /dev/null
+++ b/X11/X.org/app/xinput/1.6.2/Makefile
@@ -0,0 +1,180 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xinput
+
+REQUIRES           = X11/X.org/lib/libXi/1.7.6
+REQUIRES          += X11/X.org/lib/libXrandr/1.5.0
+REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.6.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xinput/xinput-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xinput-$(version)
+src_dir_name       = xinput-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xinput
+XORG_PKG_VERSION             = 1.6.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = configure X11 input devices utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL NEWS README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xinput/1.6.2/PATCHES b/X11/X.org/app/xinput/1.6.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xinput/1.6.2/xinput-pkg-description.in b/X11/X.org/app/xinput/1.6.2/xinput-pkg-description.in
new file mode 100644
index 000000000..4c10cd6eb
--- /dev/null
+++ b/X11/X.org/app/xinput/1.6.2/xinput-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xinput: xinput @VERSION@ (configure X11 input devices utility)
+xinput:
+xinput: xinput is part of X11.
+xinput:
+xinput: For more information about the X.Org Foundation (the providers
+xinput: of the X.Org implementation of the X Window System).
+xinput:
+xinput: See: http://www.x.org
+xinput:
+xinput:
+xinput:
diff --git a/X11/X.org/app/xinput/1.6.2/xinput-pkg-install.sh b/X11/X.org/app/xinput/1.6.2/xinput-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xinput/1.6.2/xinput-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xkbcomp/1.3.0/Makefile b/X11/X.org/app/xkbcomp/1.3.0/Makefile
index a8a8d493e..b6aa653d4 100644
--- a/X11/X.org/app/xkbcomp/1.3.0/Makefile
+++ b/X11/X.org/app/xkbcomp/1.3.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xkbcomp
 
-REQUIRES           = X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xkbcomp/1.3.1/Makefile b/X11/X.org/app/xkbcomp/1.3.1/Makefile
new file mode 100644
index 000000000..a95c81b1a
--- /dev/null
+++ b/X11/X.org/app/xkbcomp/1.3.1/Makefile
@@ -0,0 +1,184 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xkbcomp
+
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.3.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xkbcomp/xkbcomp-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xkbcomp-$(version)
+src_dir_name       = xkbcomp-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xkbcomp
+XORG_PKG_VERSION             = 1.3.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X keymap compiler
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-xkb-config-root=/etc/X11/xkb
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xkbcomp.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xkbcomp/1.3.1/PATCHES b/X11/X.org/app/xkbcomp/1.3.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-description.in b/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-description.in
new file mode 100644
index 000000000..a2dbee474
--- /dev/null
+++ b/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+xkbcomp: xkbcomp @VERSION@ (X keymap compiler)
+xkbcomp:
+xkbcomp: xkbcomp is part of X11.
+xkbcomp:
+xkbcomp: For more information about the X.Org Foundation (the providers
+xkbcomp: of the X.Org implementation of the X Window System).
+xkbcomp:
+xkbcomp: See: http://www.x.org
+xkbcomp:
+xkbcomp:
+xkbcomp:
diff --git a/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-install.sh b/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xkbcomp/1.3.1/xkbcomp-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xkbevd/1.1.3/Makefile b/X11/X.org/app/xkbevd/1.1.3/Makefile
index 26eb577fd..fdbcfdadc 100644
--- a/X11/X.org/app/xkbevd/1.1.3/Makefile
+++ b/X11/X.org/app/xkbevd/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xkbevd
 
-REQUIRES           = X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xkbevd/1.1.4/Makefile b/X11/X.org/app/xkbevd/1.1.4/Makefile
new file mode 100644
index 000000000..294af96d1
--- /dev/null
+++ b/X11/X.org/app/xkbevd/1.1.4/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xkbevd
+
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xkbevd/xkbevd-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xkbevd-$(version)
+src_dir_name       = xkbevd-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xkbevd
+XORG_PKG_VERSION             = 1.1.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 keyboard event daemon
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xkbevd/1.1.4/PATCHES b/X11/X.org/app/xkbevd/1.1.4/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-description.in b/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-description.in
new file mode 100644
index 000000000..d59dacf38
--- /dev/null
+++ b/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xkbevd: xkbevd @VERSION@ (X11 keyboard event daemon)
+xkbevd:
+xkbevd: xkbevd is part of X11.
+xkbevd:
+xkbevd: For more information about the X.Org Foundation (the providers
+xkbevd: of the X.Org implementation of the X Window System).
+xkbevd:
+xkbevd: See: http://www.x.org
+xkbevd:
+xkbevd:
+xkbevd:
diff --git a/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-install.sh b/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xkbevd/1.1.4/xkbevd-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xkbprint/1.0.3/Makefile b/X11/X.org/app/xkbprint/1.0.3/Makefile
index 766e4dfc5..4f49f8345 100644
--- a/X11/X.org/app/xkbprint/1.0.3/Makefile
+++ b/X11/X.org/app/xkbprint/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xkbprint
 
-REQUIRES           = X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xkbprint/1.0.4/Makefile b/X11/X.org/app/xkbprint/1.0.4/Makefile
new file mode 100644
index 000000000..32af075c8
--- /dev/null
+++ b/X11/X.org/app/xkbprint/1.0.4/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xkbprint
+
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xkbprint/xkbprint-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xkbprint-$(version)
+src_dir_name       = xkbprint-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xkbprint
+XORG_PKG_VERSION             = 1.0.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = print an XKB keyboard description
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xkbprint/1.0.4/PATCHES b/X11/X.org/app/xkbprint/1.0.4/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-description.in b/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-description.in
new file mode 100644
index 000000000..4e2e603bb
--- /dev/null
+++ b/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xkbprint: xkbprint @VERSION@ (print an XKB keyboard description)
+xkbprint:
+xkbprint: xkbprint is part of X11.
+xkbprint:
+xkbprint: For more information about the X.Org Foundation (the providers
+xkbprint: of the X.Org implementation of the X Window System).
+xkbprint:
+xkbprint: See: http://www.x.org
+xkbprint:
+xkbprint:
+xkbprint:
diff --git a/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-install.sh b/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xkbprint/1.0.4/xkbprint-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xkbutils/1.0.4/Makefile b/X11/X.org/app/xkbutils/1.0.4/Makefile
index 59b560a8d..c72d370b4 100644
--- a/X11/X.org/app/xkbutils/1.0.4/Makefile
+++ b/X11/X.org/app/xkbutils/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xkbutils
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xkill/1.0.4/Makefile b/X11/X.org/app/xkill/1.0.4/Makefile
index b875ee110..961261dae 100644
--- a/X11/X.org/app/xkill/1.0.4/Makefile
+++ b/X11/X.org/app/xkill/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xload/1.1.2/Makefile b/X11/X.org/app/xload/1.1.2/Makefile
index fbe6f1a96..7d87626fc 100644
--- a/X11/X.org/app/xload/1.1.2/Makefile
+++ b/X11/X.org/app/xload/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xload
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xlogo/1.0.4/Makefile b/X11/X.org/app/xlogo/1.0.4/Makefile
index ad8f160ce..a0e7f0b93 100644
--- a/X11/X.org/app/xlogo/1.0.4/Makefile
+++ b/X11/X.org/app/xlogo/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/app/xlogo
 
 REQUIRES           = X11/X.org/lib/libXft/2.3.2
-REQUIRES          += X11/X.org/lib/libXaw/1.0.12
+REQUIRES          += X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xlsatoms/1.1.1/Makefile b/X11/X.org/app/xlsatoms/1.1.1/Makefile
index 32c7fca8a..1f2044247 100644
--- a/X11/X.org/app/xlsatoms/1.1.1/Makefile
+++ b/X11/X.org/app/xlsatoms/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xlsatoms
 
-REQUIRES           = X11/X.org/xcb/libxcb/1.11
+REQUIRES           = X11/X.org/xcb/libxcb/1.11.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xlsatoms/1.1.2/Makefile b/X11/X.org/app/xlsatoms/1.1.2/Makefile
new file mode 100644
index 000000000..880fc5eb4
--- /dev/null
+++ b/X11/X.org/app/xlsatoms/1.1.2/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xlsatoms
+
+REQUIRES           = X11/X.org/xcb/libxcb/1.11.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xlsatoms/xlsatoms-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xlsatoms-$(version)
+src_dir_name       = xlsatoms-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xlsatoms
+XORG_PKG_VERSION             = 1.1.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = lists the interned atoms
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xlsatoms/1.1.2/PATCHES b/X11/X.org/app/xlsatoms/1.1.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-description.in b/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-description.in
new file mode 100644
index 000000000..f9418bc25
--- /dev/null
+++ b/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xlsatoms: xlsatoms @VERSION@ (lists the interned atoms)
+xlsatoms:
+xlsatoms: xlsatoms is part of X11.
+xlsatoms:
+xlsatoms: For more information about the X.Org Foundation (the providers
+xlsatoms: of the X.Org implementation of the X Window System).
+xlsatoms:
+xlsatoms: See: http://www.x.org
+xlsatoms:
+xlsatoms:
+xlsatoms:
diff --git a/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-install.sh b/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xlsatoms/1.1.2/xlsatoms-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xlsclients/1.1.3/Makefile b/X11/X.org/app/xlsclients/1.1.3/Makefile
index 7ba35f6fe..9c95112e5 100644
--- a/X11/X.org/app/xlsclients/1.1.3/Makefile
+++ b/X11/X.org/app/xlsclients/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xlsclients
 
-REQUIRES           = X11/X.org/xcb/libxcb/1.11
+REQUIRES           = X11/X.org/xcb/libxcb/1.11.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xlsfonts/1.0.4/Makefile b/X11/X.org/app/xlsfonts/1.0.4/Makefile
index 3cf9cc4ed..6ec34dbde 100644
--- a/X11/X.org/app/xlsfonts/1.0.4/Makefile
+++ b/X11/X.org/app/xlsfonts/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xlsfonts
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xlsfonts/1.0.5/Makefile b/X11/X.org/app/xlsfonts/1.0.5/Makefile
new file mode 100644
index 000000000..d091823f9
--- /dev/null
+++ b/X11/X.org/app/xlsfonts/1.0.5/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xlsfonts
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xlsfonts/xlsfonts-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xlsfonts-$(version)
+src_dir_name       = xlsfonts-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xlsfonts
+XORG_PKG_VERSION             = 1.0.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = list available fonts utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xlsfonts/1.0.5/PATCHES b/X11/X.org/app/xlsfonts/1.0.5/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-description.in b/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-description.in
new file mode 100644
index 000000000..76a7cbf68
--- /dev/null
+++ b/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+xlsfonts: xlsfonts @VERSION@ (list available fonts utility)
+xlsfonts:
+xlsfonts: xlsfonts is part of X11.
+xlsfonts:
+xlsfonts: For more information about the X.Org Foundation (the providers
+xlsfonts: of the X.Org implementation of the X Window System).
+xlsfonts:
+xlsfonts: See: http://www.x.org
+xlsfonts:
+xlsfonts:
+xlsfonts:
diff --git a/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-install.sh b/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xlsfonts/1.0.5/xlsfonts-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xmag/1.0.5/Makefile b/X11/X.org/app/xmag/1.0.5/Makefile
index 182c41381..d396dfdc4 100644
--- a/X11/X.org/app/xmag/1.0.5/Makefile
+++ b/X11/X.org/app/xmag/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xmag
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xmag/1.0.6/Makefile b/X11/X.org/app/xmag/1.0.6/Makefile
new file mode 100644
index 000000000..74a92de85
--- /dev/null
+++ b/X11/X.org/app/xmag/1.0.6/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xmag
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xmag/xmag-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xmag-$(version)
+src_dir_name       = xmag-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xmag
+XORG_PKG_VERSION             = 1.0.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 accessibility utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xmag/1.0.6/PATCHES b/X11/X.org/app/xmag/1.0.6/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xmag/1.0.6/xmag-pkg-description.in b/X11/X.org/app/xmag/1.0.6/xmag-pkg-description.in
new file mode 100644
index 000000000..f46b8ad43
--- /dev/null
+++ b/X11/X.org/app/xmag/1.0.6/xmag-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+xmag: xmag @VERSION@ (X11 accessibility utility)
+xmag:
+xmag: xmag is part of X11.
+xmag:
+xmag: For more information about the X.Org Foundation (the providers
+xmag: of the X.Org implementation of the X Window System).
+xmag:
+xmag: See: http://www.x.org
+xmag:
+xmag:
+xmag:
diff --git a/X11/X.org/app/xmag/1.0.6/xmag-pkg-install.sh b/X11/X.org/app/xmag/1.0.6/xmag-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xmag/1.0.6/xmag-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xman/1.1.3/Makefile b/X11/X.org/app/xman/1.1.3/Makefile
index 074cd5810..519849541 100644
--- a/X11/X.org/app/xman/1.1.3/Makefile
+++ b/X11/X.org/app/xman/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xman
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xman/1.1.4/Makefile b/X11/X.org/app/xman/1.1.4/Makefile
new file mode 100644
index 000000000..1e6df0033
--- /dev/null
+++ b/X11/X.org/app/xman/1.1.4/Makefile
@@ -0,0 +1,180 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xman
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xman/xman-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xman-$(version)
+src_dir_name       = xman-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xman
+XORG_PKG_VERSION             = 1.1.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = graphical manual page browser
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-manconfig=/usr/lib$(LIBSUFFIX)/man.conf
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xman/1.1.4/PATCHES b/X11/X.org/app/xman/1.1.4/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xman/1.1.4/xman-pkg-description.in b/X11/X.org/app/xman/1.1.4/xman-pkg-description.in
new file mode 100644
index 000000000..145f0e768
--- /dev/null
+++ b/X11/X.org/app/xman/1.1.4/xman-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+xman: xman @VERSION@ (graphical manual page browser)
+xman:
+xman: xman is part of X11.
+xman:
+xman: For more information about the X.Org Foundation (the providers
+xman: of the X.Org implementation of the X Window System).
+xman:
+xman: See: http://www.x.org
+xman:
+xman:
+xman:
diff --git a/X11/X.org/app/xman/1.1.4/xman-pkg-install.sh b/X11/X.org/app/xman/1.1.4/xman-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xman/1.1.4/xman-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xmessage/1.0.4/Makefile b/X11/X.org/app/xmessage/1.0.4/Makefile
index ee947d503..c1021989a 100644
--- a/X11/X.org/app/xmessage/1.0.4/Makefile
+++ b/X11/X.org/app/xmessage/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xmessage
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xmh/1.0.2/Makefile b/X11/X.org/app/xmh/1.0.2/Makefile
index e2464c1a3..b483c5614 100644
--- a/X11/X.org/app/xmh/1.0.2/Makefile
+++ b/X11/X.org/app/xmh/1.0.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xmh
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xmh/1.0.3/Makefile b/X11/X.org/app/xmh/1.0.3/Makefile
new file mode 100644
index 000000000..76e7abf37
--- /dev/null
+++ b/X11/X.org/app/xmh/1.0.3/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xmh
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xmh/xmh-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xmh-$(version)
+src_dir_name       = xmh-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xmh
+XORG_PKG_VERSION             = 1.0.3
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 mail handler
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xmh/1.0.3/PATCHES b/X11/X.org/app/xmh/1.0.3/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xmh/1.0.3/xmh-pkg-description.in b/X11/X.org/app/xmh/1.0.3/xmh-pkg-description.in
new file mode 100644
index 000000000..023086eff
--- /dev/null
+++ b/X11/X.org/app/xmh/1.0.3/xmh-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+xmh: xmh @VERSION@ (X11 mail handler)
+xmh:
+xmh: xmh is part of X11.
+xmh:
+xmh: For more information about the X.Org Foundation (the providers
+xmh: of the X.Org implementation of the X Window System).
+xmh:
+xmh: See: http://www.x.org
+xmh:
+xmh:
+xmh:
diff --git a/X11/X.org/app/xmh/1.0.3/xmh-pkg-install.sh b/X11/X.org/app/xmh/1.0.3/xmh-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xmh/1.0.3/xmh-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xmodmap/1.0.8/Makefile b/X11/X.org/app/xmodmap/1.0.8/Makefile
index 1a4728dc7..2d9f5f32e 100644
--- a/X11/X.org/app/xmodmap/1.0.8/Makefile
+++ b/X11/X.org/app/xmodmap/1.0.8/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xmodmap
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xmodmap/1.0.9/Makefile b/X11/X.org/app/xmodmap/1.0.9/Makefile
new file mode 100644
index 000000000..51b519f2e
--- /dev/null
+++ b/X11/X.org/app/xmodmap/1.0.9/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xmodmap
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.9
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xmodmap/xmodmap-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xmodmap-$(version)
+src_dir_name       = xmodmap-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xmodmap
+XORG_PKG_VERSION             = 1.0.9
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 keyboard utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xmodmap/1.0.9/PATCHES b/X11/X.org/app/xmodmap/1.0.9/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-description.in b/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-description.in
new file mode 100644
index 000000000..91c2fa488
--- /dev/null
+++ b/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+xmodmap: xmodmap @VERSION@ (X11 keyboard utility)
+xmodmap:
+xmodmap: xmodmap is part of X11.
+xmodmap:
+xmodmap: For more information about the X.Org Foundation (the providers
+xmodmap: of the X.Org implementation of the X Window System).
+xmodmap:
+xmodmap: See: http://www.x.org
+xmodmap:
+xmodmap:
+xmodmap:
diff --git a/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-install.sh b/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xmodmap/1.0.9/xmodmap-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xmore/1.0.2/Makefile b/X11/X.org/app/xmore/1.0.2/Makefile
index d5a8d54ea..7255bec61 100644
--- a/X11/X.org/app/xmore/1.0.2/Makefile
+++ b/X11/X.org/app/xmore/1.0.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xmore
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xpr/1.0.4/Makefile b/X11/X.org/app/xpr/1.0.4/Makefile
index d51188e1f..d7afabd71 100644
--- a/X11/X.org/app/xpr/1.0.4/Makefile
+++ b/X11/X.org/app/xpr/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xprop/1.2.2/Makefile b/X11/X.org/app/xprop/1.2.2/Makefile
index 856dc29f4..03dc2d360 100644
--- a/X11/X.org/app/xprop/1.2.2/Makefile
+++ b/X11/X.org/app/xprop/1.2.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xprop
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xrandr/1.4.3/Makefile b/X11/X.org/app/xrandr/1.4.3/Makefile
index d8e5ade55..62f7ebaed 100644
--- a/X11/X.org/app/xrandr/1.4.3/Makefile
+++ b/X11/X.org/app/xrandr/1.4.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xrandr
 
-REQUIRES           = X11/X.org/lib/libXrandr/1.4.2
+REQUIRES           = X11/X.org/lib/libXrandr/1.5.0
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xrandr/1.5.0/Makefile b/X11/X.org/app/xrandr/1.5.0/Makefile
new file mode 100644
index 000000000..d3fddc96a
--- /dev/null
+++ b/X11/X.org/app/xrandr/1.5.0/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xrandr
+
+REQUIRES           = X11/X.org/lib/libXrandr/1.5.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xrandr/xrandr-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xrandr-$(version)
+src_dir_name       = xrandr-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xrandr
+XORG_PKG_VERSION             = 1.5.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 RandR utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xrandr/1.5.0/PATCHES b/X11/X.org/app/xrandr/1.5.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-description.in b/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-description.in
new file mode 100644
index 000000000..1bb0f173f
--- /dev/null
+++ b/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xrandr: xrandr @VERSION@ (X11 RandR utility)
+xrandr:
+xrandr: xrandr is part of X11.
+xrandr:
+xrandr: For more information about the X.Org Foundation (the providers
+xrandr: of the X.Org implementation of the X Window System).
+xrandr:
+xrandr: See: http://www.x.org
+xrandr:
+xrandr:
+xrandr:
diff --git a/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-install.sh b/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xrandr/1.5.0/xrandr-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xrdb/1.1.0/Makefile b/X11/X.org/app/xrdb/1.1.0/Makefile
index 9b6559b2b..e57803748 100644
--- a/X11/X.org/app/xrdb/1.1.0/Makefile
+++ b/X11/X.org/app/xrdb/1.1.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xrefresh/1.0.5/Makefile b/X11/X.org/app/xrefresh/1.0.5/Makefile
index 007f1a637..fb20eb4a1 100644
--- a/X11/X.org/app/xrefresh/1.0.5/Makefile
+++ b/X11/X.org/app/xrefresh/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xrefresh
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xscope/1.4.1/Makefile b/X11/X.org/app/xscope/1.4.1/Makefile
index 3ab1d1386..fe2ef5313 100644
--- a/X11/X.org/app/xscope/1.4.1/Makefile
+++ b/X11/X.org/app/xscope/1.4.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xscope
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xset/1.2.3/Makefile b/X11/X.org/app/xset/1.2.3/Makefile
index cfaf49068..03d01077e 100644
--- a/X11/X.org/app/xset/1.2.3/Makefile
+++ b/X11/X.org/app/xset/1.2.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xsetroot/1.1.1/Makefile b/X11/X.org/app/xsetroot/1.1.1/Makefile
index bbf115de0..46c687bd9 100644
--- a/X11/X.org/app/xsetroot/1.1.1/Makefile
+++ b/X11/X.org/app/xsetroot/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xsm/1.0.3/Makefile b/X11/X.org/app/xsm/1.0.3/Makefile
index ee57fdda9..1a7281213 100644
--- a/X11/X.org/app/xsm/1.0.3/Makefile
+++ b/X11/X.org/app/xsm/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xsm
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xstdcmap/1.0.3/Makefile b/X11/X.org/app/xstdcmap/1.0.3/Makefile
index 887afd68a..8103ffc71 100644
--- a/X11/X.org/app/xstdcmap/1.0.3/Makefile
+++ b/X11/X.org/app/xstdcmap/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xvidtune/1.0.3/Makefile b/X11/X.org/app/xvidtune/1.0.3/Makefile
index 2d918cf04..004d9fbc5 100644
--- a/X11/X.org/app/xvidtune/1.0.3/Makefile
+++ b/X11/X.org/app/xvidtune/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xvidtune
 
-REQUIRES           = X11/X.org/lib/libXaw/1.0.12
-REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.3
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+REQUIRES          += X11/X.org/lib/libXxf86vm/1.1.4
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xvinfo/1.1.2/Makefile b/X11/X.org/app/xvinfo/1.1.2/Makefile
index 55b71a151..a79305c83 100644
--- a/X11/X.org/app/xvinfo/1.1.2/Makefile
+++ b/X11/X.org/app/xvinfo/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/app/xvinfo/1.1.3/Makefile b/X11/X.org/app/xvinfo/1.1.3/Makefile
new file mode 100644
index 000000000..abe301fc3
--- /dev/null
+++ b/X11/X.org/app/xvinfo/1.1.3/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/app/xvinfo
+
+REQUIRES           = X11/X.org/lib/libXv/1.0.10
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/app/xvinfo/xvinfo-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xvinfo-$(version)
+src_dir_name       = xvinfo-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xvinfo
+XORG_PKG_VERSION             = 1.1.3
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X11 X-Video utility
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/app/xvinfo/1.1.3/PATCHES b/X11/X.org/app/xvinfo/1.1.3/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-description.in b/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-description.in
new file mode 100644
index 000000000..e432d55e7
--- /dev/null
+++ b/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+xvinfo: xvinfo @VERSION@ (X11 X-Video utility)
+xvinfo:
+xvinfo: xvinfo is part of X11.
+xvinfo:
+xvinfo: For more information about the X.Org Foundation (the providers
+xvinfo: of the X.Org implementation of the X Window System).
+xvinfo:
+xvinfo: See: http://www.x.org
+xvinfo:
+xvinfo:
+xvinfo:
diff --git a/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-install.sh b/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/app/xvinfo/1.1.3/xvinfo-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/app/xwd/1.0.6/Makefile b/X11/X.org/app/xwd/1.0.6/Makefile
index fe8646e92..d22fe6f85 100644
--- a/X11/X.org/app/xwd/1.0.6/Makefile
+++ b/X11/X.org/app/xwd/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xwd
 
-REQUIRES           = X11/X.org/lib/libxkbfile/1.0.8
+REQUIRES           = X11/X.org/lib/libxkbfile/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xwininfo/1.1.3/Makefile b/X11/X.org/app/xwininfo/1.1.3/Makefile
index 35d357d84..d4025e40a 100644
--- a/X11/X.org/app/xwininfo/1.1.3/Makefile
+++ b/X11/X.org/app/xwininfo/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xwininfo
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/app/xwud/1.0.4/Makefile b/X11/X.org/app/xwud/1.0.4/Makefile
index 3a4c56459..114386f16 100644
--- a/X11/X.org/app/xwud/1.0.4/Makefile
+++ b/X11/X.org/app/xwud/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/app/xwud
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/data/xbitmaps/1.1.1/Makefile b/X11/X.org/data/xbitmaps/1.1.1/Makefile
index 6f66271f3..3eac6ce1c 100644
--- a/X11/X.org/data/xbitmaps/1.1.1/Makefile
+++ b/X11/X.org/data/xbitmaps/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/data/xcursor-themes/1.0.4/Makefile b/X11/X.org/data/xcursor-themes/1.0.4/Makefile
index 0d8186acf..66e867f26 100644
--- a/X11/X.org/data/xcursor-themes/1.0.4/Makefile
+++ b/X11/X.org/data/xcursor-themes/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/data/xkeyboard-config/2.13/Makefile b/X11/X.org/data/xkeyboard-config/2.13/Makefile
index 83f790198..49b9cbc4f 100644
--- a/X11/X.org/data/xkeyboard-config/2.13/Makefile
+++ b/X11/X.org/data/xkeyboard-config/2.13/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/data/xkeyboard-config/2.17/Makefile b/X11/X.org/data/xkeyboard-config/2.17/Makefile
new file mode 100644
index 000000000..6bfe73652
--- /dev/null
+++ b/X11/X.org/data/xkeyboard-config/2.17/Makefile
@@ -0,0 +1,186 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/data/xkeyboard-config
+
+REQUIRES           = X11/X.org/util/util-macros/1.19.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.17
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/data/xkeyboard-config/xkeyboard-config-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xkeyboard-config-$(version)
+src_dir_name       = xkeyboard-config-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xkeyboard-config
+XORG_PKG_VERSION             = 2.17
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Keyboard Extension config files
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-compat-rules
+extra_configure_switches += --with-xkb-base=/etc/X11/xkb
+extra_configure_switches += --with-xkb-rules-symlink=xfree86,xorg
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@mkdir $(XORG_PKG)/usr/share/X11
+	@( cd $(XORG_PKG)/usr/share/X11  ; \
+	   ln -sf ../../../etc/X11/xkb . ; \
+	 )
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING NEWS README TODO docs/HOWTO* docs/README* \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/share/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xkeyboard-config.pc \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/data/xkeyboard-config/2.17/PATCHES b/X11/X.org/data/xkeyboard-config/2.17/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-description.in b/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-description.in
new file mode 100644
index 000000000..165380e98
--- /dev/null
+++ b/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+xkeyboard-config: xkeyboard-config @VERSION@ (X Keyboard Extension config files)
+xkeyboard-config:
+xkeyboard-config: The X Keyboard Extension essentially replaces the core protocol
+xkeyboard-config: definition of keyboard. The extension makes possible to clearly
+xkeyboard-config: and explicitly specify most aspects of keyboard behaviour on
+xkeyboard-config: per-key basis and to more closely track the logical and physical
+xkeyboard-config: state of the keyboard. It also includes a number of keyboard
+xkeyboard-config: controls designed to make keyboards more accessible to people
+xkeyboard-config: with physical impairments.
+xkeyboard-config:
+xkeyboard-config:
diff --git a/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-install.sh b/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-install.sh
new file mode 100755
index 000000000..f4d619cb8
--- /dev/null
+++ b/X11/X.org/data/xkeyboard-config/2.17/xkeyboard-config-pkg-install.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  if [ -f etc/X11/xkb/symbols/pc ]; then
+    mv etc/X11/xkb etc/X11/xkb.old.bak.$$
+    mkdir -p etc/X11/xkb/rules
+  fi
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  pre_install
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/doc/xorg-docs/1.7.1/Makefile b/X11/X.org/doc/xorg-docs/1.7.1/Makefile
new file mode 100644
index 000000000..bce332784
--- /dev/null
+++ b/X11/X.org/doc/xorg-docs/1.7.1/Makefile
@@ -0,0 +1,183 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/doc/xorg-docs
+
+REQUIRES           = X11/X.org/doc/xorg-sgml-doctools/1.11
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES          += X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES          += X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.7.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/doc/xorg-docs/xorg-docs-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xorg-docs-$(version)
+src_dir_name       = xorg-docs-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xorg-docs
+XORG_PKG_VERSION             = 1.7.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = documentation for X11
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/doc/xorg-docs/1.7.1/PATCHES b/X11/X.org/doc/xorg-docs/1.7.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-description.in b/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-description.in
new file mode 100644
index 000000000..147852b53
--- /dev/null
+++ b/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+xorg-docs: xorg-docs @VERSION@ (documentation for X11)
+xorg-docs:
+xorg-docs: This package provides miscellaneous documentation for the X Window
+xorg-docs: System that doesn't better fit into other packages.
+xorg-docs:
+xorg-docs: The preferred documentation format for these documents
+xorg-docs: is DocBook XML.
+xorg-docs:
+xorg-docs:
+xorg-docs:
+xorg-docs:
diff --git a/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-install.sh b/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/doc/xorg-docs/1.7.1/xorg-docs-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/doc/xorg-docs/1.7/Makefile b/X11/X.org/doc/xorg-docs/1.7/Makefile
index c605671ea..1f514708c 100644
--- a/X11/X.org/doc/xorg-docs/1.7/Makefile
+++ b/X11/X.org/doc/xorg-docs/1.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,10 +24,18 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/doc/xorg-docs
 
 REQUIRES           = X11/X.org/doc/xorg-sgml-doctools/1.11
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES          += X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES          += X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/doc/xorg-sgml-doctools/1.11/Makefile b/X11/X.org/doc/xorg-sgml-doctools/1.11/Makefile
index 378f3b77d..5c1be9cc7 100644
--- a/X11/X.org/doc/xorg-sgml-doctools/1.11/Makefile
+++ b/X11/X.org/doc/xorg-sgml-doctools/1.11/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/driver-input/Makefile b/X11/X.org/driver-input/Makefile
index b0bd82ddb..4c54cc972 100644
--- a/X11/X.org/driver-input/Makefile
+++ b/X11/X.org/driver-input/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -22,17 +25,25 @@ include ../../../build-system/constants.mk
 
 REQUIRES += X11/X.org/driver/xf86-input-acecad/1.5.0
 REQUIRES += X11/X.org/driver/xf86-input-aiptek/1.4.1
-REQUIRES += X11/X.org/driver/xf86-input-evdev/2.9.0
 REQUIRES += X11/X.org/driver/xf86-input-joystick/1.6.2
-REQUIRES += X11/X.org/driver/xf86-input-keyboard/1.8.0
+REQUIRES += X11/X.org/driver/xf86-input-keyboard/1.8.1
 REQUIRES += X11/X.org/driver/xf86-input-mouse/1.9.1
 REQUIRES += X11/X.org/driver/xf86-input-penmount/1.5.0
-REQUIRES += X11/X.org/driver/xf86-input-synaptics/1.8.1
 
-REQUIRES += X11/X.org/driver/xf86-input-void/1.4.0
+REQUIRES += X11/X.org/driver/xf86-input-evdev/2.10.2
+REQUIRES += X11/X.org/driver/xf86-input-synaptics/1.8.99.1
+#
+# NOTE: xf86-input-libinput - is a replacement  of  evdev + synaptics
+#       to use this driver you have to install  60-libinput.conf from
+#       /usr/share/doc/xf86-input-libinput-0.19.0/conf directory into
+#       /usr/share/X11/xorg.conf.d/ .
+#
+REQUIRES += X11/X.org/driver/xf86-input-libinput/0.19.0
+
+REQUIRES += X11/X.org/driver/xf86-input-void/1.4.1
 
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
-REQUIRES += X11/X.org/driver/xf86-input-vmmouse/13.0.0
+REQUIRES += X11/X.org/driver/xf86-input-vmmouse/13.1.0
 endif
 
 
diff --git a/X11/X.org/driver-video/Makefile b/X11/X.org/driver-video/Makefile
index e89d7c045..8a9dbfe39 100644
--- a/X11/X.org/driver-video/Makefile
+++ b/X11/X.org/driver-video/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -24,11 +27,11 @@ REQUIRES += X11/X.org/driver/xf86-video-dummy/0.3.7
 REQUIRES += X11/X.org/driver/xf86-video-fbdev/0.4.4
 REQUIRES += X11/X.org/driver/xf86-video-modesetting/0.9.0
 REQUIRES += X11/X.org/driver/xf86-video-v4l/0.2.0
-REQUIRES += X11/X.org/driver/xf86-video-vesa/2.3.3
+REQUIRES += X11/X.org/driver/xf86-video-vesa/2.3.4
 
 ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
-REQUIRES += X11/X.org/driver/xf86-video-intel/2.99.916
-REQUIRES += X11/X.org/driver/xf86-video-vmware/13.0.2
+REQUIRES += X11/X.org/driver/xf86-video-intel/2.99.917.1
+REQUIRES += X11/X.org/driver/xf86-video-vmware/13.1.0
 endif
 
 ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
@@ -38,6 +41,14 @@ ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2
 endif
 
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201)),)
+REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2
+endif
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_MXQ)),)
+REQUIRES += X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2
+endif
+
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/driver/xf86-input-acecad/1.5.0/Makefile b/X11/X.org/driver/xf86-input-acecad/1.5.0/Makefile
index c3b4178af..86e79a937 100644
--- a/X11/X.org/driver/xf86-input-acecad/1.5.0/Makefile
+++ b/X11/X.org/driver/xf86-input-acecad/1.5.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-acecad
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 REQUIRES          += app/sysfsutils/2.1.0
 
diff --git a/X11/X.org/driver/xf86-input-aiptek/1.4.1/Makefile b/X11/X.org/driver/xf86-input-aiptek/1.4.1/Makefile
index 68d5a9022..90c7e24e6 100644
--- a/X11/X.org/driver/xf86-input-aiptek/1.4.1/Makefile
+++ b/X11/X.org/driver/xf86-input-aiptek/1.4.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-aiptek
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
@@ -163,7 +174,7 @@ $(install_target): $(build_target)
 	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" aiptek_drv.la \
 	 )
 	# ======= Strip binaries =======
-	@( cd $(XORG_PKG); \
+	@( cd $(XORG_PKG) ; \
 	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
 	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
 	 )
diff --git a/X11/X.org/driver/xf86-input-aiptek/1.4.1/PATCHES b/X11/X.org/driver/xf86-input-aiptek/1.4.1/PATCHES
index e69de29bb..37be7cbbb 100644
--- a/X11/X.org/driver/xf86-input-aiptek/1.4.1/PATCHES
+++ b/X11/X.org/driver/xf86-input-aiptek/1.4.1/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/driver/xf86-input-aiptek/patches/xf86-input-aiptek-1.4.1-abi.patch -p0
diff --git a/X11/X.org/driver/xf86-input-evdev/2.10.2/Makefile b/X11/X.org/driver/xf86-input-evdev/2.10.2/Makefile
new file mode 100644
index 000000000..06937b705
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-evdev/2.10.2/Makefile
@@ -0,0 +1,226 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-evdev
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+REQUIRES          += libs/eudev/3.1.5
+REQUIRES          += X11/libs/libevdev/1.5.1
+REQUIRES          += X11/libs/mtdev/1.1.5
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.10.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-evdev/xf86-input-evdev-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-evdev-$(version)
+src_dir_name       = xf86-input-evdev-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-evdev
+XORG_PKG_VERSION             = 2.10.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Generic Linux input driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-sdkdir=/usr/include/xorg
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" evdev_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" evdev_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" evdev_drv.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xorg-evdev.pc; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-evdev/2.10.2/PATCHES b/X11/X.org/driver/xf86-input-evdev/2.10.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-description.in b/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-description.in
new file mode 100644
index 000000000..21027bf29
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+xf86-input-evdev: xf86-input-evdev @VERSION@ (Generic Linux input driver)
+xf86-input-evdev:
+xf86-input-evdev: xf86-input-evdev is part of X11.
+xf86-input-evdev:
+xf86-input-evdev: For more information about the X.Org Foundation (the providers
+xf86-input-evdev: of the X.Org implementation of the X Window System).
+xf86-input-evdev:
+xf86-input-evdev: See: http://www.x.org
+xf86-input-evdev:
+xf86-input-evdev:
+xf86-input-evdev:
diff --git a/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-install.sh b/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-evdev/2.10.2/xf86-input-evdev-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-input-evdev/2.9.0/Makefile b/X11/X.org/driver/xf86-input-evdev/2.9.0/Makefile
index 9659fb5b3..70eb5e581 100644
--- a/X11/X.org/driver/xf86-input-evdev/2.9.0/Makefile
+++ b/X11/X.org/driver/xf86-input-evdev/2.9.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,13 +23,21 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-evdev
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
-REQUIRES          += libs/eudev/1.9
-REQUIRES          += X11/libs/libevdev/1.3.2
+REQUIRES          += libs/eudev/3.1.5
+REQUIRES          += X11/libs/libevdev/1.5.1
 REQUIRES          += X11/libs/mtdev/1.1.5
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-joystick/1.6.2/Makefile b/X11/X.org/driver/xf86-input-joystick/1.6.2/Makefile
index 47a2c0830..ceddfe097 100644
--- a/X11/X.org/driver/xf86-input-joystick/1.6.2/Makefile
+++ b/X11/X.org/driver/xf86-input-joystick/1.6.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-joystick
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-keyboard/1.8.0/Makefile b/X11/X.org/driver/xf86-input-keyboard/1.8.0/Makefile
index cc6196b18..2de85c8fd 100644
--- a/X11/X.org/driver/xf86-input-keyboard/1.8.0/Makefile
+++ b/X11/X.org/driver/xf86-input-keyboard/1.8.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-keyboard
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-keyboard/1.8.1/Makefile b/X11/X.org/driver/xf86-input-keyboard/1.8.1/Makefile
new file mode 100644
index 000000000..f6a2a1366
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-keyboard/1.8.1/Makefile
@@ -0,0 +1,202 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-keyboard
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.8.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-keyboard/xf86-input-keyboard-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-keyboard-$(version)
+src_dir_name       = xf86-input-keyboard-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-keyboard
+XORG_PKG_VERSION             = 1.8.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Keyboard input driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" kbd_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" kbd_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" kbd_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-keyboard/1.8.1/PATCHES b/X11/X.org/driver/xf86-input-keyboard/1.8.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-description.in b/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-description.in
new file mode 100644
index 000000000..b734d8b71
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+xf86-input-keyboard: xf86-input-keyboard @VERSION@ (Keyboard input driver)
+xf86-input-keyboard:
+xf86-input-keyboard: xf86-input-keyboard is part of X11.
+xf86-input-keyboard:
+xf86-input-keyboard: For more information about the X.Org Foundation (the providers
+xf86-input-keyboard: of the X.Org implementation of the X Window System).
+xf86-input-keyboard:
+xf86-input-keyboard: See: http://www.x.org
+xf86-input-keyboard:
+xf86-input-keyboard:
+xf86-input-keyboard:
diff --git a/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-install.sh b/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-keyboard/1.8.1/xf86-input-keyboard-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-input-libinput/0.19.0/Makefile b/X11/X.org/driver/xf86-input-libinput/0.19.0/Makefile
new file mode 100644
index 000000000..2d7f6572e
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-libinput/0.19.0/Makefile
@@ -0,0 +1,234 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-libinput
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+REQUIRES          += X11/libs/libinput/1.3.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.19.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-libinput/xf86-input-libinput-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-libinput-$(version)
+src_dir_name       = xf86-input-libinput-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-libinput
+XORG_PKG_VERSION             = 0.19.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = a libinput-based X driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-sdkdir=/usr/include/xorg
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# =======
+	# ======= Removing the /usr/share/X11/xorg.conf.d/60-libinput.conf
+	# ======= file because evdev and synaptics drivers set up by default
+	# ======= the user can set up this config manualy from
+	# =======    /usr/share/doc/$(src_dir_name)/conf
+	# ======= directory.
+	# =======
+	@rm -rf $(XORG_PKG)/usr/share/X11
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)/conf
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README.md \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) ; \
+	   cp -a conf/*.conf \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name)/conf ; \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libinput_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libinput_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libinput_drv.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xorg-libinput.pc; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-libinput/0.19.0/PATCHES b/X11/X.org/driver/xf86-input-libinput/0.19.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-description.in b/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-description.in
new file mode 100644
index 000000000..966189719
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                   |-----handy-ruler------------------------------------------------------|
+xf86-input-libinput: xf86-input-libinput @VERSION@ (libinput input driver)
+xf86-input-libinput:
+xf86-input-libinput: xf86-input-libinput is part of X11.
+xf86-input-libinput:
+xf86-input-libinput: For more information about the X.Org Foundation (the providers
+xf86-input-libinput: of the X.Org implementation of the X Window System).
+xf86-input-libinput:
+xf86-input-libinput: See: http://www.x.org
+xf86-input-libinput:
+xf86-input-libinput:
+xf86-input-libinput:
diff --git a/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-install.sh b/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-libinput/0.19.0/xf86-input-libinput-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-input-mouse/1.9.1/Makefile b/X11/X.org/driver/xf86-input-mouse/1.9.1/Makefile
index afe1349f0..9d46c18b7 100644
--- a/X11/X.org/driver/xf86-input-mouse/1.9.1/Makefile
+++ b/X11/X.org/driver/xf86-input-mouse/1.9.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-mouse
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-penmount/1.5.0/Makefile b/X11/X.org/driver/xf86-input-penmount/1.5.0/Makefile
index 0bb953cf6..ed821d5cb 100644
--- a/X11/X.org/driver/xf86-input-penmount/1.5.0/Makefile
+++ b/X11/X.org/driver/xf86-input-penmount/1.5.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-penmount
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.1/Makefile b/X11/X.org/driver/xf86-input-synaptics/1.8.1/Makefile
index 55bada4b2..795f39ddb 100644
--- a/X11/X.org/driver/xf86-input-synaptics/1.8.1/Makefile
+++ b/X11/X.org/driver/xf86-input-synaptics/1.8.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,12 +23,20 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-synaptics
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
-REQUIRES          += X11/libs/libevdev/1.3.2
+REQUIRES          += X11/libs/libevdev/1.5.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile
new file mode 100644
index 000000000..2a52ce7ff
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/Makefile
@@ -0,0 +1,240 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-synaptics
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+REQUIRES          += X11/libs/libevdev/1.5.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.8.99.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-synaptics/xf86-input-synaptics-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-synaptics-$(version)
+src_dir_name       = xf86-input-synaptics-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+conf_d_file        = $(CURDIR)/conf/50-synaptics.conf
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-synaptics
+XORG_PKG_VERSION             = 1.8.99.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Synaptics touchpad driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-sdkdir=/usr/include/xorg
+extra_configure_switches += --with-xorg-conf-dir=/usr/share/X11/xorg.conf.d
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@cp -a $(conf_d_file) $(XORG_PKG)/usr/share/X11/xorg.conf.d/50-synaptics.conf
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)/conf
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) ; \
+	   cp -a conf/*.{conf,fdi} \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name)/conf ; \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" synaptics_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" synaptics_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" synaptics_drv.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xorg-synaptics.pc; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(XORG_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/PATCHES b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/conf/50-synaptics.conf b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/conf/50-synaptics.conf
new file mode 100644
index 000000000..09c37642e
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/conf/50-synaptics.conf
@@ -0,0 +1,15 @@
+# DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES
+# Copy this file to /etc/X11/xorg.conf.d/ and edit the copy
+#
+# Use "synclient -l" to see all available options
+# Use "man synaptics" for details about what the options do
+#
+Section "InputClass"
+	Identifier "touchpad"
+	Driver "synaptics"
+	MatchDevicePath "/dev/input/event*"
+	MatchIsTouchpad "on"
+	Option "TapButton1" "1"
+	Option "TapButton2" "2"
+	Option "TapButton3" "3"
+EndSection
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-description.in b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-description.in
new file mode 100644
index 000000000..363fa858b
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                    |-----handy-ruler------------------------------------------------------|
+xf86-input-synaptics: xf86-input-synaptics @VERSION@ (Synaptics touchpad driver)
+xf86-input-synaptics:
+xf86-input-synaptics: xf86-input-synaptics is part of X11.
+xf86-input-synaptics:
+xf86-input-synaptics: For more information about the X.Org Foundation (the providers
+xf86-input-synaptics: of the X.Org implementation of the X Window System).
+xf86-input-synaptics:
+xf86-input-synaptics: See: http://www.x.org
+xf86-input-synaptics:
+xf86-input-synaptics:
+xf86-input-synaptics:
diff --git a/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-install.sh b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-synaptics/1.8.99.1/xf86-input-synaptics-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-input-vmmouse/13.0.0/Makefile b/X11/X.org/driver/xf86-input-vmmouse/13.0.0/Makefile
index 5737289b3..4f3d3de36 100644
--- a/X11/X.org/driver/xf86-input-vmmouse/13.0.0/Makefile
+++ b/X11/X.org/driver/xf86-input-vmmouse/13.0.0/Makefile
@@ -12,8 +12,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-vmmouse
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
-REQUIRES          += libs/eudev/1.9
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES          += libs/eudev/3.1.5
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/driver/xf86-input-vmmouse/13.1.0/Makefile b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/Makefile
new file mode 100644
index 000000000..12ede4116
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/Makefile
@@ -0,0 +1,205 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-vmmouse
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES          += libs/eudev/3.1.5
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 13.1.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-vmmouse/xf86-input-vmmouse-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-vmmouse-$(version)
+src_dir_name       = xf86-input-vmmouse-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-vmmouse
+XORG_PKG_VERSION             = 13.1.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = VMWare's VMMouse guest mouse driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-xorg-conf-dir=/usr/share/X11/xorg.conf.d
+extra_configure_switches += --with-udev-rules-dir=/lib/udev/rules.d
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+# we use default values:
+#
+# extra_configure_switches += --with-hal-bin-dir=$prefix/bin
+# extra_configure_switches += --with-hal-callouts-dir=$libdir/hal
+# extra_configure_switches += --with-hal-fdi-dir=$datadir/hal/fdi/policy/20thirdparty
+#
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" vmmouse_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" vmmouse_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" vmmouse_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(XORG_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-vmmouse/13.1.0/PATCHES b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-description.in b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-description.in
new file mode 100644
index 000000000..83ff90226
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                  |-----handy-ruler------------------------------------------------------|
+xf86-input-vmmouse: xf86-input-vmmouse @VERSION@ (VMWare's VMMouse guest mouse driver)
+xf86-input-vmmouse:
+xf86-input-vmmouse: xf86-input-vmmouse is part of X11.
+xf86-input-vmmouse:
+xf86-input-vmmouse: For more information about the X.Org Foundation (the providers
+xf86-input-vmmouse: of the X.Org implementation of the X Window System).
+xf86-input-vmmouse:
+xf86-input-vmmouse: See: http://www.x.org
+xf86-input-vmmouse:
+xf86-input-vmmouse:
+xf86-input-vmmouse:
diff --git a/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-install.sh b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-vmmouse/13.1.0/xf86-input-vmmouse-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-input-void/1.4.0/Makefile b/X11/X.org/driver/xf86-input-void/1.4.0/Makefile
index 0cd8236f3..75746db67 100644
--- a/X11/X.org/driver/xf86-input-void/1.4.0/Makefile
+++ b/X11/X.org/driver/xf86-input-void/1.4.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-void
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-input-void/1.4.1/Makefile b/X11/X.org/driver/xf86-input-void/1.4.1/Makefile
new file mode 100644
index 000000000..6e5a47804
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-void/1.4.1/Makefile
@@ -0,0 +1,202 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-input-void
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.4.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-input-void/xf86-input-void-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-input-void-$(version)
+src_dir_name       = xf86-input-void-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-input-void
+XORG_PKG_VERSION             = 1.4.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = null input driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" void_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/input ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" void_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" void_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-input-void/1.4.1/PATCHES b/X11/X.org/driver/xf86-input-void/1.4.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-description.in b/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-description.in
new file mode 100644
index 000000000..bde311ccc
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xf86-input-void: xf86-input-void @VERSION@ (null input driver)
+xf86-input-void:
+xf86-input-void: xf86-input-void is part of X11.
+xf86-input-void:
+xf86-input-void: For more information about the X.Org Foundation (the providers
+xf86-input-void: of the X.Org implementation of the X Window System).
+xf86-input-void:
+xf86-input-void: See: http://www.x.org
+xf86-input-void:
+xf86-input-void:
+xf86-input-void:
diff --git a/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-install.sh b/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-input-void/1.4.1/xf86-input-void-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-video-dummy/0.3.7/Makefile b/X11/X.org/driver/xf86-video-dummy/0.3.7/Makefile
index bfd61152a..d0e3e595b 100644
--- a/X11/X.org/driver/xf86-video-dummy/0.3.7/Makefile
+++ b/X11/X.org/driver/xf86-video-dummy/0.3.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-dummy
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-fbdev/0.4.4/Makefile b/X11/X.org/driver/xf86-video-fbdev/0.4.4/Makefile
index 68a5cdb54..ce3ebb99f 100644
--- a/X11/X.org/driver/xf86-video-fbdev/0.4.4/Makefile
+++ b/X11/X.org/driver/xf86-video-fbdev/0.4.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-fbdev
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile b/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile
index 326361e21..644987c68 100644
--- a/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile
+++ b/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.4.0/Makefile
@@ -1,5 +1,5 @@
 
-COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS  = $(HARDWARE_CB1X)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile b/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile
index 917d963e2..0a0ef8933 100644
--- a/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile
+++ b/X11/X.org/driver/xf86-video-fbturbo/r3p0-04rel0/0.5.1/Makefile
@@ -1,5 +1,5 @@
 
-COMPONENT_TARGETS  = $(HARDWARE_CB3X)
+COMPONENT_TARGETS  = $(HARDWARE_CB1X)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/driver/xf86-video-intel/2.99.916/Makefile b/X11/X.org/driver/xf86-video-intel/2.99.916/Makefile
index e969acf71..89d58f658 100644
--- a/X11/X.org/driver/xf86-video-intel/2.99.916/Makefile
+++ b/X11/X.org/driver/xf86-video-intel/2.99.916/Makefile
@@ -15,7 +15,7 @@ SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-intel
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
 REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
 REQUIRES          += X11/X.org/lib/libXtst/1.2.2
-REQUIRES          += X11/X.org/lib/libXvMC/1.0.8
+REQUIRES          += X11/X.org/lib/libXvMC/1.0.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/driver/xf86-video-intel/2.99.917.1/Makefile b/X11/X.org/driver/xf86-video-intel/2.99.917.1/Makefile
new file mode 100644
index 000000000..1d96ea172
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-intel/2.99.917.1/Makefile
@@ -0,0 +1,213 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-intel
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+REQUIRES          += X11/X.org/lib/libXinerama/1.1.3
+REQUIRES          += X11/X.org/lib/libXtst/1.2.2
+REQUIRES          += X11/X.org/lib/libXvMC/1.0.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.99.917.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-video-intel/xf86-video-intel-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-intel-$(version)
+src_dir_name       = xf86-video-intel-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-intel
+XORG_PKG_VERSION             = 2.99.917.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Intel graphics video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING NEWS README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" intel_drv.la \
+	 )
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libI810XvMC.la libIntelXvMC.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" intel_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" intel_drv.la \
+	 )
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libI810XvMC.la libIntelXvMC.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libI810XvMC.la libIntelXvMC.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(XORG_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-video-intel/2.99.917.1/PATCHES b/X11/X.org/driver/xf86-video-intel/2.99.917.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-description.in b/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-description.in
new file mode 100644
index 000000000..de3b230b5
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+xf86-video-intel: xf86-video-intel @VERSION@ (Intel graphics video driver)
+xf86-video-intel:
+xf86-video-intel: xf86-video-intel is part of X11.
+xf86-video-intel:
+xf86-video-intel: For more information about the X.Org Foundation (the providers
+xf86-video-intel: of the X.Org implementation of the X Window System).
+xf86-video-intel:
+xf86-video-intel: See: http://www.x.org
+xf86-video-intel:
+xf86-video-intel:
+xf86-video-intel:
diff --git a/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-install.sh b/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-intel/2.99.917.1/xf86-video-intel-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile b/X11/X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile
index 785e613e0..9931f94e8 100644
--- a/X11/X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile
+++ b/X11/X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile
@@ -12,7 +12,7 @@ include ../../../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/hal/Mali/xf86-video-mali/DX/r3p0-04rel0
 
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
-REQUIRES          += X11/X.org/lib/pixman/0.32.6
+REQUIRES          += X11/X.org/lib/pixman/0.34.0
 REQUIRES          += X11/libs/sunxi-mali/3.0.4.0
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile
new file mode 100644
index 000000000..ce27f90ac
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/Makefile
@@ -0,0 +1,207 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/xf86-video-mali/DX/r4p0-00rel0
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+REQUIRES          += X11/X.org/lib/pixman/0.34.0
+REQUIRES          += X11/libs/aml-mali/4.0.1.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.4.2
+tar_gz_archive     = $(SRC_PACKAGE_PATH)/hal/Mali/xf86-video-mali/DX/r4p0-00rel0/xf86-video-mali-$(version).tar.gz
+SRC_ARCHIVE        = $(tar_gz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-mali-$(version)
+src_dir_name       = xf86-video-mali-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+license            = $(CURDIR)/license/COPYING
+xorg_config_in     = $(CURDIR)/etc/X11/xorg.conf.mali.in
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-mali
+XORG_PKG_VERSION             = 0.4.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Mali X11 video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+CFLAGS += -I$(CURDIR)/ddk-include/include -DHAVE_STRNDUP
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
+	   automake ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install default xorg.conf file =======
+	@mkdir -p $(XORG_PKG)/etc/X11
+	@cat $(xorg_config_in) | \
+	     sed 's,@HARDWARE_SPEC@,$(HW_SPEC),' > $(XORG_PKG)/etc/X11/xorg.conf.mali
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(license) \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a $(license) README* xorg.conf \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" mali_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" mali_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" mali_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/PATCHES b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/PATCHES
new file mode 100644
index 000000000..8abbc2803
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../../../sources/hal/Mali/xf86-video-mali/DX/r4p0-00rel0/patches/xf86-video-mali-0.4.2-amlogic.patch -p0
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump.h b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump.h
new file mode 100644
index 000000000..ce593c7d5
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump.h
@@ -0,0 +1,262 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump.h
+ *
+ * This file contains the user space part of the UMP API.
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_H_
+#define _UNIFIED_MEMORY_PROVIDER_H_
+
+
+/** @defgroup ump_user_space_api UMP User Space API
+ * @{ */
+
+
+#include "ump_platform.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * External representation of a UMP handle in user space.
+ */
+typedef void *ump_handle;
+
+/**
+ * Typedef for a secure ID, a system wide identificator for UMP memory buffers.
+ */
+typedef unsigned int ump_secure_id;
+
+/**
+ * Value to indicate an invalid UMP memory handle.
+ */
+#define UMP_INVALID_MEMORY_HANDLE ((ump_handle)0)
+
+/**
+ * Value to indicate an invalid secure Id.
+ */
+#define UMP_INVALID_SECURE_ID     ((ump_secure_id)-1)
+
+/**
+ * UMP error codes for user space.
+ */
+typedef enum
+{
+	UMP_OK = 0, /**< indicates success */
+	UMP_ERROR,  /**< indicates failure */
+} ump_result;
+
+
+/**
+ * Opens and initializes the UMP library.
+ *
+ * This function must be called at least once before calling any other UMP API functions.
+ * Each open is reference counted and must be matched with a call to @ref ump_close "ump_close".
+ *
+ * @see ump_close
+ *
+ * @return UMP_OK indicates success, UMP_ERROR indicates failure.
+ */
+UMP_API_EXPORT ump_result ump_open(void);
+
+
+/**
+ * Terminate the UMP library.
+ *
+ * This must be called once for every successful @ref ump_open "ump_open". The UMP library is
+ * terminated when, and only when, the last open reference to the UMP interface is closed.
+ *
+ * @see ump_open
+ */
+UMP_API_EXPORT void ump_close(void);
+
+
+/**
+ * Retrieves the secure ID for the specified UMP memory.
+ *
+ * This identificator is unique across the entire system, and uniquely identifies
+ * the specified UMP memory. This identificator can later be used through the
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id" or
+ * @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ * functions in order to access this UMP memory, for instance from another process.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_secure_id_get "ump_dd_secure_id_get"
+ *
+ * @see ump_handle_create_from_secure_id
+ * @see ump_dd_handle_create_from_secure_id
+ * @see ump_dd_secure_id_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the secure ID for the specified UMP memory.
+ */
+UMP_API_EXPORT ump_secure_id ump_secure_id_get(ump_handle mem);
+
+
+/**
+ * Retrieves a handle to allocated UMP memory.
+ *
+ * The usage of UMP memory is reference counted, so this will increment the reference
+ * count by one for the specified UMP memory.
+ * Use @ref ump_reference_release "ump_reference_release" when there is no longer any
+ * use for the retrieved handle.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ *
+ * @see ump_reference_release
+ * @see ump_dd_handle_create_from_secure_id
+ *
+ * @param secure_id The secure ID of the UMP memory to open, that can be retrieved using the @ref ump_secure_id_get "ump_secure_id_get " function.
+ *
+ * @return UMP_INVALID_MEMORY_HANDLE indicates failure, otherwise a valid handle is returned.
+ */
+UMP_API_EXPORT ump_handle ump_handle_create_from_secure_id(ump_secure_id secure_id);
+
+
+/**
+ * Retrieves the actual size of the specified UMP memory.
+ *
+ * The size is reported in bytes, and is typically page aligned.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_size_get "ump_dd_size_get"
+ *
+ * @see ump_dd_size_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the allocated size of the specified UMP memory, in bytes.
+ */
+UMP_API_EXPORT unsigned long ump_size_get(ump_handle mem);
+
+
+/**
+ * Read from specified UMP memory.
+ *
+ * Another way of reading from (and writing to) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Destination buffer.
+ * @param src Handle to UMP memory to read from.
+ * @param offset Where to start reading, given in bytes.
+ * @param length How much to read, given in bytes.
+ */
+UMP_API_EXPORT void ump_read(void *dst, ump_handle src, unsigned long offset, unsigned long length);
+
+
+/**
+ * Write to specified UMP memory.
+ *
+ * Another way of writing to (and reading from) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Handle to UMP memory to write to.
+ * @param offset Where to start writing, given in bytes.
+ * @param src Buffer to read from.
+ * @param length How much to write, given in bytes.
+ */
+UMP_API_EXPORT void ump_write(ump_handle dst, unsigned long offset, const void *src, unsigned long length);
+
+
+/**
+ * Retrieves a memory mapped pointer to the specified UMP memory.
+ *
+ * This function retrieves a memory mapped pointer to the specified UMP memory,
+ * that can be used by the CPU. Every successful call to
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" is reference counted,
+ * and must therefore be followed by a call to
+ * @ref ump_mapped_pointer_release "ump_mapped_pointer_release " when the
+ * memory mapping is no longer needed.
+ *
+ * @note Systems without a MMU for the CPU only return the physical address, because no mapping is required.
+ *
+ * @see ump_mapped_pointer_release
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return NULL indicates failure, otherwise a CPU mapped pointer is returned.
+ */
+UMP_API_EXPORT void *ump_mapped_pointer_get(ump_handle mem);
+
+
+/**
+ * Releases a previously mapped pointer to the specified UMP memory.
+ *
+ * The CPU mapping of the specified UMP memory memory is reference counted,
+ * so every call to @ref ump_mapped_pointer_get "ump_mapped_pointer_get" must
+ * be matched with a call to this function when the mapping is no longer needed.
+ *
+ * The CPU mapping is not removed before all references to the mapping is released.
+ *
+ * @note Systems without a MMU must still implement this function, even though no unmapping should be needed.
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_mapped_pointer_release(ump_handle mem);
+
+
+/**
+ * Adds an extra reference to the specified UMP memory.
+ *
+ * This function adds an extra reference to the specified UMP memory. This function should
+ * be used every time a UMP memory handle is duplicated, that is, assigned to another ump_handle
+ * variable. The function @ref ump_reference_release "ump_reference_release" must then be used
+ * to release each copy of the UMP memory handle.
+ *
+ * @note You are not required to call @ref ump_reference_add "ump_reference_add"
+ * for UMP handles returned from
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id",
+ * because these handles are already reference counted by this function.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_add "ump_dd_reference_add"
+ *
+ * @see ump_dd_reference_add
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_add(ump_handle mem);
+
+
+/**
+ * Releases a reference from the specified UMP memory.
+ *
+ * This function should be called once for every reference to the UMP memory handle.
+ * When the last reference is released, all resources associated with this UMP memory
+ * handle are freed.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_release "ump_dd_reference_release"
+ *
+ * @see ump_dd_reference_release
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_release(ump_handle mem);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_H_ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h
new file mode 100644
index 000000000..6560fb7cf
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_platform.h
@@ -0,0 +1,62 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2011, 2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_platform.h
+ *
+ * This file should define UMP_API_EXPORT,
+ * which dictates how the UMP user space API should be exported/imported.
+ * Modify this file, if needed, to match your platform setup.
+ */
+
+#ifndef __UMP_PLATFORM_H__
+#define __UMP_PLATFORM_H__
+
+/** @addtogroup ump_user_space_api
+ * @{ */
+
+/**
+ * A define which controls how UMP user space API functions are imported and exported.
+ * This define should be set by the implementor of the UMP API.
+ */
+#if defined(_WIN32)
+
+#define UMP_API_EXPORT
+
+#elif defined(__SYMBIAN32__)
+
+#define UMP_API_EXPORT IMPORT_C
+
+#else
+
+#if defined(__GNUC__)
+#if __GNUC__ >= 4
+#   define MALI_VISIBLE  __attribute__ ((visibility ("default")))       /**< Function should be visible from outside the dll */
+#else
+#   define MALI_VISIBLE
+#endif
+
+#elif defined(__ARMCC_VERSION)
+/* ARMCC specific */
+#   define MALI_VISIBLE  __declspec(dllexport)
+
+#else
+#   define MALI_VISIBLE
+
+#endif
+
+#define UMP_API_EXPORT MALI_VISIBLE
+
+#endif
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /* __UMP_PLATFORM_H__ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h
new file mode 100644
index 000000000..c2fa15675
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h
@@ -0,0 +1,103 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2009-2010, 2012-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_ref_drv.h
+ *
+ * Reference driver extensions to the UMP user space API for allocating UMP memory
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+#define _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+
+#include "ump.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum
+{
+	/* This enum must match with the IOCTL enum in ump_ioctl.h */
+	UMP_REF_DRV_CONSTRAINT_NONE = 0,
+	UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR = 1,
+	UMP_REF_DRV_CONSTRAINT_USE_CACHE = 4,
+} ump_alloc_constraints;
+
+/** Allocate an UMP handle containing a memory buffer.
+ * Input: Size: The minimum size for the allocation.
+ * Usage: If this is UMP_REF_DRV_CONSTRAINT_USE_CACHE, the allocation is mapped as cached by the cpu.
+ *        If it is UMP_REF_DRV_CONSTRAINT_NONE it is mapped as noncached.
+ *        The flag UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR is not supported.*/
+UMP_API_EXPORT ump_handle ump_ref_drv_allocate(unsigned long size, ump_alloc_constraints usage);
+
+typedef enum
+{
+	UMP_MSYNC_CLEAN = 0 ,
+	UMP_MSYNC_CLEAN_AND_INVALIDATE = 1,
+	UMP_MSYNC_INVALIDATE = 2,
+	UMP_MSYNC_READOUT_CACHE_ENABLED = 128,
+} ump_cpu_msync_op;
+
+typedef enum
+{
+	UMP_READ = 1,
+	UMP_READ_WRITE = 3,
+} ump_lock_usage;
+
+/** Flushing cache for an ump_handle.
+ * The function will always CLEAN_AND_INVALIDATE as long as the \a op is not UMP_MSYNC_READOUT_CACHE_ENABLED.
+ * If so it will only report back if the given ump_handle is cacheable.
+ * At the momement the implementation does not use \a address or \a size.
+ * Return value is 1 if cache is enabled, and 0 if it is disabled for the given allocation.*/
+UMP_API_EXPORT int ump_cpu_msync_now(ump_handle mem, ump_cpu_msync_op op, void *address, int size);
+
+
+typedef enum
+{
+	UMP_USED_BY_CPU = 0,
+	UMP_USED_BY_MALI = 1,
+	UMP_USED_BY_UNKNOWN_DEVICE = 100,
+} ump_hw_usage;
+
+typedef enum
+{
+	UMP_CACHE_OP_START = 0,
+	UMP_CACHE_OP_FINISH  = 1,
+} ump_cache_op_control;
+
+/** Cache operation control. Tell when cache maintenance operations start and end.
+This will allow the kernel to merge cache operations togheter, thus making them faster */
+UMP_API_EXPORT int ump_cache_operations_control(ump_cache_op_control op);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage(ump_handle mem, ump_hw_usage new_user);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage_secure_id(ump_secure_id ump_id, ump_hw_usage new_user);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock(ump_handle mem, ump_lock_usage lock_usage);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock_secure_id(ump_secure_id ump_id, ump_lock_usage lock_usage);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock(ump_handle mem);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock_secure_id(ump_secure_id ump_id);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_REF_DRV_H_ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h
new file mode 100644
index 000000000..88b0a46ff
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012-2013 ARM Limited. All rights reserved.
+ * 
+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence.
+ * 
+ * A copy of the licence is included with the program, and can also be obtained from Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __UMPLOCK_IOCTL_H__
+#define __UMPLOCK_IOCTL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#ifndef __user
+#define __user
+#endif
+
+
+/**
+ * @file umplock_ioctl.h
+ * This file describes the interface needed to use the Linux device driver.
+ * The interface is used by the userpace Mali DDK.
+ */
+
+typedef enum {
+	_LOCK_ACCESS_RENDERABLE = 1,
+	_LOCK_ACCESS_TEXTURE,
+	_LOCK_ACCESS_CPU_WRITE,
+	_LOCK_ACCESS_CPU_READ,
+} _lock_access_usage;
+
+typedef struct _lock_item_s {
+	unsigned int secure_id;
+	_lock_access_usage usage;
+} _lock_item_s;
+
+
+#define LOCK_IOCTL_GROUP 0x91
+
+#define _LOCK_IOCTL_CREATE_CMD  0   /* create kernel lock item        */
+#define _LOCK_IOCTL_PROCESS_CMD 1   /* process kernel lock item       */
+#define _LOCK_IOCTL_RELEASE_CMD 2   /* release kernel lock item       */
+#define _LOCK_IOCTL_ZAP_CMD     3   /* clean up all kernel lock items */
+#define _LOCK_IOCTL_DUMP_CMD    4   /* dump all the items */
+
+#define LOCK_IOCTL_MAX_CMDS     5
+
+#define LOCK_IOCTL_CREATE  _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_CREATE_CMD,  _lock_item_s )
+#define LOCK_IOCTL_PROCESS _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_PROCESS_CMD, _lock_item_s )
+#define LOCK_IOCTL_RELEASE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_RELEASE_CMD, _lock_item_s )
+#define LOCK_IOCTL_ZAP     _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_ZAP_CMD )
+#define LOCK_IOCTL_DUMP    _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_DUMP_CMD )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UMPLOCK_IOCTL_H__ */
+
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in
new file mode 100644
index 000000000..938e242de
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/etc/X11/xorg.conf.mali.in
@@ -0,0 +1,60 @@
+#
+ # Copyright (C) 2010 ARM Limited. All rights reserved.
+ 
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to deal
+ # in the Software without restriction, including without limitation the rights
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ # copies of the Software, and to permit persons to whom the Software is
+ # furnished to do so, subject to the following conditions:
+ 
+ # The above copyright notice and this permission notice shall be included in
+ # all copies or substantial portions of the Software.
+ 
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+ # /
+
+# X.Org X server configuration file for @HARDWARE_SPEC@
+
+Section "Device"
+	Identifier "Mali FBDEV"
+	Driver	"mali"
+	Option	"fbdev"           "/dev/fb0"
+	Option	"DRI2"            "true"
+	Option  "DRI2_PAGE_FLIP"  "false"
+	Option  "DRI2_WAIT_VSYNC" "false"
+	Option  "UMP_CACHED"      "false"
+	Option  "UMP_LOCK"        "false"
+	Option  "SWCursor"        "true"
+	Option  "HWCursor"        "false"
+EndSection
+
+Section "DRI"
+	Mode 0666
+EndSection
+
+Section "Screen"
+	Identifier "DefaultScreen"
+	Device "Mali FBDEV"
+	DefaultDepth 24
+	DefaultFbBpp 32
+EndSection
+
+Section "ServerFlags"
+	Option     "NoTrapSignals" "true"
+	Option     "DontZap" "false"
+
+	# Disable DPMS timeouts.
+	Option     "StandbyTime" "0"
+	Option     "SuspendTime" "0"
+	Option     "OffTime" "0"
+
+	# Disable screen saver timeout.
+	Option     "BlankTime" "0"
+EndSection
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/license/COPYING b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/license/COPYING
new file mode 100644
index 000000000..264640162
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/license/COPYING
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) 2010 ARM Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in
new file mode 100644
index 000000000..f13cdff6f
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xf86-video-mali: xf86-video-mali @VERSION@ (Mali X11 video driver)
+xf86-video-mali:
+xf86-video-mali: xf86-video-mali is provided as a basis for creating your own
+xf86-video-mali: X Display Driver. It requires a resent version of the xorg-server,
+xf86-video-mali: as well as a successfull integration of UMP with your display device
+xf86-video-mali: driver.
+xf86-video-mali:
+xf86-video-mali: See: http://malideveloper.arm.com/develop-for-mali/drivers
+xf86-video-mali:
+xf86-video-mali:
+xf86-video-mali:
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r4p0-00rel0/0.4.2/xf86-video-mali-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile
new file mode 100644
index 000000000..7c2cf772f
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/Makefile
@@ -0,0 +1,207 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/hal/Mali/xf86-video-mali/DX/r5p0-01rel0
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+REQUIRES          += X11/X.org/lib/pixman/0.34.0
+REQUIRES          += X11/libs/aml-mali/5.0.1.0
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.4.2
+tar_gz_archive     = $(SRC_PACKAGE_PATH)/hal/Mali/xf86-video-mali/DX/r5p0-01rel0/xf86-video-mali-$(version).tar.gz
+SRC_ARCHIVE        = $(tar_gz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-mali-$(version)
+src_dir_name       = xf86-video-mali-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+license            = $(CURDIR)/license/COPYING
+xorg_config_in     = $(CURDIR)/etc/X11/xorg.conf.mali.in
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-mali
+XORG_PKG_VERSION             = 0.4.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Mali X11 video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+CFLAGS += -I$(CURDIR)/ddk-include/include -DHAVE_STRNDUP
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@( cd $(SRC_DIR) ; \
+	   sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
+	   automake ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install default xorg.conf file =======
+	@mkdir -p $(XORG_PKG)/etc/X11
+	@cat $(xorg_config_in) | \
+	     sed 's,@HARDWARE_SPEC@,$(HW_SPEC),' > $(XORG_PKG)/etc/X11/xorg.conf.mali
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(license) \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a $(license) README* xorg.conf \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" mali_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" mali_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" mali_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/PATCHES b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/PATCHES
new file mode 100644
index 000000000..05464bc61
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../../../sources/hal/Mali/xf86-video-mali/DX/r5p0-01rel0/patches/xf86-video-mali-0.4.2-amlogic.patch -p0
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump.h b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump.h
new file mode 100644
index 000000000..ce593c7d5
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump.h
@@ -0,0 +1,262 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump.h
+ *
+ * This file contains the user space part of the UMP API.
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_H_
+#define _UNIFIED_MEMORY_PROVIDER_H_
+
+
+/** @defgroup ump_user_space_api UMP User Space API
+ * @{ */
+
+
+#include "ump_platform.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * External representation of a UMP handle in user space.
+ */
+typedef void *ump_handle;
+
+/**
+ * Typedef for a secure ID, a system wide identificator for UMP memory buffers.
+ */
+typedef unsigned int ump_secure_id;
+
+/**
+ * Value to indicate an invalid UMP memory handle.
+ */
+#define UMP_INVALID_MEMORY_HANDLE ((ump_handle)0)
+
+/**
+ * Value to indicate an invalid secure Id.
+ */
+#define UMP_INVALID_SECURE_ID     ((ump_secure_id)-1)
+
+/**
+ * UMP error codes for user space.
+ */
+typedef enum
+{
+	UMP_OK = 0, /**< indicates success */
+	UMP_ERROR,  /**< indicates failure */
+} ump_result;
+
+
+/**
+ * Opens and initializes the UMP library.
+ *
+ * This function must be called at least once before calling any other UMP API functions.
+ * Each open is reference counted and must be matched with a call to @ref ump_close "ump_close".
+ *
+ * @see ump_close
+ *
+ * @return UMP_OK indicates success, UMP_ERROR indicates failure.
+ */
+UMP_API_EXPORT ump_result ump_open(void);
+
+
+/**
+ * Terminate the UMP library.
+ *
+ * This must be called once for every successful @ref ump_open "ump_open". The UMP library is
+ * terminated when, and only when, the last open reference to the UMP interface is closed.
+ *
+ * @see ump_open
+ */
+UMP_API_EXPORT void ump_close(void);
+
+
+/**
+ * Retrieves the secure ID for the specified UMP memory.
+ *
+ * This identificator is unique across the entire system, and uniquely identifies
+ * the specified UMP memory. This identificator can later be used through the
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id" or
+ * @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ * functions in order to access this UMP memory, for instance from another process.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_secure_id_get "ump_dd_secure_id_get"
+ *
+ * @see ump_handle_create_from_secure_id
+ * @see ump_dd_handle_create_from_secure_id
+ * @see ump_dd_secure_id_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the secure ID for the specified UMP memory.
+ */
+UMP_API_EXPORT ump_secure_id ump_secure_id_get(ump_handle mem);
+
+
+/**
+ * Retrieves a handle to allocated UMP memory.
+ *
+ * The usage of UMP memory is reference counted, so this will increment the reference
+ * count by one for the specified UMP memory.
+ * Use @ref ump_reference_release "ump_reference_release" when there is no longer any
+ * use for the retrieved handle.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_handle_create_from_secure_id "ump_dd_handle_create_from_secure_id"
+ *
+ * @see ump_reference_release
+ * @see ump_dd_handle_create_from_secure_id
+ *
+ * @param secure_id The secure ID of the UMP memory to open, that can be retrieved using the @ref ump_secure_id_get "ump_secure_id_get " function.
+ *
+ * @return UMP_INVALID_MEMORY_HANDLE indicates failure, otherwise a valid handle is returned.
+ */
+UMP_API_EXPORT ump_handle ump_handle_create_from_secure_id(ump_secure_id secure_id);
+
+
+/**
+ * Retrieves the actual size of the specified UMP memory.
+ *
+ * The size is reported in bytes, and is typically page aligned.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_size_get "ump_dd_size_get"
+ *
+ * @see ump_dd_size_get
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return Returns the allocated size of the specified UMP memory, in bytes.
+ */
+UMP_API_EXPORT unsigned long ump_size_get(ump_handle mem);
+
+
+/**
+ * Read from specified UMP memory.
+ *
+ * Another way of reading from (and writing to) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Destination buffer.
+ * @param src Handle to UMP memory to read from.
+ * @param offset Where to start reading, given in bytes.
+ * @param length How much to read, given in bytes.
+ */
+UMP_API_EXPORT void ump_read(void *dst, ump_handle src, unsigned long offset, unsigned long length);
+
+
+/**
+ * Write to specified UMP memory.
+ *
+ * Another way of writing to (and reading from) UMP memory is to use the
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" to retrieve
+ * a CPU mapped pointer to the memory.
+ *
+ * @see ump_mapped_pointer_get
+ *
+ * @param dst Handle to UMP memory to write to.
+ * @param offset Where to start writing, given in bytes.
+ * @param src Buffer to read from.
+ * @param length How much to write, given in bytes.
+ */
+UMP_API_EXPORT void ump_write(ump_handle dst, unsigned long offset, const void *src, unsigned long length);
+
+
+/**
+ * Retrieves a memory mapped pointer to the specified UMP memory.
+ *
+ * This function retrieves a memory mapped pointer to the specified UMP memory,
+ * that can be used by the CPU. Every successful call to
+ * @ref ump_mapped_pointer_get "ump_mapped_pointer_get" is reference counted,
+ * and must therefore be followed by a call to
+ * @ref ump_mapped_pointer_release "ump_mapped_pointer_release " when the
+ * memory mapping is no longer needed.
+ *
+ * @note Systems without a MMU for the CPU only return the physical address, because no mapping is required.
+ *
+ * @see ump_mapped_pointer_release
+ *
+ * @param mem Handle to UMP memory.
+ *
+ * @return NULL indicates failure, otherwise a CPU mapped pointer is returned.
+ */
+UMP_API_EXPORT void *ump_mapped_pointer_get(ump_handle mem);
+
+
+/**
+ * Releases a previously mapped pointer to the specified UMP memory.
+ *
+ * The CPU mapping of the specified UMP memory memory is reference counted,
+ * so every call to @ref ump_mapped_pointer_get "ump_mapped_pointer_get" must
+ * be matched with a call to this function when the mapping is no longer needed.
+ *
+ * The CPU mapping is not removed before all references to the mapping is released.
+ *
+ * @note Systems without a MMU must still implement this function, even though no unmapping should be needed.
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_mapped_pointer_release(ump_handle mem);
+
+
+/**
+ * Adds an extra reference to the specified UMP memory.
+ *
+ * This function adds an extra reference to the specified UMP memory. This function should
+ * be used every time a UMP memory handle is duplicated, that is, assigned to another ump_handle
+ * variable. The function @ref ump_reference_release "ump_reference_release" must then be used
+ * to release each copy of the UMP memory handle.
+ *
+ * @note You are not required to call @ref ump_reference_add "ump_reference_add"
+ * for UMP handles returned from
+ * @ref ump_handle_create_from_secure_id "ump_handle_create_from_secure_id",
+ * because these handles are already reference counted by this function.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_add "ump_dd_reference_add"
+ *
+ * @see ump_dd_reference_add
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_add(ump_handle mem);
+
+
+/**
+ * Releases a reference from the specified UMP memory.
+ *
+ * This function should be called once for every reference to the UMP memory handle.
+ * When the last reference is released, all resources associated with this UMP memory
+ * handle are freed.
+ *
+ * @note There is a kernel space equivalent function called @ref ump_dd_reference_release "ump_dd_reference_release"
+ *
+ * @see ump_dd_reference_release
+ *
+ * @param mem Handle to UMP memory.
+ */
+UMP_API_EXPORT void ump_reference_release(ump_handle mem);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_H_ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_platform.h b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_platform.h
new file mode 100644
index 000000000..6560fb7cf
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_platform.h
@@ -0,0 +1,62 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2008-2011, 2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_platform.h
+ *
+ * This file should define UMP_API_EXPORT,
+ * which dictates how the UMP user space API should be exported/imported.
+ * Modify this file, if needed, to match your platform setup.
+ */
+
+#ifndef __UMP_PLATFORM_H__
+#define __UMP_PLATFORM_H__
+
+/** @addtogroup ump_user_space_api
+ * @{ */
+
+/**
+ * A define which controls how UMP user space API functions are imported and exported.
+ * This define should be set by the implementor of the UMP API.
+ */
+#if defined(_WIN32)
+
+#define UMP_API_EXPORT
+
+#elif defined(__SYMBIAN32__)
+
+#define UMP_API_EXPORT IMPORT_C
+
+#else
+
+#if defined(__GNUC__)
+#if __GNUC__ >= 4
+#   define MALI_VISIBLE  __attribute__ ((visibility ("default")))       /**< Function should be visible from outside the dll */
+#else
+#   define MALI_VISIBLE
+#endif
+
+#elif defined(__ARMCC_VERSION)
+/* ARMCC specific */
+#   define MALI_VISIBLE  __declspec(dllexport)
+
+#else
+#   define MALI_VISIBLE
+
+#endif
+
+#define UMP_API_EXPORT MALI_VISIBLE
+
+#endif
+
+/** @} */ /* end group ump_user_space_api */
+
+
+#endif /* __UMP_PLATFORM_H__ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h
new file mode 100644
index 000000000..c2fa15675
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/ump/ump_ref_drv.h
@@ -0,0 +1,103 @@
+/*
+ * This confidential and proprietary software may be used only as
+ * authorised by a licensing agreement from ARM Limited
+ * (C) COPYRIGHT 2009-2010, 2012-2013 ARM Limited
+ * ALL RIGHTS RESERVED
+ * The entire notice above must be reproduced on all authorised
+ * copies and copies may only be made to the extent permitted
+ * by a licensing agreement from ARM Limited.
+ */
+
+/**
+ * @file ump_ref_drv.h
+ *
+ * Reference driver extensions to the UMP user space API for allocating UMP memory
+ */
+
+#ifndef _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+#define _UNIFIED_MEMORY_PROVIDER_REF_DRV_H_
+
+#include "ump.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum
+{
+	/* This enum must match with the IOCTL enum in ump_ioctl.h */
+	UMP_REF_DRV_CONSTRAINT_NONE = 0,
+	UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR = 1,
+	UMP_REF_DRV_CONSTRAINT_USE_CACHE = 4,
+} ump_alloc_constraints;
+
+/** Allocate an UMP handle containing a memory buffer.
+ * Input: Size: The minimum size for the allocation.
+ * Usage: If this is UMP_REF_DRV_CONSTRAINT_USE_CACHE, the allocation is mapped as cached by the cpu.
+ *        If it is UMP_REF_DRV_CONSTRAINT_NONE it is mapped as noncached.
+ *        The flag UMP_REF_DRV_CONSTRAINT_PHYSICALLY_LINEAR is not supported.*/
+UMP_API_EXPORT ump_handle ump_ref_drv_allocate(unsigned long size, ump_alloc_constraints usage);
+
+typedef enum
+{
+	UMP_MSYNC_CLEAN = 0 ,
+	UMP_MSYNC_CLEAN_AND_INVALIDATE = 1,
+	UMP_MSYNC_INVALIDATE = 2,
+	UMP_MSYNC_READOUT_CACHE_ENABLED = 128,
+} ump_cpu_msync_op;
+
+typedef enum
+{
+	UMP_READ = 1,
+	UMP_READ_WRITE = 3,
+} ump_lock_usage;
+
+/** Flushing cache for an ump_handle.
+ * The function will always CLEAN_AND_INVALIDATE as long as the \a op is not UMP_MSYNC_READOUT_CACHE_ENABLED.
+ * If so it will only report back if the given ump_handle is cacheable.
+ * At the momement the implementation does not use \a address or \a size.
+ * Return value is 1 if cache is enabled, and 0 if it is disabled for the given allocation.*/
+UMP_API_EXPORT int ump_cpu_msync_now(ump_handle mem, ump_cpu_msync_op op, void *address, int size);
+
+
+typedef enum
+{
+	UMP_USED_BY_CPU = 0,
+	UMP_USED_BY_MALI = 1,
+	UMP_USED_BY_UNKNOWN_DEVICE = 100,
+} ump_hw_usage;
+
+typedef enum
+{
+	UMP_CACHE_OP_START = 0,
+	UMP_CACHE_OP_FINISH  = 1,
+} ump_cache_op_control;
+
+/** Cache operation control. Tell when cache maintenance operations start and end.
+This will allow the kernel to merge cache operations togheter, thus making them faster */
+UMP_API_EXPORT int ump_cache_operations_control(ump_cache_op_control op);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage(ump_handle mem, ump_hw_usage new_user);
+
+/** Memory synchronization - cache flushing if previous user was different hardware */
+UMP_API_EXPORT int ump_switch_hw_usage_secure_id(ump_secure_id ump_id, ump_hw_usage new_user);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock(ump_handle mem, ump_lock_usage lock_usage);
+
+/** Locking buffer. Blocking call if the buffer is already locked. */
+UMP_API_EXPORT int ump_lock_secure_id(ump_secure_id ump_id, ump_lock_usage lock_usage);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock(ump_handle mem);
+
+/** Unlocking buffer. Let other users lock the buffer for their usage */
+UMP_API_EXPORT int ump_unlock_secure_id(ump_secure_id ump_id);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_UNIFIED_MEMORY_PROVIDER_REF_DRV_H_ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h
new file mode 100644
index 000000000..88b0a46ff
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/ddk-include/include/umplock/umplock_ioctl.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2012-2013 ARM Limited. All rights reserved.
+ * 
+ * This program is free software and is provided to you under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence.
+ * 
+ * A copy of the licence is included with the program, and can also be obtained from Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __UMPLOCK_IOCTL_H__
+#define __UMPLOCK_IOCTL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#ifndef __user
+#define __user
+#endif
+
+
+/**
+ * @file umplock_ioctl.h
+ * This file describes the interface needed to use the Linux device driver.
+ * The interface is used by the userpace Mali DDK.
+ */
+
+typedef enum {
+	_LOCK_ACCESS_RENDERABLE = 1,
+	_LOCK_ACCESS_TEXTURE,
+	_LOCK_ACCESS_CPU_WRITE,
+	_LOCK_ACCESS_CPU_READ,
+} _lock_access_usage;
+
+typedef struct _lock_item_s {
+	unsigned int secure_id;
+	_lock_access_usage usage;
+} _lock_item_s;
+
+
+#define LOCK_IOCTL_GROUP 0x91
+
+#define _LOCK_IOCTL_CREATE_CMD  0   /* create kernel lock item        */
+#define _LOCK_IOCTL_PROCESS_CMD 1   /* process kernel lock item       */
+#define _LOCK_IOCTL_RELEASE_CMD 2   /* release kernel lock item       */
+#define _LOCK_IOCTL_ZAP_CMD     3   /* clean up all kernel lock items */
+#define _LOCK_IOCTL_DUMP_CMD    4   /* dump all the items */
+
+#define LOCK_IOCTL_MAX_CMDS     5
+
+#define LOCK_IOCTL_CREATE  _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_CREATE_CMD,  _lock_item_s )
+#define LOCK_IOCTL_PROCESS _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_PROCESS_CMD, _lock_item_s )
+#define LOCK_IOCTL_RELEASE _IOW( LOCK_IOCTL_GROUP, _LOCK_IOCTL_RELEASE_CMD, _lock_item_s )
+#define LOCK_IOCTL_ZAP     _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_ZAP_CMD )
+#define LOCK_IOCTL_DUMP    _IO ( LOCK_IOCTL_GROUP, _LOCK_IOCTL_DUMP_CMD )
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UMPLOCK_IOCTL_H__ */
+
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/etc/X11/xorg.conf.mali.in b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/etc/X11/xorg.conf.mali.in
new file mode 100644
index 000000000..938e242de
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/etc/X11/xorg.conf.mali.in
@@ -0,0 +1,60 @@
+#
+ # Copyright (C) 2010 ARM Limited. All rights reserved.
+ 
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to deal
+ # in the Software without restriction, including without limitation the rights
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ # copies of the Software, and to permit persons to whom the Software is
+ # furnished to do so, subject to the following conditions:
+ 
+ # The above copyright notice and this permission notice shall be included in
+ # all copies or substantial portions of the Software.
+ 
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ # THE SOFTWARE.
+ # /
+
+# X.Org X server configuration file for @HARDWARE_SPEC@
+
+Section "Device"
+	Identifier "Mali FBDEV"
+	Driver	"mali"
+	Option	"fbdev"           "/dev/fb0"
+	Option	"DRI2"            "true"
+	Option  "DRI2_PAGE_FLIP"  "false"
+	Option  "DRI2_WAIT_VSYNC" "false"
+	Option  "UMP_CACHED"      "false"
+	Option  "UMP_LOCK"        "false"
+	Option  "SWCursor"        "true"
+	Option  "HWCursor"        "false"
+EndSection
+
+Section "DRI"
+	Mode 0666
+EndSection
+
+Section "Screen"
+	Identifier "DefaultScreen"
+	Device "Mali FBDEV"
+	DefaultDepth 24
+	DefaultFbBpp 32
+EndSection
+
+Section "ServerFlags"
+	Option     "NoTrapSignals" "true"
+	Option     "DontZap" "false"
+
+	# Disable DPMS timeouts.
+	Option     "StandbyTime" "0"
+	Option     "SuspendTime" "0"
+	Option     "OffTime" "0"
+
+	# Disable screen saver timeout.
+	Option     "BlankTime" "0"
+EndSection
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/license/COPYING b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/license/COPYING
new file mode 100644
index 000000000..264640162
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/license/COPYING
@@ -0,0 +1,22 @@
+
+/*
+ * Copyright (C) 2010 ARM Limited. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-description.in b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-description.in
new file mode 100644
index 000000000..f13cdff6f
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xf86-video-mali: xf86-video-mali @VERSION@ (Mali X11 video driver)
+xf86-video-mali:
+xf86-video-mali: xf86-video-mali is provided as a basis for creating your own
+xf86-video-mali: X Display Driver. It requires a resent version of the xorg-server,
+xf86-video-mali: as well as a successfull integration of UMP with your display device
+xf86-video-mali: driver.
+xf86-video-mali:
+xf86-video-mali: See: http://malideveloper.arm.com/develop-for-mali/drivers
+xf86-video-mali:
+xf86-video-mali:
+xf86-video-mali:
diff --git a/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-install.sh b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-mali/DX/r5p0-01rel0/0.4.2/xf86-video-mali-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-video-modesetting/0.9.0/Makefile b/X11/X.org/driver/xf86-video-modesetting/0.9.0/Makefile
index 2406e49cb..dc5614d65 100644
--- a/X11/X.org/driver/xf86-video-modesetting/0.9.0/Makefile
+++ b/X11/X.org/driver/xf86-video-modesetting/0.9.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-modesetting
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-v4l/0.2.0/Makefile b/X11/X.org/driver/xf86-video-v4l/0.2.0/Makefile
index 274e1e17f..486008049 100644
--- a/X11/X.org/driver/xf86-video-v4l/0.2.0/Makefile
+++ b/X11/X.org/driver/xf86-video-v4l/0.2.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-v4l
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-v4l/0.2.0/PATCHES b/X11/X.org/driver/xf86-video-v4l/0.2.0/PATCHES
index e69de29bb..9e4527d3a 100644
--- a/X11/X.org/driver/xf86-video-v4l/0.2.0/PATCHES
+++ b/X11/X.org/driver/xf86-video-v4l/0.2.0/PATCHES
@@ -0,0 +1,2 @@
+
+../../../../../sources/X.org/driver/xf86-video-v4l/patches/xf86-video-v4l-0.2.0-v4l2-only.patch -p0
diff --git a/X11/X.org/driver/xf86-video-vesa/2.3.3/Makefile b/X11/X.org/driver/xf86-video-vesa/2.3.3/Makefile
index 3e061530e..41211304c 100644
--- a/X11/X.org/driver/xf86-video-vesa/2.3.3/Makefile
+++ b/X11/X.org/driver/xf86-video-vesa/2.3.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,18 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vesa
 
-ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X) $(HARDWARE_CB3X)),)
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
 else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
 REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
 endif
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/driver/xf86-video-vesa/2.3.4/Makefile b/X11/X.org/driver/xf86-video-vesa/2.3.4/Makefile
new file mode 100644
index 000000000..b541ac781
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vesa/2.3.4/Makefile
@@ -0,0 +1,202 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vesa
+
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CB1X)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.2
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_CI20)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+ifneq ($(filter $(HARDWARE),$(HARDWARE_M201) $(HARDWARE_MXQ)),)
+REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+else
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+endif
+endif
+endif
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.3.4
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-video-vesa/xf86-video-vesa-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-vesa-$(version)
+src_dir_name       = xf86-video-vesa-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-vesa
+XORG_PKG_VERSION             = 2.3.4
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Generic VESA video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" vesa_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" vesa_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" vesa_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-video-vesa/2.3.4/PATCHES b/X11/X.org/driver/xf86-video-vesa/2.3.4/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-description.in b/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-description.in
new file mode 100644
index 000000000..399ba029d
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+               |-----handy-ruler------------------------------------------------------|
+xf86-video-vesa: xf86-video-vesa @VERSION@ (Generic VESA video driver)
+xf86-video-vesa:
+xf86-video-vesa: xf86-video-vesa is part of X11.
+xf86-video-vesa:
+xf86-video-vesa: For more information about the X.Org Foundation (the providers
+xf86-video-vesa: of the X.Org implementation of the X Window System).
+xf86-video-vesa:
+xf86-video-vesa: See: http://www.x.org
+xf86-video-vesa:
+xf86-video-vesa:
+xf86-video-vesa:
diff --git a/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-install.sh b/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vesa/2.3.4/xf86-video-vesa-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/driver/xf86-video-vmware/13.0.2/Makefile b/X11/X.org/driver/xf86-video-vmware/13.0.2/Makefile
index e9a7ca583..1953a733e 100644
--- a/X11/X.org/driver/xf86-video-vmware/13.0.2/Makefile
+++ b/X11/X.org/driver/xf86-video-vmware/13.0.2/Makefile
@@ -12,7 +12,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vmware
 
-REQUIRES           = X11/X.org/xserver/xorg-server/1.16.4
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
 
 REQUIRES          += X11/libs/opengl-collection
 
diff --git a/X11/X.org/driver/xf86-video-vmware/13.1.0/Makefile b/X11/X.org/driver/xf86-video-vmware/13.1.0/Makefile
new file mode 100644
index 000000000..381c7b2ec
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vmware/13.1.0/Makefile
@@ -0,0 +1,208 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/driver/xf86-video-vmware
+
+REQUIRES           = X11/X.org/xserver/xorg-server/1.18.3
+
+REQUIRES          += X11/libs/opengl-collection
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 13.1.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/driver/xf86-video-vmware/xf86-video-vmware-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/xf86-video-vmware-$(version)
+src_dir_name       = xf86-video-vmware-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = xf86-video-vmware
+XORG_PKG_VERSION             = 13.1.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = VMWare SVGA video driver
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-vmwarectrl-client
+
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=no
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" vmware_drv.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/xorg/modules/drivers ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" vmware_drv.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" vmware_drv.la \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(XORG_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/driver/xf86-video-vmware/13.1.0/PATCHES b/X11/X.org/driver/xf86-video-vmware/13.1.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-description.in b/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-description.in
new file mode 100644
index 000000000..8e4addb90
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+                 |-----handy-ruler------------------------------------------------------|
+xf86-video-vmware: xf86-video-vmware @VERSION@ (VMWare SVGA video driver)
+xf86-video-vmware:
+xf86-video-vmware: xf86-video-vmware is part of X11.
+xf86-video-vmware:
+xf86-video-vmware: For more information about the X.Org Foundation (the providers
+xf86-video-vmware: of the X.Org implementation of the X Window System).
+xf86-video-vmware:
+xf86-video-vmware: See: http://www.x.org
+xf86-video-vmware:
+xf86-video-vmware:
+xf86-video-vmware:
diff --git a/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-install.sh b/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/driver/xf86-video-vmware/13.1.0/xf86-video-vmware-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/font-collection/Makefile b/X11/X.org/font-collection/Makefile
index 0fb1f9e6e..a4b6babaf 100644
--- a/X11/X.org/font-collection/Makefile
+++ b/X11/X.org/font-collection/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/font/encodings/1.0.4/Makefile b/X11/X.org/font/encodings/1.0.4/Makefile
index 79cb4222d..06a6e0983 100644
--- a/X11/X.org/font/encodings/1.0.4/Makefile
+++ b/X11/X.org/font/encodings/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/encodings
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-adobe-100dpi/1.0.3/Makefile b/X11/X.org/font/font-adobe-100dpi/1.0.3/Makefile
index 84fe17374..f19841751 100644
--- a/X11/X.org/font/font-adobe-100dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-adobe-100dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-100dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-adobe-75dpi/1.0.3/Makefile b/X11/X.org/font/font-adobe-75dpi/1.0.3/Makefile
index 83513ecc9..d90bf4d3e 100644
--- a/X11/X.org/font/font-adobe-75dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-adobe-75dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-75dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile b/X11/X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile
index e9ff5047d..cb0ba72d4 100644
--- a/X11/X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile
+++ b/X11/X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-100dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile b/X11/X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile
index e30392086..d888ab3f6 100644
--- a/X11/X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile
+++ b/X11/X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-75dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-adobe-utopia-type1/1.0.4/Makefile b/X11/X.org/font/font-adobe-utopia-type1/1.0.4/Makefile
index 7521c17fe..def566b7b 100644
--- a/X11/X.org/font/font-adobe-utopia-type1/1.0.4/Makefile
+++ b/X11/X.org/font/font-adobe-utopia-type1/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-adobe-utopia-type1
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-alias/1.0.3/Makefile b/X11/X.org/font/font-alias/1.0.3/Makefile
index 8e5922f3d..82efa54d5 100644
--- a/X11/X.org/font/font-alias/1.0.3/Makefile
+++ b/X11/X.org/font/font-alias/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-alias
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-arabic-misc/1.0.3/Makefile b/X11/X.org/font/font-arabic-misc/1.0.3/Makefile
index c64abe00d..a7297af4e 100644
--- a/X11/X.org/font/font-arabic-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-arabic-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-arabic-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-100dpi/1.0.3/Makefile b/X11/X.org/font/font-bh-100dpi/1.0.3/Makefile
index 400d0da20..f7aac7946 100644
--- a/X11/X.org/font/font-bh-100dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-100dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-100dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-75dpi/1.0.3/Makefile b/X11/X.org/font/font-bh-75dpi/1.0.3/Makefile
index e5b14c4af..a4fe8d05d 100644
--- a/X11/X.org/font/font-bh-75dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-75dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-75dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile b/X11/X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile
index c890ae036..008db56ff 100644
--- a/X11/X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-lucidatypewriter-100dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile b/X11/X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile
index 29a17dd1d..b24540a82 100644
--- a/X11/X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-lucidatypewriter-75dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-ttf/1.0.3/Makefile b/X11/X.org/font/font-bh-ttf/1.0.3/Makefile
index b016ce02d..4e6d4273c 100644
--- a/X11/X.org/font/font-bh-ttf/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-ttf/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-ttf
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bh-type1/1.0.3/Makefile b/X11/X.org/font/font-bh-type1/1.0.3/Makefile
index d54a80b51..b8590b8e1 100644
--- a/X11/X.org/font/font-bh-type1/1.0.3/Makefile
+++ b/X11/X.org/font/font-bh-type1/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bh-type1
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bitstream-100dpi/1.0.3/Makefile b/X11/X.org/font/font-bitstream-100dpi/1.0.3/Makefile
index e337472f8..a98bc4ca9 100644
--- a/X11/X.org/font/font-bitstream-100dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bitstream-100dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-100dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bitstream-75dpi/1.0.3/Makefile b/X11/X.org/font/font-bitstream-75dpi/1.0.3/Makefile
index 557f62ccd..49623d8fb 100644
--- a/X11/X.org/font/font-bitstream-75dpi/1.0.3/Makefile
+++ b/X11/X.org/font/font-bitstream-75dpi/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-75dpi
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bitstream-speedo/1.0.2/Makefile b/X11/X.org/font/font-bitstream-speedo/1.0.2/Makefile
index e220e5a3c..d0ab9e1d3 100644
--- a/X11/X.org/font/font-bitstream-speedo/1.0.2/Makefile
+++ b/X11/X.org/font/font-bitstream-speedo/1.0.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-speedo
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-bitstream-type1/1.0.3/Makefile b/X11/X.org/font/font-bitstream-type1/1.0.3/Makefile
index 9826f51bd..9d7352d16 100644
--- a/X11/X.org/font/font-bitstream-type1/1.0.3/Makefile
+++ b/X11/X.org/font/font-bitstream-type1/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-bitstream-type1
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-cronyx-cyrillic/1.0.3/Makefile b/X11/X.org/font/font-cronyx-cyrillic/1.0.3/Makefile
index 30ccdf8e2..76f01581d 100644
--- a/X11/X.org/font/font-cronyx-cyrillic/1.0.3/Makefile
+++ b/X11/X.org/font/font-cronyx-cyrillic/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-cronyx-cyrillic
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-cursor-misc/1.0.3/Makefile b/X11/X.org/font/font-cursor-misc/1.0.3/Makefile
index 8636e7e5a..6634df7d9 100644
--- a/X11/X.org/font/font-cursor-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-cursor-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-cursor-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-daewoo-misc/1.0.3/Makefile b/X11/X.org/font/font-daewoo-misc/1.0.3/Makefile
index 1efe55276..edeeeabda 100644
--- a/X11/X.org/font/font-daewoo-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-daewoo-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-daewoo-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-dec-misc/1.0.3/Makefile b/X11/X.org/font/font-dec-misc/1.0.3/Makefile
index a92844ff1..c69b37375 100644
--- a/X11/X.org/font/font-dec-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-dec-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-dec-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-ibm-type1/1.0.3/Makefile b/X11/X.org/font/font-ibm-type1/1.0.3/Makefile
index 734617e3e..32905d201 100644
--- a/X11/X.org/font/font-ibm-type1/1.0.3/Makefile
+++ b/X11/X.org/font/font-ibm-type1/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-ibm-type1
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-isas-misc/1.0.3/Makefile b/X11/X.org/font/font-isas-misc/1.0.3/Makefile
index 6b9a588d3..1ae84349e 100644
--- a/X11/X.org/font/font-isas-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-isas-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-isas-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-jis-misc/1.0.3/Makefile b/X11/X.org/font/font-jis-misc/1.0.3/Makefile
index b7a13ff0a..f154198a5 100644
--- a/X11/X.org/font/font-jis-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-jis-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-jis-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-micro-misc/1.0.3/Makefile b/X11/X.org/font/font-micro-misc/1.0.3/Makefile
index 73fa4d20d..b5d98fed9 100644
--- a/X11/X.org/font/font-micro-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-micro-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-micro-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-misc-cyrillic/1.0.3/Makefile b/X11/X.org/font/font-misc-cyrillic/1.0.3/Makefile
index 388f2a866..0323ddff2 100644
--- a/X11/X.org/font/font-misc-cyrillic/1.0.3/Makefile
+++ b/X11/X.org/font/font-misc-cyrillic/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-cyrillic
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-misc-ethiopic/1.0.3/Makefile b/X11/X.org/font/font-misc-ethiopic/1.0.3/Makefile
index 7835ef068..f13e1afeb 100644
--- a/X11/X.org/font/font-misc-ethiopic/1.0.3/Makefile
+++ b/X11/X.org/font/font-misc-ethiopic/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-ethiopic
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-misc-meltho/1.0.3/Makefile b/X11/X.org/font/font-misc-meltho/1.0.3/Makefile
index 193102455..b34b01efd 100644
--- a/X11/X.org/font/font-misc-meltho/1.0.3/Makefile
+++ b/X11/X.org/font/font-misc-meltho/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-meltho
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-misc-misc/1.1.2/Makefile b/X11/X.org/font/font-misc-misc/1.1.2/Makefile
index 88a3113be..3e82ab25d 100644
--- a/X11/X.org/font/font-misc-misc/1.1.2/Makefile
+++ b/X11/X.org/font/font-misc-misc/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-misc-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-mutt-misc/1.0.3/Makefile b/X11/X.org/font/font-mutt-misc/1.0.3/Makefile
index f1ea33125..1270cbf62 100644
--- a/X11/X.org/font/font-mutt-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-mutt-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-mutt-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-schumacher-misc/1.1.2/Makefile b/X11/X.org/font/font-schumacher-misc/1.1.2/Makefile
index 23e6c3291..ad21f7f1b 100644
--- a/X11/X.org/font/font-schumacher-misc/1.1.2/Makefile
+++ b/X11/X.org/font/font-schumacher-misc/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-schumacher-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-screen-cyrillic/1.0.4/Makefile b/X11/X.org/font/font-screen-cyrillic/1.0.4/Makefile
index b6dbed934..6c38b7106 100644
--- a/X11/X.org/font/font-screen-cyrillic/1.0.4/Makefile
+++ b/X11/X.org/font/font-screen-cyrillic/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-screen-cyrillic
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-sony-misc/1.0.3/Makefile b/X11/X.org/font/font-sony-misc/1.0.3/Makefile
index 87fbd4ec1..81e597818 100644
--- a/X11/X.org/font/font-sony-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-sony-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-sony-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-sun-misc/1.0.3/Makefile b/X11/X.org/font/font-sun-misc/1.0.3/Makefile
index 541a1b130..3858843c0 100644
--- a/X11/X.org/font/font-sun-misc/1.0.3/Makefile
+++ b/X11/X.org/font/font-sun-misc/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-sun-misc
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-util/1.3.0/Makefile b/X11/X.org/font/font-util/1.3.0/Makefile
index 7e713b759..ea2e1ad51 100644
--- a/X11/X.org/font/font-util/1.3.0/Makefile
+++ b/X11/X.org/font/font-util/1.3.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/font/font-util/1.3.1/Makefile b/X11/X.org/font/font-util/1.3.1/Makefile
new file mode 100644
index 000000000..a917a4b18
--- /dev/null
+++ b/X11/X.org/font/font-util/1.3.1/Makefile
@@ -0,0 +1,183 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/font/font-util
+
+REQUIRES           = X11/X.org/app/mkfontdir/1.0.7
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.3.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/font/font-util/font-util-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/font-util-$(version)
+src_dir_name       = font-util-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = font-util
+XORG_PKG_VERSION             = 1.3.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = font package creation/installation utilities
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --with-fontrootdir=/usr/share/fonts
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" fontutil.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/font/font-util/1.3.1/PATCHES b/X11/X.org/font/font-util/1.3.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/font/font-util/1.3.1/font-util-pkg-description.in b/X11/X.org/font/font-util/1.3.1/font-util-pkg-description.in
new file mode 100644
index 000000000..e5a978c1c
--- /dev/null
+++ b/X11/X.org/font/font-util/1.3.1/font-util-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+font-util: font-util @VERSION@ (font package creation/installation utilities)
+font-util:
+font-util: font-util is part of X11.
+font-util:
+font-util: For more information about the X.Org Foundation (the providers
+font-util: of the X.Org implementation of the X Window System).
+font-util:
+font-util: See: http://www.x.org
+font-util:
+font-util:
+font-util:
diff --git a/libs/eudev/1.9/libeudev-pkg-install.sh b/X11/X.org/font/font-util/1.3.1/font-util-pkg-install.sh
similarity index 100%
rename from libs/eudev/1.9/libeudev-pkg-install.sh
rename to X11/X.org/font/font-util/1.3.1/font-util-pkg-install.sh
diff --git a/X11/X.org/font/font-winitzki-cyrillic/1.0.3/Makefile b/X11/X.org/font/font-winitzki-cyrillic/1.0.3/Makefile
index 71824069a..134213a66 100644
--- a/X11/X.org/font/font-winitzki-cyrillic/1.0.3/Makefile
+++ b/X11/X.org/font/font-winitzki-cyrillic/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-winitzki-cyrillic
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/font/font-xfree86-type1/1.0.4/Makefile b/X11/X.org/font/font-xfree86-type1/1.0.4/Makefile
index 71b6a42c0..d36536226 100644
--- a/X11/X.org/font/font-xfree86-type1/1.0.4/Makefile
+++ b/X11/X.org/font/font-xfree86-type1/1.0.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/font/font-xfree86-type1
 
-REQUIRES           = X11/libs/fontconfig/2.11.1
+REQUIRES           = X11/libs/fontconfig/2.11.95
 REQUIRES          += X11/X.org/app/mkfontdir/1.0.7
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libFS/1.0.6-x86_32/Makefile b/X11/X.org/lib/libFS/1.0.6-x86_32/Makefile
index 672a137c9..2bf6d7ddb 100644
--- a/X11/X.org/lib/libFS/1.0.6-x86_32/Makefile
+++ b/X11/X.org/lib/libFS/1.0.6-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libFS
 
 REQUIRES           = X11/X.org/lib/libFS/1.0.6
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/proto/fontsproto/2.1.3-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
 
diff --git a/X11/X.org/lib/libFS/1.0.6/Makefile b/X11/X.org/lib/libFS/1.0.6/Makefile
index 2314e9d89..2fa2c5709 100644
--- a/X11/X.org/lib/libFS/1.0.6/Makefile
+++ b/X11/X.org/lib/libFS/1.0.6/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libFS
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/proto/fontsproto/2.1.3
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
 
diff --git a/X11/X.org/lib/libFS/1.0.7-x86_32/Makefile b/X11/X.org/lib/libFS/1.0.7-x86_32/Makefile
new file mode 100644
index 000000000..406b9780f
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7-x86_32/Makefile
@@ -0,0 +1,158 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libFS
+
+REQUIRES           = X11/X.org/lib/libFS/1.0.7
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/proto/fontsproto/2.1.3-x86_32
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.7
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libFS/libFS-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libFS-$(version)
+src_dir_name       = libFS-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libFS-x32
+XORG_32_PKG_VERSION             = 1.0.7
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Font Service client library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libFS.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libFS.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libFS.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libfs.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libFS/1.0.7-x86_32/PATCHES b/X11/X.org/lib/libFS/1.0.7-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-description.in b/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-description.in
new file mode 100644
index 000000000..7007557b3
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libFS-x32: libFS-x32 @VERSION@ (x86_32 X Font Service client library)
+libFS-x32:
+libFS-x32: libFS is part of X11.
+libFS-x32:
+libFS-x32: For more information about the X.Org Foundation (the providers
+libFS-x32: of the X.Org implementation of the X Window System).
+libFS-x32:
+libFS-x32: See: http://www.x.org
+libFS-x32:
+libFS-x32:
+libFS-x32:
diff --git a/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-install.sh b/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7-x86_32/libFS-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libFS/1.0.7/Makefile b/X11/X.org/lib/libFS/1.0.7/Makefile
new file mode 100644
index 000000000..91298a575
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7/Makefile
@@ -0,0 +1,199 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libFS
+
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/proto/fontsproto/2.1.3
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.7
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libFS/libFS-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libFS-$(version)
+src_dir_name       = libFS-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libFS
+XORG_PKG_VERSION             = 1.0.7
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Font Service client library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libFS.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libFS.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libFS.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libfs.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libFS/1.0.7/PATCHES b/X11/X.org/lib/libFS/1.0.7/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libFS/1.0.7/libFS-pkg-description.in b/X11/X.org/lib/libFS/1.0.7/libFS-pkg-description.in
new file mode 100644
index 000000000..a5f93070f
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7/libFS-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+libFS: libFS @VERSION@ (X Font Service client library)
+libFS:
+libFS: libFS is part of X11.
+libFS:
+libFS: For more information about the X.Org Foundation (the providers
+libFS: of the X.Org implementation of the X Window System).
+libFS:
+libFS: See: http://www.x.org
+libFS:
+libFS:
+libFS:
diff --git a/X11/X.org/lib/libFS/1.0.7/libFS-pkg-install.sh b/X11/X.org/lib/libFS/1.0.7/libFS-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libFS/1.0.7/libFS-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libICE/1.0.9-x86_32/Makefile b/X11/X.org/lib/libICE/1.0.9-x86_32/Makefile
index 9e7b0fcd8..d3e762ac7 100644
--- a/X11/X.org/lib/libICE/1.0.9-x86_32/Makefile
+++ b/X11/X.org/lib/libICE/1.0.9-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libICE
 
 REQUIRES           = X11/X.org/lib/libICE/1.0.9
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libICE/1.0.9/Makefile b/X11/X.org/lib/libICE/1.0.9/Makefile
index 27e332216..21efb36a7 100644
--- a/X11/X.org/lib/libICE/1.0.9/Makefile
+++ b/X11/X.org/lib/libICE/1.0.9/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libICE
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libSM/1.2.2-x86_32/Makefile b/X11/X.org/lib/libSM/1.2.2-x86_32/Makefile
index 592f411dc..327008415 100644
--- a/X11/X.org/lib/libSM/1.2.2-x86_32/Makefile
+++ b/X11/X.org/lib/libSM/1.2.2-x86_32/Makefile
@@ -13,10 +13,10 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libSM
 
 REQUIRES           = X11/X.org/lib/libSM/1.2.2
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
 REQUIRES          += X11/X.org/lib/libICE/1.0.9-x86_32
-REQUIRES          += app/util-linux/2.24.1-x86_32
+REQUIRES          += app/util-linux/2.27.1-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libSM/1.2.2/Makefile b/X11/X.org/lib/libSM/1.2.2/Makefile
index cc12e4017..544036726 100644
--- a/X11/X.org/lib/libSM/1.2.2/Makefile
+++ b/X11/X.org/lib/libSM/1.2.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,10 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libSM
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
 REQUIRES          += X11/X.org/lib/libICE/1.0.9
-REQUIRES          += app/util-linux/2.24.1
+REQUIRES          += app/util-linux/2.27.1
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libX11/1.6.2-x86_32/Makefile b/X11/X.org/lib/libX11/1.6.2-x86_32/Makefile
index 4c4a2ac86..328ab8d69 100644
--- a/X11/X.org/lib/libX11/1.6.2-x86_32/Makefile
+++ b/X11/X.org/lib/libX11/1.6.2-x86_32/Makefile
@@ -13,11 +13,11 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libX11
 
 REQUIRES           = X11/X.org/lib/libX11/1.6.2
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
-REQUIRES          += X11/X.org/proto/kbproto/1.0.6-x86_32
-REQUIRES          += X11/X.org/proto/inputproto/2.3.1-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/proto/kbproto/1.0.7-x86_32
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2-x86_32
 REQUIRES          += X11/X.org/proto/xextproto/7.3.0-x86_32
-REQUIRES          += X11/X.org/xcb/libxcb/1.11-x86_32
+REQUIRES          += X11/X.org/xcb/libxcb/1.11.1-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libX11/1.6.2/Makefile b/X11/X.org/lib/libX11/1.6.2/Makefile
index d8279030c..ff53039b3 100644
--- a/X11/X.org/lib/libX11/1.6.2/Makefile
+++ b/X11/X.org/lib/libX11/1.6.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,12 +23,12 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libX11
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
-REQUIRES          += X11/X.org/proto/kbproto/1.0.6
-REQUIRES          += X11/X.org/proto/inputproto/2.3.1
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/proto/kbproto/1.0.7
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2
 REQUIRES          += X11/X.org/proto/xextproto/7.3.0
 REQUIRES          += X11/X.org/proto/xf86bigfontproto/1.2.0
-REQUIRES          += X11/X.org/xcb/libxcb/1.11
+REQUIRES          += X11/X.org/xcb/libxcb/1.11.1
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libX11/1.6.3-x86_32/Makefile b/X11/X.org/lib/libX11/1.6.3-x86_32/Makefile
new file mode 100644
index 000000000..f255a5c8d
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3-x86_32/Makefile
@@ -0,0 +1,175 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libX11
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/proto/kbproto/1.0.7-x86_32
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2-x86_32
+REQUIRES          += X11/X.org/proto/xextproto/7.3.0-x86_32
+REQUIRES          += X11/X.org/xcb/libxcb/1.11.1-x86_32
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.6.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libX11/libX11-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libX11-$(version)
+src_dir_name       = libX11-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libX11-x32
+XORG_32_PKG_VERSION             = 1.6.3
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = Core X11 protocol client library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libX11.la libX11-xcb.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libX11.la libX11-xcb.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libX11.la libX11-xcb.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" x11.pc x11-xcb.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libX11/1.6.3-x86_32/PATCHES b/X11/X.org/lib/libX11/1.6.3-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-description.in b/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-description.in
new file mode 100644
index 000000000..c5ef5a80f
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+libX11-x32: libX11-x32 @VERSION@ (x86_32 Core X11 protocol client library)
+libX11-x32:
+libX11-x32: libX11 is part of X11.
+libX11-x32:
+libX11-x32: For more information about the X.Org Foundation (the providers
+libX11-x32: of the X.Org implementation of the X Window System).
+libX11-x32:
+libX11-x32: See: http://www.x.org
+libX11-x32:
+libX11-x32:
+libX11-x32:
diff --git a/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-install.sh b/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3-x86_32/libX11-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libX11/1.6.3/Makefile b/X11/X.org/lib/libX11/1.6.3/Makefile
new file mode 100644
index 000000000..b9930d860
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3/Makefile
@@ -0,0 +1,260 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libX11
+
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/proto/kbproto/1.0.7
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2
+REQUIRES          += X11/X.org/proto/xextproto/7.3.0
+REQUIRES          += X11/X.org/proto/xf86bigfontproto/1.2.0
+REQUIRES          += X11/X.org/xcb/libxcb/1.11.1
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.6.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libX11/libX11-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libX11-$(version)
+src_dir_name       = libX11-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+keysym_DB          = $(CURDIR)/key-symbols/XKeysymDB
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libX11
+XORG_PKG_VERSION             = 1.6.3
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = Core X11 protocol client library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+CC_FOR_BUILD       = gcc
+CFLAGS_FOR_BUILD   = -I/usr/include
+CPPFLAGS_FOR_BUILD = -I/usr/include
+LDFLAGS_FOR_BUILD  = -L/usr/lib64
+
+env_build = CC_FOR_BUILD=$(CC_FOR_BUILD)             \
+            CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)     \
+            CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD) \
+            LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) $(env_build) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	# ======= Fix X11_CFLAGS for BUILD_CC =======
+	@( cd $(build_dir)/src/util ; \
+	   sed -i "s,^\(X11_CFLAGS = .*\)\(-I.*\),\1-I/usr/include," Makefile ; \
+	 )
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install XFree86 Key Symbols DB =======
+	@mkdir -p $(XORG_PKG)/usr/share/X11
+	@cp -a $(keysym_DB) $(XORG_PKG)/usr/share/X11
+	# ======= Install Documentation ========
+	@rm -f $(XORG_PKG)/usr/share/man/man3/XCompose.3
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; ln -sf ../man5/Compose.5 XCompose.3 )
+	@( cd $(XORG_PKG)/usr/share/man/man5 ; \
+	   for file in *.5 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL NEWS README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libX11.la libX11-xcb.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libX11.la libX11-xcb.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libX11.la libX11-xcb.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" x11.pc x11-xcb.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libX11/1.6.3/PATCHES b/X11/X.org/lib/libX11/1.6.3/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libX11/1.6.3/key-symbols/XKeysymDB b/X11/X.org/lib/libX11/1.6.3/key-symbols/XKeysymDB
new file mode 100644
index 000000000..45d892971
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3/key-symbols/XKeysymDB
@@ -0,0 +1,380 @@
+! Copyright 1993 Massachusetts Institute of Technology
+!
+! Permission to use, copy, modify, distribute, and sell this software and
+! its documentation for any purpose is hereby granted without fee, provided
+! that the above copyright notice appear in all copies and that both that
+! copyright notice and this permission notice appear in supporting
+! documentation, and that the name of M.I.T. not be used in advertising or
+! publicity pertaining to distribution of the software without specific,
+! written prior permission.  M.I.T. makes no representations about the
+! suitability of this software for any purpose.  It is provided "as is"
+! without express or implied warranty.
+!
+
+hpmute_acute		:100000A8
+hpmute_grave		:100000A9
+hpmute_asciicircum	:100000AA
+hpmute_diaeresis	:100000AB
+hpmute_asciitilde	:100000AC
+hplira			:100000AF
+hpguilder		:100000BE
+hpYdiaeresis		:100000EE
+hpIO			:100000EE
+hplongminus		:100000F6
+hpblock			:100000FC
+apLineDel		:1000FF00
+apCharDel		:1000FF01
+apCopy			:1000FF02
+apCut			:1000FF03
+apPaste			:1000FF04
+apMove			:1000FF05
+apGrow			:1000FF06
+apCmd			:1000FF07
+apShell			:1000FF08
+apLeftBar		:1000FF09
+apRightBar		:1000FF0A
+apLeftBox		:1000FF0B
+apRightBox		:1000FF0C
+apUpBox			:1000FF0D
+apDownBox		:1000FF0E
+apPop			:1000FF0F
+apRead			:1000FF10
+apEdit			:1000FF11
+apSave			:1000FF12
+apExit			:1000FF13
+apRepeat		:1000FF14
+hpModelock1		:1000FF48
+hpModelock2		:1000FF49
+hpReset			:1000FF6C
+hpSystem		:1000FF6D
+hpUser			:1000FF6E
+hpClearLine		:1000FF6F
+hpInsertLine		:1000FF70
+hpDeleteLine		:1000FF71
+hpInsertChar		:1000FF72
+hpDeleteChar		:1000FF73
+hpBackTab		:1000FF74
+hpKP_BackTab		:1000FF75
+apKP_parenleft		:1000FFA8
+apKP_parenright		:1000FFA9
+
+I2ND_FUNC_L		:10004001
+I2ND_FUNC_R		:10004002
+IREMOVE			:10004003
+IREPEAT			:10004004
+IA1			:10004101
+IA2			:10004102
+IA3			:10004103
+IA4			:10004104
+IA5			:10004105
+IA6			:10004106
+IA7			:10004107
+IA8			:10004108
+IA9			:10004109
+IA10			:1000410A
+IA11			:1000410B
+IA12			:1000410C
+IA13			:1000410D
+IA14			:1000410E
+IA15			:1000410F
+IB1			:10004201
+IB2			:10004202
+IB3			:10004203
+IB4			:10004204
+IB5			:10004205
+IB6			:10004206
+IB7			:10004207
+IB8			:10004208
+IB9			:10004209
+IB10			:1000420A
+IB11			:1000420B
+IB12			:1000420C
+IB13			:1000420D
+IB14			:1000420E
+IB15			:1000420F
+IB16			:10004210
+
+DRemove			:1000FF00
+Dring_accent		:1000FEB0
+Dcircumflex_accent	:1000FE5E
+Dcedilla_accent		:1000FE2C
+Dacute_accent		:1000FE27
+Dgrave_accent		:1000FE60
+Dtilde			:1000FE7E
+Ddiaeresis		:1000FE22
+
+osfCopy			:1004FF02
+osfCut			:1004FF03
+osfPaste		:1004FF04
+osfBackTab		:1004FF07
+osfBackSpace		:1004FF08
+osfClear		:1004FF0B
+osfEscape		:1004FF1B
+osfAddMode		:1004FF31
+osfPrimaryPaste		:1004FF32
+osfQuickPaste		:1004FF33
+osfPageLeft		:1004FF40
+osfPageUp		:1004FF41
+osfPageDown		:1004FF42
+osfPageRight		:1004FF43
+osfActivate		:1004FF44
+osfMenuBar		:1004FF45
+osfLeft			:1004FF51
+osfUp			:1004FF52
+osfRight		:1004FF53
+osfDown			:1004FF54
+osfPrior		:1004FF55
+osfNext			:1004FF56
+osfEndLine		:1004FF57
+osfBeginLine		:1004FF58
+osfEndData		:1004FF59
+osfBeginData		:1004FF5A
+osfPrevMenu		:1004FF5B
+osfNextMenu		:1004FF5C
+osfPrevField		:1004FF5D
+osfNextField		:1004FF5E
+osfSelect		:1004FF60
+osfInsert		:1004FF63
+osfUndo			:1004FF65
+osfMenu			:1004FF67
+osfCancel		:1004FF69
+osfHelp			:1004FF6A
+osfSelectAll		:1004FF71
+osfDeselectAll		:1004FF72
+osfReselect		:1004FF73
+osfExtend		:1004FF74
+osfRestore		:1004FF78
+osfSwitchDirection	:1004FF7E
+osfPriorMinor		:1004FFF5
+osfNextMinor		:1004FFF6
+osfRightLine		:1004FFF7
+osfLeftLine		:1004FFF8
+osfDelete		:1004FFFF
+
+SunFA_Grave		:1005FF00
+SunFA_Circum		:1005FF01
+SunFA_Tilde		:1005FF02
+SunFA_Acute		:1005FF03
+SunFA_Diaeresis		:1005FF04
+SunFA_Cedilla		:1005FF05
+SunF36			:1005FF10
+SunF37			:1005FF11
+SunSys_Req		:1005FF60
+SunProps		:1005FF70
+SunFront		:1005FF71
+SunCopy			:1005FF72
+SunOpen			:1005FF73
+SunPaste		:1005FF74
+SunCut			:1005FF75
+SunPowerSwitch		:1005FF76
+SunAudioLowerVolume	:1005FF77
+SunAudioMute		:1005FF78
+SunAudioRaiseVolume	:1005FF79
+SunVideoDegauss		:1005FF7A
+SunVideoLowerBrightness	:1005FF7B
+SunVideoRaiseBrightness	:1005FF7C
+SunPowerSwitchShift	:1005FF7D
+
+SunCompose		:FF20
+SunPageUp		:FF55
+SunPageDown		:FF56
+SunPrint_Screen		:FF61
+SunUndo			:FF65
+SunAgain		:FF66
+SunFind			:FF68
+SunStop			:FF69
+SunAltGraph		:FF7E
+
+WYSetup			:1006FF00
+
+ncdSetup		:1006FF00
+
+XeroxPointerButton1	:10070001
+XeroxPointerButton2	:10070002
+XeroxPointerButton3	:10070003
+XeroxPointerButton4	:10070004
+XeroxPointerButton5	:10070005
+
+! The definitions here should match <X11/XF86keysym.h>
+XF86ModeLock		:1008FF01
+XF86MonBrightnessUp	:1008FF02
+XF86MonBrightnessDown	:1008FF03
+XF86KbdLightOnOff	:1008FF04
+XF86KbdBrightnessUp	:1008FF05
+XF86KbdBrightnessDown	:1008FF06
+XF86Standby		:1008FF10
+XF86AudioLowerVolume	:1008FF11
+XF86AudioMute		:1008FF12
+XF86AudioRaiseVolume	:1008FF13
+XF86AudioPlay		:1008FF14
+XF86AudioStop		:1008FF15
+XF86AudioPrev		:1008FF16
+XF86AudioNext		:1008FF17
+XF86HomePage		:1008FF18
+XF86Mail		:1008FF19
+XF86Start		:1008FF1A
+XF86Search		:1008FF1B
+XF86AudioRecord		:1008FF1C
+XF86Calculator		:1008FF1D
+XF86Memo		:1008FF1E
+XF86ToDoList		:1008FF1F
+XF86Calendar		:1008FF20
+XF86PowerDown		:1008FF21
+XF86ContrastAdjust	:1008FF22
+XF86RockerUp		:1008FF23
+XF86RockerDown		:1008FF24
+XF86RockerEnter		:1008FF25
+XF86Back		:1008FF26
+XF86Forward		:1008FF27
+XF86Stop		:1008FF28
+XF86Refresh		:1008FF29
+XF86PowerOff		:1008FF2A
+XF86WakeUp		:1008FF2B
+XF86Eject               :1008FF2C
+XF86ScreenSaver         :1008FF2D
+XF86WWW                 :1008FF2E
+XF86Sleep               :1008FF2F
+XF86Favorites		:1008FF30
+XF86AudioPause		:1008FF31
+XF86AudioMedia		:1008FF32
+XF86MyComputer		:1008FF33
+XF86VendorHome		:1008FF34
+XF86LightBulb		:1008FF35
+XF86Shop		:1008FF36
+XF86History		:1008FF37
+XF86OpenURL		:1008FF38
+XF86AddFavorite		:1008FF39
+XF86HotLinks		:1008FF3A
+XF86BrightnessAdjust	:1008FF3B
+XF86Finance		:1008FF3C
+XF86Community		:1008FF3D
+XF86AudioRewind		:1008FF3E
+XF86BackForward		:1008FF3F
+XF86Launch0		:1008FF40
+XF86Launch1		:1008FF41
+XF86Launch2		:1008FF42
+XF86Launch3		:1008FF43
+XF86Launch4		:1008FF44
+XF86Launch5		:1008FF45
+XF86Launch6		:1008FF46
+XF86Launch7		:1008FF47
+XF86Launch8		:1008FF48
+XF86Launch9		:1008FF49
+XF86LaunchA		:1008FF4A
+XF86LaunchB		:1008FF4B
+XF86LaunchC		:1008FF4C
+XF86LaunchD		:1008FF4D
+XF86LaunchE		:1008FF4E
+XF86LaunchF		:1008FF4F
+XF86ApplicationLeft	:1008FF50
+XF86ApplicationRight	:1008FF51
+XF86Book		:1008FF52
+XF86CD			:1008FF53
+XF86Calculater		:1008FF54
+XF86Clear		:1008FF55
+XF86Close		:1008FF56
+XF86Copy		:1008FF57
+XF86Cut			:1008FF58
+XF86Display		:1008FF59
+XF86DOS			:1008FF5A
+XF86Documents		:1008FF5B
+XF86Excel		:1008FF5C
+XF86Explorer		:1008FF5D
+XF86Game		:1008FF5E
+XF86Go			:1008FF5F
+XF86iTouch		:1008FF60
+XF86LogOff		:1008FF61
+XF86Market		:1008FF62
+XF86Meeting		:1008FF63
+XF86MenuKB		:1008FF65
+XF86MenuPB		:1008FF66
+XF86MySites		:1008FF67
+XF86New			:1008FF68
+XF86News		:1008FF69
+XF86OfficeHome		:1008FF6A
+XF86Open		:1008FF6B
+XF86Option		:1008FF6C
+XF86Paste		:1008FF6D
+XF86Phone		:1008FF6E
+XF86Q			:1008FF70
+XF86Reply		:1008FF72
+XF86Reload		:1008FF73
+XF86RotateWindows	:1008FF74
+XF86RotationPB		:1008FF75
+XF86RotationKB		:1008FF76
+XF86Save		:1008FF77
+XF86ScrollUp		:1008FF78
+XF86ScrollDown		:1008FF79
+XF86ScrollClick		:1008FF7A
+XF86Send		:1008FF7B
+XF86Spell		:1008FF7C
+XF86SplitScreen		:1008FF7D
+XF86Support		:1008FF7E
+XF86TaskPane		:1008FF7F
+XF86Terminal		:1008FF80
+XF86Tools		:1008FF81
+XF86Travel		:1008FF82
+XF86UserPB		:1008FF84
+XF86User1KB		:1008FF85
+XF86User2KB		:1008FF86
+XF86Video		:1008FF87
+XF86WheelButton		:1008FF88
+XF86Word		:1008FF89
+XF86Xfer		:1008FF8A
+XF86ZoomIn		:1008FF8B
+XF86ZoomOut		:1008FF8C
+XF86Away		:1008FF8D
+XF86Messenger		:1008FF8E
+XF86WebCam		:1008FF8F
+XF86MailForward		:1008FF90
+XF86Pictures		:1008FF91
+XF86Music		:1008FF92
+XF86Battery		:1008FF93
+XF86Bluetooth		:1008FF94
+XF86WLAN		:1008FF95
+XF86UWB			:1008FF96
+XF86AudioForward	:1008FF97
+XF86AudioRepeat		:1008FF98
+XF86AudioRandomPlay	:1008FF99
+XF86Subtitle		:1008FF9A
+XF86AudioCycleTrack	:1008FF9B
+XF86CycleAngle		:1008FF9C
+XF86FrameBack		:1008FF9D
+XF86FrameForward	:1008FF9E
+XF86Time		:1008FF9F
+XF86Select		:1008FFA0
+XF86View		:1008FFA1
+XF86TopMenu		:1008FFA2
+XF86Red			:1008FFA3
+XF86Green		:1008FFA4
+XF86Yellow		:1008FFA5
+XF86Blue             	:1008FFA6
+XF86Suspend		:1008FFA7
+XF86Hibernate		:1008FFA8
+XF86TouchpadToggle	:1008FFA9
+
+! XFree86 special action keys
+XF86_Switch_VT_1	:1008FE01
+XF86_Switch_VT_2	:1008FE02
+XF86_Switch_VT_3	:1008FE03
+XF86_Switch_VT_4	:1008FE04
+XF86_Switch_VT_5	:1008FE05
+XF86_Switch_VT_6	:1008FE06
+XF86_Switch_VT_7	:1008FE07
+XF86_Switch_VT_8	:1008FE08
+XF86_Switch_VT_9	:1008FE09
+XF86_Switch_VT_10	:1008FE0A
+XF86_Switch_VT_11	:1008FE0B
+XF86_Switch_VT_12	:1008FE0C
+XF86_Ungrab		:1008FE20
+XF86_ClearGrab		:1008FE21
+XF86_Next_VMode		:1008FE22
+XF86_Prev_VMode		:1008FE23
+
+usldead_acute		:100000A8
+usldead_grave		:100000A9
+usldead_diaeresis	:100000AB
+usldead_asciicircum	:100000AA
+usldead_asciitilde	:100000AC
+usldead_cedilla		:1000FE2C
+usldead_ring		:1000FEB0
diff --git a/X11/X.org/lib/libX11/1.6.3/libX11-pkg-description.in b/X11/X.org/lib/libX11/1.6.3/libX11-pkg-description.in
new file mode 100644
index 000000000..1fe2762de
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3/libX11-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+libX11: libX11 @VERSION@ (Core X11 protocol client library)
+libX11:
+libX11: libX11 is part of X11.
+libX11:
+libX11: For more information about the X.Org Foundation (the providers
+libX11: of the X.Org implementation of the X Window System).
+libX11:
+libX11: See: http://www.x.org
+libX11:
+libX11:
+libX11:
diff --git a/X11/X.org/lib/libX11/1.6.3/libX11-pkg-install.sh b/X11/X.org/lib/libX11/1.6.3/libX11-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libX11/1.6.3/libX11-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile b/X11/X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile
index 857a91378..d7bdf2521 100644
--- a/X11/X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile
+++ b/X11/X.org/lib/libXScrnSaver/1.2.2-x86_32/Makefile
@@ -13,10 +13,10 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXScrnSaver
 
 REQUIRES           = X11/X.org/lib/libXScrnSaver/1.2.2
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/proto/scrnsaverproto/1.2.2-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
-REQUIRES          += X11/X.org/lib/libX11/1.6.2-x86_32
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
 REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXScrnSaver/1.2.2/Makefile b/X11/X.org/lib/libXScrnSaver/1.2.2/Makefile
index 0579ebd76..e09e1d662 100644
--- a/X11/X.org/lib/libXScrnSaver/1.2.2/Makefile
+++ b/X11/X.org/lib/libXScrnSaver/1.2.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,10 +23,10 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXScrnSaver
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/proto/scrnsaverproto/1.2.2
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
-REQUIRES          += X11/X.org/lib/libX11/1.6.2
+REQUIRES          += X11/X.org/lib/libX11/1.6.3
 REQUIRES          += X11/X.org/lib/libXext/1.3.3
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXau/1.0.8-x86_32/Makefile b/X11/X.org/lib/libXau/1.0.8-x86_32/Makefile
index 8527ee1d4..3a7573ed5 100644
--- a/X11/X.org/lib/libXau/1.0.8-x86_32/Makefile
+++ b/X11/X.org/lib/libXau/1.0.8-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXau
 
 REQUIRES           = X11/X.org/lib/libXau/1.0.8
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXau/1.0.8/Makefile b/X11/X.org/lib/libXau/1.0.8/Makefile
index aead51dfe..17d05fcc9 100644
--- a/X11/X.org/lib/libXau/1.0.8/Makefile
+++ b/X11/X.org/lib/libXau/1.0.8/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXau
 
-REQUIRES          += X11/X.org/proto/xproto/7.0.26
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXaw/1.0.12-x86_32/Makefile b/X11/X.org/lib/libXaw/1.0.12-x86_32/Makefile
index f1632ade8..adfc79f79 100644
--- a/X11/X.org/lib/libXaw/1.0.12-x86_32/Makefile
+++ b/X11/X.org/lib/libXaw/1.0.12-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXaw
 
 REQUIRES           = X11/X.org/lib/libXaw/1.0.12
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2-x86_32
 REQUIRES          += X11/X.org/lib/libXpm/3.5.11-x86_32
 
diff --git a/X11/X.org/lib/libXaw/1.0.12/Makefile b/X11/X.org/lib/libXaw/1.0.12/Makefile
index 25b4d91d9..b14910ce3 100644
--- a/X11/X.org/lib/libXaw/1.0.12/Makefile
+++ b/X11/X.org/lib/libXaw/1.0.12/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXaw
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2
 REQUIRES          += X11/X.org/lib/libXpm/3.5.11
 
diff --git a/X11/X.org/lib/libXaw/1.0.13-x86_32/Makefile b/X11/X.org/lib/libXaw/1.0.13-x86_32/Makefile
new file mode 100644
index 000000000..fb6cf38e0
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13-x86_32/Makefile
@@ -0,0 +1,170 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXaw
+
+REQUIRES           = X11/X.org/lib/libXaw/1.0.13
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/lib/libXmu/1.1.2-x86_32
+REQUIRES          += X11/X.org/lib/libXpm/3.5.11-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.13
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXaw/libXaw-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXaw-$(version)
+src_dir_name       = libXaw-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXaw-x32
+XORG_32_PKG_VERSION             = 1.0.13
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Athena Widget Set client library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXaw6.la libXaw7.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXaw6.la libXaw7.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXaw6.la libXaw7.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xaw6.pc xaw7.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXaw/1.0.13-x86_32/PATCHES b/X11/X.org/lib/libXaw/1.0.13-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-description.in b/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-description.in
new file mode 100644
index 000000000..6fc01ad82
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+libXaw-x32: libXaw-x32 @VERSION@ (x86_32 X Athena Widget Set client library)
+libXaw-x32:
+libXaw-x32: libXaw is part of X11.
+libXaw-x32:
+libXaw-x32: For more information about the X.Org Foundation (the providers
+libXaw-x32: of the X.Org implementation of the X Window System).
+libXaw-x32:
+libXaw-x32: See: http://www.x.org
+libXaw-x32:
+libXaw-x32:
+libXaw-x32:
diff --git a/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-install.sh b/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13-x86_32/libXaw-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXaw/1.0.13/Makefile b/X11/X.org/lib/libXaw/1.0.13/Makefile
new file mode 100644
index 000000000..59233764b
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13/Makefile
@@ -0,0 +1,211 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXaw
+
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/lib/libXmu/1.1.2
+REQUIRES          += X11/X.org/lib/libXpm/3.5.11
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.13
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXaw/libXaw-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXaw-$(version)
+src_dir_name       = libXaw-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXaw
+XORG_PKG_VERSION             = 1.0.13
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Athena Widget Set client library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXaw6.la libXaw7.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXaw6.la libXaw7.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXaw6.la libXaw7.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xaw6.pc xaw7.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXaw/1.0.13/PATCHES b/X11/X.org/lib/libXaw/1.0.13/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-description.in b/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-description.in
new file mode 100644
index 000000000..855b72f5c
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+libXaw: libXaw @VERSION@ (X Athena Widget Set client library)
+libXaw:
+libXaw: libXaw is part of X11.
+libXaw:
+libXaw: For more information about the X.Org Foundation (the providers
+libXaw: of the X.Org implementation of the X Window System).
+libXaw:
+libXaw: See: http://www.x.org
+libXaw:
+libXaw:
+libXaw:
diff --git a/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-install.sh b/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXaw/1.0.13/libXaw-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXaw3d/1.6.2-x86_32/Makefile b/X11/X.org/lib/libXaw3d/1.6.2-x86_32/Makefile
index 4340ebc73..2f300bd3e 100644
--- a/X11/X.org/lib/libXaw3d/1.6.2-x86_32/Makefile
+++ b/X11/X.org/lib/libXaw3d/1.6.2-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXaw3d
 
 REQUIRES           = X11/X.org/lib/libXaw3d/1.6.2
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2-x86_32
 REQUIRES          += X11/X.org/lib/libXpm/3.5.11-x86_32
 
diff --git a/X11/X.org/lib/libXaw3d/1.6.2/Makefile b/X11/X.org/lib/libXaw3d/1.6.2/Makefile
index a926d3eab..b4a9f45c4 100644
--- a/X11/X.org/lib/libXaw3d/1.6.2/Makefile
+++ b/X11/X.org/lib/libXaw3d/1.6.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXaw3d
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2
 REQUIRES          += X11/X.org/lib/libXpm/3.5.11
 
diff --git a/X11/X.org/lib/libXcm/0.5.3-x86_32/Makefile b/X11/X.org/lib/libXcm/0.5.3-x86_32/Makefile
index 148c9cebe..878e304b4 100644
--- a/X11/X.org/lib/libXcm/0.5.3-x86_32/Makefile
+++ b/X11/X.org/lib/libXcm/0.5.3-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXcm
 
 REQUIRES           = X11/X.org/lib/libXcm/0.5.3
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2-x86_32
 REQUIRES          += X11/X.org/lib/libXfixes/5.0.1-x86_32
 
diff --git a/X11/X.org/lib/libXcm/0.5.3/Makefile b/X11/X.org/lib/libXcm/0.5.3/Makefile
index 498efc752..e36d70d23 100644
--- a/X11/X.org/lib/libXcm/0.5.3/Makefile
+++ b/X11/X.org/lib/libXcm/0.5.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXcm
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/libXmu/1.1.2
 REQUIRES          += X11/X.org/lib/libXfixes/5.0.1
 
diff --git a/X11/X.org/lib/libXcomposite/0.4.4/Makefile b/X11/X.org/lib/libXcomposite/0.4.4/Makefile
index a5f7e2733..5d5fccb89 100644
--- a/X11/X.org/lib/libXcomposite/0.4.4/Makefile
+++ b/X11/X.org/lib/libXcomposite/0.4.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXcursor/1.1.14-x86_32/Makefile b/X11/X.org/lib/libXcursor/1.1.14-x86_32/Makefile
index ad6e33220..89c126ba1 100644
--- a/X11/X.org/lib/libXcursor/1.1.14-x86_32/Makefile
+++ b/X11/X.org/lib/libXcursor/1.1.14-x86_32/Makefile
@@ -14,7 +14,7 @@ SOURCE_REQUIRES    = sources/X.org/lib/libXcursor
 
 REQUIRES           = X11/X.org/lib/libXcursor/1.1.14
 REQUIRES          += X11/X.org/lib/libXfixes/5.0.1-x86_32
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8-x86_32
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXcursor/1.1.14/Makefile b/X11/X.org/lib/libXcursor/1.1.14/Makefile
index be71256f8..a9bc894fd 100644
--- a/X11/X.org/lib/libXcursor/1.1.14/Makefile
+++ b/X11/X.org/lib/libXcursor/1.1.14/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXcursor
 
 REQUIRES           = X11/X.org/lib/libXfixes/5.0.1
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXdamage/1.1.4/Makefile b/X11/X.org/lib/libXdamage/1.1.4/Makefile
index 3d77e7736..24dffd375 100644
--- a/X11/X.org/lib/libXdamage/1.1.4/Makefile
+++ b/X11/X.org/lib/libXdamage/1.1.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXdmcp/1.1.1-x86_32/Makefile b/X11/X.org/lib/libXdmcp/1.1.1-x86_32/Makefile
index e7b29811f..b1d5d6af2 100644
--- a/X11/X.org/lib/libXdmcp/1.1.1-x86_32/Makefile
+++ b/X11/X.org/lib/libXdmcp/1.1.1-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXdmcp
 
 REQUIRES           = X11/X.org/lib/libXdmcp/1.1.1
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXdmcp/1.1.1/Makefile b/X11/X.org/lib/libXdmcp/1.1.1/Makefile
index 032bbbdd0..35aefac98 100644
--- a/X11/X.org/lib/libXdmcp/1.1.1/Makefile
+++ b/X11/X.org/lib/libXdmcp/1.1.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXdmcp
 
-REQUIRES          += X11/X.org/proto/xproto/7.0.26
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXdmcp/1.1.2-x86_32/Makefile b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/Makefile
new file mode 100644
index 000000000..41267a217
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/Makefile
@@ -0,0 +1,154 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXdmcp
+
+REQUIRES           = X11/X.org/lib/libXdmcp/1.1.2
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXdmcp/libXdmcp-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXdmcp-$(version)
+src_dir_name       = libXdmcp-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXdmcp-x32
+XORG_32_PKG_VERSION             = 1.1.2
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X DM Control Protocol library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXdmcp.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXdmcp.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXdmcp.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xdmcp.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXdmcp/1.1.2-x86_32/PATCHES b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-description.in b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-description.in
new file mode 100644
index 000000000..768514db2
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+libXdmcp-x32: libXdmcp-x32 @VERSION@ (x86_32 X DM Control Protocol library)
+libXdmcp-x32:
+libXdmcp-x32: libXdmcp is part of X11.
+libXdmcp-x32:
+libXdmcp-x32: For more information about the X.Org Foundation (the providers
+libXdmcp-x32: of the X.Org implementation of the X Window System).
+libXdmcp-x32:
+libXdmcp-x32: See: http://www.x.org
+libXdmcp-x32:
+libXdmcp-x32:
+libXdmcp-x32:
diff --git a/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-install.sh b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2-x86_32/libXdmcp-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXdmcp/1.1.2/Makefile b/X11/X.org/lib/libXdmcp/1.1.2/Makefile
new file mode 100644
index 000000000..425bcef41
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2/Makefile
@@ -0,0 +1,194 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXdmcp
+
+REQUIRES          += X11/X.org/proto/xproto/7.0.29
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.2
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXdmcp/libXdmcp-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXdmcp-$(version)
+src_dir_name       = libXdmcp-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXdmcp
+XORG_PKG_VERSION             = 1.1.2
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X DM Control Protocol library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXdmcp.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXdmcp.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXdmcp.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xdmcp.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG); \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXdmcp/1.1.2/PATCHES b/X11/X.org/lib/libXdmcp/1.1.2/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-description.in b/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-description.in
new file mode 100644
index 000000000..770edc858
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+libXdmcp: libXdmcp @VERSION@ (X DM Control Protocol library)
+libXdmcp:
+libXdmcp: libXdmcp is part of X11.
+libXdmcp:
+libXdmcp: For more information about the X.Org Foundation (the providers
+libXdmcp: of the X.Org implementation of the X Window System).
+libXdmcp:
+libXdmcp: See: http://www.x.org
+libXdmcp:
+libXdmcp:
+libXdmcp:
diff --git a/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-install.sh b/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXdmcp/1.1.2/libXdmcp-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXevie/1.0.3/Makefile b/X11/X.org/lib/libXevie/1.0.3/Makefile
index be897b510..4488d3fc8 100644
--- a/X11/X.org/lib/libXevie/1.0.3/Makefile
+++ b/X11/X.org/lib/libXevie/1.0.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXext/1.3.3-x86_32/Makefile b/X11/X.org/lib/libXext/1.3.3-x86_32/Makefile
index 87c598997..9a4442e61 100644
--- a/X11/X.org/lib/libXext/1.3.3-x86_32/Makefile
+++ b/X11/X.org/lib/libXext/1.3.3-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXext
 
 REQUIRES           = X11/X.org/lib/libXext/1.3.3
-REQUIRES          += X11/X.org/lib/libX11/1.6.2-x86_32
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
 REQUIRES          += X11/X.org/proto/xextproto/7.3.0-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXext/1.3.3/Makefile b/X11/X.org/lib/libXext/1.3.3/Makefile
index eaa909527..5ca37b3e2 100644
--- a/X11/X.org/lib/libXext/1.3.3/Makefile
+++ b/X11/X.org/lib/libXext/1.3.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXext
 
-REQUIRES           = X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
 REQUIRES          += X11/X.org/proto/xextproto/7.3.0
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXfixes/5.0.1-x86_32/Makefile b/X11/X.org/lib/libXfixes/5.0.1-x86_32/Makefile
index 8f004c5a2..fee52c95c 100644
--- a/X11/X.org/lib/libXfixes/5.0.1-x86_32/Makefile
+++ b/X11/X.org/lib/libXfixes/5.0.1-x86_32/Makefile
@@ -14,7 +14,7 @@ SOURCE_REQUIRES    = sources/X.org/lib/libXfixes
 
 REQUIRES           = X11/X.org/lib/libXfixes/5.0.1
 REQUIRES          += X11/X.org/proto/fixesproto/5.0-x86_32
-REQUIRES          += X11/X.org/lib/libX11/1.6.2-x86_32
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXfixes/5.0.1/Makefile b/X11/X.org/lib/libXfixes/5.0.1/Makefile
index 8655c880f..a7199c8d2 100644
--- a/X11/X.org/lib/libXfixes/5.0.1/Makefile
+++ b/X11/X.org/lib/libXfixes/5.0.1/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -21,7 +24,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXfixes
 
 REQUIRES           = X11/X.org/proto/fixesproto/5.0
-REQUIRES          += X11/X.org/lib/libX11/1.6.2
+REQUIRES          += X11/X.org/lib/libX11/1.6.3
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXfont/1.5.0-x86_32/Makefile b/X11/X.org/lib/libXfont/1.5.0-x86_32/Makefile
index 2cbabbbae..a821f93de 100644
--- a/X11/X.org/lib/libXfont/1.5.0-x86_32/Makefile
+++ b/X11/X.org/lib/libXfont/1.5.0-x86_32/Makefile
@@ -13,9 +13,9 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXfont
 
 REQUIRES           = X11/X.org/lib/libXfont/1.5.0
-REQUIRES          += libs/freetype/2.5.3-x86_32
+REQUIRES          += libs/freetype/2.6.3-x86_32
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
-REQUIRES          += X11/X.org/lib/libfontenc/1.1.2-x86_32
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3-x86_32
 REQUIRES          += X11/X.org/proto/fontsproto/2.1.3-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXfont/1.5.0/Makefile b/X11/X.org/lib/libXfont/1.5.0/Makefile
index 1748444e1..a9449082b 100644
--- a/X11/X.org/lib/libXfont/1.5.0/Makefile
+++ b/X11/X.org/lib/libXfont/1.5.0/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,9 +23,9 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXfont
 
-REQUIRES           = libs/freetype/2.5.3
+REQUIRES           = libs/freetype/2.6.3
 REQUIRES          += X11/X.org/lib/xtrans/1.3.5
-REQUIRES          += X11/X.org/lib/libfontenc/1.1.2
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3
 REQUIRES          += X11/X.org/proto/fontsproto/2.1.3
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXfont/1.5.1-x86_32/Makefile b/X11/X.org/lib/libXfont/1.5.1-x86_32/Makefile
new file mode 100644
index 000000000..d71130e85
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1-x86_32/Makefile
@@ -0,0 +1,171 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXfont
+
+REQUIRES           = X11/X.org/lib/libXfont/1.5.1
+REQUIRES          += libs/freetype/2.6.3-x86_32
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5-x86_32
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3-x86_32
+REQUIRES          += X11/X.org/proto/fontsproto/2.1.3-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXfont/libXfont-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXfont-$(version)
+src_dir_name       = libXfont-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXfont-x32
+XORG_32_PKG_VERSION             = 1.5.1
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = legacy X11 font system library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXfont.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXfont.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXfont.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xfont.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXfont/1.5.1-x86_32/PATCHES b/X11/X.org/lib/libXfont/1.5.1-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-description.in b/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-description.in
new file mode 100644
index 000000000..a428cd930
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+            |-----handy-ruler------------------------------------------------------|
+libXfont-x32: libXfont-x32 @VERSION@ (x86_32 legacy X11 font system library)
+libXfont-x32:
+libXfont-x32: libXfont is part of X11.
+libXfont-x32:
+libXfont-x32: For more information about the X.Org Foundation (the providers
+libXfont-x32: of the X.Org implementation of the X Window System).
+libXfont-x32:
+libXfont-x32: See: http://www.x.org
+libXfont-x32:
+libXfont-x32:
+libXfont-x32:
diff --git a/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-install.sh b/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1-x86_32/libXfont-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXfont/1.5.1/Makefile b/X11/X.org/lib/libXfont/1.5.1/Makefile
new file mode 100644
index 000000000..6812a7df2
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1/Makefile
@@ -0,0 +1,211 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXfont
+
+REQUIRES           = libs/freetype/2.6.3
+REQUIRES          += X11/X.org/lib/xtrans/1.3.5
+REQUIRES          += X11/X.org/lib/libfontenc/1.1.3
+REQUIRES          += X11/X.org/proto/fontsproto/2.1.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5.1
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXfont/libXfont-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXfont-$(version)
+src_dir_name       = libXfont-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXfont
+XORG_PKG_VERSION             = 1.5.1
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = legacy X11 font system library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXfont.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXfont.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXfont.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xfont.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXfont/1.5.1/PATCHES b/X11/X.org/lib/libXfont/1.5.1/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-description.in b/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-description.in
new file mode 100644
index 000000000..57728b146
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+libXfont: libXfont @VERSION@ (legacy X11 font system library)
+libXfont:
+libXfont: libXfont is part of X11.
+libXfont:
+libXfont: For more information about the X.Org Foundation (the providers
+libXfont: of the X.Org implementation of the X Window System).
+libXfont:
+libXfont: See: http://www.x.org
+libXfont:
+libXfont:
+libXfont:
diff --git a/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-install.sh b/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXfont/1.5.1/libXfont-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXfontcache/1.0.5/Makefile b/X11/X.org/lib/libXfontcache/1.0.5/Makefile
index 62039610b..61b3fdc8a 100644
--- a/X11/X.org/lib/libXfontcache/1.0.5/Makefile
+++ b/X11/X.org/lib/libXfontcache/1.0.5/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXft/2.3.2-x86_32/Makefile b/X11/X.org/lib/libXft/2.3.2-x86_32/Makefile
index 7bae7eb6e..97a41cbb8 100644
--- a/X11/X.org/lib/libXft/2.3.2-x86_32/Makefile
+++ b/X11/X.org/lib/libXft/2.3.2-x86_32/Makefile
@@ -13,9 +13,9 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXft
 
 REQUIRES           = X11/X.org/lib/libXft/2.3.2
-REQUIRES          += libs/freetype/2.5.3-x86_32
-REQUIRES          += X11/libs/fontconfig/2.11.1-x86_32
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8-x86_32
+REQUIRES          += libs/freetype/2.6.3-x86_32
+REQUIRES          += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXft/2.3.2/Makefile b/X11/X.org/lib/libXft/2.3.2/Makefile
index fe30a3e9d..a135b0a99 100644
--- a/X11/X.org/lib/libXft/2.3.2/Makefile
+++ b/X11/X.org/lib/libXft/2.3.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,9 +23,9 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXft
 
-REQUIRES           = libs/freetype/2.5.3
-REQUIRES          += X11/libs/fontconfig/2.11.1
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES           = libs/freetype/2.6.3
+REQUIRES          += X11/libs/fontconfig/2.11.95
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXi/1.7.4-x86_32/Makefile b/X11/X.org/lib/libXi/1.7.4-x86_32/Makefile
index 93973f447..42fbb2c39 100644
--- a/X11/X.org/lib/libXi/1.7.4-x86_32/Makefile
+++ b/X11/X.org/lib/libXi/1.7.4-x86_32/Makefile
@@ -13,7 +13,7 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXi
 
 REQUIRES           = X11/X.org/lib/libXi/1.7.4
-REQUIRES          += X11/X.org/proto/inputproto/2.3.1-x86_32
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2-x86_32
 REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
 REQUIRES          += X11/X.org/lib/libXfixes/5.0.1-x86_32
 
diff --git a/X11/X.org/lib/libXi/1.7.4/Makefile b/X11/X.org/lib/libXi/1.7.4/Makefile
index a77ae9425..8a59b40c5 100644
--- a/X11/X.org/lib/libXi/1.7.4/Makefile
+++ b/X11/X.org/lib/libXi/1.7.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,7 +23,7 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXi
 
-REQUIRES           = X11/X.org/proto/inputproto/2.3.1
+REQUIRES           = X11/X.org/proto/inputproto/2.3.2
 REQUIRES          += X11/X.org/lib/libXext/1.3.3
 REQUIRES          += X11/X.org/lib/libXfixes/5.0.1
 
diff --git a/X11/X.org/lib/libXi/1.7.6-x86_32/Makefile b/X11/X.org/lib/libXi/1.7.6-x86_32/Makefile
new file mode 100644
index 000000000..6efc93caa
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6-x86_32/Makefile
@@ -0,0 +1,172 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXi
+
+REQUIRES           = X11/X.org/lib/libXi/1.7.6
+REQUIRES          += X11/X.org/proto/inputproto/2.3.2-x86_32
+REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
+REQUIRES          += X11/X.org/lib/libXfixes/5.0.1-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.7.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXi/libXi-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXi-$(version)
+src_dir_name       = libXi-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXi-x32
+XORG_32_PKG_VERSION             = 1.7.6
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Input Extension library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXi.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXi.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXi.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xi.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXi/1.7.6-x86_32/PATCHES b/X11/X.org/lib/libXi/1.7.6-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-description.in b/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-description.in
new file mode 100644
index 000000000..96311c96f
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libXi-x32: libXi-x32 @VERSION@ (x86_32 X Input Extension library)
+libXi-x32:
+libXi-x32: libXi is part of X11.
+libXi-x32:
+libXi-x32: For more information about the X.Org Foundation (the providers
+libXi-x32: of the X.Org implementation of the X Window System).
+libXi-x32:
+libXi-x32: See: http://www.x.org
+libXi-x32:
+libXi-x32:
+libXi-x32:
diff --git a/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-install.sh b/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6-x86_32/libXi-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXi/1.7.6/Makefile b/X11/X.org/lib/libXi/1.7.6/Makefile
new file mode 100644
index 000000000..2e4ad14cc
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6/Makefile
@@ -0,0 +1,224 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXi
+
+REQUIRES           = X11/X.org/proto/inputproto/2.3.2
+REQUIRES          += X11/X.org/lib/libXext/1.3.3
+REQUIRES          += X11/X.org/lib/libXfixes/5.0.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.7.6
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXi/libXi-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXi-$(version)
+src_dir_name       = libXi-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXi
+XORG_PKG_VERSION             = 1.7.6
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Input Extension library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXi.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXi.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXi.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xi.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXi/1.7.6/PATCHES b/X11/X.org/lib/libXi/1.7.6/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXi/1.7.6/libXi-pkg-description.in b/X11/X.org/lib/libXi/1.7.6/libXi-pkg-description.in
new file mode 100644
index 000000000..cc558ca8d
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6/libXi-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+libXi: libXi @VERSION@ (X Input Extension library)
+libXi:
+libXi: libXi is part of X11.
+libXi:
+libXi: For more information about the X.Org Foundation (the providers
+libXi: of the X.Org implementation of the X Window System).
+libXi:
+libXi: See: http://www.x.org
+libXi:
+libXi:
+libXi:
diff --git a/X11/X.org/lib/libXi/1.7.6/libXi-pkg-install.sh b/X11/X.org/lib/libXi/1.7.6/libXi-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXi/1.7.6/libXi-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXinerama/1.1.3/Makefile b/X11/X.org/lib/libXinerama/1.1.3/Makefile
index b67cdea29..3f34b79b7 100644
--- a/X11/X.org/lib/libXinerama/1.1.3/Makefile
+++ b/X11/X.org/lib/libXinerama/1.1.3/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXmu/1.1.2-x86_32/Makefile b/X11/X.org/lib/libXmu/1.1.2-x86_32/Makefile
index 351bd95d4..68739b87f 100644
--- a/X11/X.org/lib/libXmu/1.1.2-x86_32/Makefile
+++ b/X11/X.org/lib/libXmu/1.1.2-x86_32/Makefile
@@ -13,9 +13,9 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXmu
 
 REQUIRES           = X11/X.org/lib/libXmu/1.1.2
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
-REQUIRES          += X11/X.org/lib/libXt/1.1.4-x86_32
+REQUIRES          += X11/X.org/lib/libXt/1.1.5-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXmu/1.1.2/Makefile b/X11/X.org/lib/libXmu/1.1.2/Makefile
index 0bbad8c1a..d5888e9a7 100644
--- a/X11/X.org/lib/libXmu/1.1.2/Makefile
+++ b/X11/X.org/lib/libXmu/1.1.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,9 +23,9 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXmu
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/libXext/1.3.3
-REQUIRES          += X11/X.org/lib/libXt/1.1.4
+REQUIRES          += X11/X.org/lib/libXt/1.1.5
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXp/1.0.2/Makefile b/X11/X.org/lib/libXp/1.0.2/Makefile
index 91d32b472..515b58238 100644
--- a/X11/X.org/lib/libXp/1.0.2/Makefile
+++ b/X11/X.org/lib/libXp/1.0.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXp/1.0.3-x86_32/Makefile b/X11/X.org/lib/libXp/1.0.3-x86_32/Makefile
new file mode 100644
index 000000000..ae625e246
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3-x86_32/Makefile
@@ -0,0 +1,169 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXp
+
+REQUIRES           = X11/X.org/lib/libXp/1.0.3
+REQUIRES          += X11/X.org/proto/printproto/1.0.5-x86_32
+REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXp/libXp-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXp-$(version)
+src_dir_name       = libXp-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXp-x32
+XORG_32_PKG_VERSION             = 1.0.3
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Print Client Library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXp.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXp.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXp.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xp.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXp/1.0.3-x86_32/PATCHES b/X11/X.org/lib/libXp/1.0.3-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-description.in b/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-description.in
new file mode 100644
index 000000000..533fc55a5
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libXp-x32: libXp-x32 @VERSION@ (x86_32 X Print Client Library)
+libXp-x32:
+libXp-x32: libXp is part of X11.
+libXp-x32:
+libXp-x32: For more information about the X.Org Foundation (the providers
+libXp-x32: of the X.Org implementation of the X Window System).
+libXp-x32:
+libXp-x32: See: http://www.x.org
+libXp-x32:
+libXp-x32:
+libXp-x32:
diff --git a/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-install.sh b/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3-x86_32/libXp-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXp/1.0.3/Makefile b/X11/X.org/lib/libXp/1.0.3/Makefile
new file mode 100644
index 000000000..3cba2fb0d
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3/Makefile
@@ -0,0 +1,221 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXp
+
+REQUIRES           = X11/X.org/proto/printproto/1.0.5
+REQUIRES          += X11/X.org/lib/libXext/1.3.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.0.3
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXp/libXp-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXp-$(version)
+src_dir_name       = libXp-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXp
+XORG_PKG_VERSION             = 1.0.3
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Print Client Library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXp.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXp.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXp.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xp.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXp/1.0.3/PATCHES b/X11/X.org/lib/libXp/1.0.3/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXp/1.0.3/libXp-pkg-description.in b/X11/X.org/lib/libXp/1.0.3/libXp-pkg-description.in
new file mode 100644
index 000000000..09c851575
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3/libXp-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+libXp: libXp @VERSION@ (X Print Client Library)
+libXp:
+libXp: libXp is part of X11.
+libXp:
+libXp: For more information about the X.Org Foundation (the providers
+libXp: of the X.Org implementation of the X Window System).
+libXp:
+libXp: See: http://www.x.org
+libXp:
+libXp:
+libXp:
diff --git a/X11/X.org/lib/libXp/1.0.3/libXp-pkg-install.sh b/X11/X.org/lib/libXp/1.0.3/libXp-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXp/1.0.3/libXp-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXpm/3.5.11-x86_32/Makefile b/X11/X.org/lib/libXpm/3.5.11-x86_32/Makefile
index 7b7ed1759..c6086efca 100644
--- a/X11/X.org/lib/libXpm/3.5.11-x86_32/Makefile
+++ b/X11/X.org/lib/libXpm/3.5.11-x86_32/Makefile
@@ -13,9 +13,9 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXpm
 
 REQUIRES           = X11/X.org/lib/libXpm/3.5.11
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
 REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
-REQUIRES          += X11/X.org/lib/libXt/1.1.4-x86_32
+REQUIRES          += X11/X.org/lib/libXt/1.1.5-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXpm/3.5.11/Makefile b/X11/X.org/lib/libXpm/3.5.11/Makefile
index 1a0aa825d..8ce972492 100644
--- a/X11/X.org/lib/libXpm/3.5.11/Makefile
+++ b/X11/X.org/lib/libXpm/3.5.11/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,9 +23,9 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXpm
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
 REQUIRES          += X11/X.org/lib/libXext/1.3.3
-REQUIRES          += X11/X.org/lib/libXt/1.1.4
+REQUIRES          += X11/X.org/lib/libXt/1.1.5
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXrandr/1.4.2-x86_32/Makefile b/X11/X.org/lib/libXrandr/1.4.2-x86_32/Makefile
index 39e895c69..4e2cc9a8c 100644
--- a/X11/X.org/lib/libXrandr/1.4.2-x86_32/Makefile
+++ b/X11/X.org/lib/libXrandr/1.4.2-x86_32/Makefile
@@ -15,7 +15,7 @@ SOURCE_REQUIRES    = sources/X.org/lib/libXrandr
 REQUIRES           = X11/X.org/lib/libXrandr/1.4.2
 REQUIRES          += X11/X.org/proto/randrproto/1.4.0-x86_32
 REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8-x86_32
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXrandr/1.4.2/Makefile b/X11/X.org/lib/libXrandr/1.4.2/Makefile
index be4a0755c..3c1237c27 100644
--- a/X11/X.org/lib/libXrandr/1.4.2/Makefile
+++ b/X11/X.org/lib/libXrandr/1.4.2/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -22,7 +25,7 @@ SOURCE_REQUIRES    = sources/X.org/lib/libXrandr
 
 REQUIRES           = X11/X.org/proto/randrproto/1.4.0
 REQUIRES          += X11/X.org/lib/libXext/1.3.3
-REQUIRES          += X11/X.org/lib/libXrender/0.9.8
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
 
 # ======= __END_OF_REQUIRES__ =======
 
diff --git a/X11/X.org/lib/libXrandr/1.5.0-x86_32/Makefile b/X11/X.org/lib/libXrandr/1.5.0-x86_32/Makefile
new file mode 100644
index 000000000..080e67146
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0-x86_32/Makefile
@@ -0,0 +1,172 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXrandr
+
+REQUIRES           = X11/X.org/lib/libXrandr/1.5.0
+REQUIRES          += X11/X.org/proto/randrproto/1.5.0-x86_32
+REQUIRES          += X11/X.org/lib/libXext/1.3.3-x86_32
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXrandr/libXrandr-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXrandr-$(version)
+src_dir_name       = libXrandr-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXrandr-x32
+XORG_32_PKG_VERSION             = 1.5.0
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Resize, Rotate and Reflection
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXrandr.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXrandr.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXrandr.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xrandr.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXrandr/1.5.0-x86_32/PATCHES b/X11/X.org/lib/libXrandr/1.5.0-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-description.in b/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-description.in
new file mode 100644
index 000000000..ed5ea736a
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+libXrandr-x32: libXrandr-x32 @VERSION@ (x86_32 X Resize, Rotate and Reflection)
+libXrandr-x32:
+libXrandr-x32: libXrandr is part of X11.
+libXrandr-x32:
+libXrandr-x32: For more information about the X.Org Foundation (the providers
+libXrandr-x32: of the X.Org implementation of the X Window System).
+libXrandr-x32:
+libXrandr-x32: See: http://www.x.org
+libXrandr-x32:
+libXrandr-x32:
+libXrandr-x32:
diff --git a/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-install.sh b/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0-x86_32/libXrandr-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXrandr/1.5.0/Makefile b/X11/X.org/lib/libXrandr/1.5.0/Makefile
new file mode 100644
index 000000000..3cdcd220a
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0/Makefile
@@ -0,0 +1,224 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXrandr
+
+REQUIRES           = X11/X.org/proto/randrproto/1.5.0
+REQUIRES          += X11/X.org/lib/libXext/1.3.3
+REQUIRES          += X11/X.org/lib/libXrender/0.9.9
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.5.0
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXrandr/libXrandr-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXrandr-$(version)
+src_dir_name       = libXrandr-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXrandr
+XORG_PKG_VERSION             = 1.5.0
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Resize, Rotate and Reflection
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXrandr.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXrandr.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXrandr.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xrandr.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXrandr/1.5.0/PATCHES b/X11/X.org/lib/libXrandr/1.5.0/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-description.in b/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-description.in
new file mode 100644
index 000000000..d144b9427
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libXrandr: libXrandr @VERSION@ (X Resize, Rotate and Reflection)
+libXrandr:
+libXrandr: libXrandr is part of X11.
+libXrandr:
+libXrandr: For more information about the X.Org Foundation (the providers
+libXrandr: of the X.Org implementation of the X Window System).
+libXrandr:
+libXrandr: See: http://www.x.org
+libXrandr:
+libXrandr:
+libXrandr:
diff --git a/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-install.sh b/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXrandr/1.5.0/libXrandr-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXrender/0.9.8/Makefile b/X11/X.org/lib/libXrender/0.9.8/Makefile
index 2e2d28f2c..cb4bb6d05 100644
--- a/X11/X.org/lib/libXrender/0.9.8/Makefile
+++ b/X11/X.org/lib/libXrender/0.9.8/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXrender/0.9.9-x86_32/Makefile b/X11/X.org/lib/libXrender/0.9.9-x86_32/Makefile
new file mode 100644
index 000000000..94c9e69bd
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9-x86_32/Makefile
@@ -0,0 +1,170 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXrender
+
+REQUIRES           = X11/X.org/lib/libXrender/0.9.9
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
+REQUIRES          += X11/X.org/proto/renderproto/0.11.1-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.9.9
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXrender/libXrender-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXrender-$(version)
+src_dir_name       = libXrender-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXrender-x32
+XORG_32_PKG_VERSION             = 0.9.9
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Render Extension library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXrender.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXrender.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXrender.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xrender.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXrender/0.9.9-x86_32/PATCHES b/X11/X.org/lib/libXrender/0.9.9-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-description.in b/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-description.in
new file mode 100644
index 000000000..f7183bde6
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler------------------------------------------------------|
+libXrender-x32: libXrender-x32 @VERSION@ (x86_32 X Render Extension library)
+libXrender-x32:
+libXrender-x32: libXrender is part of X11.
+libXrender-x32:
+libXrender-x32: For more information about the X.Org Foundation (the providers
+libXrender-x32: of the X.Org implementation of the X Window System).
+libXrender-x32:
+libXrender-x32: See: http://www.x.org
+libXrender-x32:
+libXrender-x32:
+libXrender-x32:
diff --git a/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-install.sh b/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9-x86_32/libXrender-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXrender/0.9.9/Makefile b/X11/X.org/lib/libXrender/0.9.9/Makefile
new file mode 100644
index 000000000..df480b98e
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9/Makefile
@@ -0,0 +1,212 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXrender
+
+REQUIRES           = X11/X.org/lib/libX11/1.6.3
+REQUIRES          += X11/X.org/proto/renderproto/0.11.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 0.9.9
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXrender/libXrender-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXrender-$(version)
+src_dir_name       = libXrender-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXrender
+XORG_PKG_VERSION             = 0.9.9
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Render Extension library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXrender.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXrender.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXrender.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xrender.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"                               >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_PKG_DISTRO_NAME)"                  >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_PKG_DISTRO_VERSION)"                >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_PKG_GROUP)"                             >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_PKG_URL)"                                 >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_PKG_LICENSE)"                         >> $(XORG_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXrender/0.9.9/PATCHES b/X11/X.org/lib/libXrender/0.9.9/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-description.in b/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-description.in
new file mode 100644
index 000000000..0f28f8e3c
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+libXrender: libXrender @VERSION@ (X Render Extension library)
+libXrender:
+libXrender: libXrender is part of X11.
+libXrender:
+libXrender: For more information about the X.Org Foundation (the providers
+libXrender: of the X.Org implementation of the X Window System).
+libXrender:
+libXrender: See: http://www.x.org
+libXrender:
+libXrender:
+libXrender:
diff --git a/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-install.sh b/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXrender/0.9.9/libXrender-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXres/1.0.7/Makefile b/X11/X.org/lib/libXres/1.0.7/Makefile
index 860576ca4..fa3c16363 100644
--- a/X11/X.org/lib/libXres/1.0.7/Makefile
+++ b/X11/X.org/lib/libXres/1.0.7/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
diff --git a/X11/X.org/lib/libXt/1.1.4-x86_32/Makefile b/X11/X.org/lib/libXt/1.1.4-x86_32/Makefile
index 249802d89..f9526c4c2 100644
--- a/X11/X.org/lib/libXt/1.1.4-x86_32/Makefile
+++ b/X11/X.org/lib/libXt/1.1.4-x86_32/Makefile
@@ -13,8 +13,8 @@ include ../../../../../build-system/constants.mk
 SOURCE_REQUIRES    = sources/X.org/lib/libXt
 
 REQUIRES           = X11/X.org/lib/libXt/1.1.4
-REQUIRES          += X11/X.org/proto/xproto/7.0.26-x86_32
-REQUIRES          += X11/X.org/lib/libX11/1.6.2-x86_32
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
 REQUIRES          += X11/X.org/lib/libSM/1.2.2-x86_32
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXt/1.1.4/Makefile b/X11/X.org/lib/libXt/1.1.4/Makefile
index 0d4d890fd..5c6085d2a 100644
--- a/X11/X.org/lib/libXt/1.1.4/Makefile
+++ b/X11/X.org/lib/libXt/1.1.4/Makefile
@@ -2,13 +2,16 @@
 COMPONENT_TARGETS  = $(HARDWARE_PC32)
 COMPONENT_TARGETS += $(HARDWARE_PC64)
 COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
 COMPONENT_TARGETS += $(HARDWARE_CB3X)
 COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
-COMPONENT_TARGETS += $(HARDWARE_DM64X)
-COMPONENT_TARGETS += $(HARDWARE_BEAGLE)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
 COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
-COMPONENT_TARGETS += $(HARDWARE_B74)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
 COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
 
 
 NEED_ABS_PATH      = true
@@ -20,8 +23,8 @@ include ../../../../../build-system/constants.mk
 
 SOURCE_REQUIRES    = sources/X.org/lib/libXt
 
-REQUIRES           = X11/X.org/proto/xproto/7.0.26
-REQUIRES          += X11/X.org/lib/libX11/1.6.2
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/lib/libX11/1.6.3
 REQUIRES          += X11/X.org/lib/libSM/1.2.2
 
 # ======= __END_OF_REQUIRES__ =======
diff --git a/X11/X.org/lib/libXt/1.1.5-x86_32/Makefile b/X11/X.org/lib/libXt/1.1.5-x86_32/Makefile
new file mode 100644
index 000000000..3710a6f36
--- /dev/null
+++ b/X11/X.org/lib/libXt/1.1.5-x86_32/Makefile
@@ -0,0 +1,178 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXt
+
+REQUIRES           = X11/X.org/lib/libXt/1.1.5
+REQUIRES          += X11/X.org/proto/xproto/7.0.29-x86_32
+REQUIRES          += X11/X.org/lib/libX11/1.6.3-x86_32
+REQUIRES          += X11/X.org/lib/libSM/1.2.2-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXt/libXt-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXt-$(version)
+src_dir_name       = libXt-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_32_PKG_NAME                = libXt-x32
+XORG_32_PKG_VERSION             = 1.1.5
+XORG_32_PKG_ARCH                = $(TOOLCHAIN)
+XORG_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_32_PKG_GROUP               = $(PKG_GROUP)
+###                              |---handy-ruler-------------------------------|
+XORG_32_PKG_SHORT_DESCRIPTION   = X Toolkit Intrinsics library
+XORG_32_PKG_URL                 = $(BUG_URL)
+XORG_32_PKG_LICENSE             = custom
+XORG_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-pkg-description
+XORG_32_PKG_DESCRIPTION_FILE_IN = $(XORG_32_PKG_NAME)-pkg-description.in
+XORG_32_PKG_INSTALL_SCRIPT      = $(XORG_32_PKG_NAME)-pkg-install.sh
+
+XORG_32_PKG      = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_32_PKG_NAME)-package
+
+pkg_basename     = $(XORG_32_PKG_NAME)-$(XORG_32_PKG_VERSION)-$(XORG_32_PKG_ARCH)-$(XORG_32_PKG_DISTRO_NAME)-$(XORG_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot  = DESTDIR=$(XORG_32_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --with-appdefaultdir=/etc/X11/app-defaults
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	# ======= trick the Makefile.am developers =======
+	@( cd $(build_dir)/util ; \
+	   gcc -c -o makestrs.o $(CURDIR)/$(SRC_DIR)/util/makestrs.c ; \
+	   gcc -o makestrs makestrs.o ; \
+	 )
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	@rm -rf $(XORG_32_PKG)/usr/include
+	@rm -rf $(XORG_32_PKG)/usr/share
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXt.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXt.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXt.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xt.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_32_PKG_DESCRIPTION_FILE): $(XORG_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_32_PKG_DESCRIPTION_FILE) $(XORG_32_PKG)/.DESCRIPTION
+	@cp $(XORG_32_PKG_INSTALL_SCRIPT) $(XORG_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_32_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_32_PKG_NAME)"                            >  $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_32_PKG_VERSION)"                          >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_32_PKG_ARCH)"                               >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(XORG_32_PKG_DISTRO_NAME)"                  >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(XORG_32_PKG_DISTRO_VERSION)"                >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "group=$(XORG_32_PKG_GROUP)"                             >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(XORG_32_PKG_SHORT_DESCRIPTION)\"" >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "url=$(XORG_32_PKG_URL)"                                 >> $(XORG_32_PKG)/.PKGINFO ; \
+	 echo "license=$(XORG_32_PKG_LICENSE)"                         >> $(XORG_32_PKG)/.PKGINFO
+	@$(FAKEROOT) sh -c "cd $(XORG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
diff --git a/X11/X.org/lib/libXt/1.1.5-x86_32/PATCHES b/X11/X.org/lib/libXt/1.1.5-x86_32/PATCHES
new file mode 100644
index 000000000..e69de29bb
diff --git a/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-description.in b/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-description.in
new file mode 100644
index 000000000..18f69bb3c
--- /dev/null
+++ b/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-description.in
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
+libXt-x32: libXt-x32 @VERSION@ (x86_32 X Toolkit Intrinsics library)
+libXt-x32:
+libXt-x32: libXt is part of X11.
+libXt-x32:
+libXt-x32: For more information about the X.Org Foundation (the providers
+libXt-x32: of the X.Org implementation of the X Window System).
+libXt-x32:
+libXt-x32: See: http://www.x.org
+libXt-x32:
+libXt-x32:
+libXt-x32:
diff --git a/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-install.sh b/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-install.sh
new file mode 100755
index 000000000..8e8683cd6
--- /dev/null
+++ b/X11/X.org/lib/libXt/1.1.5-x86_32/libXt-x32-pkg-install.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
diff --git a/X11/X.org/lib/libXt/1.1.5/Makefile b/X11/X.org/lib/libXt/1.1.5/Makefile
new file mode 100644
index 000000000..1fc1d0f9f
--- /dev/null
+++ b/X11/X.org/lib/libXt/1.1.5/Makefile
@@ -0,0 +1,230 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXQ)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/X.org/lib/libXt
+
+REQUIRES           = X11/X.org/proto/xproto/7.0.29
+REQUIRES          += X11/X.org/lib/libX11/1.6.3
+REQUIRES          += X11/X.org/lib/libSM/1.2.2
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 1.1.5
+tar_bz2_archive    = $(SRC_PACKAGE_PATH)/X.org/lib/libXt/libXt-$(version).tar.bz2
+SRC_ARCHIVE        = $(tar_bz2_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/libXt-$(version)
+src_dir_name       = libXt-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xorg
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+XORG_PKG_NAME                = libXt
+XORG_PKG_VERSION             = 1.1.5
+XORG_PKG_ARCH                = $(TOOLCHAIN)
+XORG_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+XORG_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+XORG_PKG_GROUP               = $(PKG_GROUP)
+###                           |---handy-ruler-------------------------------|
+XORG_PKG_SHORT_DESCRIPTION   = X Toolkit Intrinsics library
+XORG_PKG_URL                 = $(BUG_URL)
+XORG_PKG_LICENSE             = custom
+XORG_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-pkg-description
+XORG_PKG_DESCRIPTION_FILE_IN = $(XORG_PKG_NAME)-pkg-description.in
+XORG_PKG_INSTALL_SCRIPT      = $(XORG_PKG_NAME)-pkg-install.sh
+
+XORG_PKG         = $(CURDIR)/$(TARGET_BUILD_DIR)/$(XORG_PKG_NAME)-package
+
+pkg_basename     = $(XORG_PKG_NAME)-$(XORG_PKG_VERSION)-$(XORG_PKG_ARCH)-$(XORG_PKG_DISTRO_NAME)-$(XORG_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(XORG_PKG)
+
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localstatedir=/var
+extra_configure_switches += --with-appdefaultdir=/etc/X11/app-defaults
+extra_configure_switches += --enable-shared=yes
+extra_configure_switches += --enable-static=yes
+
+extra_configure_switches += --enable-malloc0returnsnull=yes
+
+
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	# ======= trick the Makefile.am developers =======
+	@( cd $(build_dir)/util ; \
+	   gcc -c -o makestrs.o $(CURDIR)/$(SRC_DIR)/util/makestrs.c ; \
+	   gcc -o makestrs makestrs.o ; \
+	 )
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(XORG_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Install Documentation =======
+	@( cd $(XORG_PKG)/usr/share/man/man3 ; \
+	   for file in *.3 ; do                                \
+	     ln=`head -n 1 $$file` ;                           \
+	     if [ "`echo $$ln | grep '^\.so '`" != "" ] ; then \
+	       origin=`echo $$ln | cut -f 2 -d ' '` ;          \
+	       origin=`basename $$origin` ;                    \
+	       rm -f $$file ;                                  \
+	       ln -sf $$origin $$file ;                        \
+	     fi ;                                              \
+	   done ;                                              \
+	 )
+	@if [ -d $(XORG_PKG)/usr/share/man ]; then \
+	  ( cd $(XORG_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/COPYING \
+	       $(XORG_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a COPYING INSTALL README \
+	         $(XORG_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(XORG_PKG)/usr/share/doc ; \
+	   ln -sf $(src_dir_name) $(XORG_PKG_NAME) ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(XORG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove toolchain path from target libtool *.la files =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libXt.la \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(XORG_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libXt.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libXt.la \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" xt.pc \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(XORG_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+	 )
+ifneq ($(CHRPATH),)
+	# ======= Set RPATH/RUNPATH for target shared objects =======
+	@( cd $(XORG_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(XORG_PKG_DESCRIPTION_FILE): $(XORG_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG_INSTALL_SCRIPT)
+	@cp $(XORG_PKG_DESCRIPTION_FILE) $(XORG_PKG)/.DESCRIPTION
+	@cp $(XORG_PKG_INSTALL_SCRIPT) $(XORG_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(XORG_PKG)/.REQUIRES
+	@echo "pkgname=$(XORG_PKG_NAME)"                            >  $(XORG_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(XORG_PKG_VERSION)"                          >> $(XORG_PKG)/.PKGINFO ; \
+	 echo "arch=$(XORG_PKG_ARCH)"