# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1535928788 -10800
# Node ID 02b674913611ff3b2f90f85aa459e2fdc0f1a77d
# Parent  15f1e7e9a1c9faec9ca4753f6f4bada3aa4c094a
Update Xorg

diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-adobe-100dpi/receipt
--- a/xorg-font-adobe-100dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-adobe-100dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,13 +8,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:adobe-100dpi"
 
 TARBALL="font-adobe-100dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-adobe-75dpi/receipt
--- a/xorg-font-adobe-75dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-adobe-75dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,13 +8,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:adobe-75dpi"
 
 TARBALL="font-adobe-75dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-adobe-utopia-100dpi/receipt
--- a/xorg-font-adobe-utopia-100dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-adobe-utopia-100dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:adobe-utopia-100dpi"
 
 TARBALL="font-adobe-utopia-100dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-adobe-utopia-75dpi/receipt
--- a/xorg-font-adobe-utopia-75dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-adobe-utopia-75dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:adobe-utopia-75dpi"
 
 TARBALL="font-adobe-utopia-75dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-adobe-utopia-type1/receipt
--- a/xorg-font-adobe-utopia-type1/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-adobe-utopia-type1/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="fonts:adobe-utopia-type1"
 
 TARBALL="font-adobe-utopia-type1-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-arabic-misc/receipt
--- a/xorg-font-arabic-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-arabic-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:arabic-misc"
 
 TARBALL="font-arabic-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-100dpi/receipt
--- a/xorg-font-bh-100dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-100dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bh-100dpi"
 
 TARBALL="font-bh-100dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-75dpi/receipt
--- a/xorg-font-bh-75dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-75dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bh-75dpi"
 
 TARBALL="font-bh-75dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-lucidatypewriter-100dpi/receipt
--- a/xorg-font-bh-lucidatypewriter-100dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-lucidatypewriter-100dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bh-lucidatypewriter-100dpi"
 
 TARBALL="font-bh-lucidatypewriter-100dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-lucidatypewriter-75dpi/receipt
--- a/xorg-font-bh-lucidatypewriter-75dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-lucidatypewriter-75dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bh-lucidatypewriter-75dpi"
 
 TARBALL="font-bh-lucidatypewriter-75dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-ttf/receipt
--- a/xorg-font-bh-ttf/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-ttf/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="font-bh-ttf"
 
 TARBALL="font-bh-ttf-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bh-type1/receipt
--- a/xorg-font-bh-type1/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bh-type1/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="fonts:bh-type1"
 
 TARBALL="font-bh-type1-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bitstream-100dpi/receipt
--- a/xorg-font-bitstream-100dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bitstream-100dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bitstream-100dpi"
 
 TARBALL="font-bitstream-100dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bitstream-75dpi/receipt
--- a/xorg-font-bitstream-75dpi/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bitstream-75dpi/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bitstream-75dpi"
 
 TARBALL="font-bitstream-75dpi-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-bitstream-type1/receipt
--- a/xorg-font-bitstream-type1/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-bitstream-type1/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:bitstream-type1"
 
 TARBALL="font-bitstream-type1-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-cronyx-cyrillic/receipt
--- a/xorg-font-cronyx-cyrillic/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-cronyx-cyrillic/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:cronyx-cyrillic"
 
 TARBALL="font-cronyx-cyrillic-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-cursor-misc/receipt
--- a/xorg-font-cursor-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-cursor-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-cursor-misc"
 
 TARBALL="font-cursor-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-daewoo-misc/receipt
--- a/xorg-font-daewoo-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-daewoo-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-daewoo-misc"
 
 TARBALL="font-daewoo-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-dec-misc/receipt
--- a/xorg-font-dec-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-dec-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-dec-misc"
 
 TARBALL="font-dec-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-ibm-type1/receipt
--- a/xorg-font-ibm-type1/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-ibm-type1/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="fonts:ibm-type1"
 
 TARBALL="font-ibm-type1-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-isas-misc/receipt
--- a/xorg-font-isas-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-isas-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:isas-misc"
 
 TARBALL="font-isas-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-jis-misc/receipt
--- a/xorg-font-jis-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-jis-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-jis-misc"
 
 TARBALL="font-jis-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-micro-misc/receipt
--- a/xorg-font-micro-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-micro-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:micro-misc"
 
 TARBALL="font-micro-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-misc-cyrillic/receipt
--- a/xorg-font-misc-cyrillic/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-misc-cyrillic/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:misc-cyrillic"
 
 TARBALL="font-misc-cyrillic-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-misc-ethiopic/receipt
--- a/xorg-font-misc-ethiopic/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-misc-ethiopic/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="font-misc-ethiopic"
 
 TARBALL="font-misc-ethiopic-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-misc-meltho/receipt
--- a/xorg-font-misc-meltho/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-misc-meltho/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-misc-meltho"
 
 TARBALL="font-misc-meltho-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-misc-misc/receipt
--- a/xorg-font-misc-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-misc-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.x.org/wiki/"
-COOKOPTS="!gz" # too long
+REPOLOGY="font-misc-misc"
 
 TARBALL="font-misc-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
-PKG_RULE="std"
+COOKOPTS="!gz" # too long
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-mutt-misc/receipt
--- a/xorg-font-mutt-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-mutt-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:mutt-misc"
 
 TARBALL="font-mutt-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-schumacher-misc/receipt
--- a/xorg-font-schumacher-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-schumacher-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-schumacher-misc"
 
 TARBALL="font-schumacher-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-screen-cyrillic/receipt
--- a/xorg-font-screen-cyrillic/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-screen-cyrillic/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:screen-cyrillic"
 
 TARBALL="font-screen-cyrillic-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-sony-misc/receipt
--- a/xorg-font-sony-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-sony-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-sony-misc"
 
 TARBALL="font-sony-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-sun-misc/receipt
--- a/xorg-font-sun-misc/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-sun-misc/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="font-sun-misc"
 
 TARBALL="font-sun-misc-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
 COOKOPTS="!gz" # too long
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-winitzki-cyrillic/receipt
--- a/xorg-font-winitzki-cyrillic/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-winitzki-cyrillic/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.x.org/wiki/"
+REPOLOGY="fonts:winitzki-cyrillic"
 
 TARBALL="font-winitzki-cyrillic-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir xorg-bdftopcf"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-font-xfree86-type1/receipt
--- a/xorg-font-xfree86-type1/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-font-xfree86-type1/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -8,6 +8,7 @@
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+REPOLOGY="fonts:xfree86-type1"
 
 TARBALL="font-xfree86-type1-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-server-light/.icon.png
--- a/xorg-server-light/.icon.png	Sun Sep 02 11:34:04 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../xorg/.icon.png
\ No newline at end of file
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-server-light/receipt
--- a/xorg-server-light/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="xorg-server-light"
-VERSION="1.19.3"
-CATEGORY="x-window"
-SHORT_DESC="Xorg core server light version (no dri, gl, and friends)"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="https://www.x.org/wiki/"
-REPOLOGY="xorg-server"
-
-TARBALL="xorg-server-$VERSION.tar.bz2"
-WGET_URL="$XORG_MIRROR/xserver/$TARBALL"
-
-BUILD_DEPENDS_arm="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-pixman-dev \
-xorg-util-macros xorg-libXfont-dev libgcrypt-dev \
-xorg-xorgproto \
-xorg-xtrans libgpg-error-dev freetype-dev \
-xorg-libxcb-dev xorg-libXcomposite-dev xorg-libXxf86vm-dev xorg-libXv-dev \
-bzip2-dev udev-dev"
-BUILD_DEPENDS="xorg-util-macros xorg-pixman-dev eudev-dev libgcrypt-dev \
-xorg-xtrans \
-xorg-xorgproto \
-xorg-libxkbfile-dev xorg-libXfont2-dev xorg-libXau-dev xorg-libpciaccess-dev"
-
-compile_rules() {
-	# Handle cross compilation. ARM use build host: perl flex
-	case "$ARCH" in
-		arm)
-			#--disable-static
-			ARCH_ARGS="--enable-malloc0returnsnull"
-			OS_NAME="SliTaz ARM"
-			VENDOR="http://arm.slitaz.org" ;;
-		*)
-			OS_NAME="SliTaz GNU/Linux"
-			VENDOR="http://www.slitaz.org" ;;
-	esac
-
-	./configure \
-		--disable-docs \
-		--disable-devel-docs \
-		--disable-screensaver \
-		--disable-glx \
-		--disable-dri \
-		--disable-dri2 \
-		--disable-dri3 \
-		--disable-xinerama \
-		--disable-config-udev \
-		--disable-libdrm \
-		--disable-systemd-logind \
-		--enable-xorg \
-		--disable-xvfb \
-		--disable-xnest \
-		--disable-glamor \
-		--disable-xephyr \
-		--disable-xfake \
-		--disable-xfbdev \
-		--enable-install-setuid \
-		--disable-ipv6 \
-		--with-vendor-web="$VENDOR" \
-		--with-builder-addr="$MAINTAINER" \
-		--with-os-name="$OS_NAME" \
-		--with-fontrootdir=/usr/share/fonts/X11 \
-		--with-xkb-output=/var/lib/xkb \
-		--with-serverconfig-path=/etc/X11 \
-		$ARCH_ARGS \
-		$CONFIGURE_ARGS &&
-	fix libtool &&
-	make &&
-	make install
-}
-
-# Be sure it as cross compile
-testsuite() {
-	readelf -h $install/usr/bin/Xorg
-}
-
-genpkg_rules() {
-	copy @std
-#	DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
-#	xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt xorg-pixman \
-#	xorg-xf86-input-evdev libgpg-error libgcrypt freetype xorg-libxcb \
-#	xorg-libXcomposite xorg-libXv bzip2 udev"
-	DEPENDS="libgcrypt xorg-libXau xorg-libXdmcp xorg-libXfont2 \
-	xorg-libpciaccess xorg-pixman"
-	SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
-	PROVIDE="xorg-server"
-}
-
-# We need /var/tmp rw to let xkbcomp build XKB definition.
-post_install() {
-	chmod 1777 "$1/var/tmp"
-}
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-server/receipt
--- a/xorg-server/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-server/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,57 +1,77 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-server"
-VERSION="1.19.3"
+VERSION="1.20.1"
 CATEGORY="x-window"
 SHORT_DESC="X server"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xorg-server.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xorg-server.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/xserver/$TARBALL"
 
 BUILD_DEPENDS="patch xorg-util-macros xorg-pixman-dev eudev-dev dbus-dev \
-xorg-libxshmfence-dev libdrm-dev xorg-libX11-dev \
-mesa-dev xorg-libXdmcp-dev libgcrypt-dev \
-xorg-xorgproto \
-xorg-libxkbfile-dev xorg-libXfont2-dev xorg-libpciaccess-dev \
-xorg-libXxf86dga-dev xorg-libdmx-dev xorg-libXaw-dev xorg-libXpm-dev \
-xorg-libXtst-dev xorg-libXres-dev \
-xorg-libXmu-dev xorg-libXext-dev xorg-libXrender-dev \
-xorg-libXfixes-dev xorg-libXi-dev xorg-libXau-dev \
-xorg-libXdmcp-dev libepoxy-dev tslib-dev xorg-xcb-util-renderutil-dev \
-xorg-xcb-util-dev xorg-xcb-util-image-dev xorg-xcb-util-wm-dev \
-xorg-xcb-util-keysyms-dev expat-dev xorg-xtrans"
-SPLIT="xorg-server-Xdmx xorg-server-Xephyr xorg-server-Xfbdev \
-xorg-server-Xnest xorg-server-Xvfb xorg-server-module-glamor xorg-server-dev \
-xorg-server"
+xorg-libxshmfence-dev libdrm-dev xorg-libX11-dev mesa-dev xorg-libXdmcp-dev \
+libgcrypt-dev xorg-xorgproto xorg-libxkbfile-dev xorg-libXfont2-dev \
+xorg-libpciaccess-dev xorg-libXxf86dga-dev xorg-libdmx-dev xorg-libXaw-dev \
+xorg-libXpm-dev xorg-libXtst-dev xorg-libXres-dev xorg-libXmu-dev \
+xorg-libXext-dev xorg-libXrender-dev xorg-libXfixes-dev xorg-libXi-dev \
+xorg-libXau-dev xorg-libXdmcp-dev libepoxy-dev tslib-dev \
+xorg-xcb-util-renderutil-dev xorg-xcb-util-dev xorg-xcb-util-image-dev \
+xorg-xcb-util-wm-dev xorg-xcb-util-keysyms-dev expat-dev xorg-xtrans \
+xorg-xkbcomp-dev openssl-dev"
+SPLIT="xorg-server-Xdmx xorg-server-Xephyr xorg-server-Xnest xorg-server-Xvfb \
+xorg-server-module-glamor xorg-server-dev xorg-server xorg-server-light:light"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
+	case $SET in
+		'')
+			SET_ARGS="
+				--disable-static \
+				--enable-glamor \
+				--enable-suid-wrapper \
+				--disable-xwayland \
+				--enable-dmx \
+				--enable-kdrive \
+				--enable-xephyr \
+				--enable-config-udev \
+				"
+			;;
+		light)
+			SET_ARGS="
+				--disable-screensaver \
+				--disable-glx \
+				--disable-dri \
+				--disable-dri2 \
+				--disable-dri3 \
+				--disable-xinerama \
+				--disable-config-udev \
+				--disable-libdrm \
+				--enable-xorg \
+				--disable-xvfb \
+				--disable-xnest \
+				--disable-glamor \
+				--disable-xephyr \
+				--disable-ipv6 \
+				--with-serverconfig-path=/etc/X11 \
+				"
+			;;
+	esac
+
 	./configure \
-		--disable-static \
-		--enable-glamor \
 		--enable-install-setuid \
-		--enable-suid-wrapper \
 		--disable-systemd-logind \
-		--disable-xwayland \
-		--disable-docs --disable-devel-docs \
+		--disable-docs \
+		--disable-devel-docs \
 		--with-xkb-output=/var/lib/xkb \
-		--enable-tslib \
-		--enable-dmx \
-		--enable-kdrive \
-		--enable-kdrive-kbd \
-		--enable-kdrive-mouse \
-		--enable-kdrive-evdev \
-		--enable-xfbdev \
-		--enable-xephyr \
-		--enable-config-udev \
 		--with-fontrootdir=/usr/share/fonts/X11 \
 		--with-os-name="SliTaz GNU/Linux" \
 		--with-vendor-web="http://www.slitaz.org/" \
 		--with-builder-addr="devel@slitaz.org" \
+		$SET_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
@@ -60,6 +80,10 @@
 	mkdir -pv $install/etc/X11/xorg.conf.d
 }
 
+testsuite() {
+	readelf -h $install/usr/bin/Xorg
+}
+
 genpkg_rules() {
 	case $PACKAGE in
 		*-Xdmx)
@@ -79,13 +103,6 @@
 			xorg-pixman xorg-xcb-util xorg-xcb-util-image \
 			xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm"
 			;;
-		*-Xfbdev)
-			copy Xfbdev
-			# chmod 4711 $fs/usr/bin/Xfbdev
-			CAT="x-window|Xfbdev framebuffer X server"
-			DEPENDS="eudev libgcrypt tslib xorg-libXau xorg-libXdmcp \
-			xorg-libXfont2 xorg-pixman"
-			;;
 		*-Xnest)
 			copy Xnest
 			# chmod 4711 $fs/usr/bin/Xnest
@@ -103,16 +120,14 @@
 		*-module-glamor)
 			copy libglamoregl.so libglx.so
 			CAT="x-window|Glamor DIX (Device Independent X) module"
-			DEPENDS="libdrm libepoxy mesa mesa-libgbm"
+			DEPENDS="libepoxy mesa mesa-libgbm"
 			;;
 		*-dev)
 			copy @dev protocol.txt
 			DEPENDS="xorg-server xorg-server-Xdmx xorg-server-Xephyr \
 			xorg-server-Xfbdev xorg-server-Xnest xorg-server-Xvfb \
 			xorg-server-module-glamor \
-			mesa-dev xorg-xorgproto \
-			xorg-libpciaccess-dev \
-			xorg-pixman-dev"
+			mesa-dev xorg-xorgproto xorg-libpciaccess-dev xorg-pixman-dev"
 			;;
 		*-server)
 			copy @std var/log/ xorg.conf.d/ @rm
@@ -123,6 +138,14 @@
 			xorg-xkeyboard-config xorg-xkbcomp"
 			SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa"
 			;;
+		xorg-server-light)
+			copy @std
+			CAT="x-window|light version without dri, gl, and friends"
+			DEPENDS="libgcrypt xorg-libXau xorg-libXdmcp xorg-libXfont2 \
+			xorg-libpciaccess xorg-libxshmfence xorg-pixman"
+			SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
+			PROVIDE="xorg-server"
+			;;
 	esac
 }
 
@@ -144,3 +167,7 @@
 post_install_xorg_server_Xvfb() {
 	install -dm1777 -oroot -groot "$1/tmp/.ICE-unix" "$1/tmp/.X11-unix"
 }
+# We need /var/tmp rw to let xkbcomp build XKB definition.
+post_install_xorg_server_light() {
+	chmod 1777 "$1/var/tmp"
+}
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-server/stuff/patches/series
--- a/xorg-server/stuff/patches/series	Sun Sep 02 11:34:04 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-# from BLFS
-xorg-server-1.19.1-add_prime_support-1.patch
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-server/stuff/patches/xorg-server-1.19.1-add_prime_support-1.patch
--- a/xorg-server/stuff/patches/xorg-server-1.19.1-add_prime_support-1.patch	Sun Sep 02 11:34:04 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-12-30
-Initial Package Version: 1.13.1
-Upstream Status:         Not submitted.
-Origin:                  Upstream mailing list.
-Comment:                 Rediffed for Package Version 1.17.2 by
-                         Fernando de Oliveira <famobr at yahoo dot com dot br>
-Description:             Adds PRIME support to Xorg Server to make GPU offloading work.
-
-diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c xorg-server-1.17.2/hw/xfree86/common/xf86Init.c
---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c	2015-06-05 12:19:40.000000000 -0300
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86Init.c	2015-06-17 11:35:07.227581436 -0300
-@@ -340,6 +340,16 @@
-     return ret;
- }
- 
-+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);                              
-+static void
-+xf86AutoConfigOutputDevices(void)
-+{
-+    int i;
-+
-+    for (i = 0; i < xf86NumGPUScreens; i++)
-+        xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
-+}
-+
- static void
- InstallSignalHandlers(void)
- {
-@@ -929,6 +939,8 @@
-     for (i = 0; i < xf86NumGPUScreens; i++)
-         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
- 
-+    xf86AutoConfigOutputDevices();
-+
-     xf86VGAarbiterWrapFunctions();
-     if (sigio_blocked)
-         OsReleaseSIGIO();
-diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c
---- xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c	2015-06-16 12:21:07.000000000 -0300
-+++ xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c	2015-06-17 11:35:07.227581436 -0300
-@@ -469,6 +469,8 @@
-     return foundScreen;
- }
- 
-+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
-+
- int
- xf86platformAddDevice(int index)
- {
-@@ -537,6 +539,7 @@
-    }
-    /* attach unbound to 0 protocol screen */
-    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
-+   xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
- 
-    RRResourcesChanged(xf86Screens[0]->pScreen);
-    RRTellChanged(xf86Screens[0]->pScreen);
-diff -Naur xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c
---- xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c	2015-06-16 10:55:48.000000000 -0300
-+++ xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c	2015-06-17 11:35:07.230581367 -0300
-@@ -3387,3 +3387,35 @@
-             crtc->x = crtc->y = 0;
-         }
- }
-+
-+
-+void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master)
-+{
-+    RRProviderPtr master_provider;
-+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master);
-+    xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn);
-+    Bool unbound = FALSE;
-+
-+    if (!config || !slave_config)
-+        return;
-+
-+    master_provider = config->randr_provider;
-+
-+    if ((master->capabilities & RR_Capability_SinkOffload) &&
-+        pScrn->capabilities & RR_Capability_SourceOffload) {
-+            /* source offload */
-+            
-+        DetachUnboundGPU(pScrn->pScreen);
-+        unbound = TRUE;
-+        AttachOffloadGPU(master->pScreen, pScrn->pScreen);
-+        slave_config->randr_provider->offload_sink = master_provider;
-+    }
-+    if ((master->capabilities & RR_Capability_SourceOutput) &&
-+               pScrn->capabilities & RR_Capability_SinkOutput) {
-+        /* sink offload */
-+        if (!unbound)
-+            DetachUnboundGPU(pScrn->pScreen);
-+        AttachOutputGPU(master->pScreen, pScrn->pScreen);
-+        slave_config->randr_provider->output_source = master_provider;
-+    }
-+}
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-util-macros/receipt
--- a/xorg-util-macros/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-util-macros/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-util-macros"
-VERSION="1.19.1"
+VERSION="1.19.2"
 CATEGORY="development"
 SHORT_DESC="Autoconf macros used in X modular configure.ac files"
 MAINTAINER="gokhlayeh@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xbacklight/receipt
--- a/xorg-xbacklight/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xbacklight/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xbacklight"
-VERSION="1.2.1"
+VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Adjust backlight brightness using RandR extension"
 MAINTAINER="jozee@slitaz.org"
@@ -18,7 +18,6 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
 	make &&
 	make install
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xbitmaps/receipt
--- a/xorg-xbitmaps/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xbitmaps/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xbitmaps"
-VERSION="1.1.1"
+VERSION="1.1.2"
 CATEGORY="development"
 SHORT_DESC="Standard set of X bitmaps"
 MAINTAINER="pankso@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xclock/receipt
--- a/xorg-xclock/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xclock/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xclock"
-VERSION="1.0.6"
+VERSION="1.0.7"
 CATEGORY="x-window"
 SHORT_DESC="X clock"
 MAINTAINER="pankso@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xdriinfo/receipt
--- a/xorg-xdriinfo/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xdriinfo/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xdriinfo"
-VERSION="1.0.5"
+VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="Query configuration information of DRI drivers"
 MAINTAINER="pankso@slitaz.org"
@@ -17,7 +17,6 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
 	make &&
 	make install
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xedit/receipt
--- a/xorg-xedit/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xedit/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xedit"
-VERSION="1.2.0"
+VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Simple text editor for X"
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xeyes/receipt
--- a/xorg-xeyes/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xeyes/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xeyes"
-VERSION="1.1.1"
+VERSION="1.1.2"
 CATEGORY="x-window"
 SHORT_DESC="Follow the mouse/SHAPE extension X demo"
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xf86-video-ati/receipt
--- a/xorg-xf86-video-ati/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xf86-video-ati/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xf86-video-ati"
-VERSION="7.9.0"
+VERSION="18.0.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg wrapper driver for ATI video cards"
 MAINTAINER="pankso@slitaz.org"
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xf86-video-fbturbo/receipt
--- a/xorg-xf86-video-fbturbo/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xf86-video-fbturbo/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,8 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xf86-video-fbturbo"
-VERSION="0.2.0"
+VERSION="0.4.0.postgit20151006"
+COMMIT="f9a6ed7"
 CATEGORY="x-window"
 SHORT_DESC="Xorg DDX driver for ARM devices (Allwinner, RPi and others)"
 MAINTAINER="pankso@slitaz.org"
@@ -10,15 +11,9 @@
 REPOLOGY="xdrv:fbturbo"
 
 TARBALL="xf86-video-fbturbo-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/archive/${COMMIT:-VERSION}.tar.gz"
 
-# 0.4.0 ---> fatal error: dri2.h: No such file or directory
-#
-# We must have DRI support into Xorg server. This is not the case 
-# actually because I stripped down Xorg build since it mesa are not
-# ported yet.
-
-BUILD_DEPENDS="xorg-server-dev automake autoconf libtool"
+BUILD_DEPENDS="xorg-util-macros xorg-server-dev automake autoconf libtool"
 
 compile_rules() {
 	autoreconf -vi
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xf86-video-mach64/receipt
--- a/xorg-xf86-video-mach64/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xf86-video-mach64/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xf86-video-mach64"
-VERSION="6.9.5"
+VERSION="6.9.6"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for ATI MACH 64 cards"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,7 +12,7 @@
 TARBALL="xf86-video-mach64-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
-BUILD_DEPENDS="xorg-server-dev"
+BUILD_DEPENDS="xorg-util-macros xorg-server-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xf86-video-s3virge/receipt
--- a/xorg-xf86-video-s3virge/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xf86-video-s3virge/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/s3virge/"
-REPOLOGY="sxdr:s3virge"
+REPOLOGY="xdrv:s3virge"
 
 TARBALL="xf86-video-s3virge-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
-BUILD_DEPENDS="xorg-server-dev"
+BUILD_DEPENDS="xorg-util-macros xorg-server-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xf86-video-vmware/receipt
--- a/xorg-xf86-video-vmware/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xf86-video-vmware/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xf86-video-vmware"
-VERSION="13.2.1"
+VERSION="13.3.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for VMware virtual video cards"
 MAINTAINER="slaxemulator@gmail.com"
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat libdrm libdrm-nouveau libgcrypt libgpg-error llvm-libs mesa"
+	DEPENDS="eudev libdrm mesa-libxatracker"
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xfontsel/receipt
--- a/xorg-xfontsel/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xfontsel/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xfontsel"
-VERSION="1.0.5"
+VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="Point and click selection of X11 font names"
 MAINTAINER="jozee@slitaz.org"
@@ -12,8 +12,7 @@
 TARBALL="xfontsel-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXaw-dev"
-PKG_RULE="std"
+BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xinit/receipt
--- a/xorg-xinit/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xinit/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xinit"
-VERSION="1.3.4"
+VERSION="1.4.0"
 CATEGORY="x-window"
 SHORT_DESC="X Window System initializer (includes startx)"
 MAINTAINER="jozee@slitaz.org"
@@ -12,8 +12,7 @@
 TARBALL="xinit-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXmu-dev"
-PKG_RULE="std"
+BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev"
 
 compile_rules() {
 	sed -e '/$serverargs $vtarg/ s/serverargs/: #&/' \
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xkill/receipt
--- a/xorg-xkill/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xkill/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xkill"
-VERSION="1.0.4"
+VERSION="1.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Kill a client by its X resource"
 MAINTAINER="mallory@sweetpeople.org"
@@ -17,7 +17,6 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
 	make &&
 	make install
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xload/receipt
--- a/xorg-xload/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xload/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xload"
-VERSION="1.1.2"
+VERSION="1.1.3"
 CATEGORY="x-window"
 SHORT_DESC="System load average display for X"
 MAINTAINER="pankso@slitaz.org"
@@ -12,8 +12,7 @@
 TARBALL="xload-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXaw-dev gettext"
-PKG_RULE="std"
+BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev gettext"
 
 compile_rules() {
 	touch /root/missing /missing
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xmessage/receipt
--- a/xorg-xmessage/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xmessage/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xmessage"
-VERSION="1.0.4"
+VERSION="1.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Display a message or query in a window"
 MAINTAINER="slaxemulator@gmail.com"
@@ -17,7 +17,6 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
 	make &&
 	make install
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xrdb/receipt
--- a/xorg-xrdb/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xrdb/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xrdb"
-VERSION="1.1.0"
+VERSION="1.1.1"
 CATEGORY="x-window"
 SHORT_DESC="X server resource database utility"
 MAINTAINER="rocky@slitaz.org"
@@ -19,7 +19,6 @@
 	touch /root/missing /missing
 
 	./configure $CONFIGURE_ARGS &&
-	fix libtool &&
 	make &&
 	make install
 }
diff -r 15f1e7e9a1c9 -r 02b674913611 xorg-xsetroot/receipt
--- a/xorg-xsetroot/receipt	Sun Sep 02 11:34:04 2018 +0300
+++ b/xorg-xsetroot/receipt	Mon Sep 03 01:53:08 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="xorg-xsetroot"
-VERSION="1.1.1"
+VERSION="1.1.2"
 CATEGORY="x-window"
 SHORT_DESC="Root window parameter setting utility for X"
 MAINTAINER="pankso@slitaz.org"