# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1545447155 -7200
# Node ID 5669e8b3be70b7463d9e14746c8b1ea668cf444e
# Parent  e167735ddedca9b4b53cfb7368087614f3019d36
Update png and Xorg in dependencies.

diff -r e167735ddedc -r 5669e8b3be70 LibreOffice/receipt
--- a/LibreOffice/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/LibreOffice/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -90,8 +90,8 @@
 			glib gpgme gst1-plugins-base gstreamer1 gtk2 icu lcms2 libassuan \
 			libcomerr libcups libcurl libepoxy libgpg-error libicu libkrb5 \
 			libsqlite3 libxml2 libxslt neon nspr nss pango perl python \
-			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXinerama \
-			xorg-libXrandr xorg-libXrender zlib"
+			libice libsm libx11 libxext libxinerama \
+			libxrandr libxrender zlib"
 			SUGGESTED="mesa"
 
 			action 'Info: current size is...'; sizes
@@ -160,7 +160,7 @@
 			copy @std *.inc @rm
 			CAT="office|extra files"
 			DEPENDS="glib gst0-plugins-base gstreamer0 libepoxy libicu libxml2 \
-			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext"
+			libice libsm libx11 libxext"
 			SUGGESTED="libQtCore libQtGui libQtNetwork"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 R/receipt
--- a/R/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/R/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cran.r-project.org/src/base/R-3/$TARBALL"
 
-BUILD_DEPENDS="automake gfortran readline-dev xorg-imake icu-dev \
-xorg-libX11-dev xorg-libICE-dev xorg-libXt-dev xorg-libXmu-dev cairo-dev \
+BUILD_DEPENDS="automake gfortran readline-dev imake icu-dev \
+libx11-dev libice-dev libxt-dev libxmu-dev cairo-dev \
 pango-dev tcl-dev tk-dev zlib-dev pcre-dev curl-dev libjpeg-turbo-dev libpaper"
 SPLIT="$PACKAGE-dev"
 
@@ -40,9 +40,9 @@
 		R)
 			copy @std
 			DEPENDS="bzlib cairo gcc-lib-math glib icu libcurl libgfortran \
-			libgomp libicu libjpeg-turbo liblzma libpng16 ncurses pango pcre \
-			readline tcl tk xorg-libICE xorg-libSM xorg-libX11 xorg-libXext \
-			xorg-libXmu xorg-libXt zlib   midori epdfview"
+			libgomp libicu libjpeg-turbo liblzma libpng ncurses pango pcre \
+			readline tcl tk libice libsm libx11 libxext \
+			libxmu libxt zlib   midori epdfview"
 			;;
 		R-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 aalib/receipt
--- a/aalib/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/aalib/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev xorg-libXt-dev xorg-libX11-dev"
+BUILD_DEPENDS="ncurses-dev libxt-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		aalib)
 			copy @std
-			DEPENDS="ncurses xorg-libX11"
+			DEPENDS="ncurses libx11"
 			;;
 		*-dev) copy @dev;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 aaphoto/receipt
--- a/aaphoto/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/aaphoto/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="aaphoto_sources_$VERSION.tar.gz"
 WGET_URL="http://log69.com/downloads/$TARBALL"
 
-BUILD_DEPENDS="libgomp libjpeg-turbo-dev libpng16-dev"
+BUILD_DEPENDS="libgomp libjpeg-turbo-dev libpng-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libgomp libjpeg-turbo libpng16"
+	DEPENDS="libgomp libjpeg-turbo libpng"
 	TAGS="photo jpeg jpg png"
 }
diff -r e167735ddedc -r 5669e8b3be70 abiword/receipt
--- a/abiword/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/abiword/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -45,14 +45,14 @@
 		abiword-plugins)
 			copy plugins/*.so
 			CAT="office|extra plugins: MSWord, OpenDocument, Wikipedia, etc."
-			DEPENDS="abiword glib readline xorg-libXdamage fribidi libxslt"
+			DEPENDS="abiword glib readline libxdamage fribidi libxslt"
 			TAGS="doc odf docx"
 			;;
 		abiword)
 			copy @std @rm
 			TAGS="word doc office"
 			DEPENDS="gtk3 fribidi libglade popt libxml2 libart_lgpl \
-			libgsf glib enchant wv xorg-libXdamage gcc-lib-base \
+			libgsf glib enchant wv libxdamage gcc-lib-base \
 			librsvg goffice glibc-locale libffi"
 			SUGGESTED="abiword-plugins"
 
diff -r e167735ddedc -r 5669e8b3be70 accessx/receipt
--- a/accessx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/accessx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE${VERSION//./}.tar.gz"
 WGET_URL="http://cita.disability.uiuc.edu/software/accessx/files/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev tk-dev"
+BUILD_DEPENDS="libx11-dev libxext-dev tk-dev"
 
 compile_rules() {
 	sed -i 's|$(CC) $(OPTS) ax.C|$(CC) $(LDFLAGS) $(OPTS) ax.C|' Makefile
@@ -30,5 +30,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11   tk tcl"
+	DEPENDS="libx11   tk tcl"
 }
diff -r e167735ddedc -r 5669e8b3be70 aiksaurus/receipt
--- a/aiksaurus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/aiksaurus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev patch expat-dev xorg-libXau-dev glib-dev"
+BUILD_DEPENDS="gtk2-dev patch expat-dev libxau-dev glib-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 amiwm/receipt
--- a/amiwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/amiwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE$VERSION.tar.gz"
 WGET_URL="ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev xorg-libXt-dev \
-xorg-libXmu-dev"
+BUILD_DEPENDS="libx11-dev libxext-dev libice-dev libxt-dev \
+libxmu-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -29,5 +29,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXmu"
+	DEPENDS="libice libsm libx11 libxext libxmu"
 }
diff -r e167735ddedc -r 5669e8b3be70 amsn/receipt
--- a/amsn/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/amsn/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev xorg-libICE-dev \
-xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
-xorg-libXScrnSaver-dev zlib-dev libpng16-dev v4l-utils-dev autoconf automake"
+BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev libice-dev \
+libsm-dev libx11-dev libxau-dev libxdmcp-dev \
+libxscrnsaver-dev zlib-dev libpng-dev v4l-utils-dev autoconf automake"
 # for audio conversations: gst0-plugins-base-dev;
 # also need absent farstream-0.1 and farsight2-0.10 >= 0.0.9
 COOKOPTS="!pngz" # some png are really gif, and many problems with palette
@@ -36,7 +36,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libjpeg-turbo libpng16 python xorg-libX11   tk glib tls v4l-utils"
+	DEPENDS="libjpeg-turbo libpng python libx11   tk glib tls v4l-utils"
 	# /usr/share/amsn/plugins/amsnplus/snapshot depends on libImlib.so.11 - absent
 	TAGS="chat messenger im"
 }
diff -r e167735ddedc -r 5669e8b3be70 antimicro/receipt
--- a/antimicro/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/antimicro/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/AntiMicro/antimicro/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="qmake Qt4-dev libsdl-dev xorg-libXtst-dev xorg-libX11-dev"
+BUILD_DEPENDS="qmake Qt4-dev libsdl-dev libxtst-dev libx11-dev"
 
 compile_rules() {
 	qmake INSTALL_PREFIX=/usr &&
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libsdl xorg-libXtst xorg-libX11 libQtGui libQtCore xorg-libXi \
-	xorg-libXext xorg-libXau xorg-libXdmcp xorg-libxcb"
+	DEPENDS="libsdl libxtst libx11 libQtGui libQtCore libxi \
+	libxext libxau libxdmcp libxcb"
 }
diff -r e167735ddedc -r 5669e8b3be70 apng2gif/receipt
--- a/apng2gif/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/apng2gif/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev libpng16-dev"
+BUILD_DEPENDS="zlib-dev libpng-dev"
 
 compile_rules() {
 	make &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 zlib"
+	DEPENDS="libpng zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 apngasm/receipt
--- a/apngasm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/apngasm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev libpng16-dev"
+BUILD_DEPENDS="zlib-dev libpng-dev"
 
 compile_rules() {
 	make &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 zlib"
+	DEPENDS="libpng zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 apngdis/receipt
--- a/apngdis/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/apngdis/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev libpng16-dev"
+BUILD_DEPENDS="zlib-dev libpng-dev"
 
 compile_rules() {
 	make &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 zlib"
+	DEPENDS="libpng zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 apngopt/receipt
--- a/apngopt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/apngopt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/apng/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev libpng16-dev"
+BUILD_DEPENDS="zlib-dev libpng-dev"
 
 compile_rules() {
 	make &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 zlib"
+	DEPENDS="libpng zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 ardour/receipt
--- a/ardour/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ardour/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -21,7 +21,7 @@
 fontconfig freetype gdk-pixbuf glib glibmm gtk2 gtkmm libarchive libcurl \
 libgiomm liblo liblrdf libogg libsamplerate libsigc++ libsndfile libusb \
 libxml2 lilv pango pangomm readline rubberband serd sord sratom taglib \
-vamp-plugin-sdk xorg-libX11"
+vamp-plugin-sdk libx11"
 TAGS_std="audio recorder mixer"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 assaultcube/receipt
--- a/assaultcube/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/assaultcube/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libtool clang-dev openal-dev libsdl-image-dev \
 libsdl-mixer-dev mesa-dev glu-dev zlib-dev curl-dev"
-# xorg-libX11-dev libogg-dev libvorbis-dev
+# libx11-dev libogg-dev libvorbis-dev
 SPLIT="$PACKAGE-data"
 COOKOPTS="skip-log-errors"
 
diff -r e167735ddedc -r 5669e8b3be70 asunder/receipt
--- a/asunder/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/asunder/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/releases/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev alsa-lib-dev libcddb-dev cdparanoia-dev \
-xorg-libXdamage-dev intltool"
+libxdamage-dev intltool"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 at-spi2-core/receipt
--- a/at-spi2-core/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/at-spi2-core/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja dbus-dev glib-dev xorg-libX11-dev xorg-libXtst-dev \
+BUILD_DEPENDS="meson ninja dbus-dev glib-dev libx11-dev libxtst-dev \
 gobject-introspection-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		at-spi2-core)
 			copy @std
-			DEPENDS="dbus glib xorg-libX11 xorg-libXtst"
+			DEPENDS="dbus glib libx11 libxtst"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 aterm/receipt
--- a/aterm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/aterm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev"
+BUILD_DEPENDS="libsm-dev libxext-dev libxt-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 	TAGS="terminal"
 }
diff -r e167735ddedc -r 5669e8b3be70 atril/receipt
--- a/atril/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/atril/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev libsecret-dev \
 caja-dev gobject-introspection-dev poppler-dev libspectre-dev tiff-dev \
-djvulibre-dev webkit2gtk-dev itstool xorg-libSM-dev"
+djvulibre-dev webkit2gtk-dev itstool libsm-dev"
 SPLIT="\
 $PACKAGE-caja $PACKAGE-comics $PACKAGE-djvu $PACKAGE-epub $PACKAGE-pdf \
 $PACKAGE-psd  $PACKAGE-tiff   $PACKAGE      $PACKAGE-dev"
@@ -78,7 +78,7 @@
 		atril)
 			copy @std @rm
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsecret libxml2 pango \
-			xorg-libICE xorg-libSM zlib"
+			libice libsm zlib"
 			TAGS="MATE pdf djvu"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 audacious-plugins/receipt
--- a/audacious-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/audacious-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,7 +16,7 @@
 fluidsynth-dev mpg123-dev faad2-dev wavpack-dev libsndfile-dev libmodplug-dev \
 libsamplerate-dev alsa-lib-dev jack-dev pulseaudio-dev neon-dev libmms-dev \
 dbus-dev dbus-glib-dev libnotify-dev gdk-pixbuf-dev lirc-dev curl-dev \
-xorg-libXrender-dev xorg-libXcomposite-dev ffmpeg-dev qt5-dev mesa-dev \
+libxrender-dev libxcomposite-dev ffmpeg-dev qt5-dev mesa-dev \
 audacious-qt-dev"
 SPLIT="audacious-skins \
 $PACKAGE        $PACKAGE-extra \
@@ -56,8 +56,8 @@
 			notify.so playlist-manager.so search-tool.so skins.so \
 			statusicon.so
 			DEPENDS="audacious-plugins-common audacious \
-			cairo gdk-pixbuf glib gtk2 libnotify pango xorg-libX11 \
-			xorg-libXcomposite xorg-libXrender"
+			cairo gdk-pixbuf glib gtk2 libnotify pango libx11 \
+			libxcomposite libxrender"
 			CAT="multimedia|GTK+2 based plugins"
 			;;
 		audacious-plugins-extra)
@@ -65,7 +65,7 @@
 			amidi-plug.so vtx.so blur_scope.so cairo-spectrum.so gl-spectrum.so
 			DEPENDS="audacious-plugins-common-extra audacious \
 			cairo dbus-glib fluidsynth gdk-pixbuf glib gtk2 libxml2 mesa \
-			pango xorg-libX11"
+			pango libx11"
 			CAT="multimedia|GTK+2 based extra plugins"
 			;;
 
diff -r e167735ddedc -r 5669e8b3be70 avidemux/receipt
--- a/avidemux/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/avidemux/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="tar coreutils-file-special coreutils-file-format cmake yasm \
-gettext-dev xorg-libXv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
+gettext-dev libxv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
 opencore-amr-dev x264-dev faac-dev faad2-dev libsamplerate-dev alsa-lib-dev \
 libxslt-dev libvpx-dev bash qt5-dev xorg-dev zlib-dev mesa-dev sqlite3-dev \
 glu-dev fribidi-dev"
@@ -39,7 +39,7 @@
 	mkdir -p $fs/usr/lib $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
-	DEPENDS="alsa-lib libxml2 xorg-libXv cairo libxslt libvpx libvorbis \
+	DEPENDS="alsa-lib libxml2 libxv cairo libxslt libvpx libvorbis \
 	qt5-base opencore-amr lame faac faad2 libsamplerate xvidcore x264"
 	TAGS="video movie editor avi mpeg mp4"
 }
diff -r e167735ddedc -r 5669e8b3be70 awesome/receipt
--- a/awesome/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/awesome/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="https://github.com/awesomeWM/awesome-releases/raw/master/$TARBALL"
 
 BUILD_DEPENDS="cmake asciidoc xmlto docbook-xsl imagemagick lua-dev \
-xorg-libxcb-dev glib-dev gdk-pixbuf-dev cairo-dev xorg-xcb-util-cursor-dev \
-xorg-xcb-util-dev xorg-xcb-util-keysyms-dev xorg-xcb-util-wm-dev \
+libxcb-dev glib-dev gdk-pixbuf-dev cairo-dev xcb-util-cursor-dev \
+xcb-util-dev xcb-util-keysyms-dev xcb-util-wm-dev \
 libxkbcommon-dev startup-notification-dev libxdg-basedir-dev xcb-util-xrm-dev \
 dbus-dev lgi pango-dev"
 
@@ -33,8 +33,8 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo dbus gdk-pixbuf glib liblua libxdg-basedir libxkbcommon-x11 \
-	libxkbcommon startup-notification xcb-util-xrm xorg-libX11 xorg-libxcb \
-	xorg-xcb-util xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm \
+	libxkbcommon startup-notification xcb-util-xrm libx11 libxcb \
+	xcb-util xcb-util-cursor xcb-util-keysyms xcb-util-wm \
 	   pango-typelib lgi"
 	TAGS="window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 awn-extras/receipt
--- a/awn-extras/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/awn-extras/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/p12tic/awn-extras/archive/${COMMIT:-v$VERSION}.tar.gz"
 
 BUILD_DEPENDS="intltool automake gettext-dev libtool glib-dev awn-dev \
-libgtop-dev libwnck2-dev xorg-libXcomposite-dev libnotify-dev vte-gtk2-dev \
+libgtop-dev libwnck2-dev libxcomposite-dev libnotify-dev vte-gtk2-dev \
 gconf-dev notify-python-dev vala dbus-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk awn cairo dbus dbus-glib gconf gdk-pixbuf glib gtk2 \
-	libdesktop-agnostic libgtop libnotify libwnck2 python vte-gtk2 xorg-libX11 \
-	xorg-libXcomposite xorg-libXrender   python notify-python"
+	libdesktop-agnostic libgtop libnotify libwnck2 python vte-gtk2 libx11 \
+	libxcomposite libxrender   python notify-python"
 }
diff -r e167735ddedc -r 5669e8b3be70 awn/receipt
--- a/awn/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/awn/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="intltool gtk-doc libtool automake python-dev gtk2-dev \
 python-pycairo-dev python-pygtk-dev vala python-pyxdg glibmm-dev libdesktop-agnostic-dev \
-gtkmm-dev dbus-glib-dev xorg-libXcomposite-dev libwnck2-dev libgtop-dev"
+gtkmm-dev dbus-glib-dev libxcomposite-dev libwnck2-dev libgtop-dev"
 SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
@@ -37,8 +37,8 @@
 		awn)
 			copy @std
 			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
-			libdesktop-agnostic libgtop libwnck2 pango python xorg-libX11 \
-			xorg-libXext"
+			libdesktop-agnostic libgtop libwnck2 pango python libx11 \
+			libxext"
 			TAGS="panel"
 			PROVIDE="avant-window-navigator"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 ayttm/receipt
--- a/ayttm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ayttm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xorg-xcb-util-dev openssl10-dev \
-flex enchant-dev xorg-libXpm-dev libtool gettext-dev"
+BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xcb-util-dev openssl10-dev \
+flex enchant-dev libxpm-dev libtool gettext-dev"
 
 compile_rules() {
 	# remove -lfl
@@ -40,7 +40,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/applnk/ $fs/usr/share/gnome/
-	DEPENDS="enchant gdk-pixbuf glib gtk2 libltdl openssl10 pango xorg-libX11 \
-	xorg-libXpm"
+	DEPENDS="enchant gdk-pixbuf glib gtk2 libltdl openssl10 pango libx11 \
+	libxpm"
 	CONFIG_FILES="/etc/ayttmrc"
 }
diff -r e167735ddedc -r 5669e8b3be70 azdrawing/receipt
--- a/azdrawing/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/azdrawing/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://acc.dl.osdn.jp/azdrawing/63500/$TARBALL"
 
-DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
-xorg-libXft xorg-libXi zlib"
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev libjpeg-turbo-dev \
-xorg-libXext-dev xorg-libXi-dev"
+DEPENDS="fontconfig freetype libjpeg-turbo libx11 libxext \
+libxft libxi zlib"
+BUILD_DEPENDS="libx11-dev libxft-dev libjpeg-turbo-dev \
+libxext-dev libxi-dev"
 
 compile_rules() {
 	sed -i "s|/usr/local|$install/usr|; s|\$(MACRO) ||" Makefile
diff -r e167735ddedc -r 5669e8b3be70 azpainter/receipt
--- a/azpainter/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/azpainter/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 # Use GNU wget because Busybox wget can't follow redirection
 BUILD_DEPENDS="wget freetype-dev fontconfig-dev libjpeg-turbo-dev \
-xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev"
+libx11-dev libxext-dev libxi-dev"
 
 compile_rules() {
 	# regenerate translations after patching
@@ -33,6 +33,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
-	xorg-libXext xorg-libXi zlib"
+	DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
+	libxext libxi zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 azpainter1/receipt
--- a/azpainter1/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/azpainter1/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="azpainter-$VERSION.tar.bz2"
 WGET_URL="http://rwthaachen.dl.osdn.jp/azpainter/64397/$TARBALL"
 
-BUILD_DEPENDS="libjpeg-turbo-dev freetype-dev xorg-libX11-dev xorg-libXext-dev \
-xorg-libXi-dev xorg-libXft-dev"
+BUILD_DEPENDS="libjpeg-turbo-dev freetype-dev libx11-dev libxext-dev \
+libxi-dev libxft-dev"
 
 compile_rules() {
 	sed -i "s|/usr/local|$install/usr|; s|gtk|echo &|;s|\$(MACRO) ||" Makefile
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
-	xorg-libXft xorg-libXi zlib"
+	DEPENDS="fontconfig freetype libjpeg-turbo libx11 libxext \
+	libxft libxi zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 bicon/receipt
--- a/bicon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/bicon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="kbd fribidi xorg-setxkbmap xorg-xkbcomp"
+	DEPENDS="kbd fribidi setxkbmap xkbcomp"
 }
diff -r e167735ddedc -r 5669e8b3be70 billardgl/receipt
--- a/billardgl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/billardgl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="glu xorg-libXmu-dev xorg-libXi-dev mesa-dev glu-dev freeglut-dev"
+BUILD_DEPENDS="glu libxmu-dev libxi-dev mesa-dev glu-dev freeglut-dev"
 
 compile_rules() {
 	cd $src/src
diff -r e167735ddedc -r 5669e8b3be70 blackbox/receipt
--- a/blackbox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/blackbox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/bbidulock/blackboxwm/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmark-gfm asciidoc links gettext xorg-libX11-dev \
-xorg-libICE-dev xorg-libXext-dev xorg-libXft-dev"
+BUILD_DEPENDS="cmark-gfm asciidoc links gettext libx11-dev \
+libice-dev libxext-dev libxft-dev"
 SPLIT="$PACKAGE-dev"
 
 # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc
@@ -33,12 +33,12 @@
 	case $PACKAGE in
 		blackbox)
 			copy @std
-			DEPENDS="xorg-libX11 xorg-libXext xorg-libXft"
+			DEPENDS="libx11 libxext libxft"
 			TAGS="window-manager"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="blackbox xorg-libXft-dev"
+			DEPENDS="blackbox libxft-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 blender/receipt
--- a/blender/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/blender/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.blender.org/source/$TARBALL"
 
-BUILD_DEPENDS="cmake xorg-libXmu ilmbase-dev yasm coreutils-file-format \
+BUILD_DEPENDS="cmake libxmu ilmbase-dev yasm coreutils-file-format \
 gettext-dev mesa-dev freeglut-dev librsvg-dev openexr-dev tiff-dev openal-dev \
 glu libsdl-dev python3-dev libsamplerate-dev ffmpeg-dev lcms-dev openjpeg-dev \
 boost-dev boost-math boost-math-tr1 boost-filesystem \
-glu-dev glew-dev xorg-libXi-dev"
+glu-dev glew-dev libxi-dev"
 
 compile_rules() {
 	p3v=$(. $WOK/python3/receipt; echo ${VERSION%.*})
@@ -48,7 +48,7 @@
 	LOCALE="fr de pt_BR es ru zh_CN"
 	copy @std
 	DEPENDS="python3 mesa libsdl libsamplerate libdrm jpeg glu openjpeg \
-	ffmpeg lcms openexr desktop-file-utils libgomp tiff libpng16 freeglut \
+	ffmpeg lcms openexr desktop-file-utils libgomp tiff libpng freeglut \
 	freetype openal zlib librsvg glew boost-filesystem boost-regex \
 	boost-thread boost-date-time boost-dev" #boost-dev?
 	SUGGESTED="nvidia"
diff -r e167735ddedc -r 5669e8b3be70 blueman/receipt
--- a/blueman/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/blueman/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="bluez-dev python-dev python-pygtk-dev notify-python-dev libnotify-dev \
 python-pyrex startup-notification-dev util-linux-uuid-dev dbus-dev \
-python-dbus-dev intltool libtool xorg-xcb-util-dev"
+python-dbus-dev intltool libtool xcb-util-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 bmpanel2/receipt
--- a/bmpanel2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/bmpanel2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/nsf/bmpanel2/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="cmake xorg-libX11-dev cairo-dev pango-dev"
+BUILD_DEPENDS="cmake libx11-dev cairo-dev pango-dev"
 SPLIT="$PACKAGE-themes bmpanel2cfg"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		bmpanel2)
 			copy bmpanel2 native/ transpy/
-			DEPENDS="cairo glib pango xorg-libX11 xorg-libXext"
+			DEPENDS="cairo glib pango libx11 libxext"
 			TAGS="panel"
 			;;
 		bmpanel2-themes)
diff -r e167735ddedc -r 5669e8b3be70 brasero/receipt
--- a/brasero/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/brasero/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev itstool libxml2-tools gstreamer1-dev \
-gst1-plugins-base-dev libxml2-dev xorg-libSM-dev xorg-libICE-dev gtk3-dev \
+gst1-plugins-base-dev libxml2-dev libsm-dev libice-dev gtk3-dev \
 libnotify-dev libcanberra-dev intltool libburn-dev libisofs-dev \
 gobject-introspection-dev"
 SPLIT="$PACKAGE-dev"
diff -r e167735ddedc -r 5669e8b3be70 brasero2/receipt
--- a/brasero2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/brasero2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="$GNOME_MIRROR/brasero/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gnome-doc-utils gstreamer0-dev gst0-plugins-base-dev \
-libunique-dev gconf-dev xorg-libSM-dev gtk2-dev libcanberra-dev libburn-dev \
-libisofs-dev gobject-introspection-dev intltool xorg-libICE-dev"
+libunique-dev gconf-dev libsm-dev gtk2-dev libcanberra-dev libburn-dev \
+libisofs-dev gobject-introspection-dev intltool libice-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -40,7 +40,7 @@
 			copy @std
 			DEPENDS="cairo gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk2 \
 			libburn libcanberra-gtk2 libisofs libunique libxml2 pango \
-			xorg-libICE xorg-libSM"
+			libice libsm"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 brisk-menu/receipt
--- a/brisk-menu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/brisk-menu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="glib gtk3 mate-menus mate-panel xorg-libX11"
+	DEPENDS="glib gtk3 mate-menus mate-panel libx11"
 	TAGS="MATE Solus menu GUI"
 }
diff -r e167735ddedc -r 5669e8b3be70 bzflag/receipt
--- a/bzflag/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/bzflag/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="curl-dev mesa-dev libsdl-dev glew-dev util-linux-uuid-dev \
-expat-dev xorg-libxshmfence-dev"
+expat-dev libxshmfence-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 cairo-compmgr/receipt
--- a/cairo-compmgr/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cairo-compmgr/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.tuxfamily.org/ccm/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
-xorg-libXi-dev xorg-libSM-dev cairo-dev xorg-pixman-dev gtk2-dev vala \
-xorg-libICE-dev xorg-libX11-dev util-linux-uuid-dev intltool"
+BUILD_DEPENDS="libxcomposite-dev libxdamage-dev libxext-dev \
+libxi-dev libsm-dev cairo-dev pixman-dev gtk2-dev vala \
+libice-dev libx11-dev util-linux-uuid-dev intltool"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -38,9 +38,9 @@
 	case $PACKAGE in
 		cairo-compmgr)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk2 pango vala xorg-libICE \
-			xorg-libSM xorg-libX11 xorg-libXcomposite xorg-libXdamage \
-			xorg-libXext xorg-libXfixes xorg-libXi xorg-pixman"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango vala libice \
+			libsm libx11 libxcomposite libxdamage \
+			libxext libxfixes libxi pixman"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 cairo-dock-plugins/receipt
--- a/cairo-dock-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cairo-dock-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -55,7 +55,7 @@
 			DEPENDS="alsa-lib cairo dbus-glib fftw gdk-pixbuf glib gtk3 \
 			libdbusmenu-gtk3 libetpan libexif libical libindicator-gtk3 \
 			librsvg libxklavier libxml2 libzeitgeist lm-sensors mesa pango \
-			pulseaudio upower vte xorg-libX11 xorg-libXrandr xorg-libXxf86vm"
+			pulseaudio upower vte libx11 libxrandr libxxf86vm"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 cairo-dock/receipt
--- a/cairo-dock/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cairo-dock/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="https://github.com/Cairo-Dock/cairo-dock-core/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake glib-dev cairo-dev librsvg-dev dbus-dev dbus-glib-dev \
-libxml2-dev mesa-dev glu-dev curl-dev xorg-libXtst-dev xorg-libXcomposite-dev \
-xorg-libXrandr-dev gtk3-dev gettext-dev"
+libxml2-dev mesa-dev glu-dev curl-dev libxtst-dev libxcomposite-dev \
+libxrandr-dev gtk3-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,8 +33,8 @@
 		cairo-dock)
 			copy @std
 			DEPENDS="cairo dbus-glib gdk-pixbuf glib glu gtk3 libcurl librsvg \
-			libxml2 mesa pango xorg-libX11 xorg-libXcomposite xorg-libXinerama \
-			xorg-libXrandr xorg-libXrender xorg-libXtst   bash" # xorg-xcompmgr
+			libxml2 mesa pango libx11 libxcomposite libxinerama \
+			libxrandr libxrender libxtst   bash" # xcompmgr
 			SUGGESTED="cairo-dock-plugins"
 			;;
 		*-dev)
@@ -42,8 +42,8 @@
 			DEPENDS="cairo-dock \
 			cairo-dev curl-dev dbus-dev dbus-glib-dev glib-dev glu-dev \
 			gtk3-dev librsvg-dev libxml2-dev mesa-dev wayland-dev \
-			xorg-libX11-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
-			xorg-libXrender-dev xorg-libXtst-dev"
+			libx11-dev libxcomposite-dev libxrandr-dev \
+			libxrender-dev libxtst-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 cairo/receipt
--- a/cairo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cairo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev \
-xorg-libXrender-dev xorg-libxcb-dev libpng16-dev freetype-dev fontconfig-dev \
-libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev"
+BUILD_DEPENDS="zlib-dev libx11-dev libxext-dev libice-dev \
+libxrender-dev libxcb-dev libpng-dev freetype-dev fontconfig-dev \
+libspectre-dev poppler-dev librsvg-dev gtk2-dev pixman-dev"
 SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
@@ -24,13 +24,13 @@
 
 CAT_tools="development|development tools"
 
-DEPENDS_std="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \
-xorg-pixman zlib"
-DEPENDS_tools="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb xorg-pixman \
+DEPENDS_std="fontconfig freetype glib libpng libx11 libxcb \
+pixman zlib"
+DEPENDS_tools="cairo glib libx11 libxrender libxcb pixman \
 zlib"
 DEPENDS_dev="cairo cairo-tools \
-fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \
-xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev zlib-dev"
+fontconfig-dev freetype-dev glib-dev libpng-dev libx11-dev \
+libxext-dev libxrender-dev libxcb-dev pixman-dev zlib-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 caja/receipt
--- a/caja/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/caja/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev mate-desktop-dev \
-pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev xorg-libSM-dev"
+pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev libsm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,8 +31,8 @@
 		caja)
 			copy @std
 			DEPENDS="atk cairo exempi gdk-pixbuf glib gtk3 libexif \
-			libnotify libxml2 mate-desktop pango xorg-libICE xorg-libSM \
-			xorg-libX11   shared-mime-info"
+			libnotify libxml2 mate-desktop pango libice libsm \
+			libx11   shared-mime-info"
 			SUGGESTED="gvfs-smb"
 			TAGS="MATE file-manager"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 celestia/receipt
--- a/celestia/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/celestia/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -38,5 +38,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo gdk-pixbuf glib glu gtk2 gtkglext libjpeg-turbo libogg \
-	libpng16 libtheora mesa pango"
+	libpng libtheora mesa pango"
 }
diff -r e167735ddedc -r 5669e8b3be70 cellwriter/receipt
--- a/cellwriter/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cellwriter/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/risujin/cellwriter/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev xorg-libXtst-dev"
+BUILD_DEPENDS="gtk2-dev libxtst-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11 xorg-libXtst"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11 libxtst"
 }
diff -r e167735ddedc -r 5669e8b3be70 chemtool/receipt
--- a/chemtool/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/chemtool/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="gettext-dev gtk2-dev xorg-libX11-dev xorg-libICE-dev"
+BUILD_DEPENDS="gettext-dev gtk2-dev libx11-dev libice-dev"
 
 compile_rules() {
 	./configure \
@@ -34,6 +34,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
-	xorg-libX11   shared-mime-info"
+	libx11   shared-mime-info"
 	TAGS="chemistry"
 }
diff -r e167735ddedc -r 5669e8b3be70 cinepaint-stable/receipt
--- a/cinepaint-stable/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cinepaint-stable/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/cinepaint/$TARBALL"
 
 BUILD_DEPENDS="patch gtk2-dev gettext-dev tiff-dev openexr-dev ilmbase-dev \
-libjpeg-turbo-dev zlib-dev libpng16-dev lcms-dev xorg-libXmu-dev fltk-dev \
+libjpeg-turbo-dev zlib-dev libpng-dev lcms-dev libxmu-dev fltk-dev \
 python"
 SPLIT="$PACKAGE-dev"
 
@@ -34,19 +34,19 @@
 			copy @std
 			DEPENDS="atk bzlib cairo fltk fontconfig freetype gdk-pixbuf glib \
 			gtk2 ilmbase lcms libffi libharfbuzz libjpeg-turbo liblzma \
-			libpng16 libxml2 openexr pango pcre tiff util-linux-blkid \
-			util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \
-			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXextxorg-libXfixes \
-			xorg-libXft xorg-libXinerama xorg-libXmu xorg-libXrender \
-			xorg-libXt xorg-libxcb xorg-pixman zlib"
+			libpng libxml2 openexr pango pcre tiff util-linux-blkid \
+			util-linux-mount util-linux-uuid libice libsm \
+			libx11 libxau libxdmcp libxext libxfixes \
+			libxft libxinerama libxmu libxrender \
+			libxt libxcb pixman zlib"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="cinepaint-stable fontconfig-dev freetype-dev glib-dev \
-			harfbuzz-dev libjpeg-turbo-dev libpng16-dev libxml2-dev pcre-dev \
-			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
-			xorg-libXfixes xorg-libXft-dev xorg-libXinerama-dev \
-			xorg-libXrender-dev xorg-libxcb-dev xz-dev"
+			harfbuzz-dev libjpeg-turbo-dev libpng-dev libxml2-dev pcre-dev \
+			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
+			libxfixes libxft-dev libxinerama-dev \
+			libxrender-dev libxcb-dev xz-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 cinepaint/receipt
--- a/cinepaint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cinepaint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special \
-gettext-dev xorg-xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev \
-mesa-dev ilmbase-dev xorg-libXpm-dev gtk2-dev libpng16-dev bash automake \
-autoconf libtool python-dev glu-dev xorg-libXmu-dev xorg-libXext-dev" # libpng12-dev
+gettext-dev xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev \
+mesa-dev ilmbase-dev libxpm-dev gtk2-dev libpng-dev bash automake \
+autoconf libtool python-dev glu-dev libxmu-dev libxext-dev" # libpng12-dev
 
 compile_rules() {
 	sh ./autogen.sh
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="desktop-file-utils gtk2 lcms tiff jpeg fltk ftgl xorg-libXmu \
-	xorg-libXpm gutenprint zlib mesa jbigkit openexr"
+	DEPENDS="desktop-file-utils gtk2 lcms tiff jpeg fltk ftgl libxmu \
+	libxpm gutenprint zlib mesa jbigkit openexr"
 }
diff -r e167735ddedc -r 5669e8b3be70 claws-mail/receipt
--- a/claws-mail/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/claws-mail/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.claws-mail.org/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev xorg-libSM-dev glib-dev gnutls-dev gtk2-dev \
+BUILD_DEPENDS="gettext-dev libsm-dev glib-dev gnutls-dev gtk2-dev \
 enchant-dev startup-notification-dev dbus-dev dbus-glib-dev openldap-dev \
 librsvg-dev libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev \
 libarchive-dev libical-dev poppler-dev gpgme-dev python-dev python-pygtk-dev \
-libcanberra-dev ytnef-dev libnotify-dev perl-dev lcms2-dev xorg-xcb-util-dev"
+libcanberra-dev ytnef-dev libnotify-dev perl-dev lcms2-dev xcb-util-dev"
 SPLIT="\
 $PACKAGE-acpinotifier $PACKAGE-addresskeeper $PACKAGE-archive \
 $PACKAGE-attachwarner $PACKAGE-attremover    $PACKAGE-bsfilter \
@@ -42,12 +42,12 @@
 			CAT="mail|the user-friendly, lightweight and fast email client"
 			DEPENDS="atk bzlib cairo dbus dbus-glib enchant fontconfig \
 			freetype gdk-pixbuf glib gmp gtk2 libcroco openssl libetpan \
-			libffi libgnutls libharfbuzz libidn libldap liblzma libpng16 \
+			libffi libgnutls libharfbuzz libidn libldap liblzma libpng \
 			librsvg libtasn1 libunistring libxml2 nettle p11-kit pango \
 			pcre startup-notification util-linux-blkid util-linux-mount \
-			util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-			xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman \
-			xorg-xcb-util zlib"
+			util-linux-uuid libice libsm libx11 libxau \
+			libxdmcp libxext libxrender libxcb pixman \
+			xcb-util zlib"
 			TAGS="email client"
 			;;
 		*-acpinotifier)
@@ -91,7 +91,7 @@
 			DEPENDS="claws-mail gst1-plugins-base gstreamer1 icu libatomic \
 			libcurl libgcrypt libgpg-error libharfbuzz-icu libicu libidn2 \
 			libjpeg-turbo libsecret libsoup libsoup-gnome libsqlite3 libssh2 \
-			libwebp libxslt orc webkitgtk xorg-libXt"
+			libwebp libxslt orc webkitgtk libxt"
 			;;
 		*-fetchinfo)
 			copy fetchinfo.so
@@ -184,14 +184,14 @@
 			libjpeg-turbo-dev lcms2-dev libarchive-dev libassuan-dev \
 			libcanberra-dev libetpan-dev libffi-dev libgcrypt-dev \
 			libgpg-error-dev libical-dev libidn2-dev libnotify-dev libogg-dev \
-			libpng16-dev libsecret-dev libsoup-dev libssh2-dev libtool \
+			libpng-dev libsecret-dev libsoup-dev libssh2-dev libtool \
 			libvorbis-dev libwebp-dev libxml2-dev libxslt-dev lz4-lib lzo-dev \
 			nettle-dev openssl-dev orc-dev pango-dev pcre-dev perl-dev \
 			poppler-dev python-dev sqlite3-dev tiff-dev util-linux-blkid-dev \
 			util-linux-mount-dev util-linux-uuid-dev webkitgtk-dev \
-			xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
-			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
-			xorg-libXt-dev xorg-libxcb-dev xorg-pixman-dev xz-dev ytnef-dev \
+			libice-dev libsm-dev libx11-dev libxau-dev \
+			libxdmcp-dev libxext-dev libxrender-dev \
+			libxt-dev libxcb-dev pixman-dev xz-dev ytnef-dev \
 			zlib-dev   gnutls-dev"
 			PROVIDE="claws-mail-rssyl-dev"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 clearlooks/receipt
--- a/clearlooks/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/clearlooks/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 genpkg_rules() {
 	copy @std
 	rm -rf $fs/usr/share/icons
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 clipit/receipt
--- a/clipit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/clipit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk2 pango xorg-libX11"
+	DEPENDS="glib gtk2 pango libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 clutter-gst/receipt
--- a/clutter-gst/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/clutter-gst/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,7 +28,7 @@
 		clutter-gst)
 			copy @std
 			DEPENDS="clutter cogl gdk-pixbuf glib gst1-plugins-base \
-			gstreamer1 libgudev xorg-libX11"
+			gstreamer1 libgudev libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 clutter/receipt
--- a/clutter/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/clutter/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -33,13 +33,13 @@
 		clutter)
 			copy @std
 			DEPENDS="atk cairo cogl fontconfig glib json-glib pango \
-			xorg-libX11 xorg-libXcomposite xorg-libXdamage"
+			libx11 libxcomposite libxdamage"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="clutter atk-dev cairo-dev cogl-dev glib-dev json-glib-dev \
-			pango-dev xorg-libX11-dev xorg-libXcomposite-dev \
-			xorg-libXdamage-dev xorg-libXext-dev"
+			pango-dev libx11-dev libxcomposite-dev \
+			libxdamage-dev libxext-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 codeblocks/receipt
--- a/codeblocks/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/codeblocks/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
 WGET_URL="http://download.berlios.de/codeblocks/$TARBALL"
 
-BUILD_DEPENDS="wxWidgets28-dev xorg-libXdmcp-dev xorg-libXau-dev expat-dev \
+BUILD_DEPENDS="wxWidgets28-dev libxdmcp-dev libxau-dev expat-dev \
 autoconf automake libtool zip gnome-icon-theme hunspell-dev gamin-dev \
 boost-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 cogl/receipt
--- a/cogl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cogl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev mesa-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
+BUILD_DEPENDS="glib-dev mesa-dev libxcomposite-dev libxrandr-dev \
 gdk-pixbuf-dev gettext-dev cairo-dev pango-dev gobject-introspection-dev \
-xorg-libxshmfence-dev expat-dev"
+libxshmfence-dev expat-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -45,15 +45,15 @@
 		cogl)
 			copy @std
 			DEPENDS="cairo gdk-pixbuf glib libdrm mesa-libegl mesa-libgbm \
-			mesa-libwayland-egl pango wayland xorg-libX11 xorg-libXdamage \
-			xorg-libXext xorg-libXfixes xorg-libXrandr"
+			mesa-libwayland-egl pango wayland libx11 libxdamage \
+			libxext libxfixes libxrandr"
 			;;
 		cogl-dev)
 			copy @dev
 			DEPENDS="cogl cairo-dev gdk-pixbuf-dev glib-dev libdrm-dev \
-			mesa-dev wayland-dev xorg-libX11-dev xorg-libXcomposite-dev \
-			xorg-libXdamage-dev xorg-libXext-dev xorg-libXfixes-dev \
-			xorg-libXrandr-dev"
+			mesa-dev wayland-dev libx11-dev libxcomposite-dev \
+			libxdamage-dev libxext-dev libxfixes-dev \
+			libxrandr-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 compicc/receipt
--- a/compicc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compicc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/compiz/compicc/-/archive/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="oyranos-dev libxcm-dev xorg-libX11-dev compiz-dev mesa-dev"
+BUILD_DEPENDS="oyranos-dev libxcm-dev libx11-dev compiz-dev mesa-dev"
 COOKOPTS="skip-log-errors"
 
-DEPENDS_std="oyranos xorg-libX11 xorg-libXfixes xorg-libXrandr   compiz"
+DEPENDS_std="oyranos libx11 libxfixes libxrandr   compiz"
 
 TAGS="compiz"
 
diff -r e167735ddedc -r 5669e8b3be70 compiz-plugins-experimental/receipt
--- a/compiz-plugins-experimental/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compiz-plugins-experimental/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,11 +13,11 @@
 
 BUILD_DEPENDS="automake gettext-dev libtool intltool compiz-dev \
 compiz-bcop-dev cairo-dev compiz-plugins-main-dev compiz-plugins-extra-dev \
-xorg-libXScrnSaver-dev glew-dev curl-dev mesa-dev"
+libxscrnsaver-dev glew-dev curl-dev mesa-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="cairo glew glu libcurl mesa xorg-libX11 xorg-libXScrnSaver \
-xorg-libXext"
+DEPENDS_std="cairo glew glu libcurl mesa libx11 libxscrnsaver \
+libxext"
 
 TAGS="compiz"
 
diff -r e167735ddedc -r 5669e8b3be70 compiz-plugins-extra/receipt
--- a/compiz-plugins-extra/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compiz-plugins-extra/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,7 +15,7 @@
 compiz-plugins-main-dev libnotify-dev gtk2-dev mesa-dev glu-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="cairo glib glu libnotify xorg-libX11 xorg-libXext xorg-libXfixes"
+DEPENDS_std="cairo glib glu libnotify libx11 libxext libxfixes"
 
 TAGS="compiz"
 
diff -r e167735ddedc -r 5669e8b3be70 compiz-plugins-main/receipt
--- a/compiz-plugins-main/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compiz-plugins-main/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,8 +15,8 @@
 cairo-dev pango-dev glu-dev mesa-dev libjpeg-turbo-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="cairo glib glu libjpeg-turbo libxml2 pango xorg-libX11 \
-xorg-libXfixes xorg-libXrender"
+DEPENDS_std="cairo glib glu libjpeg-turbo libxml2 pango libx11 \
+libxfixes libxrender"
 DEPENDS_dev="compiz-plugins-main cairo-dev compiz-dev pango-dev"
 
 TAGS="compiz"
diff -r e167735ddedc -r 5669e8b3be70 compiz/receipt
--- a/compiz/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compiz/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,23 +12,23 @@
 TARBALL="compiz-core-v$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/compiz/compiz-core/-/archive/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="automake gettext-dev libtool intltool xorg-libX11-dev \
-xorg-libXcomposite-dev xorg-libXext-dev xorg-libXfixes-dev xorg-libXdamage-dev \
-xorg-libXrandr-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXcursor-dev \
-xorg-libICE-dev xorg-libSM-dev libxml2-dev startup-notification-dev libxslt \
-libpng16-dev libjpeg-turbo-dev glu-dev mesa-dev glib-dev dbus-dev libxml2-dev \
+BUILD_DEPENDS="automake gettext-dev libtool intltool libx11-dev \
+libxcomposite-dev libxext-dev libxfixes-dev libxdamage-dev \
+libxrandr-dev libxi-dev libxinerama-dev libxcursor-dev \
+libice-dev libsm-dev libxml2-dev startup-notification-dev libxslt \
+libpng-dev libjpeg-turbo-dev glu-dev mesa-dev glib-dev dbus-dev libxml2-dev \
 dbus-glib-dev fuse2-dev cairo-dev librsvg-dev \
-xorg-libXrender-dev gtk3-dev libwnck3-dev marco-dev"
+libxrender-dev gtk3-dev libwnck3-dev marco-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="atk cairo dbus fuse2 gdk-pixbuf glib glu gtk3 libpng16 librsvg \
-libwnck3 libxml2 marco mesa pango startup-notification xorg-libICE xorg-libSM \
-xorg-libX11 xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
-xorg-libXfixes xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender"
-DEPENDS_dev="compiz libxml2-dev startup-notification-dev xorg-libICE-dev \
-xorg-libSM-dev xorg-libX11-dev xorg-libXcomposite-dev xorg-libXcursor-dev \
-xorg-libXdamage-dev xorg-libXext-dev xorg-libXfixes-dev xorg-libXi-dev \
-xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXrender xorg-libXrender-dev"
+DEPENDS_std="atk cairo dbus fuse2 gdk-pixbuf glib glu gtk3 libpng librsvg \
+libwnck3 libxml2 marco mesa pango startup-notification libice libsm \
+libx11 libxcomposite libxcursor libxdamage libxext \
+libxfixes libxi libxinerama libxrandr libxrender"
+DEPENDS_dev="compiz libxml2-dev startup-notification-dev libice-dev \
+libsm-dev libx11-dev libxcomposite-dev libxcursor-dev \
+libxdamage-dev libxext-dev libxfixes-dev libxi-dev \
+libxinerama-dev libxrandr-dev libxrender-dev"
 
 TAGS="compiz"
 
diff -r e167735ddedc -r 5669e8b3be70 compizconfig-python/receipt
--- a/compizconfig-python/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compizconfig-python/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -17,9 +17,9 @@
 
 DEPENDS_std="libcompizconfig   python"
 DEPENDS_dev="compizconfig-python glib-dev libcompizconfig-dev libxml2-dev \
-startup-notification-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
-xorg-libXcomposite-dev xorg-libXcursor-dev xorg-libXdamage-dev xorg-libXext-dev \
-xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev"
+startup-notification-dev libice-dev libsm-dev libx11-dev \
+libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev \
+libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r e167735ddedc -r 5669e8b3be70 compton/receipt
--- a/compton/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/compton/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/chjj/compton/archive/${COMMIT:-v$VERSION}.tar.gz"
 
-BUILD_DEPENDS="pcre-dev xorg-libX11-dev xorg-libXcomposite-dev \
-xorg-libXfixes-dev xorg-libXdamage-dev xorg-libXrender-dev xorg-libXext-dev \
-xorg-libXrandr-dev xorg-libXinerama-dev dbus-dev asciidoc libxml2-tools \
+BUILD_DEPENDS="pcre-dev libx11-dev libxcomposite-dev \
+libxfixes-dev libxdamage-dev libxrender-dev libxext-dev \
+libxrandr-dev libxinerama-dev dbus-dev asciidoc libxml2-tools \
 docbook-xsl libconfig-dev"
 # Optional bdeps: libconfig-dev libdrm-dev mesa-dev
 
@@ -34,8 +34,8 @@
 
 genpkg_rules() {
 	copy etc/ bin/	# skip icons
-	DEPENDS="dbus libconfig libpcre xorg-libX11 xorg-libXcomposite \
-	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXinerama \
-	xorg-libXrandr xorg-libXrender   xorg-xwininfo xorg-xprop libconfig"
+	DEPENDS="dbus libconfig libpcre libx11 libxcomposite \
+	libxdamage libxext libxfixes libxinerama \
+	libxrandr libxrender   xwininfo xprop libconfig"
 	CONFIG_FILES="/etc/xdg/compton/compton.conf"
 }
diff -r e167735ddedc -r 5669e8b3be70 conky/receipt
--- a/conky/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/conky/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXdamage-dev xorg-libXft-dev fontconfig-dev \
+BUILD_DEPENDS="libxdamage-dev libxft-dev fontconfig-dev \
 expat-dev glib glib-dev pkg-config zlib-dev freetype-dev \
-xorg-xorgproto ncurses-dev xorg-libxcb-dev wireless_tools-dev \
-imlib2-dev lua-dev xorg-libXext-dev"
+xorgproto ncurses-dev libxcb-dev wireless_tools-dev \
+imlib2-dev lua-dev libxext-dev"
 
 compile_rules() {
 	./configure \
@@ -32,8 +32,8 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \
-	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxcb \
-	xorg-libXft xorg-libXrender zlib ncurses wireless_tools imlib2"
+	DEPENDS="expat fontconfig freetype glib libx11 libxau \
+	libxdamage libxdmcp libxext libxfixes libxcb \
+	libxft libxrender zlib ncurses wireless_tools imlib2"
 	TAGS="desktop monitoring"
 }
diff -r e167735ddedc -r 5669e8b3be70 consolekit2/receipt
--- a/consolekit2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/consolekit2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="ConsoleKit2-$VERSION.tar.bz2"
 WGET_URL="https://github.com/Consolekit2/ConsoleKit2/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gettext-dev dbus-dev glib-dev polkit-dev \
+BUILD_DEPENDS="libx11-dev gettext-dev dbus-dev glib-dev polkit-dev \
 eudev-dev xmlto libxslt docbook-xsl libxml2-tools acl-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -40,7 +40,7 @@
 	case $PACKAGE in
 		consolekit2)
 			copy @std
-			DEPENDS="acl dbus eudev glib polkit xorg-libX11 zlib"
+			DEPENDS="acl dbus eudev glib polkit libx11 zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 consonance/receipt
--- a/consonance/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/consonance/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,6 +32,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="libao taglib libmad sqlite3 dbus-glib libnotify flac libsndfile \
-	libvorbis curl libmodplug libcdio libcddb xorg-xcb-util"
+	libvorbis curl libmodplug libcdio libcddb xcb-util"
 	TAGS="player audio music MP3 Ogg"
 }
diff -r e167735ddedc -r 5669e8b3be70 cryptkeeper/receipt
--- a/cryptkeeper/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cryptkeeper/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/tomm/cryptkeeper/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev gconf-dev xorg-libX11-dev"
+BUILD_DEPENDS="gtk2-dev gconf-dev libx11-dev"
 
 compile_rules() {
 	mv po/ru_RU.gmo po/ru.gmo
diff -r e167735ddedc -r 5669e8b3be70 cups-filters/receipt
--- a/cups-filters/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cups-filters/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.openprinting.org/download/cups-filters/$TARBALL"
 
-BUILD_DEPENDS="cups-dev zlib-dev libjpeg-turbo-dev libpng16-dev tiff-dev \
+BUILD_DEPENDS="cups-dev zlib-dev libjpeg-turbo-dev libpng-dev tiff-dev \
 glib-dev lcms2-dev freetype-dev fontconfig-dev ijs-dev qpdf-dev poppler-dev \
 dbus-dev"
 SPLIT="$PACKAGE-dev"
@@ -34,7 +34,7 @@
 		cups-filters)
 			copy @std
 			DEPENDS="cups dbus fontconfig freetype glib ijs lcms2 libcups \
-			libgnutls libjpeg-turbo libpng16 poppler qpdf tiff zlib"
+			libgnutls libjpeg-turbo libpng poppler qpdf tiff zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 cwallpaper-fltk/receipt
--- a/cwallpaper-fltk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/cwallpaper-fltk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/cwallpaper/$TARBALL"
 
-BUILD_DEPENDS="fltk-dev xorg-libX11-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="fltk-dev libx11-dev libxinerama-dev"
 
 compile_rules() {
 	sed -i "s#g++#${HOST_SYSTEM}-g++#" Makefile || return 1
diff -r e167735ddedc -r 5669e8b3be70 dbus/receipt
--- a/dbus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dbus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
 
-BUILD_DEPENDS="expat-dev xorg-libX11-dev glib-dev xorg-libICE-dev \
-xorg-libSM-dev libxslt xmlto libxml2-tools" # docbook-xsl
+BUILD_DEPENDS="expat-dev libx11-dev glib-dev libice-dev \
+libsm-dev libxslt xmlto libxml2-tools" # docbook-xsl
 SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -55,7 +55,7 @@
 			;;
 		dbus)
 			copy @std @rm
-			DEPENDS="expat xorg-libX11   slitaz-base-files"
+			DEPENDS="expat libx11   slitaz-base-files"
 			CONFIG_FILES="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/"
 			;;
 		*-dev) copy @dev;;
diff -r e167735ddedc -r 5669e8b3be70 dcmtk/receipt
--- a/dcmtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dcmtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://dicom.offis.de/pub/dicom/offis/software/$PACKAGE/$PACKAGE${VERSION//./}/$TARBALL"
 
-BUILD_DEPENDS="libxml2-dev tiff-dev libpng16-dev zlib-dev" # libwrap-dev
+BUILD_DEPENDS="libxml2-dev tiff-dev libpng-dev zlib-dev" # libwrap-dev
 #SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		dcmtk)
 			copy @std
-			DEPENDS="libpng16 libxml2 tiff zlib" # libwrap
+			DEPENDS="libpng libxml2 tiff zlib" # libwrap
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 ddd/receipt
--- a/ddd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ddd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gawk lesstif-dev xorg-libXt-dev"
+BUILD_DEPENDS="gawk lesstif-dev libxt-dev"
 
 compile_rules() {
 	# Need to include an additional header in a file to build with gcc 4.4.0
@@ -39,7 +39,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="glibc-base gcc-lib-base ncurses freetype zlib util-linux-uuid \
-	xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXaw \
-	xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm xorg-libXt lesstif elfutils"
+	libice libsm libx11 libxau libxaw \
+	libxdmcp libxext libxmu libxpm libxt lesstif elfutils"
 	TAGS="debugger"
 }
diff -r e167735ddedc -r 5669e8b3be70 deadbeef/receipt
--- a/deadbeef/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/deadbeef/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 
 BUILD_DEPENDS="gettext-dev intltool yasm zlib-dev jansson-dev gtk2-dev \
 alsa-lib-dev dbus-dev curl-dev libmad-dev libvorbis-dev libogg-dev flac-dev \
-libsndfile-dev libcdio-dev libcddb-dev cdparanoia-dev xorg-libX11-dev \
-imlib2-dev libjpeg-turbo-dev libpng16-dev libsamplerate-dev faad2-dev "
+libsndfile-dev libcdio-dev libcddb-dev cdparanoia-dev libx11-dev \
+imlib2-dev libjpeg-turbo-dev libpng-dev libsamplerate-dev faad2-dev "
 SPLIT="$PACKAGE-plugins $PACKAGE-dev"
 
 compile_rules() {
@@ -32,7 +32,7 @@
 			alsa.so ddb_gui_GTK2.so hotkeys.so m3u.so mms.so mp3.so notify.so \
 			supereq.so vorbis.so @ico
 			DEPENDS="alsa-lib atk cairo dbus gdk-pixbuf glib gtk2 jansson \
-			libmad libvorbis pango xorg-libX11"
+			libmad libvorbis pango libx11"
 			SUGGESTED="deadbeef-plugins"
 			TAGS="music audio player MP3 Ogg ape"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 devilspie/receipt
--- a/devilspie/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/devilspie/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,7 +27,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libwnck2 expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
-	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-	xorg-libXrandr xorg-libXrender xorg-libXdamage"
+	DEPENDS="libwnck2 expat gtk2 libx11 libxau libxcomposite \
+	libxcursor libxdmcp libxext libxfixes libxinerama \
+	libxrandr libxrender libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 dia/receipt
--- a/dia/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dia/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -34,6 +34,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="gtk2 libxml2 freetype fontconfig glib atk pango zlib libart_lgpl \
-	libxslt popt xorg-libXdamage librsvg"
+	libxslt popt libxdamage librsvg"
 	TAGS="office diagram creator editor visio"
 }
diff -r e167735ddedc -r 5669e8b3be70 dillo/receipt
--- a/dillo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dillo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.dillo.org/download/$TARBALL"
 
-BUILD_DEPENDS="fltk-dev xorg-libX11-dev libjpeg-turbo-dev zlib-dev \
-libpng16-dev openssl10-dev"
+BUILD_DEPENDS="fltk-dev libx11-dev libjpeg-turbo-dev zlib-dev \
+libpng-dev openssl10-dev"
 
 compile_rules() {
 	cp -f $stuff/pixmaps.slitaz.h src/pixmaps.h
@@ -31,6 +31,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fltk libjpeg-turbo libpng16 openssl10 xorg-libX11 zlib"
+	DEPENDS="fltk libjpeg-turbo libpng openssl10 libx11 zlib"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 directfb/receipt
--- a/directfb/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/directfb/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,12 +12,12 @@
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="https://github.com/DirectFB/directfb/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="libtool automake gfortran libpng16-dev libjpeg-turbo-dev \
-freetype-dev tslib-dev perl fluxcomp xorg-xorgproto xorg-libXext-dev libvdpau-dev"
+BUILD_DEPENDS="libtool automake gfortran libpng-dev libjpeg-turbo-dev \
+freetype-dev tslib-dev perl fluxcomp xorgproto libxext-dev libvdpau-dev"
 
-BUILD_DEPENDS="libtool automake gfortran libpng16-dev libjpeg-turbo-dev \
-freetype-dev fluxcomp mesa-dev xorg-libxshmfence-dev expat-dev \
-xorg-libXcomposite-dev"
+BUILD_DEPENDS="libtool automake gfortran libpng-dev libjpeg-turbo-dev \
+freetype-dev fluxcomp mesa-dev libxshmfence-dev expat-dev \
+libxcomposite-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		directfb)
 			copy @std
-			DEPENDS="freetype libjpeg-turbo libpng16 tslib"
+			DEPENDS="freetype libjpeg-turbo libpng tslib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 dmenu/receipt
--- a/dmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="libx11-dev libxft-dev libxinerama-dev"
 
 compile_rules() {
 	make &&
@@ -20,6 +20,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fontconfig xorg-libX11 xorg-libXft xorg-libXinerama"
+	DEPENDS="fontconfig libx11 libxft libxinerama"
 	TAGS="launchbar"
 }
diff -r e167735ddedc -r 5669e8b3be70 dosbox/receipt
--- a/dosbox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dosbox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev alsa-lib-dev libpng16-dev libsdl-net-dev mesa-dev \
+BUILD_DEPENDS="libsdl-dev alsa-lib-dev libpng-dev libsdl-net-dev mesa-dev \
 glu-dev sdl-sound-dev"
 
 compile_rules() {
@@ -22,7 +22,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib libpng16 libsdl libsdl-net mesa sdl-sound xorg-libX11 \
+	DEPENDS="alsa-lib libpng libsdl libsdl-net mesa sdl-sound libx11 \
 	zlib"
 	TAGS="emulator dos vm86 8086"
 }
diff -r e167735ddedc -r 5669e8b3be70 dvdauthor/receipt
--- a/dvdauthor/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dvdauthor/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev freetype-dev libdvdread-dev libxml2-dev   \
+BUILD_DEPENDS="libpng-dev freetype-dev libdvdread-dev libxml2-dev   \
 fontconfig-dev fribidi-dev"
 
 compile_rules() {
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fontconfig freetype fribidi libdvdread libpng16 libxml2"
+	DEPENDS="fontconfig freetype fribidi libdvdread libpng libxml2"
 }
diff -r e167735ddedc -r 5669e8b3be70 dwm/receipt
--- a/dwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/dwm/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto \
-xorg-libXinerama-dev"
+BUILD_DEPENDS="libx11-dev xorgproto \
+libxinerama-dev"
 
 compile_rules() {
 	# From blue to grey and have lighter grey
@@ -32,7 +32,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-xsetroot"
+	DEPENDS="libx11 xsetroot"
 	TAGS="window-manager"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 dzen2/receipt
--- a/dzen2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/dzen2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://gotmor.googlepages.com/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	sed -e 's/\/usr\/local/\/usr/' < config.mk > config.mk.slitaz
@@ -25,6 +25,6 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp"
+	DEPENDS="libx11 libxau libxdmcp"
 	TAGS="system monitor notification"
 }
diff -r e167735ddedc -r 5669e8b3be70 echinus/receipt
--- a/echinus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/echinus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev xorg-libXrandr-dev"
+BUILD_DEPENDS="libx11-dev libxft-dev libxrandr-dev"
 
 compile_rules() {
 	cp $stuff/config.mk .
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXft"
+	DEPENDS="libx11 libxft"
 	TAGS="window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 efl/receipt
--- a/efl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/efl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,11 +13,11 @@
 
 BUILD_DEPENDS="gettext-dev openssl-dev libunwind-dev libjpeg-turbo-dev \
 gstreamer1-dev luajit-dev freetype-dev fontconfig-dev fribidi-dev \
-xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev mesa-dev giflib-dev \
+libx11-dev libxext-dev libxrender-dev mesa-dev giflib-dev \
 tiff-dev libwebp-dev poppler-dev libspectre-dev libraw-dev librsvg-dev \
-eudev-dev dbus-dev pulseaudio-dev xorg-libXcursor-dev xorg-libXcomposite-dev \
-xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXScrnSaver-dev bullet-dev \
-gst1-plugins-base-dev libsndfile-dev xorg-libXtst-dev"
+eudev-dev dbus-dev pulseaudio-dev libxcursor-dev libxcomposite-dev \
+libxinerama-dev libxrandr-dev libxscrnsaver-dev bullet-dev \
+gst1-plugins-base-dev libsndfile-dev libxtst-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -41,23 +41,23 @@
 			copy @std
 			DEPENDS="bullet cairo dbus eudev fontconfig freetype fribidi \
 			giflib glib gst1-plugins-base gstreamer1 libharfbuzz libjpeg-turbo \
-			libpng16 libraw librsvg libspectre libunwind libwebp luajit mesa \
-			openssl poppler python tiff util-linux-mount xorg-libX11 \
-			xorg-libXScrnSaver xorg-libXcomposite xorg-libXcursor \
-			xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi \
-			xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst zlib"
+			libpng libraw librsvg libspectre libunwind libwebp luajit mesa \
+			openssl poppler python tiff util-linux-mount libx11 \
+			libxscrnsaver libxcomposite libxcursor \
+			libxdamage libxext libxfixes libxi \
+			libxinerama libxrandr libxrender libxtst zlib"
 			TAGS="e enlightenment efl"
 			;;
 		efl-dev)
 			copy @dev
 			DEPENDS="shared-mime-info efl bullet-dev dbus-dev eudev-dev \
 			fontconfig-dev freetype-dev fribidi-dev glib-dev harfbuzz-dev \
-			libjpeg-turbo-dev libpng16-dev luajit-dev openssl-dev \
-			util-linux-mount-dev xorg-libX11-dev xorg-libXScrnSaver-dev \
-			xorg-libXcomposite-dev xorg-libXcursor-dev xorg-libXdamage-dev \
-			xorg-libXext-dev xorg-libXfixes-dev xorg-libXi-dev \
-			xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXrender-dev \
-			xorg-libXtst-dev xorg-libxcb-dev zlib-dev"
+			libjpeg-turbo-dev libpng-dev luajit-dev openssl-dev \
+			util-linux-mount-dev libx11-dev libxscrnsaver-dev \
+			libxcomposite-dev libxcursor-dev libxdamage-dev \
+			libxext-dev libxfixes-dev libxi-dev \
+			libxinerama-dev libxrandr-dev libxrender-dev \
+			libxtst-dev libxcb-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 eggwm-qt5/receipt
--- a/eggwm-qt5/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/eggwm-qt5/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="https://github.com/MoonLightDE/mlde.w.eggwm/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="qt5-dev xorg-libxcb-dev xorg-libX11-dev"
+BUILD_DEPENDS="qt5-dev libxcb-dev libx11-dev"
 
 compile_rules() {
 	qmake -makefile &&
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libatomic mesa qt5-base qt5-x11extras xorg-libX11"
+	DEPENDS="libatomic mesa qt5-base qt5-x11extras libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 eggwm/receipt
--- a/eggwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/eggwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,7 +26,7 @@
 	rm -rf $fs/usr/share/eggwm/themes/testtheme
 	find $fs/usr/share/eggwm -type f -exec chmod 0644 {} \;
 	cp -r $stuff/xsessions $fs/usr/share
-	DEPENDS="xorg-libX11 libQtCore libQtGui"
+	DEPENDS="libx11 libQtCore libQtGui"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 ekiga/receipt
--- a/ekiga/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ekiga/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev gnome-icon-theme boost-dev boost-signals \
-gconf-dev libnotify-dev xorg-libXv-dev dbus-dev dbus-glib-dev ptlib-dev \
+gconf-dev libnotify-dev libxv-dev dbus-dev dbus-glib-dev ptlib-dev \
 opal-dev"
 COOKOPTS="skip-log-errors"
 
@@ -31,6 +31,6 @@
 genpkg_rules() {
 	copy @std @ico
 	DEPENDS="atk boost-signals dbus-glib gconf gdk-pixbuf glib gtk2 libnotify \
-	libxml2 opal pango ptlib xorg-libX11 xorg-libXext xorg-libXv"
+	libxml2 opal pango ptlib libx11 libxext libxv"
 	TAGS="telephony"
 }
diff -r e167735ddedc -r 5669e8b3be70 emacs/receipt
--- a/emacs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/emacs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \
-fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng16-dev \
+fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng-dev \
 librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev xorg-dev-proto lcms2-dev"
 # giflib-dev: version 4 needed, add --with-gif=no)
 SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE $PACKAGE-common"
@@ -25,9 +25,9 @@
 DEPENDS_help="emacs"
 DEPENDS_lisp_sources="emacs"
 DEPENDS_std="dbus fontconfig freetype gdk-pixbuf glib gtk2 lcms2 libgnutls \
-libpng16 librsvg libxml2 ncurses tiff xorg-libICE xorg-libSM xorg-libX11 \
-xorg-libXext xorg-libXfixes xorg-libXft xorg-libXpm xorg-libXrender \
-xorg-libxcb zlib"
+libpng librsvg libxml2 ncurses tiff libice libsm libx11 \
+libxext libxfixes libxft libxpm libxrender \
+libxcb zlib"
 DEPENDS_common=" "
 
 CAT_help="development|help files"
diff -r e167735ddedc -r 5669e8b3be70 emelfm2/receipt
--- a/emelfm2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/emelfm2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://emelfm2.net/rel/$TARBALL" # FIXME
 
-BUILD_DEPENDS="gtk2-dev xorg-xorgproto libmagic-dev coreutils-operations gettext"
+BUILD_DEPENDS="gtk2-dev xorgproto libmagic-dev coreutils-operations gettext"
 
 compile_rules() {
 	sed \
@@ -34,6 +34,6 @@
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cd $fs/usr/share/pixmaps
 	ln -s emelfm2/emelfm2_32.png emelfm2.png
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 	TAGS="file-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 emerald/receipt
--- a/emerald/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/emerald/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,15 +11,15 @@
 TARBALL="$PACKAGE-v$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/compiz/emerald/-/archive/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="automake gettext-dev libtool intltool xorg-libXrender-dev \
-xorg-libXi-dev gtk3-dev libwnck3-dev compiz-dev cairo-dev pango-dev"
+BUILD_DEPENDS="automake gettext-dev libtool intltool libxrender-dev \
+libxi-dev gtk3-dev libwnck3-dev compiz-dev cairo-dev pango-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="atk cairo compiz gdk-pixbuf glib gtk3 libwnck3 pango xorg-libX11 \
-xorg-libXi xorg-libXrender"
+DEPENDS_std="atk cairo compiz gdk-pixbuf glib gtk3 libwnck3 pango libx11 \
+libxi libxrender"
 DEPENDS_dev="emerald atk-dev cairo-dev compiz-dev gdk-pixbuf-dev glib-dev \
-gtk3-dev libwnck3-dev pango-dev xorg-libX11-dev xorg-libXi-dev \
-xorg-libXrender-dev"
+gtk3-dev libwnck3-dev pango-dev libx11-dev libxi-dev \
+libxrender-dev"
 
 TAGS="compiz"
 
diff -r e167735ddedc -r 5669e8b3be70 engrampa/receipt
--- a/engrampa/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/engrampa/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/engrampa/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev caja-dev json-glib-dev \
-itstool xorg-libSM-dev"
+itstool libsm-dev"
 
 DEPENDS_std="cairo caja gdk-pixbuf glib gtk3 json-glib pango"
 SUGGESTED_std="unrar unace p7zip zip"
diff -r e167735ddedc -r 5669e8b3be70 enlightenment/receipt
--- a/enlightenment/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/enlightenment/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://download.enlightenment.org/rel/apps/enlightenment/$TARBALL"
 
 BUILD_DEPENDS="pam-dev bluez-dev gettext-dev efl-dev alsa-lib-dev pulseaudio-dev \
-xorg-xcb-util-keysyms-dev pm-utils"
+xcb-util-keysyms-dev pm-utils"
 SPLIT="$PACKAGE-backgrounds $PACKAGE $PACKAGE-common $PACKAGE-dev \
 $PACKAGE-pam:pam"
 
@@ -56,8 +56,8 @@
 			;;
 		enlightenment-common)
 			copy @std @rm *.mo
-			DEPENDS="alsa-lib bluez efl pulseaudio xorg-libxcb \
-			xorg-xcb-util-keysyms"
+			DEPENDS="alsa-lib bluez efl pulseaudio libxcb \
+			xcb-util-keysyms"
 			CAT="x-window|common files for PAM and non-PAM packages"
 			;;
 		enlightenment-dev)
diff -r e167735ddedc -r 5669e8b3be70 enna/receipt
--- a/enna/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/enna/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,7 +16,7 @@
 edje-dev edbus-dev emotion-dev ethumb-dev elementary-dev embryo-dev curl-dev \
 eio-dev xine-lib-dev libexif-dev alsa-lib-dev libplayer-dev libxml2-dev \
 libtool expat-dev jpeg-dev glib-dev ffmpeg-dev libvalhalla-dev libelementary \
-xorg-libXrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext-dev"
+libxrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext-dev"
 
 # Handle cross compilation
 case "$ARCH" in
@@ -81,7 +81,7 @@
 	cp -a $install/usr/share/enna $fs/usr/share
 	DEPENDS="eina eet ecore evas efreet edje edbus emotion ethumb elementary \
 	embryo libvalhalla libcurl xine-lib libexif alsa-lib libplayer \
-	xorg-libXrandr"
+	libxrandr"
 	TAGS="images music video e17"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 eom/receipt
--- a/eom/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/eom/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -19,7 +19,7 @@
 
 DEPENDS_std="atk cairo dbus-glib exempi gdk-pixbuf glib gobject-introspection \
 gtk3 lcms2 libexif libjpeg-turbo libpeas libpeas-gtk librsvg libxml2 \
-mate-desktop xorg-libX11 zlib"
+mate-desktop libx11 zlib"
 DEPENDS_dev="eom glib-dev gtk3-dev"
 
 TAGS_std="MATE"
diff -r e167735ddedc -r 5669e8b3be70 epdfview-cups/receipt
--- a/epdfview-cups/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/epdfview-cups/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -41,6 +41,6 @@
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
-	DEPENDS="gtk2 poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
+	DEPENDS="gtk2 poppler glib libpng cups libxdamage gcc-lib-base libcomerr3"
 	PROVIDE="epdfview:cups"
 }
diff -r e167735ddedc -r 5669e8b3be70 epdfview/receipt
--- a/epdfview/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/epdfview/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -34,6 +34,6 @@
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
-	DEPENDS="gtk2 poppler glib libpng16 xorg-libXdamage gcc-lib-base"
+	DEPENDS="gtk2 poppler glib libpng libxdamage gcc-lib-base"
 	TAGS="pdf viewer"
 }
diff -r e167735ddedc -r 5669e8b3be70 evolution-data-server/receipt
--- a/evolution-data-server/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/evolution-data-server/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libglade-dev libsoup-dev gtk2-dev orbit2-dev libbonobo-dev \
-gconf-dev libical-dev firefox-dev db-dev xorg-libxcb-dev popt-dev bison flex \
+gconf-dev libical-dev firefox-dev db-dev libxcb-dev popt-dev bison flex \
 glib-dev sqlite3-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 exo/receipt
--- a/exo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/exo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,7 +30,7 @@
 			COOKOPTS="!menus !pixmaps"
 			copy *.so*
 			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
-			xorg-libX11"
+			libx11"
 			;;
 		*-tools)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 extrema/receipt
--- a/extrema/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/extrema/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 wxWidgets28 xorg-libXxf86vm libxml2"
+	DEPENDS="gtk2 wxWidgets28 libxxf86vm libxml2"
 	TAGS="data visualization analysis"
 }
diff -r e167735ddedc -r 5669e8b3be70 fbgrab/receipt
--- a/fbgrab/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fbgrab/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev zlib-dev"
+BUILD_DEPENDS="libpng-dev zlib-dev"
 
 compile_rules() {
 	#sed -i '/splint/d' Makefile
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 zlib"
+	DEPENDS="libpng zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 fbida/receipt
--- a/fbida/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fbida/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="freetype-dev fontconfig-dev libexif-dev curl-dev jpeg-dev \
-libpng16-dev tiff-dev"
+libpng-dev tiff-dev"
 
 compile_rules() {
 	make || return 1
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 giflib tiff jpeg ttf-bitstream-vera libexif zlib \
+	DEPENDS="libpng giflib tiff jpeg ttf-bitstream-vera libexif zlib \
 	libcurl freetype fontconfig"
 }
diff -r e167735ddedc -r 5669e8b3be70 fbxkb/receipt
--- a/fbxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fbxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-libXmu-dev"
+BUILD_DEPENDS="gtk2-dev libxmu-dev"
 
 compile_rules() {
 	./configure &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXmu"
+	DEPENDS="gtk2 libxmu"
 }
diff -r e167735ddedc -r 5669e8b3be70 fcitx-configtool/receipt
--- a/fcitx-configtool/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fcitx-configtool/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool xorg-libXrender-dev \
+BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool libxrender-dev \
 cairo-dev pango-dev fcitx-dev file"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 fcitx/receipt
--- a/fcitx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fcitx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -46,7 +46,7 @@
 			cp -a $install/usr/share/icons/ $fs/usr/share/
 			;;
 		*-dev)
-			DEPENDS="libfcitx xorg-libX11-dev"
+			DEPENDS="libfcitx libx11-dev"
 			mkdir -p $fs/usr/lib/pkgconfig/ $fs/usr/share/
 			cp -a $install/usr/lib/libfcitx*.so $fs/usr/lib/
 			cp -a $install/usr/lib/pkgconfig/*.pc $fs/usr/lib/pkgconfig/
diff -r e167735ddedc -r 5669e8b3be70 feathernotes/receipt
--- a/feathernotes/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/feathernotes/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11"
+	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 featherpad/receipt
--- a/featherpad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/featherpad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,5 +27,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11"
+	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 feh/receipt
--- a/feh/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/feh/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://feh.finalrewind.org/$TARBALL"
 
-BUILD_DEPENDS="imlib2-dev giblib-dev xorg-xorgproto \
-xorg-libX11-dev libpng16-dev jpeg-dev curl-dev xorg-libXinerama-dev \
-xorg-libXt-dev"
+BUILD_DEPENDS="imlib2-dev giblib-dev xorgproto \
+libx11-dev libpng-dev jpeg-dev curl-dev libxinerama-dev \
+libxt-dev"
 
 compile_rules() {
 	sed -i 's|/usr/local|/usr|g' config.mk
@@ -31,7 +31,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="imlib2 giblib jpeg libpng16 xorg-libX11 freetype xorg-libXau \
-	xorg-libXdmcp xorg-libXext xorg-libXinerama libcurl"
+	DEPENDS="imlib2 giblib jpeg libpng libx11 freetype libxau \
+	libxdmcp libxext libxinerama libcurl"
 	TAGS="image photo viewer"
 }
diff -r e167735ddedc -r 5669e8b3be70 ffmpeg/receipt
--- a/ffmpeg/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ffmpeg/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
 BUILD_DEPENDS="coreutils-file-format libass-dev fdk-aac-dev lame-dev opus-dev \
-libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev xorg-libX11-dev \
+libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev libx11-dev \
 libsdl2-dev yasm"
 SPLIT="ffplay ffserver $PACKAGE-dev $PACKAGE"
 
@@ -73,7 +73,7 @@
 			copy @dev examples/
 			DEPENDS="ffmpeg bzip2-dev fdk-aac-dev freetype-dev lame-dev \
 			libass-dev libogg-dev libtheora-dev libvorbis-dev libvpx-dev \
-			opus-dev x264-dev x265-dev xorg-libX11-dev xorg-libxcb-dev xz-dev \
+			opus-dev x264-dev x265-dev libx11-dev libxcb-dev xz-dev \
 			zlib-dev"
 			;;
 		ffmpeg)
@@ -81,7 +81,7 @@
 			SUGGESTED="ffplay"
 			TAGS="audio video convert stream"
 			DEPENDS="bzlib fdk-aac freetype lame libass liblzma libtheora-enc \
-			libvorbis libvpx opus x264 x265 xorg-libxcb zlib"
+			libvorbis libvpx opus x264 x265 libxcb zlib"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 ffmpegthumbnailer/receipt
--- a/ffmpegthumbnailer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ffmpegthumbnailer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake libjpeg-turbo-dev zlib-dev libpng16-dev ffmpeg-dev"
+BUILD_DEPENDS="cmake libjpeg-turbo-dev zlib-dev libpng-dev ffmpeg-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -40,7 +40,7 @@
 	case $PACKAGE in
 		ffmpegthumbnailer)
 			copy @std
-			DEPENDS="ffmpeg libjpeg-turbo libpng16 zlib"
+			DEPENDS="ffmpeg libjpeg-turbo libpng zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 filezilla/receipt
--- a/filezilla/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/filezilla/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,6 +27,6 @@
 genpkg_rules() {
 	copy @std
 	rm -rf $fs/usr/share/fileszilla/docs
-	DEPENDS="wxWidgets28 gnutls libidn xorg-libXxf86vm libtasn1 sqlite3"
+	DEPENDS="wxWidgets28 gnutls libidn libxxf86vm libtasn1 sqlite3"
 	TAGS="ftp client"
 }
diff -r e167735ddedc -r 5669e8b3be70 firefox-official/receipt
--- a/firefox-official/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/firefox-official/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -87,7 +87,7 @@
 	CAT="network|$lang language"
 	cp -a $install/* $fs
 	DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf glib gtk2 \
-	gtk3 pango xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \
-	xorg-libXfixes xorg-libXrender xorg-libXt xorg-libxcb"
+	gtk3 pango libx11 libxcomposite libxdamage libxext \
+	libxfixes libxrender libxt libxcb"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 firefox/receipt
--- a/firefox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/firefox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -109,15 +109,15 @@
 				$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
 
 			chown -R root.root $fs
-			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
-			xorg-libXdamage alsa-lib xorg-libXt libevent libvpx pango nss \
+			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg libx11 \
+			libxdamage alsa-lib libxt libevent libvpx pango nss \
 			libfirefox"
 			TAGS="web-browser"
 			;;
 		*-dev)
-			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib xorg-libXt \
-			xorg-libXinerama xorg-libXcursor xorg-libXcomposite xorg-libXext \
-			xorg-libXdamage xorg-libxcb xorg-libSM xorg-libICE"
+			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib libxt \
+			libxinerama libxcursor libxcomposite libxext \
+			libxdamage libxcb libsm libice"
 			mkdir -p $fs/usr/include/$WANTED-$VERSION
 			cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
 
@@ -145,8 +145,8 @@
 			;;
 		libfirefox)
 			CAT="network|firefox/thunderbird common files"
-			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
-			xorg-libXdamage alsa-lib xorg-libXt"
+			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg libx11 \
+			libxdamage alsa-lib libxt"
 			# dictionaries/en-US.aff
 			# dictionaries/en-US.dic
 			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
diff -r e167735ddedc -r 5669e8b3be70 flam3/receipt
--- a/flam3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/flam3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/scottdraves/flam3/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng16-dev libxml2-dev"
+BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng-dev libxml2-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,11 +29,11 @@
 	case $PACKAGE in
 		flam3)
 			copy @std
-			DEPENDS="libjpeg-turbo libpng16 libxml2 zlib"
+			DEPENDS="libjpeg-turbo libpng libxml2 zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="flam3 libjpeg-turbo-dev libpng16-dev libxml2-dev"
+			DEPENDS="flam3 libjpeg-turbo-dev libpng-dev libxml2-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 flmusic/receipt
--- a/flmusic/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/flmusic/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz"
 WGET_URL="http://home.arcor.de/szukw000/$TARBALL" # FIXME
 
-BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev xorg-libX11-dev"
+BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev libx11-dev"
 
 compile_rules() {
 	#sed -i '/ioctl.h/a #include <limits.h>' reader.c &&
diff -r e167735ddedc -r 5669e8b3be70 florence-gtk2/receipt
--- a/florence-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/florence-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="florence-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/florence/$TARBALL"
 
-BUILD_DEPENDS="intltool gconf-dev xorg-libX11-dev glib-dev cairo-dev \
-librsvg-dev libxml2-dev gtk2-dev gstreamer0-dev xorg-libXtst-dev \
+BUILD_DEPENDS="intltool gconf-dev libx11-dev glib-dev cairo-dev \
+librsvg-dev libxml2-dev gtk2-dev gstreamer0-dev libxtst-dev \
 at-spi2-core-dev at-spi2-atk-dev gtk2-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std *.mo
 	DEPENDS="gconf at-spi2-core cairo gdk-pixbuf glib gstreamer0 gtk2 librsvg \
-	libxml2 pango xorg-libX11 xorg-libXtst"
+	libxml2 pango libx11 libxtst"
 	PROVIDE="florence"
 }
diff -r e167735ddedc -r 5669e8b3be70 florence/receipt
--- a/florence/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/florence/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="intltool glib-dev xorg-libXext-dev cairo-dev librsvg-dev \
-libxml2-dev gstreamer1-dev gtk3-dev xorg-libXtst-dev"
+BUILD_DEPENDS="intltool glib-dev libxext-dev cairo-dev librsvg-dev \
+libxml2-dev gstreamer1-dev gtk3-dev libxtst-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -35,7 +35,7 @@
 		florence)
 			copy @std *.mo
 			DEPENDS="cairo gdk-pixbuf glib gstreamer1 gtk3 librsvg libxml2 \
-			pango xorg-libX11 xorg-libXext xorg-libXtst"
+			pango libx11 libxext libxtst"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 flrec/receipt
--- a/flrec/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/flrec/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://matteolucarelli.altervista.org/flrec/$TARBALL"
 
-BUILD_DEPENDS="fltk-dev sox-dev xorg-libX11-dev"
+BUILD_DEPENDS="fltk-dev sox-dev libx11-dev"
 
 compile_rules() {
 	make CC=$HOST_SYSTEM-g++ &&
diff -r e167735ddedc -r 5669e8b3be70 fltk-2.0.x/receipt
--- a/fltk-2.0.x/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fltk-2.0.x/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="subversion|http://svn.easysw.com/public/fltk/fltk/trunk"
 BRANCH="${VERSION#r}"
 
-BUILD_DEPENDS="xorg-libXft-dev glu glu-dev mesa mesa-dev \
+BUILD_DEPENDS="libxft-dev glu glu-dev mesa mesa-dev \
 subversion autoconf xorg-dev libpng12-dev"
 SPLIT="$PACKAGE-dev $PACKAGE-fluid2 $PACKAGE-gl"
 
@@ -42,10 +42,10 @@
 genpkg_rules() {
 	case $PACKAGE in
 		fltk-2.0.x)
-			DEPENDS="expat fontconfig freetype jpeg xorg-libX11 \
-			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
-			xorg-libXrender zlib libpng12 xorg-libXi \
-			xorg-libXinerama gcc-lib-base"
+			DEPENDS="expat fontconfig freetype jpeg libx11 \
+			libxau libxdmcp libxext libxft \
+			libxrender zlib libpng12 libxi \
+			libxinerama gcc-lib-base"
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/lib/*.so* $fs/usr/lib
 			# Remove gl support --> fltk-2.0.x-gl
@@ -66,8 +66,8 @@
 			;;
 		*-gl)
 			CAT="x-window|GL library"
-			DEPENDS="mesa glu expat fontconfig xorg-libXft \
-			xorg-libXi xorg-libXinerama xorg-libXext gcc-lib-base"
+			DEPENDS="mesa glu expat fontconfig libxft \
+			libxi libxinerama libxext gcc-lib-base"
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/lib/libfltk2*gl*.so* $fs/usr/lib
 			;;
diff -r e167735ddedc -r 5669e8b3be70 fltk/receipt
--- a/fltk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fltk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng16-dev \
-xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev mesa-dev xorg-libXinerama-dev \
-freetype-dev xorg-libXft-dev xorg-libXcursor-dev xorg-xprop"
+BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng-dev \
+libx11-dev libice-dev libsm-dev mesa-dev libxinerama-dev \
+freetype-dev libxft-dev libxcursor-dev xprop"
 SPLIT="$PACKAGE-blocks $PACKAGE-checkers $PACKAGE-sudoku $PACKAGE-colbrowser \
 $PACKAGE-editor $PACKAGE-doc $PACKAGE $PACKAGE-dev"
 COOKOPTS="!menus"
@@ -59,34 +59,34 @@
 		fltk-blocks)
 			copy $PACKAGE*
 			CAT="games|FLTK Blocks game"
-			DEPENDS="alsa-lib fontconfig xorg-libX11 xorg-libXcursor \
-			xorg-libXext xorg-libXfixes xorg-libXft xorg-libXinerama \
-			xorg-libXrender"
+			DEPENDS="alsa-lib fontconfig libx11 libxcursor \
+			libxext libxfixes libxft libxinerama \
+			libxrender"
 			;;
 		fltk-checkers)
 			copy $PACKAGE*
 			CAT="games|FLTK Checkers game"
-			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
-			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
+			DEPENDS="fontconfig libx11 libxcursor libxext \
+			libxfixes libxft libxinerama libxrender"
 			;;
 		fltk-sudoku)
 			copy $PACKAGE*
 			CAT="games|FLTK Sudoku game"
-			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng16 xorg-libX11 \
-			xorg-libXcursor xorg-libXext xorg-libXfixes xorg-libXft \
-			xorg-libXinerama xorg-libXrender"
+			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng libx11 \
+			libxcursor libxext libxfixes libxft \
+			libxinerama libxrender"
 			;;
 		fltk-colbrowser)
 			copy $PACKAGE* rgb.txt
 			CAT="graphics|FLTK Color browser"
-			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
-			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
+			DEPENDS="fontconfig libx11 libxcursor libxext \
+			libxfixes libxft libxinerama libxrender"
 			;;
 		fltk-editor)
 			copy $PACKAGE*
 			CAT="development|FLTK text editor"
-			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
-			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
+			DEPENDS="fontconfig libx11 libxcursor libxext \
+			libxfixes libxft libxinerama libxrender"
 			;;
 		fltk-doc)
 			copy doc/
@@ -94,9 +94,9 @@
 			;;
 		fltk)
 			copy @std @rm
-			DEPENDS="fontconfig libjpeg-turbo libpng16 mesa \
-			xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
-			xorg-libXft xorg-libXinerama xorg-libXrender"
+			DEPENDS="fontconfig libjpeg-turbo libpng mesa \
+			libx11 libxcursor libxext libxfixes \
+			libxft libxinerama libxrender"
 			;;
 		fltk-dev)
 			copy @dev @rm # remove examples in doc
diff -r e167735ddedc -r 5669e8b3be70 fluxbox/receipt
--- a/fluxbox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fluxbox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,7 +24,7 @@
 	case $PACKAGE in
 		fluxbox)
 			TAGS="window-manager"
-			DEPENDS="xorg fontconfig imlib2 hsetroot xorg-xcompmgr"
+			DEPENDS="xorg fontconfig imlib2 hsetroot xcompmgr"
 			mkdir -p $fs/usr/share/fluxbox/styles
 			cp -a $install/usr/bin $fs/usr
 			for f in apps keys overlay windowmenu init menu; do
diff -r e167735ddedc -r 5669e8b3be70 flxine/receipt
--- a/flxine/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/flxine/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://home.arcor.de/szukw000/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info fltk-dev xine-lib-dev autoconf automake \
-xorg-libX11-dev"
+libx11-dev"
 
 compile_rules() {
 	#export ac_cv_lib_pthread_pthread_create=yes
diff -r e167735ddedc -r 5669e8b3be70 fontforge/receipt
--- a/fontforge/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fontforge/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,10 +12,10 @@
 WGET_URL="https://github.com/fontforge/fontforge/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="libtool perl-dev tar autoconf automake bash coreutils-line \
-xorg-libX11-dev xorg-libICE-dev zlib-dev freetype-dev libjpeg-turbo-dev \
-libpng16-dev tiff-dev readline-dev cairo-dev pango-dev xorg-libXft-dev \
+libx11-dev libice-dev zlib-dev freetype-dev libjpeg-turbo-dev \
+libpng-dev tiff-dev readline-dev cairo-dev pango-dev libxft-dev \
 gtk2-dev python-dev libuninameslist-dev libspiro-dev util-linux-uuid-dev \
-xorg-libSM-dev gettext-dev"
+libsm-dev gettext-dev"
 SPLIT="$PACKAGE-fonts $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -39,7 +39,7 @@
 			;;
 		fontforge)
 			copy @std @rm *.mo
-			DEPENDS="gtk2 libuninameslist python libspiro libltdl xorg-libSM"
+			DEPENDS="gtk2 libuninameslist python libspiro libltdl libsm"
 			TAGS="editor font"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 foobillard/receipt
--- a/foobillard/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/foobillard/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev freetype-dev libpng16-dev glu mesa-dev \
+BUILD_DEPENDS="libsdl-dev freetype-dev libpng-dev glu mesa-dev \
 zlib-dev glu-dev"
 
 compile_rules() {
@@ -31,5 +31,5 @@
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/foobillard $fs/usr/share
-	DEPENDS="libsdl freetype libpng16 mesa glu"
+	DEPENDS="libsdl freetype libpng mesa glu"
 }
diff -r e167735ddedc -r 5669e8b3be70 foobillardplus/receipt
--- a/foobillardplus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/foobillardplus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="automake autoconf libsdl-dev libsdl-mixer-dev libsdl-net-dev \
-mesa-dev glu-dev freetype-dev libpng16-dev"
+mesa-dev glu-dev freetype-dev libpng-dev"
 SPLIT="$PACKAGE-music $PACKAGE"
 
 compile_rules() {
@@ -52,7 +52,7 @@
 			;;
 		foobillardplus)
 			copy @std @rm hicolor/ # 128px icons isn't copied with @std
-			DEPENDS="freetype glu libpng16 libsdl libsdl-mixer libsdl-net mesa"
+			DEPENDS="freetype glu libpng libsdl libsdl-mixer libsdl-net mesa"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 fox/receipt
--- a/fox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.fox-toolkit.org/pub/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev jpeg-dev tiff-dev xorg-libXft-dev mesa-dev \
+BUILD_DEPENDS="libpng-dev jpeg-dev tiff-dev libxft-dev mesa-dev \
 glu-dev freetype-dev fontconfig-dev expat-dev libxml2-dev xorg-dev \
-xorg-libxshmfence-dev"
+libxshmfence-dev"
 SPLIT="adie calculator $PACKAGE-dev $PACKAGE-doc pathfinder shutterbug"
 
 compile_rules() {
@@ -34,9 +34,9 @@
 		fox)
 			copy libCHART-*.so* libFOX-*.so*
 			SUGGESTED="adie calculator pathfinder shutterbug"
-			DEPENDS="libpng16 jpeg tiff xorg-libXft bzlib mesa glu \
-			xorg-libXcursor xorg-libXrandr xorg-libXxf86vm \
-			xorg-libXdamage libdrm jbigkit"
+			DEPENDS="libpng jpeg tiff libxft bzlib mesa glu \
+			libxcursor libxrandr libxxf86vm \
+			libxdamage libdrm jbigkit"
 			;;
 		adie)
 			copy adie Adie.stx
diff -r e167735ddedc -r 5669e8b3be70 fox14/receipt
--- a/fox14/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fox14/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="fox-$VERSION.tar.gz"
 WGET_URL="http://ftp.fox-toolkit.org/pub/$TARBALL"
 
-BUILD_DEPENDS="bzlib xorg-libXrender xorg-libXrender-dev fontconfig-dev \
-freetype-dev libpng12-dev jpeg-dev tiff-dev xorg-libXft-dev mesa glu expat-dev \
+BUILD_DEPENDS="bzlib libxrender-dev fontconfig-dev \
+freetype-dev libpng12-dev jpeg-dev tiff-dev libxft-dev mesa glu expat-dev \
 libxml2-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -34,12 +34,12 @@
 	case $PACKAGE in
 		fox14)
 			copy @std
-			DEPENDS="libpng12 jpeg tiff xorg-libXft bzlib mesa glu"
+			DEPENDS="libpng12 jpeg tiff libxft bzlib mesa glu"
 			SUGGESTED="adie calculator pathfinder shutterbug"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="fox xorg-libX11-dev"
+			DEPENDS="fox libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 fpm2/receipt
--- a/fpm2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fpm2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -10,9 +10,9 @@
 WEB_SITE="https://als.regnet.cz/fpm2/"
 WGET_URL="https://als.regnet.cz/fpm2/download/$TARBALL"
 
-DEPENDS="expat gtk2 libxml2 xorg-libX11 xorg-libXau xorg-libXcomposite \
-xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-xorg-libXrandr xorg-libXrender xorg-libXdamage"
+DEPENDS="expat gtk2 libxml2 libx11 libxau libxcomposite \
+libxcursor libxdmcp libxext libxfixes libxinerama \
+libxrandr libxrender libxdamage"
 BUILD_DEPENDS="gtk2-dev libxml2-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 freeciv/receipt
--- a/freeciv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/freeciv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="zlib ncurses readline gtk2 gettext-base xorg-libXdamage \
+	DEPENDS="zlib ncurses readline gtk2 gettext-base libxdamage \
 	libsdl-mixer bzip2"
 	TAGS="strategy"
 }
diff -r e167735ddedc -r 5669e8b3be70 freeglut/receipt
--- a/freeglut/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/freeglut/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="cmake mesa-dev glu-dev xorg-libXi-dev"
+BUILD_DEPENDS="cmake mesa-dev glu-dev libxi-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,12 +33,12 @@
 	case $PACKAGE in
 		freeglut)
 			copy @std
-			DEPENDS="mesa xorg-libX11 xorg-libXi xorg-libXxf86vm"
+			DEPENDS="mesa libx11 libxi libxxf86vm"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="freeglut mesa-dev xorg-libX11-dev xorg-libXrandr-dev \
-			xorg-libXxf86vm-dev"
+			DEPENDS="freeglut mesa-dev libx11-dev libxrandr-dev \
+			libxxf86vm-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 freerdp/receipt
--- a/freerdp/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/freerdp/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -10,8 +10,8 @@
 WEB_SITE="http://www.freerdp.com/"
 WGET_URL="https://github.com/FreeRDP/FreeRDP/archive/$VERSION.zip"
 
-BUILD_DEPENDS="zlib-dev openssl-dev cups-dev alsa-lib-dev xorg-libxcb-dev xorg-dev \
-xorg-dev-proto cmake ffmpeg-dev xorg-libXv-dev pcsc-lite-dev"
+BUILD_DEPENDS="zlib-dev openssl-dev cups-dev alsa-lib-dev libxcb-dev xorg-dev \
+xorg-dev-proto cmake ffmpeg-dev libxv-dev pcsc-lite-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,8 +27,8 @@
 	case $PACKAGE in
 		freerdp)
 			copy @std
-			DEPENDS="zlib libkrb5 openssl libcomerr cups alsa-lib xorg-libxcb \
-			xorg-libXcursor ffmpeg xorg-libXv pcsc-lite"
+			DEPENDS="zlib libkrb5 openssl libcomerr cups alsa-lib libxcb \
+			libxcursor ffmpeg libxv pcsc-lite"
 			TAGS="rdp remote-desktop"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 freetype/receipt
--- a/freetype/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/freetype/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng16-dev"
+BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 # Option "--harfbuzz" used in the task to install build dependency harfbuzz-dev
@@ -38,11 +38,11 @@
 	case $PACKAGE in
 		freetype)
 			copy @std
-			DEPENDS="bzlib libharfbuzz libpng16 zlib"
+			DEPENDS="bzlib libharfbuzz libpng zlib"
 			;;
 		freetype-dev)
 			copy @dev
-			DEPENDS="freetype bzip2-dev harfbuzz-dev libpng16-dev zlib-dev"
+			DEPENDS="freetype bzip2-dev harfbuzz-dev libpng-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 frogatto/receipt
--- a/frogatto/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/frogatto/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/frogatto/frogatto/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="xorg-libX11-dev libsdl-dev mesa-dev glu-dev glew-dev \
-libsdl-image-dev libpng16-dev zlib-dev boost-dev libsdl-ttf-dev \
+BUILD_DEPENDS="libx11-dev libsdl-dev mesa-dev glu-dev glew-dev \
+libsdl-image-dev libpng-dev zlib-dev boost-dev libsdl-ttf-dev \
 libsdl-mixer-dev coreutils-file-format ccache"
 SPLIT="$PACKAGE-data"
 
@@ -32,8 +32,8 @@
 		frogatto)
 			copy game server frogatto frogatto.desktop frogatto.png
 			DEPENDS="glew boost-iostreams boost-regex boost-system \
-			boost-thread glu libpng16 libsdl libsdl-image \
-			libsdl-mixer libsdl-ttf mesa xorg-libX11 zlib"
+			boost-thread glu libpng libsdl libsdl-image \
+			libsdl-mixer libsdl-ttf mesa libx11 zlib"
 			;;
 		frogatto-data)
 			copy data/ images/ modules/ music/ *.ttf
diff -r e167735ddedc -r 5669e8b3be70 ftgl/receipt
--- a/ftgl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ftgl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="freetype-dev freeglut-dev mesa-dev glu-dev \
-expat-dev xorg-libxshmfence-dev"
+expat-dev libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 fuse-emulator/receipt
--- a/fuse-emulator/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/fuse-emulator/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="fuse-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL"
 
-BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk2-dev \
+BUILD_DEPENDS="perl libspectrum-dev libx11-dev libice-dev gtk2-dev \
 gtk3-dev alsa-lib-dev libsdl-dev libgcrypt-dev"
 SPLIT="$PACKAGE-gtk3:gtk3"
 
@@ -31,14 +31,14 @@
 	case $PACKAGE in
 		fuse-emulator)
 			copy @std @ico # only 16 and 48
-			DEPENDS="alsa-lib gdk-pixbuf glib gtk2 libpng16 libsdl libspectrum \
-			libxml2 pango xorg-libX11 zlib"
+			DEPENDS="alsa-lib gdk-pixbuf glib gtk2 libpng libsdl libspectrum \
+			libxml2 pango libx11 zlib"
 			;;
 		fuse-emulator-gtk3)
 			copy @std @ico # only 16 and 48
 			CAT="games|with GTK+3 interface"
-			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk3 libpng16 libsdl \
-			libspectrum libxml2 pango xorg-libX11 zlib"
+			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk3 libpng libsdl \
+			libspectrum libxml2 pango libx11 zlib"
 			;;
 	esac
 	TAGS="emulator spectrum"
diff -r e167735ddedc -r 5669e8b3be70 gajim/receipt
--- a/gajim/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gajim/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.gajim.org/downloads/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev xorg-xcb-util-dev enchant-dev xorg-xorgproto \
+BUILD_DEPENDS="gettext-dev xcb-util-dev enchant-dev xorgproto \
 python-dev libffi-dev intltool python-pygtk-dev"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="gtkspell python python-dbus python-pygtk python-pygobject2 python-pyopenssl \
-	python-pysqlite xorg-libXScrnSaver bind-client"
+	python-pysqlite libxscrnsaver bind-client"
 }
diff -r e167735ddedc -r 5669e8b3be70 gambas2/receipt
--- a/gambas2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gambas2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/gambas/$TARBALL"
 
 BUILD_DEPENDS="poppler-dev util-linux-uuid-dev lcms2-dev tiff-dev jpeg-dev \
-libpng16-dev autoconf automake libtool freetype-dev fontconfig-dev"
+libpng-dev autoconf automake libtool freetype-dev fontconfig-dev"
 
 COOKOPTS="skip-log-errors"
 
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="poppler util-linux-uuid lcms2 tiff jpeg libpng16"
+	DEPENDS="poppler util-linux-uuid lcms2 tiff jpeg libpng"
 	TAGS="interpreter basic"
 }
diff -r e167735ddedc -r 5669e8b3be70 garcon/receipt
--- a/garcon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/garcon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool libxfce4util-dev gtk2-dev libxfce4ui-dev \
-xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+libsm-dev startup-notification-dev xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 gcc+gcj/receipt
--- a/gcc+gcj/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gcc+gcj/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -19,8 +19,8 @@
 TAGS="compiler C C++ objective-C java"
 
 BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev mpc-library \
-expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
-xorg-libXtst \
+expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorgproto \
+libxtst \
 elfutils elfutils-dev util-linux-uuid-dev"
 
 compile_rules() {
@@ -98,11 +98,11 @@
 	# Include files.
 	cp -a $install/usr/include $fs/usr
 	DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr \
-	python gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 \
-	xorg-libxcb xorg-xcb-util xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
-	xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-	xorg-libXtst alsa-lib elfutils"
+	python gtk2 atk cairo expat fontconfig freetype pango pixman libpng \
+	libxcb xcb-util libice libsm libx11 libxau \
+	libxcomposite libxcursor libxdamage libxdmcp \
+	libxext libxfixes libxinerama libxrandr libxrender \
+	libxtst alsa-lib elfutils"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 gcolor2/receipt
--- a/gcolor2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gcolor2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,5 +27,5 @@
 	COOKOPTS="!pixmaps"
 	copy bin/
 	DEPENDS="atk gdk-pixbuf glib gtk2"
-	SUGGESTED="xorg-rgb"
+	SUGGESTED="rgb"
 }
diff -r e167735ddedc -r 5669e8b3be70 gdk-pixbuf/receipt
--- a/gdk-pixbuf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gdk-pixbuf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev gobject-introspection-dev xorg-libX11-dev \
+BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng-dev \
+libjpeg-turbo-dev tiff-dev gobject-introspection-dev libx11-dev \
 gettext-dev libxslt docbook-xsl libxml2-tools"
 SPLIT="$PACKAGE-dev $PACKAGE"
 
@@ -34,12 +34,12 @@
 	case $PACKAGE in
 		*-dev)
 			copy @dev gdk-pixbuf-csource
-			DEPENDS="gdk-pixbuf glib-dev shared-mime-info-dev xorg-libX11-dev"
+			DEPENDS="gdk-pixbuf glib-dev shared-mime-info-dev libx11-dev"
 			# gdk-pixbuf-csource use shared-mime-info to detect the image file format
 			;;
 		*)
 			copy @std @rm
-			DEPENDS="glib libjpeg-turbo libpng16 tiff xorg-libX11"
+			DEPENDS="glib libjpeg-turbo libpng tiff libx11"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 geany-plugins/receipt
--- a/geany-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/geany-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="geany atk cairo enchant fontconfig freetype gdk-pixbuf glib gtk2 \
-	gtkspell libxml2 pango python vte-gtk2 xorg-libX11 xorg-libXext"
+	gtkspell libxml2 pango python vte-gtk2 libx11 libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 gegl/receipt
--- a/gegl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gegl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.gimp.org/pub/gegl/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="babl-dev glib-dev json-glib-dev libjpeg-turbo-dev libpng16-dev \
+BUILD_DEPENDS="babl-dev glib-dev json-glib-dev libjpeg-turbo-dev libpng-dev \
 gobject-introspection-dev gettext-dev gexiv2-dev cairo-dev pango-dev \
 gdk-pixbuf-dev lensfun-dev librsvg-dev v4l-utils-dev openexr-dev ilmbase-dev \
 libsdl-dev libraw-dev jasper-dev lua-dev ffmpeg-dev lcms-dev libspiro-dev \
@@ -39,7 +39,7 @@
 			copy gcut gegl gegl-imgcmp gegl-c*.so gegl-g*.so grey2.json \
 			jpg-*.so npy-*.so png-*.so ppm-*.so rgbe-*.so seamless-*.so \
 			transformops.so libgegl*.so*
-			DEPENDS="babl gexiv2 glib json-glib libjpeg-turbo libpng16 libspiro"
+			DEPENDS="babl gexiv2 glib json-glib libjpeg-turbo libpng libspiro"
 			;;
 		*-extra)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 get-google-earth/receipt
--- a/get-google-earth/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/get-google-earth/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,6 +16,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="bzip2 xorg-base-fonts"
+	DEPENDS="bzip2 font-misc-misc-base"
 	TAGS="map visualization"
 }
diff -r e167735ddedc -r 5669e8b3be70 gettext/receipt
--- a/gettext/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gettext/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev emacs \
-xorg-libXrandr-dev xorg-libXfixes-dev"
+libxrandr-dev libxfixes-dev"
 SPLIT="$PACKAGE-base $PACKAGE emacs-pkg-po-mode $PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 ghostscript/receipt
--- a/ghostscript/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ghostscript/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 # build depends are optional; ghostscripts still build but does not compile in cups support
 BUILD_DEPENDS="cairo-dev gtk2-dev expat-dev fontconfig-dev freetype-dev \
-gnutls-dev libgcrypt-dev libgpg-error-dev libpng16-dev tiff-dev \
+gnutls-dev libgcrypt-dev libgpg-error-dev libpng-dev tiff-dev \
 zlib-dev cups-dev jbig2dec jasper-dev libjpeg-turbo-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -49,7 +49,7 @@
 			ln -s gsc $fs/usr/bin/gs
 
 			DEPENDS="atk cairo cups fontconfig freetype gdk-pixbuf glib gtk2 \
-			libcups libgnutls libidn libjpeg-turbo libpng16 pango tiff zlib"
+			libcups libgnutls libidn libjpeg-turbo libpng pango tiff zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 giac/receipt
--- a/giac/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/giac/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www-fourier.ujf-grenoble.fr/~parisse/giac/$TARBALL"
 
-BUILD_DEPENDS="gmp-dev mpfr-dev libpng16-dev gsl-dev pari-dev ntl readline-dev \
-cocoalib fltk-dev xorg-libX11-dev gf2x-dev xorg-libXinerama-dev libxml2-dev \
+BUILD_DEPENDS="gmp-dev mpfr-dev libpng-dev gsl-dev pari-dev ntl readline-dev \
+cocoalib fltk-dev libx11-dev gf2x-dev libxinerama-dev libxml2-dev \
 fltk-2.0.x-gl bison gfortran mesa-dev expat-dev gf2x-dev boost-dev \
-boost-system xorg-libxshmfence-dev" # lapack
+boost-system libxshmfence-dev" # lapack
 
 compile_rules() {
 	sed -i 's| doc | |' Makefile*
@@ -34,5 +34,5 @@
 
 genpkg_rules() {
 	copy @std @dev
-	DEPENDS="gmp mpfr libpng16 gsl pari ntl readline cocoalib fltk gf2x"
+	DEPENDS="gmp mpfr libpng gsl pari ntl readline cocoalib fltk gf2x"
 }
diff -r e167735ddedc -r 5669e8b3be70 giblib/receipt
--- a/giblib/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/giblib/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://linuxbrit.co.uk/downloads/$TARBALL"
 
-BUILD_DEPENDS="gfortran imlib2-dev imlib2 xorg-xorgproto freetype-dev \
-xorg-libXext-dev"
+BUILD_DEPENDS="gfortran imlib2-dev imlib2 xorgproto freetype-dev \
+libxext-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,8 +28,8 @@
 	case $PACKAGE in
 		giblib)
 			copy @std
-			DEPENDS="imlib2 freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
-			xorg-libXext"
+			DEPENDS="imlib2 freetype libx11 libxau libxdmcp \
+			libxext"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 gifsicle/receipt
--- a/gifsicle/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gifsicle/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.lcdf.org/gifsicle/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev"
+BUILD_DEPENDS="libx11-dev libice-dev libsm-dev"
 SPLIT="gifview $PACKAGE"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 	case $PACKAGE in
 		gifview)
 			copy gifview
-			DEPENDS="xorg-libX11"
+			DEPENDS="libx11"
 			CAT="graphics|GIF viewer"
 			;;
 		gifsicle)
diff -r e167735ddedc -r 5669e8b3be70 gigolo/receipt
--- a/gigolo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gigolo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="xfce4-dev-tools gtk2-dev xorg-libX11-dev"
+BUILD_DEPENDS="xfce4-dev-tools gtk2-dev libx11-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk2 xorg-libX11"
+	DEPENDS="glib gtk2 libx11"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 gimp/receipt
--- a/gimp/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gimp/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,11 +12,11 @@
 WGET_URL="https://download.gimp.org/pub/gimp/v${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool iso-codes-dev babl-dev gegl-dev atk-dev glib-dev \
-glib-networking xorg-libX11-dev xorg-libICE-dev gtk2-dev gexiv2-dev \
-xorg-libXmu-dev xorg-libXfixes-dev ghostscript-dev libmng-dev aalib-dev \
-xorg-libXpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
+glib-networking libx11-dev libice-dev gtk2-dev gexiv2-dev \
+libxmu-dev libxfixes-dev ghostscript-dev libmng-dev aalib-dev \
+libxpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
 mypaint-brushes-dev librsvg-dev poppler-dev poppler-data libwmf-dev \
-openjpeg2-dev xorg-libXcursor-dev libgudev-dev xdg-utils libxslt \
+openjpeg2-dev libxcursor-dev libgudev-dev xdg-utils libxslt \
 shared-mime-info-dev desktop-file-utils-extra gtk-doc tiff-dev"
 SPLIT="$PACKAGE-brushes $PACKAGE-console $PACKAGE-dev $PACKAGE-plug-ins \
 $PACKAGE"
@@ -59,15 +59,15 @@
 				-o -name screenshot \) -delete # -> main package
 			CAT="graphics|plug-ins suite for advanced users"
 			DEPENDS="aalib babl bzlib cairo gdk-pixbuf gegl gexiv2 gimp glib \
-			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng16 \
+			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng \
 			librsvg libwebp libwmf openexr openjpeg2 pango poppler tiff \
-			xorg-libX11 xorg-libXcursor xorg-libXpm zlib"
+			libx11 libxcursor libxpm zlib"
 			;;
 		gimp)
 			copy @std @rm # all the rest
 			DEPENDS="babl cairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
 			glib gtk2 lcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
-			libpng16 pango xorg-libX11 xorg-libXext xorg-libXfixes xorg-libXmu \
+			libpng pango libx11 libxext libxfixes libxmu \
 			zlib"
 			SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
 			gimp-plugin-ufraw mypaint-brushes gegl-extra"
diff -r e167735ddedc -r 5669e8b3be70 gitmail/receipt
--- a/gitmail/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gitmail/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,5 +29,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 glew/receipt
--- a/glew/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/glew/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev mesa-dev"
+BUILD_DEPENDS="libx11-dev mesa-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="mesa xorg-libX11"
+DEPENDS_std="mesa libx11"
 DEPENDS_dev="glew glu-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 glu/receipt
--- a/glu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/glu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glu/$TARBALL"
 
 BUILD_DEPENDS="mesa-dev automake autoconf libtool expat-dev xorg-dev \
-xorg-libxshmfence-dev"
+libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 glw/receipt
--- a/glw/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/glw/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glw/$TARBALL"
 
 BUILD_DEPENDS="mesa-dev automake autoconf libtool util-linux-uuid-dev \
-expat-dev xorg-dev intltool gettext-dev xorg-libxshmfence-dev"
+expat-dev xorg-dev intltool gettext-dev libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,8 +30,8 @@
 		glw)
 			copy @std
 			DEPENDS="glibc-base util-linux-uuid zlib freetype lesstif mesa \
-			xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
-			xorg-libXt"
+			libice libsm libx11 libxau libxdmcp \
+			libxt"
 			PROVIDE="libglw"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 gmerlin/receipt
--- a/gmerlin/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gmerlin/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="texinfo libxml2-dev expat-dev gavl-dev gtk2-dev alsa-lib-dev \
-libpng16-dev mesa-dev xorg-libxshmfence-dev gettext-dev"
+libpng-dev mesa-dev libxshmfence-dev gettext-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -34,5 +34,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libxml2 expat gavl gtk2 alsa-lib libpng16"
+	DEPENDS="libxml2 expat gavl gtk2 alsa-lib libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 gmpc/receipt
--- a/gmpc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gmpc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.sarine.nl/Programs/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gob2-dev libglade-dev libmpd libmpd-dev curl-dev sqlite3-dev \
-xorg-libSM-dev libsoup-dev xorg-xcb-util-dev util-linux-uuid-dev flex intltool \
+libsm-dev libsoup-dev xcb-util-dev util-linux-uuid-dev flex intltool \
 vala"
 SPLIT="$PACKAGE-dev"
 
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		gmpc)
 			copy @std
-			DEPENDS="libglade libmpd curl xorg-libSM libsoup libsexy mpd \
+			DEPENDS="libglade libmpd curl libsm libsoup libsexy mpd \
 			sqlite3 libtasn1"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 gmtk/receipt
--- a/gmtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gmtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext-dev intltool xorg-libX11-dev gtk3-dev gtk2-dev glib-dev \
+BUILD_DEPENDS="gettext-dev intltool libx11-dev gtk3-dev gtk2-dev glib-dev \
 gconf-dev alsa-lib-dev pulseaudio-dev"
 SPLIT="gmlib $PACKAGE gmtk3 $PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 gnet/receipt
--- a/gnet/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnet/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev util-linux-uuid-dev xorg-libXt"
+BUILD_DEPENDS="glib-dev util-linux-uuid-dev libxt"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 gnome-desktop/receipt
--- a/gnome-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnome-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev eudev-dev libseccomp-dev gdk-pixbuf-dev \
-gtk3-dev glib-dev gsettings-desktop-schemas-dev xorg-xkeyboard-config-dev \
+BUILD_DEPENDS="libx11-dev eudev-dev libseccomp-dev gdk-pixbuf-dev \
+gtk3-dev glib-dev gsettings-desktop-schemas-dev xkeyboard-config-dev \
 iso-codes-dev itstool libxml2-tools gettext-dev gobject-introspection-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 gnome-desktop2/receipt
--- a/gnome-desktop2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnome-desktop2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="gnome-desktop-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/gnome-desktop/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev \
-xorg-libXrandr-dev gdk-pixbuf-dev gtk2-dev glib-dev gconf-dev gnome-doc-utils \
+BUILD_DEPENDS="intltool startup-notification-dev libx11-dev \
+libxrandr-dev gdk-pixbuf-dev gtk2-dev glib-dev gconf-dev gnome-doc-utils \
 rarian-dev"
 SPLIT="$PACKAGE-about $PACKAGE $PACKAGE-dev"
 
@@ -36,7 +36,7 @@
 		gnome-desktop2)
 			copy @std @rm
 			DEPENDS="cairo gconf gdk-pixbuf glib gtk2 startup-notification \
-			xorg-libX11 xorg-libXrandr"
+			libx11 libxrandr"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 gnome-mplayer/receipt
--- a/gnome-mplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnome-mplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev xorg-libX11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev \
-dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \
+BUILD_DEPENDS="gettext-dev libx11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev \
+dbus-dev dbus-glib-dev libxscrnsaver-dev alsa-lib-dev pulseaudio-dev \
 libnotify-dev libgpod-dev"
 SPLIT="$PACKAGE-gtk3:gtk3"
 
@@ -43,13 +43,13 @@
 		gnome-mplayer)
 			copy @std
 			DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk2 \
-			libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
+			libgpod libnotify libx11 libxscrnsaver   mplayer"
 			CAT="multimedia|with GTK2"
 			;;
 		gnome-mplayer-gtk3)
 			copy @std
 			DEPENDS="alsa-lib cairo dbus dbus-glib gdk-pixbuf glib gmlib gmtk3 \
-			gtk3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
+			gtk3 libgpod libnotify libx11 libxscrnsaver   mplayer"
 			CAT="multimedia|with GTK3"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 gnubg/receipt
--- a/gnubg/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnubg/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://files.gnubg.org/media/sources/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake bison flex libtool \
-glib-dev libpng16-dev freetype-dev gtk2-dev cairo-dev libcanberra-dev \
+glib-dev libpng-dev freetype-dev gtk2-dev cairo-dev libcanberra-dev \
 gtkglext-dev readline-dev python sqlite3-dev gmp-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 gnuplot/receipt
--- a/gnuplot/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnuplot/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev readline-dev ncurses-dev libgd-dev jpeg-dev \
-freetype-dev libpng16-dev xorg-libXpm-dev xorg-libX11-dev xorg-libXau-dev \
-xorg-libXdmcp-dev fontconfig-dev expat-dev wxWidgets-dev pango-dev cairo-dev"
+freetype-dev libpng-dev libxpm-dev libx11-dev libxau-dev \
+libxdmcp-dev fontconfig-dev expat-dev wxWidgets-dev pango-dev cairo-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,7 +23,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="zlib readline ncurses libgd jpeg freetype libpng16 gcc-lib-base \
-	xorg-libXpm xorg-libX11 xorg-libXau xorg-libXdmcp fontconfig expat \
-	wxWidgets xorg-libXxf86vm"
+	DEPENDS="zlib readline ncurses libgd jpeg freetype libpng gcc-lib-base \
+	libxpm libx11 libxau libxdmcp fontconfig expat \
+	wxWidgets libxxf86vm"
 }
diff -r e167735ddedc -r 5669e8b3be70 gnustep-back/receipt
--- a/gnustep-back/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnustep-back/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gnustep-make tar gnustep-base-dev gnustep-gui-dev libart_lgpl-dev \
 audiofile-dev aspell-dev giflib-dev gnutls-dev util-linux-uuid-dev \
-libtasn1-dev xorg-libXmu-dev freetype-dev xorg-libXt-dev xorg-libXrender-dev \
+libtasn1-dev libxmu-dev freetype-dev libxt-dev libxrender-dev \
 freetype-dev cairo-dev"
 
 compile_rules() {
@@ -29,5 +29,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/GNUstep $fs/usr/lib
 	DEPENDS="gnustep-base gnustep-gui libart_lgpl audiofile aspell \
-	giflib gnutls libbfd util-linux-uuid libtasn1 xorg-libXmu freetype"
+	giflib gnutls libbfd util-linux-uuid libtasn1 libxmu freetype"
 }
diff -r e167735ddedc -r 5669e8b3be70 gnustep-gui/receipt
--- a/gnustep-gui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gnustep-gui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
 
 BUILD_DEPENDS="gnustep-make gnustep-base-dev audiofile-dev aspell-dev giflib-dev \
-portaudio-dev cups-dev libtasn1-dev tar jpeg-dev tiff-dev libpng16-dev"
+portaudio-dev cups-dev libtasn1-dev tar jpeg-dev tiff-dev libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 			cp -a $install/usr/lib/*.so* $fs/usr/lib
 			cp -a $install/usr/lib/GNUstep $fs/usr/lib
 			DEPENDS="gnustep-base audiofile aspell giflib portaudio cups \
-			libcomerr3 libtasn1 jpeg tiff libpng16"
+			libcomerr3 libtasn1 jpeg tiff libpng"
 			;;
 		*-dev)
 			mkdir -p $fs/usr/share
diff -r e167735ddedc -r 5669e8b3be70 gobby/receipt
--- a/gobby/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gobby/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,6 +29,6 @@
 	cp -a $install/usr/share/icons/hicolor/48x48/apps/* \
 		$fs/usr/share/pixmaps
 	DEPENDS="gnutls libgpg-error libgcrypt gtk2 cairomm glibmm gtkmm \
-	gtksourceview libsigc++ libxml++ net6 obby xorg-libXdamage gcc-lib-base \
+	gtksourceview libsigc++ libxml++ net6 obby libxdamage gcc-lib-base \
 	libtasn1"
 }
diff -r e167735ddedc -r 5669e8b3be70 gocr/receipt
--- a/gocr/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gocr/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16"
+	DEPENDS="libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 gogglesmm/receipt
--- a/gogglesmm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gogglesmm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="http://gogglesmm.googlecode.com/files/$TARBALL" # FIXME
 
 BUILD_DEPENDS="shared-mime-info fox-dev sqlite3 taglib dbus-dev xine-lib-dev \
-sqlite3-dev taglib-dev curl-dev expat-dev xorg-xorgproto \
-xorg-libX11-dev libgcrypt-dev mesa-dev glu-dev"
+sqlite3-dev taglib-dev curl-dev expat-dev xorgproto \
+libx11-dev libgcrypt-dev mesa-dev glu-dev"
 
 compile_rules() {
 	sed -i 's/0x80/-128/g' src/gmutils.cpp
@@ -35,6 +35,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fox xine-lib dbus curl sqlite3 taglib libpng16 jpeg expat tiff \
+	DEPENDS="fox xine-lib dbus curl sqlite3 taglib libpng jpeg expat tiff \
 	mesa glu"
 }
diff -r e167735ddedc -r 5669e8b3be70 gpicview/receipt
--- a/gpicview/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gpicview/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,6 +26,6 @@
 genpkg_rules() {
 	# skip pixmaps and icons (found in the icon theme)
 	copy bin/ *.desktop *.ui
-	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo xorg-libX11"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo libx11"
 	TAGS="LXDE"
 }
diff -r e167735ddedc -r 5669e8b3be70 gqview/receipt
--- a/gqview/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gqview/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 graphviz/receipt
--- a/graphviz/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/graphviz/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://graphviz.org/pub/graphviz/stable/SOURCES/$TARBALL"
 
-BUILD_DEPENDS="automake xorg-dev expat-dev zlib-dev libpng16-dev \
+BUILD_DEPENDS="automake xorg-dev expat-dev zlib-dev libpng-dev \
 libjpeg-turbo-dev libgd-dev swig ocaml python-dev tcl-dev tk-dev librsvg-dev \
 ruby-dev libcroco-dev util-linux-uuid-dev pango-dev libxml2-dev gdk-pixbuf-dev \
 guile-dev gmp-dev pcre-dev perl-dev libtool" # php-dev lua-dev
@@ -82,8 +82,8 @@
 			;;
 		graphviz)
 			copy @std @rm
-			DEPENDS="cairo expat glib libgd libltdl librsvg pango xorg-libX11 \
-			xorg-libXaw xorg-libXmu xorg-libXt zlib"
+			DEPENDS="cairo expat glib libgd libltdl librsvg pango libx11 \
+			libxaw libxmu libxt zlib"
 			;;
 	esac
 	find $fs -type f -name '*.la' -delete
diff -r e167735ddedc -r 5669e8b3be70 grisbi/receipt
--- a/grisbi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/grisbi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXdamage libofx libofx openssl"
+	DEPENDS="gtk2 libxdamage libofx libofx openssl"
 }
diff -r e167735ddedc -r 5669e8b3be70 grsync/receipt
--- a/grsync/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/grsync/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.opbyte.it/release/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-xorgproto perl-xml-parser intltool"
+BUILD_DEPENDS="gtk2-dev xorgproto perl-xml-parser intltool"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -34,5 +34,5 @@
 	cp -a $install/usr/share/grsync $fs/usr/share
 	sed -i s'|#!/bin/bash|#!/bin/sh|' $fs/usr/bin/grsync-batch
 	chmod +x $fs/usr/bin/*
-	DEPENDS="gtk2 rsync xorg-libXdamage acl"
+	DEPENDS="gtk2 rsync libxdamage acl"
 }
diff -r e167735ddedc -r 5669e8b3be70 gst0-plugins-bad/receipt
--- a/gst0-plugins-bad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gst0-plugins-bad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev \
 gettext-dev \
-faac-dev libpng16-dev libvpx-dev openssl-dev xvidcore-dev libjpeg-turbo-dev \
+faac-dev libpng-dev libvpx-dev openssl-dev xvidcore-dev libjpeg-turbo-dev \
 faad2-dev jasper-dev libmms-dev libmodplug-dev libsndfile-dev libsdl-dev \
 expat-dev flac-dev mjpegtools-dev curl-dev neon-dev schroedinger-dev opus-dev \
 zvbi-dev"
@@ -38,20 +38,20 @@
 		*-bad)
 			copy @std
 			DEPENDS="bzlib faac faad2 glib gst0-plugins-base gstreamer0 jasper \
-			openssl libcurl libffi liblzma libmms libmodplug libpng16 libsdl \
+			openssl libcurl libffi liblzma libmms libmodplug libpng libsdl \
 			libsndfile libvpx libxml2 mjpegtools opus orc pcre \
-			schroedinger xorg-libX11 xvidcore zlib zvbi"
+			schroedinger libx11 xvidcore zlib zvbi"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="gst0-plugins-bad \
 			bzip2-dev curl-dev faac-dev faad2-dev flac-dev glib-dev \
 			gst0-plugins-base-dev gstreamer0-dev jasper-dev libffi-dev \
-			libmms-dev libmodplug-dev libogg-dev libpng16-dev libsdl-dev \
+			libmms-dev libmodplug-dev libogg-dev libpng-dev libsdl-dev \
 			libsndfile-dev libvorbis-dev libvpx-dev libxml2-dev mjpegtools-dev \
 			openssl-dev opus-dev orc-dev pcre-dev schroedinger-dev \
 			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
-			xorg-libX11-dev xorg-libXau-dev xorg-libxcb-dev xorg-libXdmcp-dev \
+			libx11-dev libxau-dev libxcb-dev libxdmcp-dev \
 			xvidcore-dev xz-dev zlib-dev zvbi-dev"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 gst0-plugins-base/receipt
--- a/gst0-plugins-base/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gst0-plugins-base/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$GNOME_MIRROR/gst-plugins-base/0.10/$TARBALL"
 
 BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev libtheora-dev \
-libtheora-enc libvorbis-dev eudev-dev xorg-libXv-dev xorg-libXvMC-dev \
+libtheora-enc libvorbis-dev eudev-dev libxv-dev libxvmc-dev \
 util-linux-uuid-dev cdparanoia-dev orc-dev gobject-introspection-dev \
 xorg-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
@@ -38,8 +38,8 @@
 		*-base)
 			copy @std
 			DEPENDS="alsa-lib cairo cdparanoia glib gstreamer0 libogg \
-			libtheora-enc libvorbis libxml2 orc pango xorg-libX11 xorg-libXext \
-			xorg-libXv zlib"
+			libtheora-enc libvorbis libxml2 orc pango libx11 libxext \
+			libxv zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 gst0-plugins-good/receipt
--- a/gst0-plugins-good/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gst0-plugins-good/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,10 +15,10 @@
 
 BUILD_DEPENDS="gettext-dev gconf-dev gtk-doc python glib-dev orc-dev \
 gstreamer0-dev gst0-plugins-base-dev gtk2-dev libgudev-dev v4l-utils-dev \
-xorg-libXfixes-dev xorg-libXdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
+libxfixes-dev libxdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
 jack2-dev libcaca-dev libdv-dev libraw1394-dev libiec61883-dev libavc1394-dev \
 libshout-dev libsoup-dev speex-dev taglib-dev wavpack-dev libjpeg-turbo-dev \
-xorg-xorgproto xorg-libXv-dev"
+xorgproto libxv-dev"
 SPLIT="$PACKAGE-extra $PACKAGE"
 
 compile_rules() {
@@ -52,15 +52,15 @@
 			CAT="multimedia|extra plugins"
 			DEPENDS="glib gst0-plugins-base gstreamer0 jack2 libdv libgudev \
 			libshout libsoup libsoup-gnome libxml2 orc taglib v4l-utils \
-			wavpack xorg-libX11 xorg-libXext xorg-libXv"
+			wavpack libx11 libxext libxv"
 			MAINTAINER="psychomaniak@xakep.ru"
 			;;
 		*-good)
 			copy @std @rm
 			DEPENDS="gconf aalib bzlib cairo flac gdk-pixbuf glib \
 			gst0-plugins-base gstreamer0 libavc1394 libcaca libiec61883 \
-			libjpeg-turbo libpng16 libraw1394 libxml2 ncurses orc speex \
-			xorg-libX11 xorg-libXdamage xorg-libXext xorg-libXfixes zlib"
+			libjpeg-turbo libpng libraw1394 libxml2 ncurses orc speex \
+			libx11 libxdamage libxext libxfixes zlib"
 			SUGGESTED="gst0-plugins-good-extra"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 gst1-plugins-base/receipt
--- a/gst1-plugins-base/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gst1-plugins-base/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$TARBALL"
 
 BUILD_DEPENDS="gettext-dev valgrind-dev python gstreamer1-dev \
-orc-dev xorg-libX11-dev xorg-libXv-dev alsa-lib-dev cdparanoia-dev \
+orc-dev libx11-dev libxv-dev alsa-lib-dev cdparanoia-dev \
 libvorbis-dev libogg-dev opus-dev pango-dev libtheora-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -34,8 +34,8 @@
 		gst1-plugins-base)
 			copy @std
 			DEPENDS="alsa-lib cairo cdparanoia glib gstreamer1 libogg \
-			libtheora-enc libvorbis opus orc pango xorg-libX11 xorg-libXext \
-			xorg-libXv zlib"
+			libtheora-enc libvorbis opus orc pango libx11 libxext \
+			libxv zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 gtick/receipt
--- a/gtick/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtick/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.antcom.de/gtick/download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-xorgproto"
+BUILD_DEPENDS="gtk2-dev xorgproto"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXdamage libsndfile libogg"
+	DEPENDS="gtk2 libxdamage libsndfile libogg"
 }
diff -r e167735ddedc -r 5669e8b3be70 gtk-engines/receipt
--- a/gtk-engines/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk-engines/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,7 +32,7 @@
 		gtk-engines)
 			copy @std @rm
 			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
-			DEPENDS="gtk2 xorg-libXdamage"
+			DEPENDS="gtk2 libxdamage"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 gtk-gnutella/receipt
--- a/gtk-gnutella/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk-gnutella/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,8 +30,8 @@
 	cp -a $install/usr/share/applications/* $fs/usr/share/applications/
 	cp -a $install/usr/share/pixmaps/* $fs/usr/share/pixmaps
 	cp -a $install/usr/share/gtk-gnutella/pixmaps/* $fs/usr/share/gtk-gnutella/pixmaps/
-	DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 xorg-libX11 \
-	xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-	xorg-libXdamage libtasn1"
+	DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 libx11 \
+	libxau libxcomposite libxcursor libxdmcp libxext \
+	libxfixes libxinerama libxrandr libxrender \
+	libxdamage libtasn1"
 }
diff -r e167735ddedc -r 5669e8b3be70 gtk-screenshot/receipt
--- a/gtk-screenshot/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk-screenshot/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev libxml2-dev automake autoconf xorg-libXext-dev intltool"
+BUILD_DEPENDS="gtk2-dev libxml2-dev automake autoconf libxext-dev intltool"
 
 compile_rules() {
 	cp $stuff/ru.po $src/po
diff -r e167735ddedc -r 5669e8b3be70 gtk-sharp/receipt
--- a/gtk-sharp/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk-sharp/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,11 +26,11 @@
 		gtk-sharp)
 			copy *.so *.dll *.config
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib \
-			glibc-base gtk2 harfbuzz libffi libglade libpng16 xorg-libxcb \
-			libxml2 pango pcre xorg-pixman xorg-libX11 xorg-libXau \
-			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
-			xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
-			xorg-libXrender zlib"
+			glibc-base gtk2 harfbuzz libffi libglade libpng libxcb \
+			libxml2 pango pcre pixman libx11 libxau \
+			libxcomposite libxcursor libxdamage libxdmcp \
+			libxext libxfixes libxinerama libxrandr \
+			libxrender zlib"
 			;;
 		*-dev)
 			copy bin/ *.a *.la *.pc *.xml *.exe *.pl
diff -r e167735ddedc -r 5669e8b3be70 gtk2/receipt
--- a/gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,9 +15,9 @@
 BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
 symlinks \
 glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc automake gettext-dev xorg-libXinerama-dev"
+gobject-introspection-dev gtk-doc automake gettext-dev libxinerama-dev"
 BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc gettext-dev xorg-libXinerama-dev \
+gobject-introspection-dev gtk-doc gettext-dev libxinerama-dev \
 shared-mime-info-dev"
 SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
 
@@ -52,7 +52,7 @@
 			COOKOPTS="!menus"
 			copy @std @rm
 			DEPENDS="atk cairo fontconfig gdk-pixbuf glib libcups pango \
-			xorg-libX11 xorg-libXext xorg-libXinerama xorg-libXrender"
+			libx11 libxext libxinerama libxrender"
 			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
 			SUGGESTED="cups gnutls libgcrypt libgpg-error"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 gtk3/receipt
--- a/gtk3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtk3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,10 +13,10 @@
 TARBALL="gtk+-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="xorg-libSM-dev"
+BUILD_DEPENDS="libsm-dev"
 BUILD_DEPENDS="gettext-dev wayland-protocols-dev wayland-dev glib-dev atk-dev \
-pango-dev cairo-dev gdk-pixbuf-dev xorg-libXinerama-dev xorg-libXi-dev \
-xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXdamage-dev libxkbcommon-dev \
+pango-dev cairo-dev gdk-pixbuf-dev libxinerama-dev libxi-dev \
+libxrandr-dev libxcomposite-dev libxdamage-dev libxkbcommon-dev \
 mesa-dev libepoxy-dev at-spi2-atk-dev iso-codes-dev cups-dev rest-dev \
 json-glib-dev gobject-introspection-dev colord-dev gtk-doc libxslt "
 SPLIT="$PACKAGE-demo $PACKAGE-widget-factory $PACKAGE-icon-browser \
@@ -78,19 +78,19 @@
 			DEPENDS="gtk3 \
 			at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \
 			glib-dev libepoxy-dev libxkbcommon-dev mesa-dev pango-dev \
-			wayland-dev wayland-protocols-dev xorg-libX11-dev \
-			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
-			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
-			xorg-libXrandr-dev"
+			wayland-dev wayland-protocols-dev libx11-dev \
+			libxcomposite-dev libxdamage-dev libxext-dev \
+			libxfixes-dev libxi-dev libxinerama-dev \
+			libxrandr-dev"
 			;;
 		*)
 			COOKOPTS="!menus"
 			copy etc/ bin/ themes/ *.so* *.xml @rm
 			DEPENDS="at-spi2-atk atk cairo colord fontconfig freetype \
 			gdk-pixbuf glib json-glib libcups libepoxy libharfbuzz \
-			libxkbcommon mesa-libwayland-egl pango rest wayland xorg-libX11 \
-			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
-			xorg-libXi xorg-libXinerama xorg-libXrandr"
+			libxkbcommon mesa-libwayland-egl pango rest wayland libx11 \
+			libxcomposite libxdamage libxext libxfixes \
+			libxi libxinerama libxrandr"
 			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 gtkballs/receipt
--- a/gtkballs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtkballs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -49,7 +49,7 @@
 			;;
 		gtkballs)
 			copy @std @rm
-			DEPENDS="gtk2 xorg-libXdamage"
+			DEPENDS="gtk2 libxdamage"
 			SUGGESTED="gtkballs-themes"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 gtkglext/receipt
--- a/gtkglext/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtkglext/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev glu glu-dev mesa-dev \
-util-linux-uuid-dev autoconf pangox-compat-dev expat-dev xorg-libxshmfence-dev"
+util-linux-uuid-dev autoconf pangox-compat-dev expat-dev libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 gtklife/receipt
--- a/gtklife/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtklife/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 gtkmm/receipt
--- a/gtkmm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtkmm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		gtkmm)
 			copy @std
-			DEPENDS="gtk2 atkmm glibmm cairomm libsigc++ xorg-libXdamage \
+			DEPENDS="gtk2 atkmm glibmm cairomm libsigc++ libxdamage \
 			libgiomm pangomm gcc-lib-base"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 gtktetris/receipt
--- a/gtktetris/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gtktetris/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,5 +25,5 @@
 	cp -a $src/gtktetris $fs/usr/games
 	touch $fs/var/games/gtktetris/highscore.dat
 	chmod 666 $fs/var/games/gtktetris/highscore.dat
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 gucharmap/receipt
--- a/gucharmap/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gucharmap/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		gucharmap)
 			copy @std
-			DEPENDS="gtk2 xorg-libXdamage"
+			DEPENDS="gtk2 libxdamage"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 guvcview/receipt
--- a/guvcview/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/guvcview/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="intltool v4l-utils-dev eudev-dev libusb-dev ffmpeg-dev \
-libpng16-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
+libpng-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		guvcview)
 			copy @std *.mo
-			DEPENDS="eudev ffmpeg glib gsl gtk3 libpng16 libsdl2 libusb \
+			DEPENDS="eudev ffmpeg glib gsl gtk3 libpng libsdl2 libusb \
 			portaudio v4l-utils"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 gv/receipt
--- a/gv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.gnu.org/gnu/gv/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXaw3d-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="libxaw3d-dev libxinerama-dev"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share/man
-	DEPENDS="ghostscript xorg-libXaw3d xorg-libXinerama"
+	DEPENDS="ghostscript libxaw3d libxinerama"
 }
diff -r e167735ddedc -r 5669e8b3be70 gvim/receipt
--- a/gvim/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gvim/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -52,7 +52,7 @@
 	cp -a $src/runtime/vim16x16.png $fs/usr/share/icons/hicolor/16x16/apps/gvim.png
 	cp -a $stuff/gvim.desktop $fs/usr/share/applications
 	cp -a $install/etc/vim $fs/etc
-	DEPENDS="ncurses gtk2 xorg-libXt xorg-libXau xorg-libXdmcp"
+	DEPENDS="ncurses gtk2 libxt libxau libxdmcp"
 	CONFIG_FILES="/etc/vim/vimrc"
 	TAGS="text-editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 gvolwheel/receipt
--- a/gvolwheel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gvolwheel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,8 +26,8 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base gdk-pixbuf \
-	glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango xorg-pixman \
-	xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
-	xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
-	xorg-libXrender zlib"
+	glib glibc-base gtk2 libffi libpng libxcb pango pixman \
+	libx11 libxau libxcomposite libxcursor libxdamage \
+	libxdmcp libxext libxfixes libxinerama libxrandr \
+	libxrender zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 gxine/receipt
--- a/gxine/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gxine/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$SF_MIRROR/xine/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info spidermonkey-dev xine-lib-dev xorg-dev \
-dbus-dev gtk2-dev xorg-libXinerama-dev xorg-libXext-dev perl \
-xorg-libXv-dev xorg-xorgproto"
+dbus-dev gtk2-dev libxinerama-dev libxext-dev perl \
+libxv-dev xorgproto"
 
 compile_rules() {
 	# Fix for glib2 (-lm)
diff -r e167735ddedc -r 5669e8b3be70 gxmessage/receipt
--- a/gxmessage/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/gxmessage/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 expat xorg-libXdamage"
+	DEPENDS="gtk2 expat libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 hardinfo/receipt
--- a/hardinfo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/hardinfo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 	cd $fs/usr/share/pixmaps
 	rm ../$PACKAGE/pixmaps/logo.xcf
 	ln -s ../$PACKAGE/pixmaps/logo.png hardinfo.png
-	DEPENDS="gtk2 pciutils xorg-libXdamage"
+	DEPENDS="gtk2 pciutils libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 hardware-thinkpad-600e/receipt
--- a/hardware-thinkpad-600e/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/hardware-thinkpad-600e/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 genpkg_rules() {
 	mkdir -p $fs/etc
 	DEPENDS="linux-acpi linux-mwave tp_smapi linux-sound \
-	xorg-xf86-video-neomagic"
+	xf86-video-neomagic"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 homebank/receipt
--- a/homebank/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/homebank/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,6 +28,6 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/homebank/images $fs/usr/share/homebank
 	cp -a $install/usr/share/icons/hicolor/48x48 $fs/usr/share/icons/hicolor
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 	TAGS="office finance"
 }
diff -r e167735ddedc -r 5669e8b3be70 hsetroot/receipt
--- a/hsetroot/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/hsetroot/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://thegraveyard.org/files/$TARBALL" # FIXME
 
-BUILD_DEPENDS="imlib2-dev libpng16-dev xorg-libX11-dev"
+BUILD_DEPENDS="imlib2-dev libpng-dev libx11-dev"
 # ARM: imlib2-dev must be installed in build chroot
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="imlib2 libpng16 freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
-	xorg-libXext"
+	DEPENDS="imlib2 libpng freetype libx11 libxau libxdmcp \
+	libxext"
 	TAGS="wallpaper"
 }
diff -r e167735ddedc -r 5669e8b3be70 ht/receipt
--- a/ht/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ht/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	cp -a $install/usr $fs
-	DEPENDS="lzo ncurses xorg-libX11 xorg-libXau xorg-libXdmcp"
+	DEPENDS="lzo ncurses libx11 libxau libxdmcp"
 	TAGS="viewer text-editor analysis"
 }
diff -r e167735ddedc -r 5669e8b3be70 htmldoc/receipt
--- a/htmldoc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/htmldoc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="https://github.com/michaelrsweet/htmldoc/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="fltk-dev libgcrypt-dev libjpeg-turbo-dev libpng16-dev \
-xorg-libXpm-dev"
+BUILD_DEPENDS="fltk-dev libgcrypt-dev libjpeg-turbo-dev libpng-dev \
+libxpm-dev"
 
 compile_rules() {
 	echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fltk fontconfig libjpeg-turbo libpng16 xorg-libX11 xorg-libXext \
-	xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXpm zlib"
+	DEPENDS="fltk fontconfig libjpeg-turbo libpng libx11 libxext \
+	libxfixes libxft libxinerama libxpm zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 hydra/receipt
--- a/hydra/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/hydra/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,6 +30,6 @@
 	mkdir -p $fs/usr/bin
 	cp -a $src/hydra $fs/usr/bin
 	cp -a $src/xhydra $fs/usr/bin
-	DEPENDS="gtk2 openssl xorg-libXdamage apr libssh libmysqlclient \
+	DEPENDS="gtk2 openssl libxdamage apr libssh libmysqlclient \
 	libidn libpostgresqlclient libsvn"
 }
diff -r e167735ddedc -r 5669e8b3be70 i3/receipt
--- a/i3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/i3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
-BUILD_DEPENDS="make gcc xorg-xcb-proto xorg-libxcb-dev xorg-xcb-util-dev \
-libev-dev flex bison yajl-dev t2 docbook-xml xorg-libXcursor-dev \
-xorg-libX11-dev pcre-dev startup-notification-dev xorg-xcb-util-keysyms-dev \
-xorg-xcb-util-wm-dev pango-dev"
+BUILD_DEPENDS="make gcc xcb-proto libxcb-dev xcb-util-dev \
+libev-dev flex bison yajl-dev t2 docbook-xml libxcursor-dev \
+libx11-dev pcre-dev startup-notification-dev xcb-util-keysyms-dev \
+xcb-util-wm-dev pango-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,8 +29,8 @@
 		i3)
 			copy @std
 			DEPENDS="cairo glib libev libpcre pango startup-notification \
-			xorg-libX11 xorg-libXcursor xorg-libxcb xorg-xcb-util \
-			xorg-xcb-util-keysyms xorg-xcb-util-wm yajl   dmenu"
+			libx11 libxcursor libxcb xcb-util \
+			xcb-util-keysyms xcb-util-wm yajl   dmenu"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 ibus/receipt
--- a/ibus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ibus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		ibus)
 			copy @std
-			DEPENDS="gconf glib gtk2 pango python xorg-libX11"
+			DEPENDS="gconf glib gtk2 pango python libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/icedtea6-jdk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,8 +16,8 @@
 BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk cups-dev cpio \
 coreutils-file-special coreutils-file-summarize alsa-lib-dev file patch perl \
 zip unzip findutils  bzip2 tar glib-dev fastjar rhino ecj apache-ant jpeg-dev \
-xalan-xerces-j gtk2-dev giflib-dev libpng16-dev xorg-dev xorg-libXtst-dev \
-xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
+xalan-xerces-j gtk2-dev giflib-dev libpng-dev xorg-dev libxtst-dev \
+libxp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
 openjdk-6-src"
 SPLIT="icedtea6-jre java-jdk java-jre"
 
@@ -156,16 +156,16 @@
 			mkdir -p $fs/usr/lib/jvm/java-icedtea
 			cp -a $install/usr/lib/jvm/java-icedtea/bin $fs/usr/lib/jvm/java-icedtea
 			cp -a $install/usr/lib/jvm/java-icedtea/lib $fs/usr/lib/jvm/java-icedtea
-			DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
+			DEPENDS="icedtea6-jre xorg libxtst libxp cups"
 			;;
 		icedtea6-jre)
 			mkdir -p $fs/usr/lib/jvm/java-icedtea
 			cp -a $install/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
 			CAT="development|JRE"
 			DEPENDS="glibc-base gcc-lib-base util-linux-uuid alsa-lib \
-			freetype giflib libjpeg libpng16 zlib xorg-libICE \
-			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
-			xorg-libXext xorg-libXi xorg-libXrender xorg-libXtst"
+			freetype giflib libjpeg libpng zlib libice \
+			libsm libx11 libxau libxdmcp \
+			libxext libxi libxrender libxtst"
 			;;
 		java-jdk)
 			mkdir -p $fs/usr
diff -r e167735ddedc -r 5669e8b3be70 icewm-xdgmenu/receipt
--- a/icewm-xdgmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/icewm-xdgmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL=$SOURCE
 WGET_URL="http://distro.ibiblio.org/puppylinux/sources/x/$TARBALL"
 
-BUILD_DEPENDS="gnome-menus gnome-menus-dev glib-dev xorg-libXpm xorg-libXext"
+BUILD_DEPENDS="gnome-menus gnome-menus-dev glib-dev libxpm libxext"
 
 compile_rules() {
 	cd $src/$PACKAGE
diff -r e167735ddedc -r 5669e8b3be70 icewm/receipt
--- a/icewm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/icewm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/bbidulock/icewm/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-mkfontdir gettext-dev fontconfig-dev xorg-libXext-dev \
-xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \
-xorg-libXft-dev alsa-lib-dev libsndfile-dev xorg-libXinerama-dev fribidi-dev \
+BUILD_DEPENDS="mkfontdir gettext-dev fontconfig-dev libxext-dev \
+libx11-dev libice-dev libsm-dev libxrandr-dev \
+libxft-dev alsa-lib-dev libsndfile-dev libxinerama-dev fribidi-dev \
 gdk-pixbuf-dev flac-dev"
 
 compile_rules() {
@@ -31,6 +31,6 @@
 genpkg_rules() {
 	copy @std
 	TAGS="window-manager"
-	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis xorg-libSM \
-	xorg-libXft xorg-libXinerama xorg-libXrandr"
+	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis libsm \
+	libxft libxinerama libxrandr"
 }
diff -r e167735ddedc -r 5669e8b3be70 icoutils/receipt
--- a/icoutils/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/icoutils/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev"
+BUILD_DEPENDS="libpng-dev"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16"
+	DEPENDS="libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 idesk/receipt
--- a/idesk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/idesk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="imlib2-dev xorg-libXft-dev"
+BUILD_DEPENDS="imlib2-dev libxft-dev"
 
 compile_rules() {
 	./configure \
@@ -30,5 +30,5 @@
 	rm -f \
 		$fs/usr/share/idesk/*.xpm \
 		$fs/usr/share/idesk/README
-	DEPENDS="imlib2 xorg-libXft"
+	DEPENDS="imlib2 libxft"
 }
diff -r e167735ddedc -r 5669e8b3be70 imagemagick/receipt
--- a/imagemagick/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/imagemagick/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="ImageMagick-$VERSION.tar.xz"
 WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
 
-BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
-xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
-libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
+BUILD_DEPENDS="bzip2-dev libx11-dev libice-dev libxext-dev \
+libxt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
+libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \
 libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
 openexr-dev libgsf-dev libcroco-dev" # graphviz-dev
 SPLIT="perl-image-magick $PACKAGE $PACKAGE-dev"
@@ -58,16 +58,16 @@
   <policy domain="coder" rights="none" pattern="PLT" />
 EOT
 			DEPENDS="bzlib cairo fftw fontconfig freetype glib lcms2 libgomp \
-			libjpeg-turbo libltdl liblzma libpng16 librsvg libxml2 openexr \
-			pango tiff xorg-libX11 xorg-libXext zlib"
+			libjpeg-turbo libltdl liblzma libpng librsvg libxml2 openexr \
+			pango tiff libx11 libxext zlib"
 			TAGS="image photo toolkit"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="imagemagick \
 			bzip2-dev fftw-dev fontconfig-dev freetype-dev lcms2-dev libgomp \
-			libltdl xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
-			xorg-libXext-dev xorg-libXt-dev xz-dev zlib-dev"
+			libltdl libice-dev libsm-dev libx11-dev \
+			libxext-dev libxt-dev xz-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 imagemagick6/receipt
--- a/imagemagick6/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/imagemagick6/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,9 +13,9 @@
 #WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"	# not available here now
 WGET_URL="ftp://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/$TARBALL"
 
-BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
-xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
-libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
+BUILD_DEPENDS="bzip2-dev libx11-dev libice-dev libxext-dev \
+libxt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
+libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \
 libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
 openexr-dev libgsf-dev" # graphviz-dev
 SPLIT="$PACKAGE-dev"
@@ -49,16 +49,16 @@
   <policy domain="coder" rights="none" pattern="PLT" />
 EOT
 			DEPENDS="bzlib cairo fftw fontconfig freetype glib lcms2 libgomp \
-			libjpeg-turbo libltdl liblzma libpng16 libxml2 openexr pango tiff \
-			xorg-libX11 xorg-libXext zlib"
+			libjpeg-turbo libltdl liblzma libpng libxml2 openexr pango tiff \
+			libx11 libxext zlib"
 			TAGS="image photo toolkit"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="imagemagick6 \
 			bzip2-dev fftw-dev fontconfig-dev freetype-dev lcms2-dev libgomp \
-			libltdl xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
-			xorg-libXext-dev xorg-libXt-dev xz-dev zlib-dev"
+			libltdl libice-dev libsm-dev libx11-dev \
+			libxext-dev libxt-dev xz-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 imlib2/receipt
--- a/imlib2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/imlib2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/enlightenment/$TARBALL"
 
-BUILD_DEPENDS="freetype-dev xorg-libX11-dev xorg-libICE-dev libjpeg-turbo-dev \
-tiff-dev giflib-dev libid3tag-dev xorg-libXext-dev xz-dev"
+BUILD_DEPENDS="freetype-dev libx11-dev libice-dev libjpeg-turbo-dev \
+tiff-dev giflib-dev libid3tag-dev libxext-dev xz-dev"
 SPLIT="$PACKAGE-test $PACKAGE-dev"
 
 compile_rules() {
@@ -30,13 +30,13 @@
 	case $PACKAGE in
 		imlib2)
 			copy *.so* imlib2_conv imlib2_grab imlib2_view
-			DEPENDS="bzlib freetype giflib libid3tag libjpeg-turbo libpng16 \
-			tiff xorg-libX11 xorg-libXext zlib"
+			DEPENDS="bzlib freetype giflib libid3tag libjpeg-turbo libpng \
+			tiff libx11 libxext zlib"
 			;;
 		imlib2-test)
 			copy @std @rm
 			CAT="development|testing utilities"
-			DEPENDS="imlib2 xorg-libX11"
+			DEPENDS="imlib2 libx11"
 			;;
 		imlib2-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 inkscape/receipt
--- a/inkscape/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/inkscape/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -57,9 +57,9 @@
 			copy @std @rm
 			DEPENDS="aspell atk atkmm cairo cairomm fontconfig freetype gc \
 			gdk-pixbuf glib glibmm gnome-vfs gsl gtk2 gtkmm gtkspell \
-			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng16 \
+			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng \
 			librevenge libsigc++ libvisio libwpg libxml2 libxslt pango pangomm \
-			perl poppler popt potrace python xorg-libX11 zlib"
+			perl poppler popt potrace python libx11 zlib"
 			TAGS="image vector editor svg"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 inxi/receipt
--- a/inxi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/inxi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,9 +29,9 @@
 	sed -i 's|uname:uname|uname:coreutils-context-system|' $inxi
 	sed -i 's|wc:coreutils|wc:coreutils-file-summarize|' $inxi
 	sed -i 's|glxinfo:mesa-utils|glxinfo:mesa-demos|' $inxi
-	sed -i 's|xdpyinfo:X11-utils|xdpyinfo:xorg-xdpyinfo|' $inxi
-	sed -i 's|xprop:X11-utils|xprop:xorg-xprop|' $inxi
-	sed -i 's|xrandr:x11-xserver-utils|xrandr:xorg-xrandr|' $inxi
+	sed -i 's|xdpyinfo:X11-utils|xdpyinfo:xdpyinfo|' $inxi
+	sed -i 's|xprop:X11-utils|xprop:xprop|' $inxi
+	sed -i 's|xrandr:x11-xserver-utils|xrandr:xrandr|' $inxi
 	sed -i 's|dig:dnsutils|dig:bind-client|' $inxi
 	sed -i 's|hddtemp:hddtemp|hddtemp:|' $inxi # no package
 	sed -i 's|ip:iproute|ip:iproute2|' $inxi
diff -r e167735ddedc -r 5669e8b3be70 irrlicht/receipt
--- a/irrlicht/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/irrlicht/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		irrlicht)
 			copy @std
-			DEPENDS="mesa gcc-lib-base xorg-libxcb xorg-libXfixes"
+			DEPENDS="mesa gcc-lib-base libxcb libxfixes"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 jbig2dec/receipt
--- a/jbig2dec/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/jbig2dec/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev"
+BUILD_DEPENDS="libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 js/receipt
--- a/js/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/js/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,7 +16,7 @@
 # Use BLFS 8.1 source mirror:
 WGET_URL="http://ftp.osuosl.org/pub/blfs/8.1/m/$TARBALL"
 
-BUILD_DEPENDS="autoconf213 xorg-libXt-dev python-dev xorg-libX11-dev nspr-dev \
+BUILD_DEPENDS="autoconf213 libxt-dev python-dev libx11-dev nspr-dev \
 zlib-dev icu-dev coreutils-file-special"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 jwm/receipt
--- a/jwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/jwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://joewing.net/projects/jwm/releases/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev libpng16-dev libjpeg-turbo-dev cairo-dev \
-librsvg-dev freetype-dev xorg-libXft-dev xorg-libXrender-dev fribidi-dev \
-xorg-libXpm-dev xorg-libXmu-dev gettext xorg-libXinerama-dev \
+BUILD_DEPENDS="libx11-dev libpng-dev libjpeg-turbo-dev cairo-dev \
+librsvg-dev freetype-dev libxft-dev libxrender-dev fribidi-dev \
+libxpm-dev libxmu-dev gettext libxinerama-dev \
 libxslt libxml2-tools"
 
 compile_rules() {
@@ -48,9 +48,9 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo fribidi glib libjpeg-turbo libpng16 librsvg xorg-libX11 \
-	xorg-libXext xorg-libXft xorg-libXinerama xorg-libXmu xorg-libXpm \
-	xorg-libXrender   slitaz-configs-base xorg-xload xorg-xclock imlib2 \
+	DEPENDS="cairo fribidi glib libjpeg-turbo libpng librsvg libx11 \
+	libxext libxft libxinerama libxmu libxpm \
+	libxrender   slitaz-configs-base xload xclock imlib2 \
 	hsetroot compton nano"
 	TAGS="window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 karmen/receipt
--- a/karmen/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/karmen/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	./configure \
@@ -30,7 +30,7 @@
 	cp -a $stuff/xsessions $fs/usr/share
 	cp -a $stuff/etc $fs
 	chown 0.0 $fs/usr/bin/*
-	DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
+	DEPENDS="libx11 xsetroot nano xterm xclock dialog"
 	TAGS="window-manager"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 kazehakase/receipt
--- a/kazehakase/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kazehakase/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 PATCH_URL="http://http.debian.net/debian/pool/main/k/kazehakase/kazehakase_0.5.8-4.diff.gz"
 
 BUILD_DEPENDS="libtool automake autoconf intltool \
-gtk2-dev dbus-glib-dev webkitgtk-dev gnutls-dev xorg-libSM-dev zlib-dev \
+gtk2-dev dbus-glib-dev webkitgtk-dev gnutls-dev libsm-dev zlib-dev \
 util-linux-uuid-dev libxslt-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 keepassx/receipt
--- a/keepassx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/keepassx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="Qt4-dev xorg-libXtst-dev xorg-libXtst qmake mesa-libegl"
+BUILD_DEPENDS="Qt4-dev libxtst-dev qmake mesa-libegl"
 
 compile_rules() {
 	cd $src/src
@@ -33,6 +33,6 @@
 	cp -a $install/usr/share/keepassx/license.html $fs/usr/share/licenses/$PACKAGE.html
 	ln -s /usr/share/keepassx/icons/keepassx_small.png $fs/usr/share/icons/hicolor/16x16/apps/keepassx.png
 	ln -s /usr/share/keepassx/icons/keepassx_large.png $fs/usr/share/icons/hicolor/48x48/apps/keepassx.png
-	DEPENDS="xorg-libXtst libQtCore libQtGui libQtXml gcc-lib-base"
+	DEPENDS="libxtst libQtCore libQtGui libQtXml gcc-lib-base"
 	TAGS="password key"
 }
diff -r e167735ddedc -r 5669e8b3be70 keybinder/receipt
--- a/keybinder/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/keybinder/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gobject-introspection-dev xorg-libXext-dev python-dev \
+BUILD_DEPENDS="gtk2-dev gobject-introspection-dev libxext-dev python-dev \
 python-pygtk-dev python-pygobject2-dev automake autoconf libtool"
 SPLIT="$PACKAGE-python $PACKAGE-dev"
 
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		keybinder)
 			copy libkeybinder.so*
-			DEPENDS="glib gtk2 xorg-libX11"
+			DEPENDS="glib gtk2 libx11"
 			;;
 		keybinder-python)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 keybinder3/receipt
--- a/keybinder3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/keybinder3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$VERSION/keybinder-3.0-$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk3-dev gobject-introspection-dev xorg-libXext-dev \
-xorg-libXrender-dev"
+BUILD_DEPENDS="gtk3-dev gobject-introspection-dev libxext-dev \
+libxrender-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		keybinder3)
 			copy @std
-			DEPENDS="glib gtk3 xorg-libX11"
+			DEPENDS="glib gtk3 libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 kguiaddons/receipt
--- a/kguiaddons/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kguiaddons/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,8 +32,8 @@
 	case $PACKAGE in
 		kguiaddons)
 			copy @std
-			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
-			xorg-libxcb"
+			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
+			libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 kidletime/receipt
--- a/kidletime/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kidletime/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,8 +32,8 @@
 	case $PACKAGE in
 		kidletime)
 			copy @std
-			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
-			xorg-libxcb"
+			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
+			libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 kino/receipt
--- a/kino/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kino/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,10 +12,10 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="intltool libdv perl xorg-dev xorg-dev-proto gtk2-dev libglade-dev \
-libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev xorg-libXv-dev \
-libiec61883-dev libxml2-dev bash libpng16-dev freetype-dev fontconfig-dev \
-libiec61883 ffmpeg-dev xorg-libXv libsamplerate util-linux-uuid-dev \
-alsa-lib xorg-libXext v4l-utils-dev"
+libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev libxv-dev \
+libiec61883-dev libxml2-dev bash libpng-dev freetype-dev fontconfig-dev \
+libiec61883 ffmpeg-dev libsamplerate util-linux-uuid-dev \
+alsa-lib libxext v4l-utils-dev"
 
 compile_rules() {
 	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
@@ -36,7 +36,7 @@
 	# Remove Help files
 	rm -rf $fs/usr/share/kino/help
 	DEPENDS="gtk2 libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
-	libiec61883 xorg-libXv linux-firewire xorg-libXdamage ffmpeg"
+	libiec61883 libxv linux-firewire libxdamage ffmpeg"
 	SUGGESTED="lame vorbis-tools mjpegtools dvdauthor"
 	TAGS="video editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 klavaro/receipt
--- a/klavaro/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/klavaro/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXdamage gtk2-dev xorg-xorgproto gtkdatabox-dev curl-dev \
+BUILD_DEPENDS="libxdamage gtk2-dev xorgproto gtkdatabox-dev curl-dev \
 libsexy-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 	cp -a $install/usr/share/klavaro $fs/usr/share
 	cp -a $install/usr/share/icons/hicolor/24x24/apps/* \
 		$fs/usr/share/pixmaps
-	DEPENDS="gtk2 xorg-libXdamage gtkdatabox libcurl libsexy"
+	DEPENDS="gtk2 libxdamage gtkdatabox libcurl libsexy"
 	TAGS="typing"
 }
diff -r e167735ddedc -r 5669e8b3be70 kvantum/receipt
--- a/kvantum/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kvantum/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/tsujan/Kvantum/archive/V$VERSION.tar.gz"
 
-BUILD_DEPENDS="qt5-dev xorg-libX11-dev"
+BUILD_DEPENDS="qt5-dev libx11-dev"
 
 compile_rules() {
 	mkdir build
@@ -27,6 +27,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11 \
-	xorg-libXext"
+	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11 \
+	libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 kwindowsystem/receipt
--- a/kwindowsystem/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/kwindowsystem/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev extra-cmake-modules mesa-dev \
-xorg-xcb-util-keysyms-dev"
+xcb-util-keysyms-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,8 +33,8 @@
 	case $PACKAGE in
 		kwindowsystem)
 			copy @std
-			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
-			xorg-libXfixes xorg-libXrender xorg-libxcb xorg-xcb-util-keysyms"
+			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
+			libxfixes libxrender libxcb xcb-util-keysyms"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 lbreakout2/receipt
--- a/lbreakout2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lbreakout2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lgames/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev libsdl-dev"
+BUILD_DEPENDS="libpng-dev libsdl-dev"
 
 compile_rules() {
 	sed -i 's|/usr/doc|/usr/share/doc|' configure*
@@ -32,5 +32,5 @@
 	cp -a $install/usr/share $fs/usr
 	rm -rf $fs/usr/share/doc
 	cp -a $stuff/* $fs
-	DEPENDS="libpng16 libsdl libsdl-mixer zlib"
+	DEPENDS="libpng libsdl libsdl-mixer zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 leafpad/receipt
--- a/leafpad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/leafpad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-libXrender-dev xorg-xorgproto intltool"
+BUILD_DEPENDS="gtk2-dev libxrender-dev xorgproto intltool"
 
 COOKOPTS="!pixmaps"
 
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy leafpad
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 	TAGS="text-editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 lensfun/receipt
--- a/lensfun/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lensfun/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lensfun/$TARBALL"
 
-BUILD_DEPENDS="cmake glib-dev libpng16-dev"
+BUILD_DEPENDS="cmake glib-dev libpng-dev"
 SPLIT="lenstool $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -38,7 +38,7 @@
 		lenstool)
 			copy lenstool
 			CAT="multimedia|reference implementation for Lenstool"
-			DEPENDS="glib lensfun libpng16"
+			DEPENDS="glib lensfun libpng"
 			;;
 		lensfun)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 leocad/receipt
--- a/leocad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/leocad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,8 +35,8 @@
 	chmod +x $fs/usr/bin/leocad
 	cp -a $install/* $fs
 	DEPENDS="glibc-base gcc-lib-base glib expat zlib leocad-pieces gtk2 atk \
-	cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb \
-	xorg-xcb-util xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
-	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft \
-	xorg-libXinerama xorg-libXrender mesa glu"
+	cairo pixman pango jpeg libpng fontconfig freetype libxcb \
+	xcb-util libx11 libxau libxcomposite libxcursor \
+	libxdamage libxdmcp libxext libxfixes libxft \
+	libxinerama libxrender mesa glu"
 }
diff -r e167735ddedc -r 5669e8b3be70 leptonica/receipt
--- a/leptonica/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/leptonica/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.leptonica.org/source/$TARBALL"
 
-BUILD_DEPENDS="giflib-dev jpeg-dev libpng16-dev tiff-dev xorg-dev"
+BUILD_DEPENDS="giflib-dev jpeg-dev libpng-dev tiff-dev xorg-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,8 +25,8 @@
 	case $PACKAGE in
 		leptonica)
 			copy @std
-			DEPENDS="giflib jpeg libpng16 tiff xorg-libX11 xorg-libXau \
-			xorg-libXdmcp xorg-libxcb"
+			DEPENDS="giflib jpeg libpng tiff libx11 libxau \
+			libxdmcp libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 lesstif/receipt
--- a/lesstif/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lesstif/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-xorgproto xorg-libXt-dev xorg-libXext-dev \
+BUILD_DEPENDS="xorgproto libxt-dev libxext-dev \
 util-linux-uuid-dev automake"
 SPLIT="$PACKAGE-dev"
 
@@ -26,9 +26,9 @@
 	case $PACKAGE in
 		lesstif)
 			copy @std
-			DEPENDS="glibc-base xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-			xorg-libXdmcp xorg-libXext xorg-libXt util-linux-uuid freetype \
-			xorg-libXp"
+			DEPENDS="glibc-base libice libsm libx11 libxau \
+			libxdmcp libxext libxt util-linux-uuid freetype \
+			libxp"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libXaw3dXft/receipt
--- a/libXaw3dXft/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libXaw3dXft/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXmu-dev xorg-libXext-dev \
-xorg-libXft-dev xorg-libXpm-dev"
+BUILD_DEPENDS="libx11-dev libxt-dev libxmu-dev libxext-dev \
+libxft-dev libxpm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,14 +31,14 @@
 	case $PACKAGE in
 		libXaw3dXft)
 			copy @std
-			DEPENDS="xorg-libX11 xorg-libXext xorg-libXft xorg-libXmu \
-			xorg-libXpm xorg-libXt"
+			DEPENDS="libx11 libxext libxft libxmu \
+			libxpm libxt"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libXaw3dXft fontconfig-dev xorg-libX11-dev \
-			xorg-libXext-dev xorg-libXft-dev xorg-libXmu-dev xorg-libXt-dev \
-			xorg-xorgproto"
+			DEPENDS="libXaw3dXft fontconfig-dev libx11-dev \
+			libxext-dev libxft-dev libxmu-dev libxt-dev \
+			xorgproto"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libbonoboui/receipt
--- a/libbonoboui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libbonoboui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev xorg-libICE-dev popt-dev \
+BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev libice-dev popt-dev \
 libgnomecanvas-dev libbonobo-dev libgnome-dev gconf-dev libglade-dev \
-xorg-libSM-dev libgcrypt-dev"
+libsm-dev libgcrypt-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 		libbonoboui)
 			copy @std
 			DEPENDS="atk gconf gdk-pixbuf glib gtk2 libart_lgpl libbonobo \
-			libglade libgnome libgnomecanvas libxml2 orbit2 popt xorg-libX11"
+			libglade libgnome libgnomecanvas libxml2 orbit2 popt libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libcaca/receipt
--- a/libcaca/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libcaca/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://caca.zoy.org/files/libcaca/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev xorg-libX11-dev mesa-dev ncurses-dev python imlib2-dev \
+BUILD_DEPENDS="zlib-dev libx11-dev mesa-dev ncurses-dev python imlib2-dev \
 pango-dev doxygen cppunit-dev"
 SPLIT="python-caca $PACKAGE-dev"
 
@@ -27,7 +27,7 @@
 		libcaca)
 			copy @std
 			rm -rf $fs/usr/lib/python2.7/
-			DEPENDS="imlib2 ncurses xorg-libX11 zlib"
+			DEPENDS="imlib2 ncurses libx11 zlib"
 			;;
 		python-caca)
 			copy *.py
@@ -35,8 +35,8 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libcaca python-caca ncurses-dev xorg-libX11-dev \
-			xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev zlib-dev"
+			DEPENDS="libcaca python-caca ncurses-dev libx11-dev \
+			libxau-dev libxdmcp-dev libxcb-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libcanberra/receipt
--- a/libcanberra/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libcanberra/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -42,12 +42,12 @@
 		*-gtk2)
 			copy gtk-2.0/modules/*.so libcanberra-gtk.so*
 			CAT="sound|GTK+2 integration"
-			DEPENDS="glib gtk2 libcanberra xorg-libX11"
+			DEPENDS="glib gtk2 libcanberra libx11"
 			;;
 		*-gtk3)
 			copy gtk-3.0/modules/*.so libcanberra-gtk3.so* canberra-gtk-play
 			CAT="sound|GTK+3 integration"
-			DEPENDS="glib gtk3 libcanberra xorg-libX11"
+			DEPENDS="glib gtk3 libcanberra libx11"
 			;;
 		libcanberra)
 			copy @std @rm
@@ -56,7 +56,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="${SPLIT/$PACKAGE/} \
-			gtk2-dev gtk3-dev xorg-libX11-dev"
+			gtk2-dev gtk3-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libcompizconfig/receipt
--- a/libcompizconfig/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libcompizconfig/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-v$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/compiz/libcompizconfig/-/archive/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev compiz-dev protobuf-dev \
+BUILD_DEPENDS="automake libtool libx11-dev compiz-dev protobuf-dev \
 libxslt-dev mesa-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="libxml2 xorg-libX11"
+DEPENDS_std="libxml2 libx11"
 DEPENDS_dev="libcompizconfig compiz-dev"
 
 TAGS="compiz"
diff -r e167735ddedc -r 5669e8b3be70 libdbusmenu/receipt
--- a/libdbusmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libdbusmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,7 +35,7 @@
 	case $PACKAGE in
 		libdbusmenu-gtk2-apps)
 			copy libexec/
-			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk2 xorg-libX11"
+			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk2 libx11"
 			CAT="development|GTK+2 applications"
 			;;
 		libdbusmenu-gtk2)
@@ -52,7 +52,7 @@
 
 		libdbusmenu-gtk3-apps)
 			copy libexec/ # note "gtk2" in depends
-			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk3 xorg-libX11"
+			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk3 libx11"
 			CAT="development|GTK+3 applications"
 			;;
 		libdbusmenu-gtk3)
diff -r e167735ddedc -r 5669e8b3be70 libdv/receipt
--- a/libdv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libdv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# With no effect on final binaries: xorg-libX11-dev xorg-libXt-dev libsdl-dev
+# With no effect on final binaries: libx11-dev libxt-dev libsdl-dev
 BUILD_DEPENDS="gfortran"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 libepoxy/receipt
--- a/libepoxy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libepoxy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/anholt/libepoxy/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="meson ninja xorg-libX11-dev mesa-dev"
+BUILD_DEPENDS="meson ninja libx11-dev mesa-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libfakekey/receipt
--- a/libfakekey/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libfakekey/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXtst-dev"
+BUILD_DEPENDS="automake libtool libx11-dev libxtst-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -26,12 +26,12 @@
 	case $PACKAGE in
 		libfakekey)
 			copy @std
-			DEPENDS="xorg-libX11 xorg-libXtst"
+			DEPENDS="libx11 libxtst"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="libfakekey \
-			xorg-libX11-dev xorg-libXtst-dev"
+			libx11-dev libxtst-dev"
 			;;
 	esac
 	TAGS="matchbox"
diff -r e167735ddedc -r 5669e8b3be70 libfm-qt/receipt
--- a/libfm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libfm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,7 +35,7 @@
 		libfm-qt)
 			copy @std
 			rm -rf $fs/usr/share/mime	# useless, see shared-mime-info package
-			DEPENDS="glib libfm menu-cache qt5-base qt5-x11extras xorg-libxcb"
+			DEPENDS="glib libfm menu-cache qt5-base qt5-x11extras libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libgd/receipt
--- a/libgd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GITHUB/libgd/libgd/tarball/gd-$VERSION"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev zlib-dev libpng16-dev \
-freetype-dev fontconfig-dev libjpeg-turbo-dev xorg-libXpm-dev tiff-dev \
+BUILD_DEPENDS="automake libtool libx11-dev zlib-dev libpng-dev \
+freetype-dev fontconfig-dev libjpeg-turbo-dev libxpm-dev tiff-dev \
 libwebp-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -29,13 +29,13 @@
 	case $PACKAGE in
 		libgd)
 			copy @std
-			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 libwebp tiff \
-			xorg-libXpm zlib"
+			DEPENDS="fontconfig freetype libjpeg-turbo libpng libwebp tiff \
+			libxpm zlib"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="libgd fontconfig-dev freetype-dev libjpeg-turbo-dev \
-			libpng16-dev libwebp-dev tiff-dev xorg-libX11-dev xorg-libXpm-dev \
+			libpng-dev libwebp-dev tiff-dev libx11-dev libxpm-dev \
 			zlib-dev"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 libgdiplus/receipt
--- a/libgdiplus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgdiplus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="m4 bison glib-dev xorg-dev libxml2-dev \
 cairo-dev expat-dev freetype-dev fontconfig-dev giflib giflib-dev jpeg-dev \
-libpng16-dev tiff-dev xorg-pixman-dev libexif-dev libexif zlib-dev \
+libpng-dev tiff-dev pixman-dev libexif-dev libexif zlib-dev \
 util-linux-uuid-dev automake autoconf libtool"
 SPLIT="$PACKAGE-dev"
 
@@ -35,9 +35,9 @@
 	case $PACKAGE in
 		libgdiplus)
 			copy @std
-			DEPENDS="glib glibc-base xorg-libICE xorg-libSM xorg-libX11 \
-			xorg-libXau xorg-libXdmcp xorg-libXrender cairo expat \
-			freetype fontconfig giflib jpeg libpng16 tiff xorg-pixman \
+			DEPENDS="glib glibc-base libice libsm libx11 \
+			libxau libxdmcp libxrender cairo expat \
+			freetype fontconfig giflib jpeg libpng tiff pixman \
 			libexif zlib util-linux-uuid"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 libgnomecanvas/receipt
--- a/libgnomecanvas/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgnomecanvas/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev xorg-libXcursor-dev \
+BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev libxcursor-dev \
 intltool"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 libgnomeprintui/receipt
--- a/libgnomeprintui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgnomeprintui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gnome-icon-theme flex libgnomeprint-dev \
-xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXcursor-dev \
-xorg-libXcomposite-dev xorg-libXdamage-dev \
+libxinerama-dev libxrandr-dev libxcursor-dev \
+libxcomposite-dev libxdamage-dev \
 libgnomecanvas-dev libart_lgpl-dev intltool"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 libgnomeui/receipt
--- a/libgnomeui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgnomeui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 
 BUILD_DEPENDS="libgnome-dev libgnomecanvas-dev gnome-keyring \
 libgnome-keyring-dev libbonoboui-dev util-linux-uuid-dev libgcrypt-dev \
-dbus-glib-dev esound-dev audiofile-dev libglade-dev intltool xorg-libICE-dev \
-xorg-libSM-dev"
+dbus-glib-dev esound-dev audiofile-dev libglade-dev intltool libice-dev \
+libsm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -32,14 +32,14 @@
 			copy @std
 			DEPENDS="gconf atk gdk-pixbuf glib gnome-vfs gtk2 libart_lgpl \
 			libbonoboui libglade libgnome libgnome-keyring libgnomecanvas \
-			pango xorg-libICE xorg-libSM"
+			pango libice libsm"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="libgnomeui gconf-dev gdk-pixbuf-dev gnome-vfs-dev \
 			gtk2-dev libart_lgpl-dev libbonoboui-dev libgnome-dev \
-			libgnome-keyring-dev libgnomecanvas-dev xorg-libICE-dev \
-			xorg-libSM-dev"
+			libgnome-keyring-dev libgnomecanvas-dev libice-dev \
+			libsm-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libgtkhtml/receipt
--- a/libgtkhtml/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgtkhtml/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="libxml2-dev gtk2-dev xorg-libXdamage-dev expat-dev"
+BUILD_DEPENDS="libxml2-dev gtk2-dev libxdamage-dev expat-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,10 +27,10 @@
 		libgtkhtml)
 			copy @std
 			DEPENDS="glibc-base glib expat libxml2 zlib gtk2 cairo atk \
-			fontconfig freetype pango xorg-pixman libpng16 xorg-libX11 \
-			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXcursor \
-			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
-			xorg-libXinerama xorg-libXrender"
+			fontconfig freetype pango pixman libpng libx11 \
+			libxau libxcomposite libxcursor \
+			libxdamage libxdmcp libxext libxfixes \
+			libxinerama libxrender"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libgtop/receipt
--- a/libgtop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libgtop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev intltool xorg-libX11-dev xorg-libXau-dev gtk-doc"
+BUILD_DEPENDS="glib-dev intltool libx11-dev libxau-dev gtk-doc"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		libgtop)
 			copy @std
-			DEPENDS="glib xorg-libXau"
+			DEPENDS="glib libxau"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libharu/receipt
--- a/libharu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libharu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libharu/libharu/archive/RELEASE_${VERSION//./_}.tar.gz"
 
-BUILD_DEPENDS="automake libtool zlib-dev libpng16-dev"
+BUILD_DEPENDS="automake libtool zlib-dev libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,11 +31,11 @@
 	case $PACKAGE in
 		libharu)
 			copy @std
-			DEPENDS="libpng16 zlib"
+			DEPENDS="libpng zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libharu libpng16-dev zlib-dev"
+			DEPENDS="libharu libpng-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libheif/receipt
--- a/libheif/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libheif/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/strukturag/libheif/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="libde265-dev x265-dev libjpeg-turbo-dev libpng16-dev"
+BUILD_DEPENDS="libde265-dev x265-dev libjpeg-turbo-dev libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		libheif)
 			copy @std
-			DEPENDS="libde265 libjpeg-turbo libpng16 x265"
+			DEPENDS="libde265 libjpeg-turbo libpng x265"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libicns/receipt
--- a/libicns/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libicns/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/icns/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev jasper-dev"
+BUILD_DEPENDS="libpng-dev jasper-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libicns)
 			copy @std
-			DEPENDS="jasper libpng16"
+			DEPENDS="jasper libpng"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libkscreen/receipt
--- a/libkscreen/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libkscreen/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		libkscreen)
 			copy @std
-			DEPENDS="kwayland qt5-base qt5-x11extras xorg-libxcb"
+			DEPENDS="kwayland qt5-base qt5-x11extras libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 liblxqt/receipt
--- a/liblxqt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/liblxqt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/liblxqt/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="lxqt-build-tools xorg-libX11-dev mesa-dev libqtxdg-dev \
-kwindowsystem-dev xorg-libXScrnSaver-dev"
+BUILD_DEPENDS="lxqt-build-tools libx11-dev mesa-dev libqtxdg-dev \
+kwindowsystem-dev libxscrnsaver-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -35,7 +35,7 @@
 		liblxqt)
 			copy @std
 			DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras \
-			xorg-libX11 xorg-libXScrnSaver"
+			libx11 libxscrnsaver"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libmatchbox/receipt
--- a/libmatchbox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libmatchbox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXext-dev pango-dev \
-libpng16-dev libjpeg-turbo-dev"
+BUILD_DEPENDS="automake libtool libx11-dev libxext-dev pango-dev \
+libpng-dev libjpeg-turbo-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,13 +30,13 @@
 	case $PACKAGE in
 		libmatchbox)
 			copy @std
-			DEPENDS="glib libjpeg-turbo libpng16 pango xorg-libX11 \
-			xorg-libXext xorg-libXft"
+			DEPENDS="glib libjpeg-turbo libpng pango libx11 \
+			libxext libxft"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libmatchbox libjpeg-turbo-dev libpng16-dev pango-dev \
-			xorg-libX11-dev xorg-libXext-dev"
+			DEPENDS="libmatchbox libjpeg-turbo-dev libpng-dev pango-dev \
+			libx11-dev libxext-dev"
 			;;
 	esac
 	TAGS="matchbox"
diff -r e167735ddedc -r 5669e8b3be70 libmatekbd/receipt
--- a/libmatekbd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libmatekbd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libmatekbd)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk3 libxklavier pango xorg-libX11"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 libxklavier pango libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libmpeg2/receipt
--- a/libmpeg2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libmpeg2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libmpeg2.sourceforge.net/files/$TARBALL" # no $SF_MIRROR
 
-BUILD_DEPENDS="gfortran xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
-xorg-libSM-dev xorg-libXv-dev"
+BUILD_DEPENDS="gfortran libx11-dev libice-dev libxext-dev \
+libsm-dev libxv-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		libmpeg2)
 			copy @std
-			DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXv"
+			DEPENDS="libice libsm libx11 libxext libxv"
 			TAGS="mpeg-1 mpeg-2 decoder"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 libpano13/receipt
--- a/libpano13/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libpano13/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/panotools/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev libpng16-dev libjpeg-turbo-dev tiff-dev"
+BUILD_DEPENDS="zlib-dev libpng-dev libjpeg-turbo-dev tiff-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		libpano13)
 			copy @std
-			DEPENDS="libjpeg-turbo libpng16 tiff"
+			DEPENDS="libjpeg-turbo libpng tiff"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libplayer/receipt
--- a/libplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://libplayer.geexbox.org/releases/$TARBALL"
 
-BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-libxcb-dev"
-# xorg-libX11-dev libvdpau-dev with --enable-xlib-hack
+BUILD_DEPENDS="shared-mime-info xine-lib-dev libxcb-dev"
+# libx11-dev libvdpau-dev with --enable-xlib-hack
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,11 +31,11 @@
 	case $PACKAGE in
 		libplayer)
 			copy @std
-			DEPENDS="xine-lib xorg-libxcb"
+			DEPENDS="xine-lib libxcb"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libplayer xine-lib-dev xorg-libxcb-dev"
+			DEPENDS="libplayer xine-lib-dev libxcb-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libproxy/receipt
--- a/libproxy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libproxy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		libproxy)
 			copy @std
-			DEPENDS="glib gtk2 xorg-libXmu webkitgtk libtasn1"
+			DEPENDS="glib gtk2 libxmu webkitgtk libtasn1"
 			SUGGESTED="python icu libcurl libxslt"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 libquicktime/receipt
--- a/libquicktime/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libquicktime/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev \
+BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev libxv-dev libxaw-dev \
 x264-dev zlib-dev mesa-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		libquicktime)
 			copy @std
-			DEPENDS="gtk2 ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264"
+			DEPENDS="gtk2 ffmpeg alsa-lib libxv mesa libxaw x264"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libsde-utils-x11/receipt
--- a/libsde-utils-x11/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsde-utils-x11/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/libsde-utils-x11/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool libsde-utils-dev xorg-libX11-dev"
+BUILD_DEPENDS="automake libtool libsde-utils-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		libsde-utils-x11)
 			copy @std
-			DEPENDS="glib libsde-utils xorg-libX11"
+			DEPENDS="glib libsde-utils libx11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libsde-utils-x11 xorg-libX11-dev"
+			DEPENDS="libsde-utils-x11 libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libsdl-gfx/receipt
--- a/libsdl-gfx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl-gfx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="SDL_gfx-$VERSION.tar.gz"
 WGET_URL="http://www.ferzkopp.net/Software/SDL_gfx-2.0/$TARBALL"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libICE-dev libsdl-dev"
+BUILD_DEPENDS="automake libtool libx11-dev libice-dev libsdl-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libsdl-image/receipt
--- a/libsdl-image/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl-image/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="SDL_image-$VERSION.tar.gz"
 WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
+BUILD_DEPENDS="libsdl-dev libjpeg-turbo-dev libpng-dev tiff-dev libwebp-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libsdl-pango/receipt
--- a/libsdl-pango/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl-pango/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,7 +31,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="libsdl-pango bzip2-dev fontconfig-dev freetype-dev \
-			glib-dev harfbuzz-dev libffi-dev libpng16-dev libxml2-dev \
+			glib-dev harfbuzz-dev libffi-dev libpng-dev libxml2-dev \
 			pango-dev pcre-dev xz-dev zlib-dev"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 libsdl/receipt
--- a/libsdl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 TARBALL="SDL-$VERSION.tar.gz"
 WGET_URL="http://www.libsdl.org/release/$TARBALL"
 
-BUILD_DEPENDS="nasm alsa-lib-dev xorg-libX11-dev xorg-libICE-dev \
-xorg-libXrandr-dev mesa-dev glu-dev tslib-dev libusb-dev"
+BUILD_DEPENDS="nasm alsa-lib-dev libx11-dev libice-dev \
+libxrandr-dev mesa-dev glu-dev tslib-dev libusb-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -40,7 +40,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libsdl tslib-dev xorg-libX11-dev"
+			DEPENDS="libsdl tslib-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libsdl2-image/receipt
--- a/libsdl2-image/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl2-image/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="SDL2_image-$VERSION.tar.gz"
 WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
 
-BUILD_DEPENDS="libsdl2-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
+BUILD_DEPENDS="libsdl2-dev libjpeg-turbo-dev libpng-dev tiff-dev libwebp-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 		libsdl2-image)
 			copy @std
 			DEPENDS="libsdl2 tslib"
-			SUGGESTED="libjpeg-turbo libpng16 tiff libwebp"
+			SUGGESTED="libjpeg-turbo libpng tiff libwebp"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libsdl2-ttf/receipt
--- a/libsdl2-ttf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl2-ttf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="SDL2_ttf-$VERSION.tar.gz"
 WGET_URL="http://www.libsdl.org/projects/SDL_ttf/release/$TARBALL"
 
-BUILD_DEPENDS="freetype-dev libsdl2-dev xorg-libX11-dev xorg-libICE-dev \
-mesa-dev expat-dev xorg-libxshmfence-dev"
+BUILD_DEPENDS="freetype-dev libsdl2-dev libx11-dev libice-dev \
+mesa-dev expat-dev libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libsdl2/receipt
--- a/libsdl2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsdl2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 TARBALL="SDL2-$VERSION.tar.gz"
 WGET_URL="http://www.libsdl.org/release/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev doxygen pulseaudio-dev xorg-libXcursor-dev \
-xorg-libXinerama-dev xorg-libXScrnSaver-dev xorg-libXxf86vm-dev mesa-dev \
+BUILD_DEPENDS="alsa-lib-dev doxygen pulseaudio-dev libxcursor-dev \
+libxinerama-dev libxscrnsaver-dev libxxf86vm-dev mesa-dev \
 wayland-dev wayland-protocols-dev libxkbcommon-dev eudev-dev dbus-dev ibus-dev \
 tslib-dev graphviz" # + fcitx-dev -> broken
 SPLIT="$PACKAGE-dev"
diff -r e167735ddedc -r 5669e8b3be70 libsexy/receipt
--- a/libsexy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libsexy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://releases.chipx86.com/libsexy/libsexy/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-xorgproto libxml2-dev"
+BUILD_DEPENDS="gtk2-dev xorgproto libxml2-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libsexy)
 			copy @std
-			DEPENDS="gtk2 xorg-libXdamage"
+			DEPENDS="gtk2 libxdamage"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libstroke/receipt
--- a/libstroke/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libstroke/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="http://archive.ubuntu.com/ubuntu/pool/universe/libs/libstroke/$TARBALL"
 
-BUILD_DEPENDS="patch gfortran xorg-libXt-dev"
+BUILD_DEPENDS="patch gfortran libxt-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libstroke)
 			copy @std
-			DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
+			DEPENDS="libx11 libxau libxdmcp libxcb"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libtheora/receipt
--- a/libtheora/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libtheora/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://downloads.xiph.org/releases/theora/$TARBALL"
 
-BUILD_DEPENDS="libogg-dev libvorbis-dev libpng16-dev"
+BUILD_DEPENDS="libogg-dev libvorbis-dev libpng-dev"
 SPLIT="$PACKAGE-enc $PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libunique/receipt
--- a/libunique/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libunique/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="patch automake glib-dev gettext-dev libtool gtk2-dev \
-xorg-libICE-dev gobject-introspection-dev gtk-doc"
+libice-dev gobject-introspection-dev gtk-doc"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		libunique)
 			copy @std
-			DEPENDS="glib gtk2 xorg-libX11"
+			DEPENDS="glib gtk2 libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libvips/receipt
--- a/libvips/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libvips/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/supported/${VERSION%.*}/$TARBALL" # FIXME
 
 BUILD_DEPENDS="gtk-doc libtool swig \
-gobject-introspection-dev fftw-dev lcms-dev libpng16-dev jpeg-dev \
+gobject-introspection-dev fftw-dev lcms-dev libpng-dev jpeg-dev \
 imagemagick-dev tiff-dev zlib-dev libexif-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		libvips)
 			copy @std
-			DEPENDS="fftw lcms pango libpng16 jpeg imagemagick tiff zlib \
+			DEPENDS="fftw lcms pango libpng jpeg imagemagick tiff zlib \
 			glib libexif openexr liboil"
 			TAGS="image"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 libvirt/receipt
--- a/libvirt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libvirt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,10 +12,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://libvirt.org/sources/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev acl-dev attr-dev util-linux-blkid-dev curl-dev \
+BUILD_DEPENDS="libx11-dev acl-dev attr-dev util-linux-blkid-dev curl-dev \
 dbus-dev libdevmapper-dev fuse2-dev glusterfs-dev gnutls-dev netcf-dev \
 libnl-dev parted-dev libpcap-dev libssh-dev libxml2-dev gettext-dev \
-xorg-libpciaccess-dev libsasl cyrus-sasl-dev libtirpc-dev yajl-dev \
+libpciaccess-dev libsasl cyrus-sasl-dev libtirpc-dev yajl-dev \
 rpcsvc-proto lvm2-dev open-iscsi"
 SPLIT="$PACKAGE-dev"
 
@@ -50,7 +50,7 @@
 			copy @std
 			DEPENDS="acl dbus eudev fuse2 glusterfs libcurl libdevmapper \
 			libgnutls libnl libpcap libsasl libssh libssh2 libtirpc libxml2 \
-			netcf parted util-linux-blkid xorg-libpciaccess yajl"
+			netcf parted util-linux-blkid libpciaccess yajl"
 			CONFIG_FILES="/etc/libvirt/"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 libvncserver/receipt
--- a/libvncserver/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libvncserver/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="LibVNCServer-$VERSION.tar.gz"
 WGET_URL="https://github.com/LibVNC/libvncserver/archive/$TARBALL"
 
-BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng16-dev"
+BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng-dev"
 SPLIT="$PACKAGE-novnc $PACKAGE-dev"
 
 compile_rules() {
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		libvncserver)
 			copy *.so*
-			DEPENDS="openssl libjpeg-turbo libpng16 zlib"
+			DEPENDS="openssl libjpeg-turbo libpng zlib"
 			;;
 		libvncserver-novnc)
 			copy novnc/
@@ -39,7 +39,7 @@
 		*-dev)
 			copy @dev
 			rm -r $fs/var	# it includes 'include/' too and false recognized as dev files
-			DEPENDS="libvncserver libjpeg-turbo-dev libpng16-dev openssl-dev \
+			DEPENDS="libvncserver libjpeg-turbo-dev libpng-dev openssl-dev \
 			zlib-dev"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 libwebp/receipt
--- a/libwebp/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libwebp/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev giflib-dev"
+BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev"
 SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
@@ -36,7 +36,7 @@
 		libwebp-apps)
 			copy bin/
 			CAT="graphics|applications"
-			DEPENDS="giflib libjpeg-turbo libpng16 libwebp tiff"
+			DEPENDS="giflib libjpeg-turbo libpng libwebp tiff"
 			;;
 		libwebp-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libwmf/receipt
--- a/libwmf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libwmf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/wvware/$TARBALL"
 
-BUILD_DEPENDS="gfortran xorg-libXt-dev expat-dev libxml2-dev freetype-dev \
+BUILD_DEPENDS="gfortran libxt-dev expat-dev libxml2-dev freetype-dev \
 libjpeg-turbo-dev libgd-dev gdk-pixbuf-dev gtk2-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -26,8 +26,8 @@
 	case $PACKAGE in
 		libwmf)
 			copy @std
-			DEPENDS="expat freetype gdk-pixbuf glib libjpeg-turbo libpng16 \
-			xorg-libX11 zlib"
+			DEPENDS="expat freetype gdk-pixbuf glib libjpeg-turbo libpng \
+			libx11 zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 libwnck2/receipt
--- a/libwnck2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libwnck2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="libwnck-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev gtk2-dev \
-gobject-introspection-dev xorg-xcb-util-dev"
+BUILD_DEPENDS="intltool startup-notification-dev libx11-dev gtk2-dev \
+gobject-introspection-dev xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,13 +28,13 @@
 			copy @std
 			PROVIDE="libwnck"
 			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango startup-notification \
-			xorg-libX11"
+			libx11"
 			;;
 		*-dev)
 			copy @dev
 			PROVIDE="libwnck-dev"
 			DEPENDS="libwnck2 cairo-dev glib-dev gtk2-dev pango-dev \
-			startup-notification-dev xorg-libX11-dev"
+			startup-notification-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libwnck3/receipt
--- a/libwnck3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libwnck3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="libwnck-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev startup-notification-dev xorg-libX11-dev gtk3-dev \
-xorg-libXres-dev gtk-doc xorg-xcb-util-dev"
+BUILD_DEPENDS="gettext-dev startup-notification-dev libx11-dev gtk3-dev \
+libxres-dev gtk-doc xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,12 +28,12 @@
 		libwnck3)
 			copy @std
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango \
-			startup-notification xorg-libX11 xorg-libXrender xorg-libXres"
+			startup-notification libx11 libxrender libxres"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="libwnck3 cairo-dev glib-dev gtk3-dev pango-dev \
-			startup-notification-dev xorg-libX11-dev xorg-libXres-dev"
+			startup-notification-dev libx11-dev libxres-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 libxcm/receipt
--- a/libxcm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libxcm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/oyranos-cms/libxcm/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXfixes-dev xorg-libXmu-dev"
+BUILD_DEPENDS="libx11-dev libxfixes-dev libxmu-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="xorg-libX11 xorg-libXfixes xorg-libXmu"
-DEPENDS_dev="libxcm xorg-libX11-dev xorg-xorgproto"
+DEPENDS_std="libx11 libxfixes libxmu"
+DEPENDS_dev="$PACKAGE libx11-dev xorgproto"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,10 +23,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		libxcm) copy @std; DEPENDS="$DEPENDS_std";;
-		*-dev)  copy @dev; DEPENDS="$DEPENDS_dev";;
-	esac
-}
diff -r e167735ddedc -r 5669e8b3be70 libxfce4ui/receipt
--- a/libxfce4ui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libxfce4ui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
+BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
 gtk2-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \
-xorg-xcb-util-dev"
+xcb-util-dev"
 SPLIT="$PACKAGE-dev $PACKAGE-glade3 $PACKAGE"
 
 compile_rules() {
@@ -42,7 +42,7 @@
 		libxfce4ui)
 			copy @std @rm
 			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
-			startup-notification xfconf xorg-libICE xorg-libSM xorg-libX11"
+			startup-notification xfconf libice libsm libx11"
 			;;
 	esac
 	TAGS="Xfce"
diff -r e167735ddedc -r 5669e8b3be70 libxfcegui4/receipt
--- a/libxfcegui4/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libxfcegui4/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev libxfce4util-dev xfconf-dev startup-notification-dev \
-libglade-dev xorg-xcb-util-dev intltool util-linux-uuid-dev"
+libglade-dev xcb-util-dev intltool util-linux-uuid-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 libxklavier/receipt
--- a/libxklavier/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/libxklavier/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="https://people.freedesktop.org/~svu/$TARBALL"
 
 BUILD_DEPENDS="gettext-dev gobject-introspection-dev vala gtk-doc \
-xorg-libX11-dev xorg-server-dev xorg-xkbcomp-dev xorg-libxkbfile-dev \
-xorg-libXi-dev libxml2-dev iso-codes-dev"
+libx11-dev xorg-server-dev xkbcomp-dev libxkbfile-dev \
+libxi-dev libxml2-dev iso-codes-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		libxklavier)
 			copy @std
-			DEPENDS="glib libxml2 xorg-libX11 xorg-libXi xorg-libxkbfile \
+			DEPENDS="glib libxml2 libx11 libxi libxkbfile \
 			   iso-codes"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 lightdm-qt/receipt
--- a/lightdm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lightdm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,8 +15,8 @@
 WGET_URL="https://launchpad.net/lightdm/1.8/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="Qt4-dev gobject-introspection-dev pam-dev itstool \
-libxklavier-dev libgcrypt-dev wget xorg-libXdmcp-dev xorg-libX11-dev \
-xorg-libXi-dev xorg-libxkbfile-dev gettext-dev intltool"
+libxklavier-dev libgcrypt-dev wget libxdmcp-dev libx11-dev \
+libxi-dev libxkbfile-dev gettext-dev intltool"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -42,8 +42,8 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="Qt4-dev lightdm-dev lightdm-qt xorg-libXi-dev \
-			xorg-libxkbfile-dev"
+			DEPENDS="Qt4-dev lightdm-dev lightdm-qt libxi-dev \
+			libxkbfile-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 lightdm/receipt
--- a/lightdm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lightdm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,13 +35,13 @@
 	case $PACKAGE in
 		lightdm)
 			copy @std *.mo
-			DEPENDS="libgcrypt glib libxklavier pam xorg-libX11"
+			DEPENDS="libgcrypt glib libxklavier pam libx11"
 			CONFIG_FILES="/etc/init/lightdm.conf /etc/lightdm/keys.conf \
 			/etc/lightdm/lightdm.conf /etc/lightdm/users.conf"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="lightdm glib-dev libxklavier-dev xorg-libX11-dev"
+			DEPENDS="lightdm glib-dev libxklavier-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 lincity-ng/receipt
--- a/lincity-ng/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lincity-ng/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 	cp -a $install/usr/share/lincity-ng $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	DEPENDS="mesa libxml2 physfs libsdl-gfx libsdl-image libsdl-mixer \
-	libsdl-ttf xorg-libxcb"
+	libsdl-ttf libxcb"
 }
diff -r e167735ddedc -r 5669e8b3be70 linphone/receipt
--- a/linphone/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/linphone/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download-mirror.savannah.gnu.org/releases/linphone/${VERSION%.*}.x/sources/$TARBALL"
 
 BUILD_DEPENDS="intltool libsdl-dev ffmpeg-dev osip-dev exosip-dev speex-dev \
-xorg-libXv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
+libxv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
 SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
@@ -42,7 +42,7 @@
 	case $PACKAGE in
 		linphone)
 			copy @std
-			DEPENDS="osip exosip speex ffmpeg xorg-libXv v4l-utils libglade gtk2 \
+			DEPENDS="osip exosip speex ffmpeg libxv v4l-utils libglade gtk2 \
 			glib"
 			TAGS="softphone telephony"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 lirc/receipt
--- a/lirc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lirc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -37,7 +37,7 @@
 	case $PACKAGE in
 		lirc)
 			copy @std
-			DEPENDS="glibc-base libusb libusb-compat libftdi xorg-libXau \
+			DEPENDS="glibc-base libusb libusb-compat libftdi libxau \
 			libirman portaudio alsa-lib util-linux-uuid"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 listpatron/receipt
--- a/listpatron/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/listpatron/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,5 +30,5 @@
 	cp -a $install/usr/share/xml $fs/usr/share
 	cd $fs/usr/share/pixmaps
 	ln -s listpatron/icons/listpatron-col-add.png listpatron.png
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 lives/receipt
--- a/lives/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lives/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="LiVES-$VERSION.tar.bz2"
 WGET_URL="http://lives-video.com/releases/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng16-dev gtk2-dev procps expat-dev \
+BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng-dev gtk2-dev procps expat-dev \
 perl gettext"
 
 compile_rules() {
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib libpng16 gtk2 sox mjpegtools libavc1394 liboil libtheora"
+	DEPENDS="alsa-lib libpng gtk2 sox mjpegtools libavc1394 liboil libtheora"
 }
diff -r e167735ddedc -r 5669e8b3be70 lmms/receipt
--- a/lmms/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lmms/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev glib-dev fftw-dev fluidsynth-dev libpng16-dev \
-libogg-dev libvorbis-dev alsa-lib-dev xorg-libXft-dev xorg-libXinerama-dev \
+BUILD_DEPENDS="libsdl-dev glib-dev fftw-dev fluidsynth-dev libpng-dev \
+libogg-dev libvorbis-dev alsa-lib-dev libxft-dev libxinerama-dev \
 libsndfile-dev libsamplerate-dev Qt4-dev qt4-phonon qmake cmake freetype-dev"
 
 compile_rules() {
@@ -27,6 +27,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libsdl glib fluidsynth libpng16 libvorbis fftw xorg-libXft \
-	xorg-libXinerama libsamplerate libQtGui libQtXml"
+	DEPENDS="libsdl glib fluidsynth libpng libvorbis fftw libxft \
+	libxinerama libsamplerate libQtGui libQtXml"
 }
diff -r e167735ddedc -r 5669e8b3be70 lockdis/receipt
--- a/lockdis/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lockdis/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXau-dev xorg-libXpm-dev \
-xorg-libXdmcp-dev"
+BUILD_DEPENDS="libx11-dev libxau-dev libxpm-dev \
+libxdmcp-dev"
 
 compile_rules() {
 	./configure \
@@ -27,5 +27,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="xorg-libX11 xorg-libXau xorg-libXpm xorg-libXdmcp"
+	DEPENDS="libx11 libxau libxpm libxdmcp"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxappearance-obconf/receipt
--- a/lxappearance-obconf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxappearance-obconf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool openbox-dev gtk2-dev lxappearance-dev \
-xorg-libXrandr-dev"
+libxrandr-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 lxappearance/receipt
--- a/lxappearance/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxappearance/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev dbus-dev dbus-glib-dev"
+BUILD_DEPENDS="intltool libx11-dev gtk2-dev dbus-dev dbus-glib-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -32,7 +32,7 @@
 		lxappearance)
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
-			glib gtk2 pango xorg-libX11"
+			glib gtk2 pango libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 lxde/receipt
--- a/lxde/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxde/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -18,7 +18,7 @@
 
 	TAGS="LXDE window-manager desktop"
 	SUGGESTED="lxterminal lxdm lxshortcut xarchiver"
-	DEPENDS="xorg-libX11 gtk2 lxpanel lxtask lxappearance lxsession pcmanfm \
+	DEPENDS="libx11 gtk2 lxpanel lxtask lxappearance lxsession pcmanfm \
 	lxrandr lxinput openbox obconf gpicview leafpad slitaz-configs \
 	slitaz-tools-boxes"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxdm/receipt
--- a/lxdm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxdm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev   iso-codes" # + consolekit2-dev
+BUILD_DEPENDS="intltool libx11-dev gtk2-dev   iso-codes" # + consolekit2-dev
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -37,7 +37,7 @@
 		lxdm)
 			copy @std
 			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
-			xorg-libX11 xorg-libxcb"
+			libx11 libxcb"
 			SUGGESTED="iso-codes"
 			CONFIG_FILES="/etc/lxdm/LoginReady /etc/lxdm/PostLogin \
 			/etc/lxdm/PostLogout /etc/lxdm/PreLogin /etc/lxdm/PreReboot \
diff -r e167735ddedc -r 5669e8b3be70 lxhotkey/receipt
--- a/lxhotkey/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxhotkey/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool libfm-dev xorg-libX11-dev"
+BUILD_DEPENDS="intltool libfm-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		lxhotkey)
 			copy @std
-			DEPENDS="glib libfm libfm-extra libunistring xorg-libX11"
+			DEPENDS="glib libfm libfm-extra libunistring libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 lximage-qt/receipt
--- a/lximage-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lximage-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="glib libexif libfm libfm-qt menu-cache qt5-base qt5-svg \
-	qt5-x11extras xorg-libX11 xorg-libXext xorg-libXfixes xorg-libxcb"
+	qt5-x11extras libx11 libxext libxfixes libxcb"
 	TAGS="LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxinput/receipt
--- a/lxinput/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxinput/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,6 +27,6 @@
 	# skip icons (found in the icon theme)
 	copy bin/ *.ui
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
-	xorg-libX11   xorg-xset"
+	libx11   xset"
 	TAGS="LXDE keyboard mouse"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxlauncher/receipt
--- a/lxlauncher/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxlauncher/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gtk2-dev gnome-menus gnome-menus-dev \
-menu-cache-dev startup-notification-dev startup-notification xorg-libxcb-dev \
+BUILD_DEPENDS="libx11-dev gtk2-dev gnome-menus gnome-menus-dev \
+menu-cache-dev startup-notification-dev startup-notification libxcb-dev \
 intltool"
 
 compile_rules() {
@@ -27,6 +27,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo gdk-pixbuf glib gtk2 menu-cache startup-notification \
-	xorg-libX11   gnome-menus"
+	libx11   gnome-menus"
 	TAGS="LXDE netbook"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxpanel/receipt
--- a/lxpanel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxpanel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -40,13 +40,13 @@
 			stock_volume.png volume-*.png window-manager.png
 			CAT="x-window|extra files and plugins"
 			TAGS="LXDE"
-			DEPENDS="glib gtk2 lxpanel xorg-libX11"
+			DEPENDS="glib gtk2 lxpanel libx11"
 			;;
 		lxpanel)
 			copy @std @rm
 			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 libfm libfm-gtk \
 			keybinder libwnck2 libxml2 menu-cache pango wireless_tools \
-			xorg-libX11    slitaz-menus"
+			libx11    slitaz-menus"
 			#CONFIG_FILES="/etc/xdg/lxpanel/default/"
 			TAGS="LXDE gtk2 panel"
 			SUGGESTED="lxde lxsession slitaz-icon"
diff -r e167735ddedc -r 5669e8b3be70 lxqt-appswitcher/receipt
--- a/lxqt-appswitcher/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-appswitcher/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev liblxqt-dev \
+BUILD_DEPENDS="cmake Qt4-dev qmake libx11-dev liblxqt-dev \
 lxqt-globalkeys-dev libqtxdg-dev "
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 lxqt-config-randr/receipt
--- a/lxqt-config-randr/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-config-randr/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev xorg-libXrandr-dev \
+BUILD_DEPENDS="cmake Qt4-dev qmake libx11-dev libxrandr-dev \
 libqtxdg-dev liblxqt-dev"
 
 compile_rules() {
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="libQtCore libQtGui xorg-libX11 xorg-libXext xorg-libXrandr"
+	DEPENDS="libQtCore libQtGui libx11 libxext libxrandr"
 	TAGS="LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxqt-config/receipt
--- a/lxqt-config/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-config/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/lxde/lxqt-config/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev liblxqt-dev kwindowsystem-dev \
-lxqt-build-tools libkscreen-dev xorg-libXcursor-dev zlib-dev"
+lxqt-build-tools libkscreen-dev libxcursor-dev zlib-dev"
 
 compile_rules() {
 	# temporary workaround due to cmake-3.8
@@ -37,7 +37,7 @@
 genpkg_rules() {
 	copy @std lxqt-config # usually /usr/bin/*-config is dev, but not this time
 	DEPENDS="kwindowsystem libkscreen liblxqt libqtxdg qt5-base qt5-svg \
-	qt5-x11extras xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
-	xorg-libxcb zlib"
+	qt5-x11extras libx11 libxcursor libxext libxfixes \
+	libxcb zlib"
 	TAGS="LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxqt-globalkeys/receipt
--- a/lxqt-globalkeys/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-globalkeys/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -39,7 +39,7 @@
 		lxqt-globalkeys)
 			copy @std
 			DEPENDS="kwindowsystem liblxqt libqtxdg qt5-base qt5-svg \
-			qt5-x11extras xorg-libX11 xorg-libXext"
+			qt5-x11extras libx11 libxext"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 lxqt-panel/receipt
--- a/lxqt-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,8 +14,8 @@
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev kwindowsystem-dev liblxqt-dev \
 lxqt-build-tools lxqt-globalkeys-dev libstatgrab-dev solid-dev menu-cache-dev \
-lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev xorg-libXcomposite-dev \
-xorg-libXrender-dev alsa-lib-dev libxkbcommon-dev xorg-xcb-util-dev \
+lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev libxcomposite-dev \
+libxrender-dev alsa-lib-dev libxkbcommon-dev xcb-util-dev \
 pulseaudio-dev"
 SPLIT="$PACKAGE-sensors $PACKAGE $PACKAGE-dev"
 
@@ -51,9 +51,9 @@
 			DEPENDS="alsa-lib glib kwindowsystem libdbusmenu-qt liblxqt \
 			libqtxdg libstatgrab libsysstat libxkbcommon-x11 libxkbcommon \
 			lxqt-globalkeys menu-cache pulseaudio qt5-base qt5-svg \
-			qt5-x11extras solid xorg-libICE xorg-libSM xorg-libX11 \
-			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
-			xorg-libXrender xorg-libxcb xorg-xcb-util"
+			qt5-x11extras solid libice libsm libx11 \
+			libxcomposite libxdamage libxext libxfixes \
+			libxrender libxcb xcb-util"
 			SUGGESTED="qastools xscreensaver"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 lxqt-session/receipt
--- a/lxqt-session/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt-session/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-session/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake xorg-libX11-dev qt5-dev mesa-dev kwindowsystem-dev \
+BUILD_DEPENDS="cmake libx11-dev qt5-dev mesa-dev kwindowsystem-dev \
 liblxqt-dev lxqt-build-tools xdg-user-dirs eudev-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="eudev kwindowsystem liblxqt libqtxdg qt5-base qt5-svg \
-	qt5-x11extras xorg-libX11 xorg-libXext"
+	qt5-x11extras libx11 libxext"
 	TAGS="LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxqt/receipt
--- a/lxqt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxqt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 lxqt-openssh-askpass lxqt-panel lxqt-policykit lxqt-powermanagement \
 lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo lxqt-themes pavucontrol-qt \
 pcmanfm-qt qterminal qtermwidget lxmenu-data   \
-gvfs gvfs-udisks2 openbox qlipper xorg-xprop xorg-xset"
+gvfs gvfs-udisks2 openbox qlipper xprop xset"
 # still Qt4: obconf-qt lxqt-config-randr lxqt-appswitcher
 
 SUGGESTED="copyq juffed qps qupzilla oxygen-icons \
diff -r e167735ddedc -r 5669e8b3be70 lxsession/receipt
--- a/lxsession/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxsession/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev polkit-dev vala libxslt docbook-xsl \
+BUILD_DEPENDS="intltool libx11-dev polkit-dev vala libxslt docbook-xsl \
 automake gtk2-dev"
 
 compile_rules() {
@@ -55,7 +55,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango polkit \
-	xorg-libX11   dbus-glib lsb-release"
+	libx11   dbus-glib lsb-release"
 	CONFIG_FILES="/etc/xdg/lxsession/LXDE/desktop.conf \
 	/etc/xdg/lxsession/LXDE/conffiles.conf"
 }
diff -r e167735ddedc -r 5669e8b3be70 lxterminal/receipt
--- a/lxterminal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lxterminal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,7 +29,7 @@
 			copy @std
 			rm -r $fs/usr/share/icons
 			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
-			vte-gtk2 xorg-libX11 xorg-libXext"
+			vte-gtk2 libx11 libxext"
 			SUGGESTED="lxterminal-locales"
 			TAGS="LXDE terminal"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 lyx/receipt
--- a/lyx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/lyx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$TARBALL"
 
-BUILD_DEPENDS="python Qt4-dev bison aspell-dev xorg-libX11-dev aiksaurus-dev \
+BUILD_DEPENDS="python Qt4-dev bison aspell-dev libx11-dev aiksaurus-dev \
 zlib-dev"
 SPLIT="$PACKAGE-doc $PACKAGE-examples $PACKAGE-locales $PACKAGE"
 
diff -r e167735ddedc -r 5669e8b3be70 magicpoint/receipt
--- a/magicpoint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/magicpoint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 # use Debian patches with Debian sources
 WGET_URL="http://http.debian.net/debian/pool/main/m/mgp/mgp_$VERSION.orig.tar.gz"
 
-BUILD_DEPENDS="perl xorg-libX11-dev xorg-libXft-dev fontconfig-dev xorg-imake \
-xorg-cf-files imlib2-dev xorg-libXmu-dev"
+BUILD_DEPENDS="perl libx11-dev libxft-dev fontconfig-dev imake \
+xorg-cf-files imlib2-dev libxmu-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="giflib imlib2 libpng16 xorg-libSM xorg-libX11 xorg-libXext \
-	xorg-libXft xorg-libXmu xorg-libXt"
+	DEPENDS="giflib imlib2 libpng libsm libx11 libxext \
+	libxft libxmu libxt"
 }
diff -r e167735ddedc -r 5669e8b3be70 magnifier/receipt
--- a/magnifier/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/magnifier/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -20,7 +20,7 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	cp $install/usr/share/magnifier/icon3.ico $fs/usr/share/pixmaps/icon3.png
-	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
-	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-	xorg-libXrandr xorg-libXrender xorg-libXdamage"
+	DEPENDS="expat gtk2 libx11 libxau libxcomposite \
+	libxcursor libxdmcp libxext libxfixes libxinerama \
+	libxrandr libxrender libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 mana/receipt
--- a/mana/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mana/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://manasource.org/files/$TARBALL"
 
 BUILD_DEPENDS="physfs-dev libxml2-dev libsdl-mixer-dev libsdl-image-dev \
-libsdl-net-dev libsdl-ttf-dev libsdl-ttf curl-dev zlib-dev libpng16-dev guichan-dev \
+libsdl-net-dev libsdl-ttf-dev libsdl-ttf curl-dev zlib-dev libpng-dev guichan-dev \
 libsdl-gfx-dev enet"
 
 compile_rules() {
@@ -31,5 +31,5 @@
 	cp -a $install/usr/share/mana $fs/usr/share/
 	cp -a $install/usr/share/pixmaps $fs/usr/share/
 	DEPENDS="ttf-dejavu physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
-	libsdl-ttf curl zlib libpng16 guichan libsdl-gfx"
+	libsdl-ttf curl zlib libpng guichan libsdl-gfx"
 }
diff -r e167735ddedc -r 5669e8b3be70 manaplus/receipt
--- a/manaplus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/manaplus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.evolonline.org/manaplus/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev \
-libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng16-dev zlib-dev"
+libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng-dev zlib-dev"
 
 compile_rules() {
 	./configure \
@@ -26,5 +26,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
-	libsdl-ttf libpng16 libsdl-gfx ttf-dejavu zlib"
+	libsdl-ttf libpng libsdl-gfx ttf-dejavu zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 mapserver/receipt
--- a/mapserver/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mapserver/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.osgeo.org/mapserver/$TARBALL"
 
 BUILD_DEPENDS="giflib-dev gdal-dev libgd-dev proj-dev postgresql-dev curl-dev \
-geos-dev apache-dev freetype-dev libpng16-dev jpeg-dev libgd-dev libgd \
+geos-dev apache-dev freetype-dev libpng-dev jpeg-dev libgd-dev libgd \
 libxml2-dev fribidi-dev cairo-dev fcgi-dev cmake"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 marco/receipt
--- a/marco/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/marco/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="https://github.com/mate-desktop/marco/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev startup-notification-dev \
-xorg-libXcursor-dev libgtop-dev libcanberra-dev zenity itstool \
-xorg-xcb-util-dev"
+libxcursor-dev libgtop-dev libcanberra-dev zenity itstool \
+xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,9 +29,9 @@
 		marco)
 			copy @std
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
-			libcanberra-gtk3 libgtop pango startup-notification xorg-libX11 \
-			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
-			xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender"
+			libcanberra-gtk3 libgtop pango startup-notification libx11 \
+			libxcomposite libxcursor libxdamage libxext \
+			libxfixes libxinerama libxrandr libxrender"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 matchbox-desktop-2/receipt
--- a/matchbox-desktop-2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-desktop-2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-desktop-2/snapshot/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev dbus-dev dbus-glib-dev util-linux-uuid-dev"
-BUILD_DEPENDS="automake glib-dev gtk3-dev xorg-libX11-dev"
+BUILD_DEPENDS="automake glib-dev gtk3-dev libx11-dev"
 
 compile_rules() {
 	mkdir m4
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk gdk-pixbuf glib gtk3 pango xorg-libX11"
+	DEPENDS="atk gdk-pixbuf glib gtk3 pango libx11"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-desktop/receipt
--- a/matchbox-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gfortran libmatchbox-dev startup-notification-dev \
-xorg-xcb-util-dev"
+xcb-util-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -ldl"
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libmatchbox startup-notification xorg-libX11 zlib"
+	DEPENDS="libmatchbox startup-notification libx11 zlib"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-keyboard/receipt
--- a/matchbox-keyboard/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-keyboard/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool libfakekey-dev xorg-libXft-dev expat-dev"
+BUILD_DEPENDS="automake libtool libfakekey-dev libxft-dev expat-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat libfakekey libpng16 xorg-libX11 xorg-libXft xorg-libXrender"
+	DEPENDS="expat libfakekey libpng libx11 libxft libxrender"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-panel-2/receipt
--- a/matchbox-panel-2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-panel-2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-panel-2/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext-dev xorg-libX11-dev gtk3-dev \
+BUILD_DEPENDS="automake libtool gettext-dev libx11-dev gtk3-dev \
 dbus-glib-dev"
 
 compile_rules() {
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 xorg-libX11"
+	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 libx11"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-panel-manager/receipt
--- a/matchbox-panel-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-panel-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk2 xorg-libX11"
+	DEPENDS="gdk-pixbuf glib gtk2 libx11"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-panel/receipt
--- a/matchbox-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libmatchbox startup-notification wireless_tools xorg-libX11 \
-	xorg-libXext"
+	DEPENDS="libmatchbox startup-notification wireless_tools libx11 \
+	libxext"
 	TAGS="matchbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-window-manager-2/receipt
--- a/matchbox-window-manager-2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-window-manager-2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager-2/snapshot/matchbox-window-manager-2-$HASH.tar.bz2"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev pango-dev gtk2-dev \
-libpng12-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXcursor-dev \
+BUILD_DEPENDS="automake libtool libx11-dev pango-dev gtk2-dev \
+libpng12-dev libxcomposite-dev libxdamage-dev libxcursor-dev \
 expat-dev"
 
 compile_rules() {
@@ -41,6 +41,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat glib gtk2 libpng16 pango xorg-libX11 xorg-libXcomposite \
-	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXft xorg-libXrender"
+	DEPENDS="expat glib gtk2 libpng pango libx11 libxcomposite \
+	libxdamage libxext libxfixes libxft libxrender"
 }
diff -r e167735ddedc -r 5669e8b3be70 matchbox-window-manager/receipt
--- a/matchbox-window-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matchbox-window-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake gconf-dev libmatchbox-dev xorg-libXfixes-dev \
-xorg-libXcursor-dev expat-dev startup-notification-dev xorg-libSM-dev"
+BUILD_DEPENDS="automake gconf-dev libmatchbox-dev libxfixes-dev \
+libxcursor-dev expat-dev startup-notification-dev libsm-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat libmatchbox startup-notification xorg-libICE xorg-libSM \
-	xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes"
+	DEPENDS="expat libmatchbox startup-notification libice libsm \
+	libx11 libxcursor libxext libxfixes"
 	TAGS="window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-applets/receipt
--- a/mate-applets/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-applets/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-applets/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools-dev xorg-libX11-dev python-dev gtk3-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev libx11-dev python-dev gtk3-dev \
 mate-panel-dev libgtop-dev libwnck3-dev libnotify-dev dbus-glib-dev \
 polkit-dev upower-dev gucharmap3-dev python-pygobject-dev itstool libmateweather-dev \
 gtksourceview3-dev wireless_tools-dev" # + cpufrequtils-dev + libcpupower(absent)
@@ -32,15 +32,15 @@
 
 genpkg_rules() {
 	deps="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk3 libffi \
-	libharfbuzz liblzma libpng16 libxml2 mate-panel pango pcre \
-	util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 xorg-libXau \
-	xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman zlib"
+	libharfbuzz liblzma libpng libxml2 mate-panel pango pcre \
+	util-linux-blkid util-linux-mount util-linux-uuid libx11 libxau \
+	libxdmcp libxext libxrender libxcb pixman zlib"
 
 	case $PACKAGE in
 		*-accessx-status)
 			copy accessx-status* *AccessxStatus* *accessx-status*/mate-* \
 			apps/mate-ax-applet.png
-			DEPENDS="$deps xorg-libICE xorg-libSM"
+			DEPENDS="$deps libice libsm"
 			CAT="x-window|Keyboard Accessibility Monitor"
 			;;
 		*-battstat)
@@ -86,7 +86,7 @@
 		*-stickynotes)
 			copy *stickynotes* *StickyNotes* mate-sticky-notes-*
 			DEPENDS="$deps gtksourceview3 libwnck3 startup-notification \
-			xorg-xcb-util"
+			xcb-util"
 			CAT="x-window|Sticky Notes"
 			;;
 		*-timer)
diff -r e167735ddedc -r 5669e8b3be70 mate-control-center/receipt
--- a/mate-control-center/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-control-center/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-control-center/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools itstool xorg-libX11-dev \
-xorg-libXScrnSaver-dev xorg-libXext-dev libcanberra-dev xorg-libXxf86misc-dev \
-xorg-xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
+BUILD_DEPENDS="mate-common yelp-tools itstool libx11-dev \
+libxscrnsaver-dev libxext-dev libcanberra-dev libxxf86misc-dev \
+xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
 librsvg-dev mate-settings-daemon-dev libappindicator-gtk3-dev \
-desktop-file-utils xorg-libXcursor-dev libmatekbd-dev libxklavier-dev"
+desktop-file-utils libxcursor-dev libmatekbd-dev libxklavier-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -35,8 +35,8 @@
 			DEPENDS="atk cairo dbus-glib dconf fontconfig freetype gdk-pixbuf \
 			glib gtk3 libappindicator-gtk3 libcanberra libcanberra-gtk3 \
 			libmatekbd librsvg libxklavier libxml2 marco mate-desktop \
-			mate-menus pango xorg-libX11 xorg-libXScrnSaver xorg-libXcursor \
-			xorg-libXi"
+			mate-menus pango libx11 libxscrnsaver libxcursor \
+			libxi"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 mate-desktop/receipt
--- a/mate-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="https://github.com/mate-desktop/mate-desktop/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev dconf-dev \
-startup-notification-dev xorg-libX11-dev xorg-libXrandr-dev gdk-pixbuf-dev \
-gtk3-dev xorg-xcb-util-dev"
+startup-notification-dev libx11-dev libxrandr-dev gdk-pixbuf-dev \
+gtk3-dev xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,7 +29,7 @@
 		mate-desktop)
 			copy @std @ico # only 16 and 48 icons
 			DEPENDS="atk cairo dconf gdk-pixbuf glib gtk3 pango \
-			startup-notification xorg-libX11 xorg-libXrandr"
+			startup-notification libx11 libxrandr"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 mate-indicator-applet/receipt
--- a/mate-indicator-applet/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-indicator-applet/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-indicator-applet/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk3-dev xorg-libX11-dev mate-panel-dev \
+BUILD_DEPENDS="mate-common gtk3-dev libx11-dev mate-panel-dev \
 libindicator-gtk3-dev"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk glib gtk3 libindicator-gtk3 mate-panel xorg-libX11"
+	DEPENDS="atk glib gtk3 libindicator-gtk3 mate-panel libx11"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-netbook/receipt
--- a/mate-netbook/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-netbook/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-netbook/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk3-dev libwnck3-dev xorg-libXtst-dev \
+BUILD_DEPENDS="mate-common gtk3-dev libwnck3-dev libxtst-dev \
 libfakekey-dev mate-panel-dev"
 
 compile_rules() {
@@ -25,6 +25,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libfakekey libwnck3 mate-panel \
-	pango xorg-libX11"
+	pango libx11"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-notification-daemon-gtk2/receipt
--- a/mate-notification-daemon-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-notification-daemon-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,7 +32,7 @@
 genpkg_rules() {
 	copy @std @ico # only 16 and 48 icons
 	DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libcanberra-gtk2 \
-	libnotify libwnck2 xorg-libX11"
+	libnotify libwnck2 libx11"
 	PROVIDE="notification-daemon"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-notification-daemon/receipt
--- a/mate-notification-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-notification-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,7 +28,7 @@
 		mate-notification-daemon)
 			copy @std @ico # only 16 and 48 icons
 			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk3 \
-			libcanberra-gtk3 libnotify libwnck3 pango xorg-libX11"
+			libcanberra-gtk3 libnotify libwnck3 pango libx11"
 			PROVIDE="gtk3:notification-daemon"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 mate-panel/receipt
--- a/mate-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-panel/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk-doc yelp-tools-dev gobject-introspection-dev \
-xorg-libICE-dev xorg-libSM-dev gtk3-dev mate-desktop-dev mate-menus-dev \
+libice-dev libsm-dev gtk3-dev mate-desktop-dev mate-menus-dev \
 dbus-glib-dev libwnck3-dev librsvg-dev libmateweather-dev itstool"
 SPLIT="$PACKAGE-dev"
 
@@ -30,8 +30,8 @@
 		mate-panel)
 			copy @std
 			DEPENDS="atk cairo dbus-glib gdk-pixbuf glib gtk3 libmateweather \
-			librsvg libwnck3 mate-desktop mate-menus pango xorg-libICE \
-			xorg-libSM xorg-libX11 xorg-libXrandr"
+			librsvg libwnck3 mate-desktop mate-menus pango libice \
+			libsm libx11 libxrandr"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 mate-power-manager/receipt
--- a/mate-power-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-power-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,6 +26,6 @@
 	copy @std
 	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libcanberra \
 	libcanberra-gtk3 libgnome-keyring3 libnotify mate-panel pango upower \
-	xorg-libX11 xorg-libXext xorg-libXrandr"
+	libx11 libxext libxrandr"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-screensaver/receipt
--- a/mate-screensaver/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-screensaver/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-screensaver/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk3-dev \
-dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \
-mesa-dev libmatekbd-dev libnotify-dev expat-dev xorg-libxshmfence-dev"
+BUILD_DEPENDS="mate-common libx11-dev libxscrnsaver-dev gtk3-dev \
+dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto libxext-dev \
+mesa-dev libmatekbd-dev libnotify-dev expat-dev libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 			copy @std
 			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libmatekbd \
 			libnotify libxklavier mate-desktop mate-menus mesa pango \
-			xorg-libX11 xorg-libXScrnSaver xorg-libXext xorg-libXxf86vm"
+			libx11 libxscrnsaver libxext libxxf86vm"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 mate-session-manager/receipt
--- a/mate-session-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-session-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-session-manager/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev xorg-libXtst-dev xmlto \
-libxslt-dev libwrap-dev docbook-xsl xorg-libSM-dev xorg-xtrans"
+BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev libxtst-dev xmlto \
+libxslt-dev libwrap-dev docbook-xsl libsm-dev xtrans"
 
 compile_rules() {
 	./autogen.sh \
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std @ico # only 16 and 48 icons
-	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 xorg-libICE xorg-libSM \
-	xorg-libX11 xorg-libXau xorg-libXext xorg-libXrender xorg-libXtst"
+	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libice libsm \
+	libx11 libxau libxext libxrender libxtst"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-settings-daemon/receipt
--- a/mate-settings-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-settings-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-settings-daemon/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev dconf-dev mate-desktop-dev \
-libnotify-dev xorg-libXxf86misc-dev libmatekbd-dev libcanberra-dev \
+libnotify-dev libxxf86misc-dev libmatekbd-dev libcanberra-dev \
 libmatemixer-dev nss-dev polkit-dev pulseaudio-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -31,8 +31,8 @@
 			copy @std
 			DEPENDS="cairo dbus dbus-glib dconf fontconfig gdk-pixbuf glib \
 			gtk3 libcanberra-gtk3 libmatekbd libmatemixer libnotify \
-			libxklavier mate-desktop nspr nss polkit pulseaudio xorg-libX11 \
-			xorg-libXi xorg-libXxf86misc"
+			libxklavier mate-desktop nspr nss polkit pulseaudio libx11 \
+			libxi libxxf86misc"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 mate-terminal/receipt
--- a/mate-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-terminal/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common yelp-tools-dev vte-dev gtk3-dev dconf-dev \
-xorg-libX11-dev itstool xorg-libSM-dev"
+libx11-dev itstool libsm-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk dconf gdk-pixbuf glib gtk3 pango vte xorg-libICE xorg-libSM \
-	xorg-libX11"
+	DEPENDS="atk dconf gdk-pixbuf glib gtk3 pango vte libice libsm \
+	libx11"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-user-share/receipt
--- a/mate-user-share/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-user-share/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-user-share/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools-dev itstool xorg-libX11-dev gtk3-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev itstool libx11-dev gtk3-dev \
 dbus-glib-dev libnotify-dev libcanberra-dev caja-dev"
 
 compile_rules() {
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="caja glib gtk3 pango xorg-libX11"
+	DEPENDS="caja glib gtk3 pango libx11"
 	TAGS="MATE"
 }
diff -r e167735ddedc -r 5669e8b3be70 mate-utils/receipt
--- a/mate-utils/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mate-utils/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-utils/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev mate-panel-dev \
-libgtop-dev libcanberra-dev itstool xorg-libSM-dev"
+libgtop-dev libcanberra-dev itstool libsm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,8 +27,8 @@
 		mate-utils)
 			copy @std @ico # only 16 and 48 icons
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
-			libcanberra-gtk3 libgtop mate-panel pango xorg-libICE xorg-libSM \
-			xorg-libX11 xorg-libXext zlib"
+			libcanberra-gtk3 libgtop mate-panel pango libice libsm \
+			libx11 libxext zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 matplotlib/receipt
--- a/matplotlib/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/matplotlib/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python python-dev zlib-dev libpng16-dev freetype-dev python-numpy \
+BUILD_DEPENDS="python python-dev zlib-dev libpng-dev freetype-dev python-numpy \
 python-pygtk-dev"
 
 compile_rules() {
@@ -23,8 +23,8 @@
 
 genpkg_rules() {
 	cp -a $install/usr $fs
-	DEPENDS="python zlib libpng16 freetype python-numpy gtk2 expat xorg-libXau \
-	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
+	DEPENDS="python zlib libpng freetype python-numpy gtk2 expat libxau \
+	libxcomposite libxcursor libxdmcp libxext \
+	libxfixes libxinerama libxrandr libxrender \
 	python-pygtk gcc-lib-base"
 }
diff -r e167735ddedc -r 5669e8b3be70 mesa-demos/receipt
--- a/mesa-demos/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mesa-demos/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$TARBALL"
 
 BUILD_DEPENDS="glew-dev mesa-dev talloc-dev mesa-libegl eudev-dev expat-dev \
-xorg-libxshmfence-dev freeglut-dev xorg-libXi-dev"
+libxshmfence-dev freeglut-dev libxi-dev"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
diff -r e167735ddedc -r 5669e8b3be70 mesa12/receipt
--- a/mesa12/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mesa12/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,10 +13,10 @@
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake libtool python libdrm-dev libgcrypt-dev \
-eudev-dev xorg-xorgproto \
-xorg-libxcb-dev xorg-libxshmfence-dev xorg-libX11-dev xorg-libXext-dev \
-xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \
-elfutils-dev llvm-dev xorg-libpciaccess-dev"
+eudev-dev xorgproto \
+libxcb-dev libxshmfence-dev libx11-dev libxext-dev \
+libxdamage-dev libxfixes-dev libxxf86vm-dev expat-dev \
+elfutils-dev llvm-dev libpciaccess-dev"
 SPLIT="$PACKAGE-dev $PACKAGE-dri $PACKAGE-libegl"
 
 compile_rules() {
@@ -51,8 +51,8 @@
 		mesa12)
 			copy etc/ libGL.so* libGLESv1_CM.so* libGLESv2.so* \
 			libOSMesa.so* libgbm.so* libglapi.so* libxatracker.so*
-			DEPENDS="expat libdrm xorg-libXdamage xorg-libXxf86vm \
-			xorg-libXt udev xorg-libxshmfence"
+			DEPENDS="expat libdrm libxdamage libxxf86vm \
+			libxt udev libxshmfence"
 			SUGGESTED="nvidia"
 			PROVIDE="libgl"
 			CONFIG_FILES="/etc/drirc"
@@ -60,15 +60,15 @@
 		mesa12-dev)
 			copy @dev
 			DEPENDS="mesa12 mesa12-dri mesa12-libegl libdrm-dev \
-			xorg-libXdamage-dev  xorg-libXxf86vm-dev \
-			xorg-libXt-dev xorg-xorgproto"
+			libxdamage-dev libxxf86vm-dev \
+			libxt-dev xorgproto"
 			;;
 		mesa12-dri)
 			copy *_dri.so 90-DRI.conf
 			CAT="x-window|DRI drivers"
 			DEPENDS="elfutils expat libdrm libdrm-intel libdrm-nouveau \
 			libdrm-radeon libgcrypt libgpg-error llvm-libs \
-			xorg-libpciaccess zlib"
+			libpciaccess zlib"
 			;;
 		mesa12-libegl)
 			copy libEGL*
diff -r e167735ddedc -r 5669e8b3be70 metacity/receipt
--- a/metacity/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/metacity/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk2-dev \
-xorg-libXcomposite-dev xorg-libXdamage-dev zenity-gtk2 xorg-libXinerama-dev \
-xorg-libXrandr-dev xorg-libXcursor-dev libcanberra-dev libltdl libvorbis-dev \
+libxcomposite-dev libxdamage-dev zenity-gtk2 libxinerama-dev \
+libxrandr-dev libxcursor-dev libcanberra-dev libltdl libvorbis-dev \
 libogg-dev libtool gnome-doc-utils gconf-dev util-linux-uuid-dev intltool"
 
 compile_rules() {
@@ -29,7 +29,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gsettings-desktop-schemas glib gtk2 xorg-libXcomposite \
-	xorg-libXdamage zenity-gtk2 xorg-libXinerama xorg-libXrandr xorg-libXcursor \
+	DEPENDS="gsettings-desktop-schemas glib gtk2 libxcomposite \
+	libxdamage zenity-gtk2 libxinerama libxrandr libxcursor \
 	libcanberra libltdl libvorbis libogg gconf"
 }
diff -r e167735ddedc -r 5669e8b3be70 mhwaveedit/receipt
--- a/mhwaveedit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mhwaveedit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.gna.org/mhwaveedit/$TARBALL" # FIXME
 
-BUILD_DEPENDS="alsa-lib-dev libxml2-dev xorg-libX11-dev gtk2-dev"
+BUILD_DEPENDS="alsa-lib-dev libxml2-dev libx11-dev gtk2-dev"
 
 compile_rules() {
 	chmod +x install-sh
@@ -32,8 +32,8 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/skel $fs/etc
 	chown -R 0.0 $fs
-	DEPENDS="alsa-lib libxml2 expat gtk2 xorg-libX11 xorg-libXau \
-	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-	xorg-libXdamage"
+	DEPENDS="alsa-lib libxml2 expat gtk2 libx11 libxau \
+	libxcomposite libxcursor libxdmcp libxext \
+	libxfixes libxinerama libxrandr libxrender \
+	libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 miam-player/receipt
--- a/miam-player/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/miam-player/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/MBach/Miam-Player/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="qt5-dev xorg-libX11-dev mesa-dev taglib-dev qtav-dev \
+BUILD_DEPENDS="qt5-dev libx11-dev mesa-dev taglib-dev qtav-dev \
 libsdl2-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 minetest/receipt
--- a/minetest/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/minetest/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -18,9 +18,9 @@
 EXTRA_SOURCE_FILES="$WGET_URL2"
 
 BUILD_DEPENDS="cmake irrlicht-dev gmp-dev jsoncpp-dev luajit-dev curl-dev \
-gettext-dev openal-dev libvorbis-dev xorg-libX11-dev xorg-libXext-dev \
-xorg-libICE-dev xorg-libSM-dev freetype-dev ncurses-dev sqlite3-dev mesa-dev \
-glu-dev libjpeg-turbo-dev bzip2-dev zlib-dev libpng16-dev doxygen graphviz"
+gettext-dev openal-dev libvorbis-dev libx11-dev libxext-dev \
+libice-dev libsm-dev freetype-dev ncurses-dev sqlite3-dev mesa-dev \
+glu-dev libjpeg-turbo-dev bzip2-dev zlib-dev libpng-dev doxygen graphviz"
 SPLIT="$PACKAGE-data"
 
 compile_rules() {
@@ -47,7 +47,7 @@
 		minetest)
 			copy bin/
 			DEPENDS="minetest-data freetype gmp irrlicht jsoncpp libcurl \
-			libsqlite3 libvorbis luajit mesa ncurses openal xorg-libX11 zlib"
+			libsqlite3 libvorbis luajit mesa ncurses openal libx11 zlib"
 			;;
 		*-data)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 mirage/receipt
--- a/mirage/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mirage/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.berlios.de/mirageiv/$TARBALL" # FIXME
 
-BUILD_DEPENDS="python python-dev xorg-xorgproto xorg-libX11-dev gettext-dev"
+BUILD_DEPENDS="python python-dev xorgproto libx11-dev gettext-dev"
 
 compile_rules() {
 	python -B setup.py install --root=$install
@@ -19,5 +19,5 @@
 
 genpkg_rules() {
 	cp -a $install/usr $fs
-	DEPENDS="python python-pygtk xorg-libX11 xorg-libXau xorg-libXdmcp libffi"
+	DEPENDS="python python-pygtk libx11 libxau libxdmcp libffi"
 }
diff -r e167735ddedc -r 5669e8b3be70 mjpegtools/receipt
--- a/mjpegtools/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mjpegtools/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,14 +11,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mjpeg/$TARBALL"
 
-BUILD_DEPENDS="libdv expat gtk2 jpeg libsdl libsdl-gfx xorg-libX11 xorg-libXau \
-xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes \
-xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage gcc-lib-base \
+BUILD_DEPENDS="libdv expat gtk2 jpeg libsdl libsdl-gfx libx11 libxau \
+libxcomposite libxcursor libxdmcp libxext libxfixes \
+libxinerama libxrandr libxrender libxdamage gcc-lib-base \
 libdv-dev libsdl-gfx-dev jpeg-dev"
 SPLIT="$PACKAGE-dev"
 
-BUILD_DEPENDS="libjpeg-turbo-dev libpng16-dev libdv-dev xorg-libX11-dev \
-xorg-libICE-dev xorg-libXxf86dga-dev gtk2-dev libsdl-dev"
+BUILD_DEPENDS="libjpeg-turbo-dev libpng-dev libdv-dev libx11-dev \
+libice-dev libxxf86dga-dev gtk2-dev libsdl-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		mjpegtools)
 			copy @std
-			DEPENDS="glib gtk2 libdv libjpeg-turbo libpng16 libsdl"
+			DEPENDS="glib gtk2 libdv libjpeg-turbo libpng libsdl"
 			TAGS="mpeg mjpeg video"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 mono/receipt
--- a/mono/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mono/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.mono-project.com/sources/mono/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev gettext-dev libtool xorg-libX11-dev cmake libgdiplus-dev"
+BUILD_DEPENDS="zlib-dev gettext-dev libtool libx11-dev cmake libgdiplus-dev"
 SPLIT="$PACKAGE-doc $PACKAGE $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
diff -r e167735ddedc -r 5669e8b3be70 mozplugger/receipt
--- a/mozplugger/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mozplugger/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	./configure &&
@@ -30,5 +30,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 mplayer-cli/receipt
--- a/mplayer-cli/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mplayer-cli/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="MPlayer-$VERSION.tar.xz"
 WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev xorg-libXv-dev alsa-lib-dev xorg-libXdamage-dev \
-giflib-dev xorg-libXxf86vm-dev xorg-xorgproto freetype-dev fontconfig-dev \
+BUILD_DEPENDS="ncurses-dev libxv-dev alsa-lib-dev libxdamage-dev \
+giflib-dev libxxf86vm-dev xorgproto freetype-dev fontconfig-dev \
 zlib-dev yasm libmad-dev libsdl-dev gnutls-dev"
 
 compile_rules() {
@@ -61,7 +61,7 @@
 	cp $src/etc/*menu.conf $fs/etc/mplayer
 	# Font
 	cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
-	DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng16 \
-	libsdl ncurses xorg-libX11 xorg-libXext xorg-libXv xorg-libXxf86vm zlib"
+	DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng \
+	libsdl ncurses libx11 libxext libxv libxxf86vm zlib"
 	PROVIDE="mplayer"
 }
diff -r e167735ddedc -r 5669e8b3be70 mplayer-svn/receipt
--- a/mplayer-svn/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mplayer-svn/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk"
 
-BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-dev libmad-dev xorg-libXv-dev \
+BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-dev libmad-dev libxv-dev \
 libtheora-dev subversion yasm"
 
 # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg
@@ -107,8 +107,8 @@
 	# Font
 	cd ..
 	ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
-	DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora lame giflib \
-	xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
+	DEPENDS="gtk2 cdparanoia libmad libxv libtheora lame giflib \
+	libxscrnsaver libxxf86vm alsa-lib bzlib x264 libass"
 	PROVIDE="mplayer"
 	SUGGESTED="v4l-utils"
 	TAGS="player movie audio video"
diff -r e167735ddedc -r 5669e8b3be70 mplayer/receipt
--- a/mplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="MPlayer-$VERSION.tar.xz"
 WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev libmad-dev xorg-libXv-dev libtheora-dev \
-alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \
-xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
-xvidcore-dev zlib-dev xorg-xorgproto yasm cdparanoia-dev \
+BUILD_DEPENDS="gtk2-dev libmad-dev libxv-dev libtheora-dev \
+alsa-lib-dev ncurses-dev lame-dev libxdamage-dev giflib-dev \
+libxxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
+xvidcore-dev zlib-dev xorgproto yasm cdparanoia-dev \
 x264-dev enca-dev libmng-dev lirc-dev"
 SPLIT="mencoder"
 
@@ -67,17 +67,17 @@
 			# Font
 			cd ..
 			ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
-			DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora alsa-lib \
-			ncurses lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm \
+			DEPENDS="gtk2 cdparanoia libmad libxv libtheora alsa-lib \
+			ncurses lame libxdamage giflib enca lirc libxxf86vm \
 			esound libmng audiofile libvorbis libogg zlib xvidcore x264 \
-			xorg-libXScrnSaver"
+			libxscrnsaver"
 			;;
 		mencoder)
 			copy /usr/bin/mencoder
 			CAT="multimedia|video and movie encoder"
 			DEPENDS="libtheora alsa-lib cdparanoia expat libogg libvorbis \
 			fontconfig freetype x264 xvidcore jpeg libmad ncurses zlib lame \
-			libpng16 giflib enca lirc"
+			libpng giflib enca lirc"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 mplayerplug-in/receipt
--- a/mplayerplug-in/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mplayerplug-in/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="mplayer gtk2-dev xorg-libXpm-dev firefox-dev libIDL gettext-dev \
+BUILD_DEPENDS="mplayer gtk2-dev libxpm-dev firefox-dev libIDL gettext-dev \
 nspr-dev"
 
 compile_rules() {
@@ -46,7 +46,7 @@
 	cp -a $install/usr/lib/mozilla $fs/usr/lib		
 	# change the default video output to xv,x11
 	sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf
-	DEPENDS="mplayer xorg-libXpm gtk2 gcc-lib-base"
+	DEPENDS="mplayer libxpm gtk2 gcc-lib-base"
 	TAGS="player audio video browser"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 mpv/receipt
--- a/mpv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mpv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mpv-player/mpv/archive/v$VERSION.tar.gz"
 EXTRA_SOURCE_FILES="$WAFTOOL"
 
-BUILD_DEPENDS="xorg-dev xorg-libXv-dev xorg-libXScrnSaver-dev lua-dev \
+BUILD_DEPENDS="xorg-dev libxv-dev libxscrnsaver-dev lua-dev \
 ffmpeg-dev enca-dev fribidi-dev libass-dev alsa-lib-dev"
 
 compile_rules() {
@@ -33,6 +33,6 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="xorg-server xorg-libXv xorg-libXinerama xorg-libXScrnSaver \
+	DEPENDS="xorg-server libxv libxinerama libxscrnsaver \
 	util-linux-uuid alsa-lib enca fribidi libass lua ffmpeg"
 }
diff -r e167735ddedc -r 5669e8b3be70 mrxvt-unicode/receipt
--- a/mrxvt-unicode/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mrxvt-unicode/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/${TARBALL/*-/}"
 
-BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev xorg-libXft-dev \
+BUILD_DEPENDS="xorg-dev libpng-dev jpeg-dev freetype-dev libxft-dev \
 libtool"
 
 compile_rules() {
@@ -29,8 +29,8 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
-	zlib xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
-	xorg-libXrender"
+	DEPENDS="libpng jpeg freetype expat fontconfig libice libsm \
+	zlib libx11 libxau libxdmcp libxft libxpm \
+	libxrender"
 	TAGS="terminal"
 }
diff -r e167735ddedc -r 5669e8b3be70 mrxvt/receipt
--- a/mrxvt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mrxvt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/materm/$TARBALL"
 
-BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev"
+BUILD_DEPENDS="xorg-dev libpng-dev jpeg-dev freetype-dev"
 
 compile_rules() {
 	./bootstrap.sh
@@ -29,8 +29,8 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
-	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
-	xorg-libXrender zlib"
+	DEPENDS="libpng jpeg freetype expat fontconfig libice libsm \
+	libx11 libxau libxdmcp libxft libxpm \
+	libxrender zlib"
 	TAGS="terminal"
 }
diff -r e167735ddedc -r 5669e8b3be70 mtools/receipt
--- a/mtools/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mtools/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://ftp.gnu.org/pub/gnu/mtools/$TARBALL"
 
-BUILD_DEPENDS="texinfo xorg-libX11-dev xorg-libICE-dev"
+BUILD_DEPENDS="texinfo libx11-dev libice-dev"
 SPLIT="$PACKAGE-floppyd $PACKAGE"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 		*-floppyd)
 			copy floppyd floppyd_installtest
 			CAT="system-tools|floppy daemon"
-			DEPENDS="xorg-libX11 xorg-libXau"
+			DEPENDS="libx11 libxau"
 			;;
 		mtools)
 			copy @std @rm
diff -r e167735ddedc -r 5669e8b3be70 mtpaint/receipt
--- a/mtpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mtpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/wjaguar/mtPaint/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev libpng16-dev lcms-dev zlib-dev gettext-dev \
+BUILD_DEPENDS="gtk2-dev libpng-dev lcms-dev zlib-dev gettext-dev \
 libjpeg-turbo-dev tiff-dev"
 
 compile_rules() {
@@ -39,5 +39,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 lcms \
-	libjpeg-turbo libpng16 pango tiff xorg-libX11 zlib"
+	libjpeg-turbo libpng pango tiff libx11 zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 mupdf/receipt
--- a/mupdf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mupdf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -48,7 +48,7 @@
 			copy mupdf-x11-curl mupdf.desktop mupdf.png
 			ln -s mupdf-x11-curl $fs/usr/bin/mupdf
 			DEPENDS="freetype jbig2dec libcurl libharfbuzz libjpeg-turbo \
-			openjpeg2 openssl xorg-libX11 xorg-libXext zlib"
+			openjpeg2 openssl libx11 libxext zlib"
 			CAT="x-window|basic X11 version"
 			;;
 		mupdf-gl)
diff -r e167735ddedc -r 5669e8b3be70 mupen64plus/receipt
--- a/mupen64plus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mupen64plus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="freetype glu boost-filesystem boost-system libpng16 \
+	DEPENDS="freetype glu boost-filesystem boost-system libpng \
 	libsamplerate libsdl mesa speexdsp zlib"
 	TAGS="emulator nintendo64"
 }
diff -r e167735ddedc -r 5669e8b3be70 mygestures/receipt
--- a/mygestures/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/mygestures/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst jansson-dev xorg-libXmu-dev \
-xorg-libXrender-dev xorg-libXtst-dev libxml2-dev"
+BUILD_DEPENDS="libx11-dev jansson-dev libxmu-dev \
+libxrender-dev libxtst-dev libxml2-dev"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXtst jansson"
+	DEPENDS="libx11 libxtst jansson"
 }
diff -r e167735ddedc -r 5669e8b3be70 nabi/receipt
--- a/nabi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/nabi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libhangul gtk2 cairo xorg-libSM xorg-libICE"
+	DEPENDS="libhangul gtk2 cairo libsm libice"
 }
diff -r e167735ddedc -r 5669e8b3be70 nagios/receipt
--- a/nagios/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/nagios/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libgd-dev libpng16-dev libjpeg-turbo-dev libtool"
+BUILD_DEPENDS="libgd-dev libpng-dev libjpeg-turbo-dev libtool"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -59,7 +59,7 @@
 			sed -i 's/Options None/Options FollowSymLinks/' \
 			$fs/etc/apache/conf.d/nagios.conf
 
-			DEPENDS="libgd libltdl   apache nagios-plugins libpng16 \
+			DEPENDS="libgd libltdl   apache nagios-plugins libpng \
 			libjpeg-turbo"
 			SUGGESTED="nagios-nrpe"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 navit/receipt
--- a/navit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/navit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="mesa-dev freeglut-dev quesoglc-dev freeimage-dev \
-imagemagick-dev xorg-libXpm-dev xorg-libXmu-dev gtk2-dev libsdl-dev \
+imagemagick-dev libxpm-dev libxmu-dev gtk2-dev libsdl-dev \
 libsdl-image-dev freetype-dev fribidi-dev imlib2-dev postgresql-dev \
-xorg-libXi-dev openssl-dev"
+libxi-dev openssl-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r e167735ddedc -r 5669e8b3be70 netsurf/receipt
--- a/netsurf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/netsurf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
 
 BUILD_DEPENDS="bison flex perl expat-dev gperf libjpeg-turbo-dev curl-dev \
-openssl-dev libpng16-dev librsvg-dev gtk2-dev check-dev perl-html-parser"
+openssl-dev libpng-dev librsvg-dev gtk2-dev check-dev perl-html-parser"
 # libharu-dev gstreamer0-dev
 
 compile_rules() {
@@ -56,7 +56,7 @@
 	copy @std
 	# Remove files to save some space
 	rm -rf $fs/usr/share/netsurf/*.xpm
-	DEPENDS="cairo expat gdk-pixbuf glib gtk2 libcurl libjpeg-turbo libpng16 \
+	DEPENDS="cairo expat gdk-pixbuf glib gtk2 libcurl libjpeg-turbo libpng \
 	librsvg openssl pango zlib"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 nitrogen/receipt
--- a/nitrogen/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/nitrogen/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/l3ib/nitrogen/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext-dev libxinerama-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,6 +22,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atkmm glib glibmm gtk2 gtkmm libgiomm libsigc++ pangomm \
-	xorg-libX11 xorg-libXinerama"
+	libx11 libxinerama"
 	TAGS="wallpaper"
 }
diff -r e167735ddedc -r 5669e8b3be70 notecase/receipt
--- a/notecase/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/notecase/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-${VERSION}_src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \
+BUILD_DEPENDS="gtk2-dev pixman-dev gtksourceview-dev gnome-vfs-dev \
 gconf-dev gettext libgcrypt-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 notes/receipt
--- a/notes/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/notes/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/nuttyartist/notes/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="qt5-dev xorg-libxcb-dev xorg-libX11-dev mesa-dev"
+BUILD_DEPENDS="qt5-dev libxcb-dev libx11-dev mesa-dev"
 
 compile_rules() {
 	mkdir build
@@ -30,5 +30,5 @@
 
 genpkg_rules() {
 	copy @std @ico # only 16 and 48; svg is too huge
-	DEPENDS="libatomic mesa qt5-base xorg-libX11"
+	DEPENDS="libatomic mesa qt5-base libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 notification-daemon-gtk2/receipt
--- a/notification-daemon-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/notification-daemon-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,7 +29,7 @@
 		notification-daemon-gtk2)
 			copy @std @ico # only 16 and 48 icons
 			DEPENDS="gconf atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
-			libcanberra-gtk2 libnotify libwnck2 xorg-libX11"
+			libcanberra-gtk2 libnotify libwnck2 libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 notification-daemon/receipt
--- a/notification-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/notification-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev gtk3-dev glib-dev xorg-libX11-dev"
+BUILD_DEPENDS="gettext-dev gtk3-dev glib-dev libx11-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango xorg-libX11"
+	DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 ntk/receipt
--- a/ntk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ntk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://git.tuxfamily.org/non/fltk/?p=non/fltk.git;a=snapshot;h=$GITHASH;sf=tgz"
 
-BUILD_DEPENDS="xorg-libXft-dev cairo-dev jpeg-dev git python"
+BUILD_DEPENDS="libxft-dev cairo-dev jpeg-dev git python"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		ntk)
 			copy @std
-			DEPENDS="xorg-libXft cairo jpeg"
+			DEPENDS="libxft cairo jpeg"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="ntk cairo-dev xorg-libX11-dev xorg-libXft-dev"
+			DEPENDS="ntk cairo-dev libx11-dev libxft-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 ntop/receipt
--- a/ntop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ntop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -43,7 +43,7 @@
 			copy @std
 			chown -R www:www $fs/usr/share/ntop/
 			CONFIG_FILES="/etc/ntop/"
-			DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng16 perl pcre libwrap
+			DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap
 			TAGS="network"
 			;;
 		ntop-dev)
diff -r e167735ddedc -r 5669e8b3be70 numlockx/receipt
--- a/numlockx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/numlockx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://pkgs.fedoraproject.org/repo/pkgs/$PACKAGE/$TARBALL/be9109370447eae23f6f3f8527bb1a67/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev"
+BUILD_DEPENDS="libx11-dev libxext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXtst"
+	DEPENDS="libxtst"
 }
diff -r e167735ddedc -r 5669e8b3be70 nvclock/receipt
--- a/nvclock/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/nvclock/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake xorg-libX11-dev xorg-libXext-dev"
+BUILD_DEPENDS="autoconf automake libx11-dev libxext-dev"
 
 compile_rules(){
 	[ -d $PACKAGE$VERSION ] && mv $PACKAGE$VERSION $PACKAGE-$VERSION
diff -r e167735ddedc -r 5669e8b3be70 nvidia-173xx/receipt
--- a/nvidia-173xx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/nvidia-173xx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -75,7 +75,7 @@
 	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1
 	ln -s libglx.so.$VERSION        $fs/usr/lib/X11/modules/extensions/libglx.so
 
-	DEPENDS="linux xorg-server gtk2 cairo linux-agp xorg-libXv"
+	DEPENDS="linux xorg-server gtk2 cairo linux-agp libxv"
 	PROVIDE="nvidia mesa"
 	TAGS="driver graphic video"
 }
diff -r e167735ddedc -r 5669e8b3be70 obconf-qt/receipt
--- a/obconf-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/obconf-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="wget cacerts cmake Qt4-dev qmake openbox-dev glib-dev \
-xorg-libXft-dev pango-dev"
+libxft-dev pango-dev"
 
 compile_rules() {
 	mkdir build
@@ -27,6 +27,6 @@
 genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="bzlib fontconfig freetype libQtCore libQtGui libffi libxml2 \
-	openbox pango pcre xorg-libICE xorg-libSM xorg-libX11 xorg-libXft zlib"
+	openbox pango pcre libice libsm libx11 libxft zlib"
 	TAGS="LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 obconf/receipt
--- a/obconf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/obconf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://openbox.org/dist/obconf/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev libglade-dev openbox-dev gdk-pixbuf-dev \
-startup-notification-dev xorg-libXft-dev"
+startup-notification-dev libxft-dev"
 
 compile_rules() {
 	msgfmt -o $src/po/ru.gmo $stuff/ru.po
@@ -27,7 +27,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="openbox gtk2 libglade shared-mime-info xorg-libXdamage \
+	DEPENDS="openbox gtk2 libglade shared-mime-info libxdamage \
 	startup-notification slitaz-boot-scripts desktop-file-utils"
 	TAGS="openbox"
 }
diff -r e167735ddedc -r 5669e8b3be70 ocaml/receipt
--- a/ocaml/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ocaml/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/ocaml/ocaml/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	./configure \
@@ -27,6 +27,6 @@
 
 genpkg_rules() {
 	copy @std @dev
-	DEPENDS="libbfd ncurses xorg-libX11"
+	DEPENDS="libbfd ncurses libx11"
 	TAGS="language programming"
 }
diff -r e167735ddedc -r 5669e8b3be70 octave/receipt
--- a/octave/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/octave/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev \
 fltk-dev perl texinfo lapack tar gawk pcre-dev mesa-dev curl-dev \
 libdrm-dev expat-dev libxml2-dev libgfortran zlib ncurses readline freetype \
-gcc-lib-base expat mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm \
-xorg-libXdamage xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl \
+gcc-lib-base expat mesa glu libx11 libxext libxxf86vm \
+libxdamage libxfixes libdrm libxau libxdmcp pcre libcurl \
 lapack bash gcc fltk gnuplot"
 
 compile_rules() {
@@ -37,8 +37,8 @@
 genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base expat \
-	mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \
-	xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl lapack bash \
+	mesa glu libx11 libxext libxxf86vm libxdamage \
+	libxfixes libdrm libxau libxdmcp pcre libcurl lapack bash \
 	gcc fltk gnuplot"
 	TAGS="programming language"
 }
diff -r e167735ddedc -r 5669e8b3be70 openbox/receipt
--- a/openbox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openbox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://openbox.org/dist/openbox/$TARBALL"
 
-BUILD_DEPENDS="glib-dev pango-dev gettext-dev xorg-libXcursor-dev \
-xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev xorg-libXinerama-dev \
-startup-notification-dev automake libtool docbook-utils xorg-libXi-dev \
-xorg-xcb-util-dev imlib2-dev librsvg-dev"
+BUILD_DEPENDS="glib-dev pango-dev gettext-dev libxcursor-dev \
+libice-dev libsm-dev libxrandr-dev libxinerama-dev \
+startup-notification-dev automake libtool docbook-utils libxi-dev \
+xcb-util-dev imlib2-dev librsvg-dev"
 SPLIT="$PACKAGE-light:light $PACKAGE-themes $PACKAGE-python $PACKAGE-dev"
 
 compile_rules() {
@@ -48,9 +48,9 @@
 			open-folder-menu.sh
 			# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
 			DEPENDS="cairo glib imlib2 librsvg libxml2 pango \
-			startup-notification xorg-libICE xorg-libSM xorg-libX11 \
-			xorg-libXcursor xorg-libXext xorg-libXft xorg-libXi \
-			xorg-libXinerama xorg-libXrandr   slitaz-configs"
+			startup-notification libice libsm libx11 \
+			libxcursor libxext libxft libxi \
+			libxinerama libxrandr   slitaz-configs"
 			SUGGESTED="obconf pcmanfm hsetroot"
 			TAGS="window-manager"
 			;;
@@ -60,9 +60,9 @@
 			open-folder-menu.sh
 			# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
 			CAT="x-window|without imlib2 and SVG support"
-			DEPENDS="glib libxml2 pango startup-notification xorg-libICE \
-			xorg-libSM xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXft \
-			xorg-libXi xorg-libXinerama xorg-libXrandr   slitaz-configs"
+			DEPENDS="glib libxml2 pango startup-notification libice \
+			libsm libx11 libxcursor libxext libxft \
+			libxi libxinerama libxrandr   slitaz-configs"
 			PROVIDE="openbox"
 			SUGGESTED="obconf spacefm pcmanfm hsetroot wbar2 conky"
 			TAGS="window-manager"
@@ -80,7 +80,7 @@
 			copy @dev
 			DEPENDS="openbox openbox-themes \
 			glib-dev imlib2-dev librsvg-dev libxml2-dev pango-dev \
-			xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXft-dev"
+			libice-dev libsm-dev libx11-dev libxft-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 opencv/receipt
--- a/opencv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/opencv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -18,7 +18,7 @@
 opencv_contrib-$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake python-dev python-numpy zlib-dev \
-libjpeg-turbo-dev tiff-dev libpng16-dev libwebp-dev jasper-dev openexr-dev \
+libjpeg-turbo-dev tiff-dev libpng-dev libwebp-dev jasper-dev openexr-dev \
 ilmbase-dev gtk2-dev glib-dev gstreamer1-dev gst1-plugins-base-dev \
 libgphoto2-dev shared-mime-info xine-lib-dev protobuf-dev " # lapack-dev
 SPLIT="$PACKAGE-dev"
@@ -70,7 +70,7 @@
 		opencv)
 			copy @std
 			DEPENDS="cairo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk2 \
-			jasper libgphoto2 libjpeg-turbo libpng16 libwebp openexr tiff \
+			jasper libgphoto2 libjpeg-turbo libpng libwebp openexr tiff \
 			xine-lib zlib"
 			;;
 		opencv-dev)
diff -r e167735ddedc -r 5669e8b3be70 openjpeg/receipt
--- a/openjpeg/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openjpeg/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/openjpeg.mirror/$TARBALL"
 
-BUILD_DEPENDS="automake libtool libpng16-dev zlib-dev tiff-dev lcms2-dev"
+BUILD_DEPENDS="automake libtool libpng-dev zlib-dev tiff-dev lcms2-dev"
 SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 		*-tools)
 			copy bin/
 			CAT="graphics|applications"
-			DEPENDS="openjpeg lcms2 libpng16 tiff"
+			DEPENDS="openjpeg lcms2 libpng tiff"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 openjpeg2/receipt
--- a/openjpeg2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openjpeg2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="openjpeg-$VERSION.tar.gz"
 WGET_URL="https://github.com/uclouvain/openjpeg/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="cmake zlib-dev libpng16-dev tiff-dev lcms2-dev"
+BUILD_DEPENDS="cmake zlib-dev libpng-dev tiff-dev lcms2-dev"
 SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
@@ -37,7 +37,7 @@
 		openjpeg2-tools)
 			copy bin/
 			CAT="graphics|applications"
-			DEPENDS="openjpeg2 lcms2 libpng16 tiff"
+			DEPENDS="openjpeg2 lcms2 libpng tiff"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 openmotif/receipt
--- a/openmotif/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openmotif/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}files/public_downloads/$PACKAGE/${VERSION%.*}/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-dev-proto xorg-libXmu xorg-libXft-dev xorg-libXrender-dev \
-xorg-xbitmaps fontconfig-dev freetype-dev jpeg-dev libpng16-dev xorg-libXt-dev \
-xorg-libSM-dev xorg-libXmu-dev xorg-libX11-dev xorg-xorgproto \
-bison flex xorg-libXp util-linux-uuid-dev expat-dev libxml2-dev"
+BUILD_DEPENDS="xorg-dev-proto libxft-dev libxrender-dev \
+xbitmaps fontconfig-dev freetype-dev jpeg-dev libpng-dev libxt-dev \
+libsm-dev libxmu-dev libx11-dev xorgproto \
+bison flex libxp util-linux-uuid-dev expat-dev libxml2-dev"
 SPLIT="$PACKAGE-demo $PACKAGE-dev $PACKAGE"
 
 compile_rules() {
@@ -39,8 +39,8 @@
 			;;
 		openmotif)
 			copy @std @rm
-			DEPENDS="xorg fontconfig expat freetype jpeg libpng16 xorg-libXp \
-			xorg-libXft"
+			DEPENDS="xorg fontconfig expat freetype jpeg libpng libxp \
+			libxft"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 openspades/receipt
--- a/openspades/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openspades/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -33,6 +33,6 @@
 genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="gcc49-lib-base glew glibc-base libcurl glu libsdl2 libsdl2-image \
-	xorg-libxcb mesa util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \
-	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
+	libxcb mesa util-linux-uuid libice libsm libx11 \
+	libxau libxdmcp libxext zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 openttd/receipt
--- a/openttd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openttd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="http://us.binaries.openttd.org/binaries/releases/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev lzo-dev zlib-dev libpng16-dev xz-dev icu-dev"
+BUILD_DEPENDS="libsdl-dev lzo-dev zlib-dev libpng-dev xz-dev icu-dev"
 
 compile_rules() {
 	./configure \
@@ -40,5 +40,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libsdl lzo zlib libpng16 icu"
+	DEPENDS="libsdl lzo zlib libpng icu"
 }
diff -r e167735ddedc -r 5669e8b3be70 openvas-client/receipt
--- a/openvas-client/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/openvas-client/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://wald.intevation.org/frs/download.php/757/$TARBALL"
 
-BUILD_DEPENDS="libgd-dev libpng16-dev glib-dev openvas-libraries-dev \
+BUILD_DEPENDS="libgd-dev libpng-dev glib-dev openvas-libraries-dev \
 gnutls-dev gtk2-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 optipng/receipt
--- a/optipng/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/optipng/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev zlib-dev"
+BUILD_DEPENDS="libpng-dev zlib-dev"
 SPLIT="$PACKAGE-static:static"
 
 compile_rules() {
@@ -40,7 +40,7 @@
 	case $PACKAGE in
 		optipng)
 			copy @std
-			DEPENDS="libpng16 zlib"
+			DEPENDS="libpng zlib"
 			;;
 		optipng-static)
 			copy @std
diff -r e167735ddedc -r 5669e8b3be70 orage/receipt
--- a/orage/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/orage/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,6 +26,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="dbus dbus-glib gdk-pixbuf glib gtk2 libical libnotify \
-	libxfce4util pango popt xfce4-panel xorg-libX11"
+	libxfce4util pango popt xfce4-panel libx11"
 	TAGS="Xfce office"
 }
diff -r e167735ddedc -r 5669e8b3be70 oxine/receipt
--- a/oxine/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/oxine/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info libcdio-dev xine-lib-dev curl-dev \
-xorg-libX11-dev xorg-libXtst-dev"
+libx11-dev libxtst-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r e167735ddedc -r 5669e8b3be70 oxygen-gtk/receipt
--- a/oxygen-gtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/oxygen-gtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 BRANCH="$VERSION"
 WGET_URL="git|git://anongit.kde.org/oxygen-gtk"
 
-BUILD_DEPENDS="git cmake xorg-libX11-dev gtk2-dev"
+BUILD_DEPENDS="git cmake libx11-dev gtk2-dev"
 
 compile_rules() {
 	mkdir build
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 oyranos/receipt
--- a/oyranos/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/oyranos/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,15 +12,15 @@
 WGET_URL="https://github.com/oyranos-cms/oyranos/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="shared-mime-info cmake yajl-dev openicc-config-dev lcms2-dev \
-cairo-dev libraw-dev exiv2-dev libpng16-dev xorg-libXfixes-dev \
-xorg-libXrandr-dev xorg-libXinerama-dev xorg-libXxf86vm-dev xorg-libXmu-dev \
+cairo-dev libraw-dev exiv2-dev libpng-dev libxfixes-dev \
+libxrandr-dev libxinerama-dev libxxf86vm-dev libxmu-dev \
 libxcm-dev libjpeg-turbo-dev tiff-dev gettext"
 SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
-DEPENDS_std="cairo exiv2 libgomp libjpeg-turbo libpng16 libraw libxcm libxml2 \
-openicc-config xorg-libX11 xorg-libXfixes xorg-libXinerama xorg-libXrandr \
-xorg-libXxf86vm yajl"
+DEPENDS_std="cairo exiv2 libgomp libjpeg-turbo libpng libraw libxcm libxml2 \
+openicc-config libx11 libxfixes libxinerama libxrandr \
+libxxf86vm yajl"
 
 compile_rules() {
 	# --libdir=/usr/lib : don't want to be /usr/lib64
diff -r e167735ddedc -r 5669e8b3be70 palemoon/receipt
--- a/palemoon/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/palemoon/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,10 +12,10 @@
 WGET_URL="https://github.com/MoonchildProductions/Pale-Moon/archive/${VERSION}_Release.tar.gz"
 
 BUILD_DEPENDS="autoconf213 gtk2-dev yasm zip unzip iw dbus-dev dbus-glib-dev \
-iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \
+iw libpng-dev gstreamer0-dev gst0-plugins-base-dev \
 libvpx-dev mesa-dev virtualenv zlib-dev bzip2-dev python-dev \
-xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo-dev \
-xorg-libXt-dev coreutils-file-special alsa-lib-dev spl spl-src"
+pixman-dev libffi-dev libjpeg-turbo-dev \
+libxt-dev coreutils-file-special alsa-lib-dev spl spl-src"
 # sqlite sqlite-dev libevent libevent-dev
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 pango/receipt
--- a/pango/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pango/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev \
+BUILD_DEPENDS="harfbuzz-dev libxft-dev cairo-dev \
 gobject-introspection-dev meson ninja fribidi-dev"
 SPLIT="$PACKAGE-typelib $PACKAGE-dev"
 
@@ -34,7 +34,7 @@
 		pango)
 			copy @std
 			DEPENDS="cairo fontconfig freetype fribidi glib libharfbuzz \
-			xorg-libX11 xorg-libXft xorg-libXrender"
+			libx11 libxft libxrender"
 			;;
 		pango-typelib)
 			copy *.typelib
@@ -45,7 +45,7 @@
 			copy @dev @rm
 			DEPENDS="pango pango-typelib \
 			cairo-dev fontconfig-dev freetype-dev fribidi-dev glib-dev \
-			harfbuzz-dev xorg-libXft-dev"
+			harfbuzz-dev libxft-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 pangox-compat/receipt
--- a/pangox-compat/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pangox-compat/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="pango-dev glib-dev xorg-libX11-dev"
+BUILD_DEPENDS="pango-dev glib-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		pangox-compat)
 			copy @std
-			DEPENDS="glib pango xorg-libX11"
+			DEPENDS="glib pango libx11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="pangox-compat pango-dev xorg-libX11-dev"
+			DEPENDS="pangox-compat pango-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 parcellite/receipt
--- a/parcellite/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/parcellite/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gtk2-dev intltool"
+BUILD_DEPENDS="libx11-dev gtk2-dev intltool"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -28,5 +28,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/skel $fs/etc
 	chown -R 0.0 $fs
-	DEPENDS="gtk2 xorg-libX11 xorg-libXdamage"
+	DEPENDS="gtk2 libx11 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 pari/receipt
--- a/pari/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pari/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://pari.math.u-bordeaux.fr/pub/$PACKAGE/unix/$TARBALL"
 
-BUILD_DEPENDS="gmp-dev readline-dev xorg-libX11-dev"
+BUILD_DEPENDS="gmp-dev readline-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,8 +34,8 @@
 	case $PACKAGE in
 		pari)
 			copy @std
-			DEPENDS="glibc-base gmp xorg-libxcb ncurses readline xorg-libX11 \
-			xorg-libXau xorg-libXdmcp"
+			DEPENDS="glibc-base gmp libxcb ncurses readline libx11 \
+			libxau libxdmcp"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 parole/receipt
--- a/parole/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/parole/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,7 +31,7 @@
 			copy @std
 			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gst0-plugins-base \
 			gstreamer0 gtk2 libnotify libxfce4ui libxfce4util taglib xfconf \
-			xorg-libX11"
+			libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 pavucontrol/receipt
--- a/pavucontrol/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pavucontrol/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 	copy @std
 	DEPENDS="atk atkmm cairo cairomm fontconfig freetype gdk-pixbuf glib \
 	glibmm gtk2 gtkmm libcanberra libgiomm libsigc++ pango pangomm pulseaudio \
-	pulseaudio-glib xorg-libX11"
+	pulseaudio-glib libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 pce/receipt
--- a/pce/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pce/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -21,7 +21,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="readline ncurses libsdl xorg-libX11 xorg-libxcb xorg-libXau \
-	xorg-libXdmcp"
+	DEPENDS="readline ncurses libsdl libx11 libxcb libxau \
+	libxdmcp"
 	TAGS="emulator atari macplus"
 }
diff -r e167735ddedc -r 5669e8b3be70 pcmanfm-legacy/receipt
--- a/pcmanfm-legacy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pcmanfm-legacy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev gamin-dev gamin shared-mime-info intltool hal-dev \
-dbus-glib-dev dbus-dev startup-notification-dev xorg-libxcb-dev xorg-xcb-util-dev \
-xorg-xcb-util xorg-libX11-dev xorg-libXt-dev"
+dbus-glib-dev dbus-dev startup-notification-dev libxcb-dev xcb-util-dev \
+libx11-dev libxt-dev"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -35,6 +35,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo dbus dbus-glib gamin gdk-pixbuf glib gtk2 hal pango \
-	startup-notification xorg-libX11   hicolor-icon-theme shared-mime-info"
+	startup-notification libx11   hicolor-icon-theme shared-mime-info"
 	TAGS="file-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 pcmanfm-qt/receipt
--- a/pcmanfm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pcmanfm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,7 +29,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib libfm libfm-qt menu-cache qt5-base qt5-x11extras xorg-libxcb \
+	DEPENDS="glib libfm libfm-qt menu-cache qt5-base qt5-x11extras libxcb \
 	   shared-mime-info"
 	TAGS="LXQt file-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 pcmanfm/receipt
--- a/pcmanfm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pcmanfm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 #WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" # SF download problems
 WGET_URL="http://git.lxde.org/gitweb/?p=lxde/pcmanfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk2-dev automake"
+BUILD_DEPENDS="intltool libx11-dev pango-dev libfm-dev gtk2-dev automake"
 
 compile_rules() {
 	# tarball from git.lxde.org requires this step
@@ -39,7 +39,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm libfm-gtk pango xorg-libX11"
+	DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm libfm-gtk pango libx11"
 	SUGGESTED="gvfs"
 	TAGS="file-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 pcsxr-svn/receipt
--- a/pcsxr-svn/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pcsxr-svn/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,10 +13,10 @@
 WGET_URL="subversion|https://pcsxr.svn.codeplex.com/svn/pcsxr"
 BRANCH="$VERSION"
 
-BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk2-dev xorg-libXtst \
-xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev zlib-dev libsdl libsdl-dev \
+BUILD_DEPENDS="glib-dev libcdio-dev libglade-dev gtk2-dev \
+libxtst-dev libxv-dev mesa-dev zlib-dev libsdl-dev \
 subversion nasm gettext-dev intltool sed lzma autoconf automake libtool \
-expat-dev xorg-libxshmfence-dev"
+expat-dev libxshmfence-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -38,6 +38,6 @@
 	cp -a $install/usr/share/psemu $fs/usr/share
 	cp -a $install/usr/share/pcsx $fs/usr/share
 	find $fs/usr/lib -name "*.la" -delete
-	DEPENDS="libcdio libglade xorg-libXtst xorg-libXv mesa libsdl"
+	DEPENDS="libcdio libglade libxtst libxv mesa libsdl"
 	TAGS="emulator playstation"
 }
diff -r e167735ddedc -r 5669e8b3be70 peazip/receipt
--- a/peazip/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/peazip/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -78,7 +78,7 @@
 			;;
 		peazip)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango xorg-libX11   \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango libx11   \
 			busybox desktop-file-utils gmp libcurl ncurses upx zpaq xdg-utils"
 			SUGGESTED="aescrypt gnupg"
 			TAGS="archiver bzip2 encryption gzip rar split tar unrar xz zip 7zip"
diff -r e167735ddedc -r 5669e8b3be70 pekwm/receipt
--- a/pekwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pekwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,8 +30,8 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXinerama xorg-libXft xorg-libXrandr xorg-libXpm"
-	SUGGESTED="hsetroot tint2 lxpanel wbar xorg-xprop xorg-xev xdotool wmctrl"
+	DEPENDS="libx11 libxinerama libxft libxrandr libxpm"
+	SUGGESTED="hsetroot tint2 lxpanel wbar xprop xev xdotool wmctrl"
 	TAGS="window-manager"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 perl-tk/receipt
--- a/perl-tk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/perl-tk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,10 +14,10 @@
 TARBALL="$ORIGIN-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/${AUTHOR:0:1}/${AUTHOR:0:2}/$AUTHOR/$TARBALL"
 
-DEPENDS_std="perl fontconfig libjpeg-turbo libpng16 xorg-libX11 \
-xorg-libXft zlib tk"
-BUILD_DEPENDS="$DEPENDS_std perl-dev xorg-libX11-dev freetype-dev \
-xorg-libXft-dev fontconfig-dev libpng16-dev zlib-dev libjpeg-turbo-dev tk-dev"
+DEPENDS_std="perl fontconfig libjpeg-turbo libpng libx11 \
+libxft zlib tk"
+BUILD_DEPENDS="$DEPENDS_std perl-dev libx11-dev freetype-dev \
+libxft-dev fontconfig-dev libpng-dev zlib-dev libjpeg-turbo-dev tk-dev"
 
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 pgadmin/receipt
--- a/pgadmin/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pgadmin/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -37,5 +37,5 @@
 	cp -a $stuff/applications $fs/usr/share
 	cp -a $stuff/icons $fs/usr/share
 	DEPENDS="postgresql wxWidgets28 gtk2 libxslt libcomerr3 libkrb5 \
-	xorg-libXxf86vm"
+	libxxf86vm"
 }
diff -r e167735ddedc -r 5669e8b3be70 php/receipt
--- a/php/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/php/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="sqlite3-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
 net-snmp-dev postgresql-dev gettext-dev openssl-dev apache-dev apr-util-dev \
-c-client mhash-dev libpng16-dev libunixODBC unixODBC-dev openldap-dev \
+c-client mhash-dev libpng-dev libunixODBC unixODBC-dev openldap-dev \
 libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl \
 jpeg-dev net-snmp-dev libvpx-dev apache coreutils-conditions sed re2c"
 SPLIT="\
@@ -135,14 +135,14 @@
 			;;
 		php-dev)
 			copy @dev
-			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng16 \
+			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng \
 			libpostgresqlclient libunixODBC mhash openssl jpeg \
 			libmcrypt libtool libkrb5 libcomerr3 net-snmp"
 			;;
 		php-gd)
 			copy gd.so
 			CAT="development|gd module"
-			DEPENDS="libpng16 php jpeg libvpx"
+			DEPENDS="libpng php jpeg libvpx"
 			;;
 		php-imap)
 			copy imap.so
diff -r e167735ddedc -r 5669e8b3be70 pidgin/receipt
--- a/pidgin/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pidgin/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev libgcrypt-dev gnutls-dev \
-startup-notification-dev libgpg-error-dev libxml2-dev xorg-libxcb-dev \
+startup-notification-dev libgpg-error-dev libxml2-dev libxcb-dev \
 libidn-dev libtasn1-dev intltool expat-dev nss-dev \
-ncurses-dev xorg-xcb-util-dev gmp-dev"
+ncurses-dev xcb-util-dev gmp-dev"
 SPLIT="libpurple libpurple-dev $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -60,8 +60,8 @@
 		pidgin)
 			copy @std @rm
 			DEPENDS="gtk2 gnutls libgcrypt libgpg-error libpurple \
-			startup-notification gmp xorg-libXdamage libxml2 \
-			xorg-libxcb xorg-xcb-util libidn ncurses libtasn1 nss"
+			startup-notification gmp libxdamage libxml2 \
+			libxcb xcb-util libidn ncurses libtasn1 nss"
 			PROVIDE="purple"
 			;;
 		pidgin-dev)
diff -r e167735ddedc -r 5669e8b3be70 pingus/receipt
--- a/pingus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pingus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,7 +15,7 @@
 WGET_URL="http://pingus.seul.org/files/$TARBALL"
 
 BUILD_DEPENDS="scons2 libsdl-dev libsdl-image-dev libsdl-mixer-dev boost-dev \
-boost-signals libpng16-dev"
+boost-signals libpng-dev"
 
 compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/screenshot.cpp
diff -r e167735ddedc -r 5669e8b3be70 plotdrop/receipt
--- a/plotdrop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/plotdrop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	rm $fs/usr/share/$PACKAGE/*.png
-	DEPENDS="gnuplot gtk2 libxml2 expat xorg-libX11 libglade"
+	DEPENDS="gnuplot gtk2 libxml2 expat libx11 libglade"
 }
diff -r e167735ddedc -r 5669e8b3be70 ploticus/receipt
--- a/ploticus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ploticus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="ploticus${VERSION/./}_src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev xorg-dev libpng16-dev"
+BUILD_DEPENDS="zlib-dev xorg-dev libpng-dev"
 
 compile_rules() {
 	cd $src/src
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="zlib xorg libpng16"
+	DEPENDS="zlib xorg libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 pluma/receipt
--- a/pluma/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pluma/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gobject-introspection-dev \
 enchant-dev iso-codes-dev gtk3-dev gtksourceview3-dev libpeas-dev itstool \
-xorg-libSM-dev"
+libsm-dev"
 SPLIT="$PACKAGE-dev $PACKAGE-plugins $PACKAGE"
 
 compile_rules() {
@@ -41,8 +41,8 @@
 			copy @std @rm
 			rm -r $fs/usr/lib # -> plugins
 			DEPENDS="atk cairo gdk-pixbuf glib gobject-introspection gtk3 \
-			gtksourceview3 libpeas libpeas-gtk pango xorg-libICE xorg-libSM \
-			xorg-libX11"
+			gtksourceview3 libpeas libpeas-gtk pango libice libsm \
+			libx11"
 			;;
 	esac
 	TAGS="MATE"
diff -r e167735ddedc -r 5669e8b3be70 plymouth/receipt
--- a/plymouth/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/plymouth/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.freedesktop.org/software/plymouth/releases/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev pango-dev gtk2-dev xorg-libpciaccess-dev libdrm-dev"
+BUILD_DEPENDS="libpng-dev pango-dev gtk2-dev libpciaccess-dev libdrm-dev"
 
 compile_rules() {
 	./configure \
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 pango gtk2 xorg-libpciaccess libdrm"
+	DEPENDS="libpng pango gtk2 libpciaccess libdrm"
 }
diff -r e167735ddedc -r 5669e8b3be70 pngquant/receipt
--- a/pngquant/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pngquant/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,10 +13,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|https://github.com/kornelski/pngquant.git"
 
-BUILD_DEPENDS="git lcms2-dev libpng16-dev zlib-dev"
+BUILD_DEPENDS="git lcms2-dev libpng-dev zlib-dev"
 SPLIT="$PACKAGE-static:static"
 
-DEPENDS_std="lcms2 libpng16 zlib"
+DEPENDS_std="lcms2 libpng zlib"
 DEPENDS_static=" "
 
 COPY_static="@std"
diff -r e167735ddedc -r 5669e8b3be70 pngrewrite/receipt
--- a/pngrewrite/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pngrewrite/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev zlib-dev"
+BUILD_DEPENDS="libpng-dev zlib-dev"
 
 compile_rules() {
 	make &&
@@ -20,5 +20,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16"
+	DEPENDS="libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 pnmixer/receipt
--- a/pnmixer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pnmixer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/nicklan/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext-dev xorg-libX11-dev \
+BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext-dev libx11-dev \
 gtk2-dev"
 
 compile_rules() {
@@ -27,8 +27,8 @@
 genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="alsa-lib atk bzlib cairo expat fontconfig freetype gcc-lib-base \
-	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
-	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
-	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-	xorg-libXrandr xorg-libXrender zlib"
+	gdk-pixbuf glib glibc-base gtk2 libffi libpng libxcb pango \
+	pixman libx11 libxau libxcomposite libxcursor \
+	libxdamage libxdmcp libxext libxfixes libxinerama \
+	libxrandr libxrender zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 podofo/receipt
--- a/podofo/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/podofo/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake fontconfig-dev freetype-dev zlib-dev jpeg-dev tiff-dev \
-libpng16-dev"
+libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -35,7 +35,7 @@
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/bin $fs/usr
 			cp -a $install/usr/lib/*.so* $fs/usr/lib
-			DEPENDS="fontconfig freetype zlib jpeg tiff gcc-lib-base libpng16"
+			DEPENDS="fontconfig freetype zlib jpeg tiff gcc-lib-base libpng"
 			;;
 		*-dev)
 			mkdir -p $fs/usr/lib
diff -r e167735ddedc -r 5669e8b3be70 ponyprog/receipt
--- a/ponyprog/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ponyprog/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -17,5 +17,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXaw"
+	DEPENDS="libxaw"
 }
diff -r e167735ddedc -r 5669e8b3be70 poppler-qt4/receipt
--- a/poppler-qt4/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/poppler-qt4/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="poppler-$VERSION.tar.xz"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXdamage expat-dev jpeg-dev tiff-dev \
+BUILD_DEPENDS="libxdamage expat-dev jpeg-dev tiff-dev \
 freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev cairo-dev \
-automake bzip2-dev libpng16-dev libtool Qt4-dev libxml2-dev"
+automake bzip2-dev libpng-dev libtool Qt4-dev libxml2-dev"
 SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 # FIXME: after Qt will be available, to merge this receipt with the poppler receipt.
@@ -43,7 +43,7 @@
 				rm -rf $fs/usr/bin/poppler-glib-demo
 			fi
 			CAT="office|utilities to manipulate PDF file"
-			DEPENDS="fontconfig poppler-qt4 cairo zlib libpng16 gcc-lib-base \
+			DEPENDS="fontconfig poppler-qt4 cairo zlib libpng gcc-lib-base \
 			libQtCore libQtXml libQtGui"
 			PROVIDE="poppler-apps"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 poppler/receipt
--- a/poppler/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/poppler/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://poppler.freedesktop.org/$TARBALL"
 
 BUILD_DEPENDS="cmake freetype-dev fontconfig-dev libjpeg-turbo-dev zlib-dev \
-libpng16-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
+libpng-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
 gdk-pixbuf-dev openjpeg2-dev lcms2-dev curl-dev poppler-data"
 SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
@@ -40,7 +40,7 @@
 		poppler)
 			copy *.so*
 			DEPENDS="cairo fontconfig freetype glib lcms2 libcurl \
-			libjpeg-turbo libpng16 nspr nss openjpeg2 tiff zlib"
+			libjpeg-turbo libpng nspr nss openjpeg2 tiff zlib"
 			;;
 		*-apps)
 			copy bin/
diff -r e167735ddedc -r 5669e8b3be70 powermanga/receipt
--- a/powermanga/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/powermanga/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://linux.tlk.fr/games/Powermanga/download/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev zlib-dev libsdl-mixer-dev xorg-libXext"
+BUILD_DEPENDS="libsdl-dev zlib-dev libsdl-mixer-dev libxext"
 
 # Packaging for SliTaz by Rene Rivero.
 
diff -r e167735ddedc -r 5669e8b3be70 prboom/receipt
--- a/prboom/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/prboom/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev libsdl-mixer-dev libsdl-net-dev mesa-dev glu \
-libpng16-dev glu-dev"
+libpng-dev glu-dev"
 
 compile_rules() {
 	sed -i 's|png_error_ptr_||;s|png_infopp_||' src/SDL/i_sshot.c
@@ -37,6 +37,6 @@
 	echo "Copying package files"
 	cp -a $install/usr/games $fs/usr
 	cp -a $install/usr/share/games $fs/usr/share
-	DEPENDS="libsdl libsdl-mixer libsdl-net libpng16 mesa glu freedoom"
+	DEPENDS="libsdl libsdl-mixer libsdl-net libpng mesa glu freedoom"
 	SUGGESTED="nvidia"
 }
diff -r e167735ddedc -r 5669e8b3be70 pulseaudio/receipt
--- a/pulseaudio/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pulseaudio/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/pulseaudio/releases/$TARBALL"
 
-BUILD_DEPENDS="intltool libtool xorg-libxcb-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libXtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
+BUILD_DEPENDS="intltool libtool libxcb-dev libice-dev libsm-dev \
+libxtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
 dbus-dev eudev-dev openssl-dev speexdsp-dev"
 SPLIT="$PACKAGE-alsa $PACKAGE-cli $PACKAGE-esound $PACKAGE-glib $PACKAGE-http \
 $PACKAGE-native $PACKAGE-rtp $PACKAGE-simple $PACKAGE $PACKAGE-dev"
@@ -72,7 +72,7 @@
 			module-x11-publish.so module-stream-restore.so \
 			module-device-manager.so module-device-restore.so
 			CAT="multimedia|native protocol support"
-			DEPENDS="dbus pulseaudio xorg-libxcb"
+			DEPENDS="dbus pulseaudio libxcb"
 			;;
 		*-rtp)
 			copy librtp.so module-rtp-recv.so module-rtp-send.so libraop.so \
@@ -90,7 +90,7 @@
 			copy @std @rm
 			CAT="multimedia|main part"
 			DEPENDS="dbus eudev libcap libltdl libsndfile speexdsp \
-			xorg-libICE xorg-libSM xorg-libX11 xorg-libXtst xorg-libxcb"
+			libice libsm libx11 libxtst libxcb"
 			SUGGESTED="consolekit2"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 putty/receipt
--- a/putty/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/putty/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -34,12 +34,12 @@
 	case $PACKAGE in
 		putty)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11   krb5"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11   krb5"
 			CAT="utilities|using GTK+2"
 			;;
 		putty-gtk3)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk3 pango xorg-libX11   krb5"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 pango libx11   krb5"
 			CAT="utilities|using GTK+3"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 puzzles/receipt
--- a/puzzles/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/puzzles/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 		cp $img $fs/usr/share/pixmaps/$(basename $img -16d24.png).png
 	done
 	cp -a $stuff/*.desktop $fs/usr/share/applications
-	DEPENDS="gtk2 cairo xorg-libxcb xorg-libXrandr"
+	DEPENDS="gtk2 cairo libxcb libxrandr"
 }
diff -r e167735ddedc -r 5669e8b3be70 pwsafe/receipt
--- a/pwsafe/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pwsafe/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -21,8 +21,8 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="readline ncurses xorg-libSM xorg-libICE xorg-libXmu xorg-libX11 \
-	openssl gcc-lib-base xorg-libXt xorg-libXext xorg-libXau xorg-libXdmcp"
+	DEPENDS="readline ncurses libsm libice libxmu libx11 \
+	openssl gcc-lib-base libxt libxext libxau libxdmcp"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 python-pygame/receipt
--- a/python-pygame/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/python-pygame/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -18,8 +18,8 @@
 WGET_URL="https://github.com/pygame/pygame/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="python-dev python3-dev \
-libsdl-dev libsdl-ttf-dev libsdl-image-dev libsdl-mixer-dev libpng16-dev \
-libjpeg-turbo-dev xorg-libX11-dev portmidi-dev freetype-dev"
+libsdl-dev libsdl-ttf-dev libsdl-image-dev libsdl-mixer-dev libpng-dev \
+libjpeg-turbo-dev libx11-dev portmidi-dev freetype-dev"
 SPLIT="$PACKAGE-dev $PACKAGE \
 ${PACKAGE/python/python3}-dev:3 ${PACKAGE/python/python3}:3"
 
@@ -39,8 +39,8 @@
 			;;
 		*)
 			copy @std @rm
-			DEPENDS="$py freetype libjpeg-turbo libpng16 libsdl libsdl-image \
-			libsdl-mixer libsdl-ttf portmidi xorg-libX11"
+			DEPENDS="$py freetype libjpeg-turbo libpng libsdl libsdl-image \
+			libsdl-mixer libsdl-ttf portmidi libx11"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 python-wxpython/receipt
--- a/python-wxpython/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/python-wxpython/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -9,12 +9,12 @@
 WEB_SITE="https://www.wxpython.org/"
 REPOLOGY="python:wxpython"
 
-BUILD_DEPENDS="python python-six python-pypubsub zlib-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
-xorg-libSM-dev mesa-dev glu-dev libsdl-dev webkit2gtk-dev gstreamer1-dev"
-BUILD_DEPENDS_x86_64="python python-six python-pypubsub zlib-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
-xorg-libSM-dev mesa-dev glu-dev libsdl-dev gstreamer1-dev \
+BUILD_DEPENDS="python python-six python-pypubsub zlib-dev libpng-dev \
+libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev libxxf86vm-dev \
+libsm-dev mesa-dev glu-dev libsdl-dev webkit2gtk-dev gstreamer1-dev"
+BUILD_DEPENDS_x86_64="python python-six python-pypubsub zlib-dev libpng-dev \
+libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev libxxf86vm-dev \
+libsm-dev mesa-dev glu-dev libsdl-dev gstreamer1-dev \
 gst1-plugins-base-dev libnotify-dev cppunit-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r e167735ddedc -r 5669e8b3be70 python/receipt
--- a/python/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/python/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -55,7 +55,7 @@
 		*-tcltk)
 			copy _tkinter.so lib-tk/ @rm
 			CAT="development|Tcl/Tk files"
-			DEPENDS="python tcl tk xorg-libX11"
+			DEPENDS="python tcl tk libx11"
 			;;
 		python)
 			# Now pyconfig.h is required for Mercurial.
diff -r e167735ddedc -r 5669e8b3be70 python3/receipt
--- a/python3/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/python3/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -21,7 +21,7 @@
 COPY_dev="@dev @rm"
 
 DEPENDS_std="python3-setuptools python3-pip bzlib expat gdbm libffi liblzma \
-libsqlite3 ncurses ncurses-libpanel openssl readline zlib" # tcl tk xorg-libX11
+libsqlite3 ncurses ncurses-libpanel openssl readline zlib" # tcl tk libx11
 
 PROVIDE_std="py3k"
 PROVIDE_dev="py3k-dev"
diff -r e167735ddedc -r 5669e8b3be70 pywebkitgtk/receipt
--- a/pywebkitgtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/pywebkitgtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,11 +29,11 @@
 			DEPENDS="atk bzlib cairo enchant fontconfig freetype gdk-pixbuf \
 			glib gst1-plugins-base gstreamer1 gtk2 icu libatomic libffi \
 			libgcrypt libgpg-error libharfbuzz libharfbuzz-icu libicu \
-			libjpeg-turbo liblzma libpng16 libsecret libsoup libsqlite3 \
+			libjpeg-turbo liblzma libpng libsecret libsoup libsqlite3 \
 			libwebp libxml2 libxslt orc pango pcre python util-linux-blkid \
-			util-linux-mount util-linux-uuid webkitgtk xorg-libICE xorg-libSM \
-			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender \
-			xorg-libXt xorg-libxcb xorg-pixman zlib"
+			util-linux-mount util-linux-uuid webkitgtk libice libsm \
+			libx11 libxau libxdmcp libxext libxrender \
+			libxt libxcb pixman zlib"
 			;;
 		*-dev)
 			copy @dev
@@ -41,12 +41,12 @@
 			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev \
 			gst1-plugins-base-dev gstreamer1-dev gtk2-dev harfbuzz-dev \
 			harfbuzz-icu-dev icu-dev libjpeg-turbo-dev libffi-dev \
-			libgcrypt-dev libgpg-error-dev libpng16-dev libsecret-dev \
+			libgcrypt-dev libgpg-error-dev libpng-dev libsecret-dev \
 			libsoup-dev libwebp-dev libxml2-dev libxslt-dev orc-dev pango-dev \
 			pcre-dev sqlite3-dev util-linux-blkid-dev util-linux-mount-dev \
-			util-linux-uuid-dev webkitgtk-dev xorg-libICE-dev xorg-libSM-dev \
-			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
-			xorg-libXrender-dev xorg-libXt-dev xorg-libxcb-dev xorg-pixman-dev \
+			util-linux-uuid-dev webkitgtk-dev libice-dev libsm-dev \
+			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
+			libxrender-dev libxt-dev libxcb-dev pixman-dev \
 			xz-dev zlib-dev"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 qarma/receipt
--- a/qarma/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qarma/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/luebking/qarma/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="qt5-dev xorg-libX11-dev"
+BUILD_DEPENDS="qt5-dev libx11-dev"
 
 compile_rules() {
 	qmake &&
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libatomic mesa qt5-base qt5-x11extras xorg-libX11"
+	DEPENDS="libatomic mesa qt5-base qt5-x11extras libx11"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 qca-ossl/receipt
--- a/qca-ossl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qca-ossl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://delta.affinix.com/download/qca/2.0/plugins/$TARBALL"
 
-BUILD_DEPENDS="qmake xorg-libX11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
+BUILD_DEPENDS="qmake libx11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
 
 compile_rules() {
 	chmod +x configure
diff -r e167735ddedc -r 5669e8b3be70 qedit/receipt
--- a/qedit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qedit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}tgz/$TARBALL"
 
-BUILD_DEPENDS="qt5-dev cmake xorg-xcb-util-keysyms-dev xorg-dev zlib-dev \
+BUILD_DEPENDS="qt5-dev cmake xcb-util-keysyms-dev xorg-dev zlib-dev \
 mesa-dev"
 
 compile_rules() {
@@ -27,6 +27,6 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="qt5-base xorg-xcb-util-keysyms"
+	DEPENDS="qt5-base xcb-util-keysyms"
 	TAGS="text-editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 qemacs/receipt
--- a/qemacs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qemacs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev"
+BUILD_DEPENDS="libx11-dev libxext-dev libxv-dev"
 SPLIT="$PACKAGE-tiny $PACKAGE-x11 $PACKAGE-dev"
 
 compile_rules() {
@@ -67,8 +67,8 @@
 			install -m 755 -s $src/html2png $fs/usr/bin
 			install $src/kmaps $src/ligatures $fs/usr/share/qe
 			CAT="editors|Light emacs clone with X11 support."
-			DEPENDS="xorg-libX11 xorg-libXext xorg-libXv xorg-libxcb \
-			xorg-libXau xorg-libXdmcp"
+			DEPENDS="libx11 libxext libxv libxcb \
+			libxau libxdmcp"
 			PROVIDE="qemacs"
 			TAGS="editor"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 qiv/receipt
--- a/qiv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qiv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev imlib2-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="gtk2-dev imlib2-dev libxinerama-dev"
 
 compile_rules() {
 	sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile
diff -r e167735ddedc -r 5669e8b3be70 qiviewer/receipt
--- a/qiviewer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qiviewer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="xorg-libX11 libQtCore libQtGui"
+	DEPENDS="libx11 libQtCore libQtGui"
 }
diff -r e167735ddedc -r 5669e8b3be70 qjackctl/receipt
--- a/qjackctl/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qjackctl/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="qmake Qt4-dev jack-dev xorg-xorgproto xorg-libX11-dev"
+BUILD_DEPENDS="qmake Qt4-dev jack-dev xorgproto libx11-dev"
 
 compile_rules() {
 	#sed -i 's|^LIBS.*|& -Wl,--copy-dt-needed-entries -lX11|' qjackctl.pro.in
@@ -24,8 +24,8 @@
 	cp -a $install/usr $fs
 	#rm -rf $fs/usr/share/man
 	DEPENDS="alsa-lib bzlib expat fontconfig freetype gcc-lib-base glib \
-	glibc-base jack libffi libpng16 libQtCore libQtDBus \
-	libQtGui libQtXml xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \
-	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
+	glibc-base jack libffi libpng libQtCore libQtDBus \
+	libQtGui libQtXml libxcb util-linux-uuid libice libsm \
+	libx11 libxau libxdmcp libxext libxrender zlib"
 	TAGS="audio sound"
 }
diff -r e167735ddedc -r 5669e8b3be70 qlipper/receipt
--- a/qlipper/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qlipper/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="qt5-base xorg-libX11"
+	DEPENDS="qt5-base libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 qoauth/receipt
--- a/qoauth/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qoauth/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
 WGET_URL="http://files.ayoy.net/$PACKAGE/release/$VERSION/src/$TARBALL"
 
-BUILD_DEPENDS="qmake qca-dev xorg-libX11-dev dbus-dev Qt4-dev slitaz-toolchain"
+BUILD_DEPENDS="qmake qca-dev libx11-dev dbus-dev Qt4-dev slitaz-toolchain"
 
 compile_rules() {
 #	echo -n "Linking..."
diff -r e167735ddedc -r 5669e8b3be70 qps/receipt
--- a/qps/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qps/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake qt5-dev mesa-dev xorg-libXrender-dev"
+BUILD_DEPENDS="cmake qt5-dev mesa-dev libxrender-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r e167735ddedc -r 5669e8b3be70 qrencode/receipt
--- a/qrencode/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qrencode/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://fukuchi.org/works/qrencode/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev"
+BUILD_DEPENDS="libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		qrencode)
 			copy @std
-			DEPENDS="libpng16"
+			DEPENDS="libpng"
 			;;
 		qrencode-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 qt4-base/receipt
--- a/qt4-base/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qt4-base/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,12 +13,12 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev dbus-dev libmng-dev cups-dev mysql-dev \
+BUILD_DEPENDS="libx11-dev dbus-dev libmng-dev cups-dev mysql-dev \
 unixODBC-dev mesa-dev fontconfig-dev postgresql-dev atk-dev autoconf automake \
 bash binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
-freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
+freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng-dev \
 libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
-pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
+pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple pixman-dev \
 tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev sqlite3-dev \
 libQtClucene wayland-dev"
 SPLIT="qt-base libQtWebkit qtconfig"
@@ -75,7 +75,7 @@
 	libQtWebkit)
 		copy libQtWebKit.so*
 		CAT="network|Web browser engine for Qt"
-		DEPENDS="libQtCore libQtGui libQtNetwork libpng16"
+		DEPENDS="libQtCore libQtGui libQtNetwork libpng"
 		;;
 	qtconfig)
 		CAT="x-window|Qtconfig is a tool that allows users to customize the default settings for Qt applications"
diff -r e167735ddedc -r 5669e8b3be70 qt4/receipt
--- a/qt4/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qt4/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,13 +12,13 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer0-dev gst0-python-dev \
+BUILD_DEPENDS="libx11-dev dbus-dev gstreamer0-dev gst0-python-dev \
 libmng-dev cups-dev mysql-dev unixODBC-dev mesa-dev fontconfig-dev mesa-libegl \
 glu glw postgresql-dev gst0-plugins-base-dev atk-dev autoconf automake bash \
 binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
-freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
+freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng-dev \
 libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
-pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
+pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple pixman-dev \
 tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
 sqlite3-dev glu-dev glw-dev wayland-dev"
 SPLIT="libQt3Support libQtClucene libQtCore libQtDBus libQtDeclarative \
@@ -149,10 +149,10 @@
 			;;
 		libQtGui)
 			CAT="development|Qt Gui Library"
-			DEPENDS="libQtCore expat fontconfig freetype xorg-libICE \
-			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
-			xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender \
-			libpng16"
+			DEPENDS="libQtCore expat fontconfig freetype libice \
+			libsm libx11 libxau libxdmcp \
+			libxext libxi libxrandr libxrender \
+			libpng"
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/lib/libQtGui.so* $fs/usr/lib
 
@@ -183,7 +183,7 @@
 			;;
 		libQtOpenGL)
 			CAT="development|Qt OpenGL Library"
-			DEPENDS="libQtGui mesa glu xorg-libXxf86vm xorg-libXdamage libdrm"
+			DEPENDS="libQtGui mesa glu libxxf86vm libxdamage libdrm"
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/lib/libQtOpenGL.so* $fs/usr/lib
 			;;
@@ -222,7 +222,7 @@
 			;;
 		libQtSvg)
 			CAT="development|Qt Svg Library"
-			DEPENDS="libQtCore libQtGui libQtXml libpng16"
+			DEPENDS="libQtCore libQtGui libQtXml libpng"
 			mkdir -p $fs/usr/lib/qt/plugins/imageformats $fs/usr/lib/qt/plugins/iconengines
 			cp -a $install/usr/lib/libQtSvg.so*	$fs/usr/lib
 			cp -a $install/usr/lib/qt/plugins/imageformats/libqsvg.so	$fs/*/*/*/*/imageformats
@@ -236,7 +236,7 @@
 			;;
 		libQtWebkit-video)
 			CAT="multimedia|Web browser engine for Qt (with gstreamer HTML5 audio video support)"
-			DEPENDS="libQtCore libQtGui libQtNetwork libpng16 \
+			DEPENDS="libQtCore libQtGui libQtNetwork libpng \
 			gst0-plugins-base gst0-plugins-good gst0-ffmpeg"
 			SUGGESTED="gst0-plugins-bad gst0-plugins-ugly"
 			mkdir -p $fs/usr/lib
@@ -261,9 +261,9 @@
 		Qt4-dev)
 			CAT="development|qt x11 toolkit"
 			SUGGESTED="libmng nvidia"
-			DEPENDS="QtDesigner jpeg tiff libpng16 mesa glu \
+			DEPENDS="QtDesigner jpeg tiff libpng mesa glu \
 			freetds libmysqlclient libpostgresqlclient libunixODBC \
-			xorg-xcb-util libQt3Support libQtClucene libQtPlugins \
+			xcb-util libQt3Support libQtClucene libQtPlugins \
 			libQtDBus libQtHelp libQtOpenGL libQtScript libQtSql \
 			libQtScriptTools libQtWebkit libQtTest qtconfig \
 			gcc-lib-base"
@@ -314,9 +314,9 @@
 			TAGS="qt"
 			DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
 			libQtDesigner libQtScript expat fontconfig freetype \
-			glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-			xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr \
-			xorg-libXrender zlib libpng16 gcc-lib-base"
+			glib libice libsm libx11 libxau \
+			libxdmcp libxext libxi libxrandr \
+			libxrender zlib libpng gcc-lib-base"
 			mkdir -p $fs/usr/bin \
 				$fs/usr/share/pixmaps \
 				$fs/usr/share/applications
diff -r e167735ddedc -r 5669e8b3be70 qt5/receipt
--- a/qt5/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qt5/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,10 +16,10 @@
 PATCH_URL="https://anonscm.debian.org/cgit/pkg-kde/qt/qtdeclarative.git/plain/debian/patches/"
 
 BUILD_DEPENDS="dbus-dev eudev-dev zlib-dev glib-dev icu-dev pcre-dev \
-openssl-dev sqlite3-dev xorg-libxcb-dev mesa-dev freetype-dev fontconfig-dev \
-libinput-dev harfbuzz-dev libjpeg-turbo-dev libpng16-dev tslib-dev \
-xorg-libX11-dev libxkbcommon-dev xorg-libXrender-dev cups-dev \
-xorg-libXcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
+openssl-dev sqlite3-dev libxcb-dev mesa-dev freetype-dev fontconfig-dev \
+libinput-dev harfbuzz-dev libjpeg-turbo-dev libpng-dev tslib-dev \
+libx11-dev libxkbcommon-dev libxrender-dev cups-dev \
+libxcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
 # Name split packages according to sources structure, for example:
 # $src/qtgamepad/ -> qt5-gamepad
 SPLIT="\
@@ -190,7 +190,7 @@
 			copy libqgtk3.so
 			CAT="development|GTK+3 theme support"
 			DEPENDS="qt5-base atk cairo gdk-pixbuf glib gtk3 mesa pango \
-			xorg-libX11 xorg-libXext";;
+			libx11 libxext";;
 		qt5-base-egl)
 			copy libQt5Egl*so*
 			CAT="development|EGL libs"
@@ -239,10 +239,10 @@
 
 			CAT="development|Base module"
 			DEPENDS="dbus eudev fontconfig freetype glib icu openssl libcups \
-			libdrm libharfbuzz libicu libinput libjpeg-turbo libpng16 \
+			libdrm libharfbuzz libicu libinput libjpeg-turbo libpng \
 			libsqlite3 libxkbcommon libxkbcommon-x11 mesa \
-			mtdev tslib xorg-libICE xorg-libSM xorg-libX11 xorg-libXext \
-			xorg-libXi xorg-libxcb zlib libatomic";;
+			mtdev tslib libice libsm libx11 libxext \
+			libxi libxcb zlib libatomic";;
 		qt5-canvas3d)
 			CAT="development|Canvas3D module"
 			DEPENDS="qt5-base qt5-declarative mesa";;
@@ -319,12 +319,12 @@
 			DEPENDS="qt5-base qt5-declarative mesa";;
 		qt5-virtualkeyboard)
 			CAT="development|VirtualKeyboard module"
-			DEPENDS="qt5-base qt5-declarative qt5-svg mesa xorg-libxcb";;
+			DEPENDS="qt5-base qt5-declarative qt5-svg mesa libxcb";;
 		qt5-wayland)
 			CAT="development|Wayland module"
 			DEPENDS="qt5-base qt5-declarative fontconfig freetype glib \
 			libxkbcommon mesa mesa-libegl mesa-libwayland-egl wayland \
-			xorg-libX11 xorg-libXcomposite xorg-libXext";;
+			libx11 libxcomposite libxext";;
 		qt5-webchannel)
 			CAT="development|WebChannel module"
 			DEPENDS="qt5-base qt5-declarative mesa";;
diff -r e167735ddedc -r 5669e8b3be70 qtav/receipt
--- a/qtav/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qtav/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/wang-bin/QtAV/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="qt5-dev ffmpeg-dev openal-dev pulseaudio-dev xorg-libXv-dev \
+BUILD_DEPENDS="qt5-dev ffmpeg-dev openal-dev pulseaudio-dev libxv-dev \
 libva-dev mesa-dev libsdl2-dev"
 SPLIT="$PACKAGE-dev $PACKAGE-player $PACKAGE-qmlplayer $PACKAGE"
 
@@ -44,7 +44,7 @@
 		qtav)
 			copy @std @rm
 			DEPENDS="ffmpeg libass libatomic libva mesa openal pulseaudio \
-			qt5-base xorg-libX11 xorg-libXext xorg-libXv"
+			qt5-base libx11 libxext libxv"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 qterminal/receipt
--- a/qterminal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qterminal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,6 +28,6 @@
 genpkg_rules() {
 	copy @std
 	sed -i '/^Actions=/d' $fs/usr/share/applications/qterminal.desktop
-	DEPENDS="qt5-base qt5-x11extras qtermwidget xorg-libX11"
+	DEPENDS="qt5-base qt5-x11extras qtermwidget libx11"
 	TAGS="terminal LXQt"
 }
diff -r e167735ddedc -r 5669e8b3be70 qtpanel/receipt
--- a/qtpanel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qtpanel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="Qt4-dev qmake cmake xorg-libX11-dev xorg-libXcomposite-dev \
-xorg-libXdamage-dev"
+BUILD_DEPENDS="Qt4-dev qmake cmake libx11-dev libxcomposite-dev \
+libxdamage-dev"
 
 compile_rules() {
 	#sed -i 's|ddd ddMMM hh:mm||' clockapplet.cpp
@@ -31,5 +31,5 @@
 	cp -a $install/* $fs
 	mkdir -p $fs/etc/xdg
 	cp -a $stuff/autostart $fs/etc/xdg
-	DEPENDS="libQtGui xorg-libXdamage xorg-libXcomposite"
+	DEPENDS="libQtGui libxdamage libxcomposite"
 }
diff -r e167735ddedc -r 5669e8b3be70 qtractor/receipt
--- a/qtractor/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qtractor/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="qmake Qt4-dev jack-dev alsa-lib-dev \
 libsndfile-dev ladspa-dev libvorbis-dev libmad-dev libsamplerate-dev \
-xorg-libX11-dev zlib-dev liblo-dev lilv lv2 "
+libx11-dev zlib-dev liblo-dev lilv lv2 "
 
 #extras:
 # librubberband : http://breakfastquay.com/rubberband/
diff -r e167735ddedc -r 5669e8b3be70 qtstyleplugins/receipt
--- a/qtstyleplugins/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qtstyleplugins/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}archive/${TARBALL/*-}"
 
 BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
-freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
+freetype-dev fontconfig-dev sqlite3-dev libpng-dev libjpeg-turbo-dev icu-dev \
 glib-dev zlib-dev libxslt-python libxslt-dev gtk2-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 qtwebkit/receipt
--- a/qtwebkit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qtwebkit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="${WEB_SITE_2}releases/download/${TARBALL/.tar*/}/$TARBALL"
 
 BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
-freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
+freetype-dev fontconfig-dev sqlite3-dev libpng-dev libjpeg-turbo-dev icu-dev \
 glib-dev zlib-dev libxslt-python libxslt-dev gstreamer1-dev \
 gst1-plugins-base-dev hyphen-dev "
 
diff -r e167735ddedc -r 5669e8b3be70 quarry/receipt
--- a/quarry/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/quarry/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 librsvg libgsf xorg-xcb-util"
+	DEPENDS="gtk2 librsvg libgsf xcb-util"
 	SUGGESTED="gnugo"
 }
diff -r e167735ddedc -r 5669e8b3be70 quesoglc/receipt
--- a/quesoglc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/quesoglc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="freetype-dev fontconfig-dev freeglut-dev fribidi-dev \
-mesa-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \
-libxml2-dev xorg-libxshmfence-dev glu-dev"
+mesa-dev expat-dev libxxf86vm-dev util-linux-uuid-dev libxcb-dev \
+libxml2-dev libxshmfence-dev glu-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 		quesoglc)
 			copy @std
 			DEPENDS="freetype fontconfig freeglut fribidi mesa glu \
-			expat xorg-libXxf86vm xorg-libxcb"
+			expat libxxf86vm libxcb"
 			;;
 		quesoglc-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 qupzilla/receipt
--- a/qupzilla/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qupzilla/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="Qt4-dev qmake openssl-dev xorg-libX11-dev"
+BUILD_DEPENDS="Qt4-dev qmake openssl-dev libx11-dev"
 SPLIT="$PACKAGE-locales"
 
 COOKOPTS="!pixmaps"
@@ -33,7 +33,7 @@
 			rm -rf $fs/usr/share/pixmaps
 			rm -rf $fs/usr/share/qupzilla/locale
 			DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtScript \
-			libQtSql libQtXml openssl xorg-libX11 zlib cacerts xdg-utils \
+			libQtSql libQtXml openssl libx11 zlib cacerts xdg-utils \
 			libQtWebkit"
 			SUGGESTED="libQtWebkit-video qupzilla-locales"
 			TAGS="web-browser"
diff -r e167735ddedc -r 5669e8b3be70 qutim/receipt
--- a/qutim/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qutim/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}dwnl/40/$TARBALL"
 
-BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev xorg-libXScrnSaver-dev dbus-dev \
+BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev libxscrnsaver-dev dbus-dev \
 libjreen-dev mesa-dev"
 
 compile_rules() {
@@ -35,5 +35,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
-	DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen qca-ossl"
+	DEPENDS="qt4 qca qt4-phonon libxscrnsaver libjreen qca-ossl"
 }
diff -r e167735ddedc -r 5669e8b3be70 qxkb/receipt
--- a/qxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/qxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://qxkb.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="cmake Qt4-dev xorg-libxkbfile-dev qmake"
+BUILD_DEPENDS="cmake Qt4-dev libxkbfile-dev qmake"
 
 compile_rules() {
 	mkdir build
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="glibc-base libQtSvg xorg-libxkbfile"
+	DEPENDS="glibc-base libQtSvg libxkbfile"
 }
diff -r e167735ddedc -r 5669e8b3be70 radeontool/receipt
--- a/radeontool/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/radeontool/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://people.freedesktop.org/~airlied/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libpciaccess-dev"
+BUILD_DEPENDS="libpciaccess-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libpciaccess"
+	DEPENDS="libpciaccess"
 }
diff -r e167735ddedc -r 5669e8b3be70 rainbow-cm/receipt
--- a/rainbow-cm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rainbow-cm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk2 pango xorg-libX11"
+	DEPENDS="glib gtk2 pango libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 raine/receipt
--- a/raine/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/raine/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/cgi-bin/gitweb.cgi?p=raine;a=snapshot;h=02988ce197bc5b9f1a9eae66251e883d649cc03b;sf=tgz"
 EXTRA_SOURCE_FILES="raines-0.51.9.tar.bz2"
 
-BUILD_DEPENDS="libsdl-dev zlib-dev libpng16-dev nasm libsdl-image-dev xz-dev \
+BUILD_DEPENDS="libsdl-dev zlib-dev libpng-dev nasm libsdl-image-dev xz-dev \
 libsdl-ttf-dev muparser-dev mesa-dev glu-dev"
 
 compile_rules() {
@@ -33,5 +33,5 @@
 	mkdir -p $fs/usr/
 	cp -a $install/usr/games $fs/usr/
 	cp -a $install/usr/share $fs/usr/
-	DEPENDS="libsdl zlib libpng16 libsdl-image liblzma libsdl-ttf muparser mesa"
+	DEPENDS="libsdl zlib libpng libsdl-image liblzma libsdl-ttf muparser mesa"
 }
diff -r e167735ddedc -r 5669e8b3be70 rapidsvn/receipt
--- a/rapidsvn/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rapidsvn/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 WGET_URL="http://www.rapidsvn.org/download/release/$VERSION/$TARBALL"
 TAGS="subversion svn version-control versioning"
 
-BUILD_DEPENDS="xorg-libXxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \
+BUILD_DEPENDS="libxxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \
 apr-util-dev cyrus-sasl-dev neon-dev libproxy-dev sqlite3-dev expat-dev python \
 util-linux-uuid-dev"
 
@@ -35,6 +35,6 @@
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="wxWidgets28 libsvn apr libltdl xorg-libXxf86vm libproxy libsqlite3 \
+	DEPENDS="wxWidgets28 libsvn apr libltdl libxxf86vm libproxy libsqlite3 \
 	libsasl apr-util"
 }
diff -r e167735ddedc -r 5669e8b3be70 ratmenu/receipt
--- a/ratmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ratmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/r/ratmenu/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
+BUILD_DEPENDS="libx11-dev xorgproto"
 
 compile_rules() {
 	make PREFIX=/usr &&
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 ratpoison/receipt
--- a/ratpoison/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ratpoison/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXtst-dev xorg-libXinerama-dev"
+BUILD_DEPENDS="libxtst-dev libxinerama-dev"
 
 compile_rules() {
 	./configure &&
@@ -23,6 +23,6 @@
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/ratpoison $fs/usr/share
-	DEPENDS="microperl xorg-libXtst xorg-libXinerama"
+	DEPENDS="microperl libxtst libxinerama"
 	TAGS="window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 razorqt/receipt
--- a/razorqt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/razorqt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -41,7 +41,7 @@
 	case $PACKAGE in
 		razorqt)
 			DEPENDS="libQtDBus libQtGui libmagic libstatgrab \
-			xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
+			libxcomposite libxcursor libxdamage \
 			lightdm-qt"
 			SUGGESTED="razorqt-themes razorqt-appswitcher razorqt-power \
 			razorqt-runner razorqt-autosuspend"
diff -r e167735ddedc -r 5669e8b3be70 rdesktop/receipt
--- a/rdesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rdesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,7 +30,7 @@
 		cp -a $install/usr/share/rdesktop/keymaps/$i* \
 			$fs/usr/share/rdesktop/keymaps
 	done
-	DEPENDS="openssl xorg-libX11 glibc-base xorg-libXau xorg-libXdmcp \
+	DEPENDS="openssl libx11 glibc-base libxau libxdmcp \
 	alsa-lib libsamplerate libao pcsc-lite"
 	TAGS="rdp remote-desktop"
 }
diff -r e167735ddedc -r 5669e8b3be70 rdpdesk/receipt
--- a/rdpdesk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rdpdesk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="wxWidgets28-dev xorg-imake jpeg-dev zlib-dev gettext \
-openssl-dev xorg-libXp autoconf xorg-libXt-dev xorg-libXp-dev xorg-libXaw-dev"
+BUILD_DEPENDS="wxWidgets28-dev imake jpeg-dev zlib-dev gettext \
+openssl-dev autoconf libxt-dev libxp-dev libxaw-dev"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	cp -a $install/usr $fs
-	DEPENDS="wxWidgets28 xorg-libXp xorg-libXaw openssl"
+	DEPENDS="wxWidgets28 libxp libxaw openssl"
 	SUGGESTED="wfica rdesktop"
 }
diff -r e167735ddedc -r 5669e8b3be70 realvnc-viewer/receipt
--- a/realvnc-viewer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/realvnc-viewer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="vnc4_$VERSION+X4.3.0.orig.tar.gz"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/v/vnc4/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev \
-xorg-libXdmcp-dev xorg-libXmu-dev xorg-xorgproto xorg-libXtst-dev"
+BUILD_DEPENDS="libxaw-dev libxt-dev libxau-dev \
+libxdmcp-dev libxmu-dev xorgproto libxtst-dev"
 
 compile_rules() {
 	mv vnc4* $src 2> /dev/null
@@ -38,8 +38,8 @@
 
 	cp -a $src/unix/vncviewer/vncviewer $fs/usr/bin
 	cp -a $stuff/* $fs/usr/share
-	DEPENDS="gcc-lib-base xorg-libXdmcp xorg-libXau xorg-libX11 xorg-libXext \
-	xorg-libICE xorg-libSM util-linux-uuid"
+	DEPENDS="gcc-lib-base libxdmcp libxau libx11 libxext \
+	libice libsm util-linux-uuid"
 	PROVIDE="vncviewer"
 	TAGS="remote-desktop vnc"
 }
diff -r e167735ddedc -r 5669e8b3be70 recordmydesktop/receipt
--- a/recordmydesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/recordmydesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libXext-dev xorg-libXdamage-dev xorg-libXfixes-dev libogg libogg-dev \
-libvorbis libvorbis-dev libtheora-dev zlib-dev xorg-libXfixes-dev \
-xorg-xorgproto"
+BUILD_DEPENDS="alsa-lib-dev libx11-dev libice-dev libsm-dev \
+libxext-dev libxdamage-dev libxfixes-dev libogg libogg-dev \
+libvorbis libvorbis-dev libtheora-dev zlib-dev \
+xorgproto"
 
 compile_rules() {
 	sed -i 's|shmstr.h|shmproto.h|g' src/*.h
@@ -32,7 +32,7 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="libtheora alsa-lib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes zlib"
+	DEPENDS="libtheora alsa-lib libice libsm libx11 libxau \
+	libxdamage libxdmcp libxext libxfixes zlib"
 	TAGS="desktop"
 }
diff -r e167735ddedc -r 5669e8b3be70 redshift/receipt
--- a/redshift/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/redshift/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="python xorg-libXrandr-dev"
+BUILD_DEPENDS="python libxrandr-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 remind/receipt
--- a/remind/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/remind/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,7 +25,7 @@
 	mkdir -p $fs/usr $fs/etc/skel
 	touch $fs/etc/skel/.reminders
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="tk tcl tcllib xorg-libXScrnSaver"
+	DEPENDS="tk tcl tcllib libxscrnsaver"
 	TAGS="office calendar"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 remmina/receipt
--- a/remmina/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/remmina/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gtk2-dev intltool cmake libgcrypt-dev libssh-dev vte-dev \
 freerdp-dev libvncserver-dev libgnome-keyring-dev gettext-dev \
-telepathy-glib-dev libappindicator-gtk3-dev xorg-libxkbfile-dev"
+telepathy-glib-dev libappindicator-gtk3-dev libxkbfile-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 rhythmcat2/receipt
--- a/rhythmcat2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rhythmcat2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -30,5 +30,5 @@
 
 genpkg_rules() {
 	copy RhythmCat2 *.so* *.PNG *.desktop *.mo
-	DEPENDS="gst0-plugins-base gtk3 xorg-libXdamage"
+	DEPENDS="gst0-plugins-base gtk3 libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 ristretto/receipt
--- a/ristretto/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ristretto/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,6 +25,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libexif libmagic libxfce4ui \
-	libxfce4util pango xfconf xorg-libX11"
+	libxfce4util pango xfconf libx11"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 rosegarden/receipt
--- a/rosegarden/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rosegarden/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="Qt4-dev ladspa-dev dssi-dev alsa-lib-dev xorg-libSM-dev \
-liblo-dev liblrdf-dev fftw-dev libsndfile-dev libsamplerate-dev xorg-imake \
-xorg-makedepend jack-dev xorg-libX11-dev lirc-dev"
+BUILD_DEPENDS="Qt4-dev ladspa-dev dssi-dev alsa-lib-dev libsm-dev \
+liblo-dev liblrdf-dev fftw-dev libsndfile-dev libsamplerate-dev imake \
+makedepend jack-dev libx11-dev lirc-dev"
 
 compile_rules() {
 	touch -d 197001010101 dependencies
@@ -32,7 +32,7 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/icons $fs/usr/share
 	DEPENDS="libQtGui libQtXml libQtNetwork libQtCore jack libsndfile liblrdf \
-	fftw libsamplerate alsa-lib xorg-libX11 zlib gcc-lib-base xorg-libxcb \
-	xorg-libXau xorg-libXdmcp lirc liblo"
+	fftw libsamplerate alsa-lib libx11 zlib gcc-lib-base libxcb \
+	libxau libxdmcp lirc liblo"
 	TAGS="midi"
 }
diff -r e167735ddedc -r 5669e8b3be70 rox-filer/receipt
--- a/rox-filer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rox-filer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/rox/$TARBALL"
 
 BUILD_DEPENDS="libglade-dev libxml2-dev gtk2-dev shared-mime-info-dev \
-xorg-libSM-dev symlinks"
+libsm-dev symlinks"
 SPLIT="$PACKAGE-default-icons $PACKAGE-locales $PACKAGE"
 
 compile_rules() {
@@ -72,8 +72,8 @@
 			;;
 		*)
 			copy @std @rm
-			DEPENDS="gdk-pixbuf glib gtk2 libglade libxml2 pango xorg-libICE \
-			xorg-libSM xorg-libX11   shared-mime-info"
+			DEPENDS="gdk-pixbuf glib gtk2 libglade libxml2 pango libice \
+			libsm libx11   shared-mime-info"
 			SUGGESTED="rox-filer-default-icons rox-filer-locales"
 			TAGS="file-manager"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 rrdtool/receipt
--- a/rrdtool/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rrdtool/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://oss.oetiker.ch/rrdtool/pub/$TARBALL"
 
-BUILD_DEPENDS="perl-dev zlib-dev freetype-dev libpng16-dev libxml2-dev \
-fontconfig-dev xorg-pixman-dev cairo-dev glib-dev pango-dev python-dev perl \
+BUILD_DEPENDS="perl-dev zlib-dev freetype-dev libpng-dev libxml2-dev \
+fontconfig-dev pixman-dev cairo-dev glib-dev pango-dev python-dev perl \
 groff tcl-dev lua5.1-dev ruby-dev gettext-dev libwrap-dev glib-dev"
 SPLIT="$PACKAGE-lua $PACKAGE-perl $PACKAGE-python $PACKAGE-ruby $PACKAGE-tcl \
 $PACKAGE-dev $PACKAGE $PACKAGE-lite:lite"
@@ -36,7 +36,7 @@
 DEPENDS_ruby="ruby rrdtool"
 DEPENDS_tcl="tcl rrdtool"
 DEPENDS_dev="rrdtool"
-DEPENDS_std="cairo glib libpng16 libwrap libxml2 pango"
+DEPENDS_std="cairo glib libpng libwrap libxml2 pango"
 DEPENDS_lite="glib libxml2"
 
 TAGS_std="logs"
diff -r e167735ddedc -r 5669e8b3be70 rubix/receipt
--- a/rubix/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/rubix/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
+	DEPENDS="libx11 libxcb libxau libxdmcp"
 }
diff -r e167735ddedc -r 5669e8b3be70 ruby-gtk2/receipt
--- a/ruby-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ruby-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,7 +35,7 @@
 		*)
 			copy @ruby
 			DEPENDS="ruby ruby-atk ruby-gdk_pixbuf2 ruby-pango cairo \
-			gdk-pixbuf glib gtk2 pango xorg-libX11"
+			gdk-pixbuf glib gtk2 pango libx11"
 			TAGS="ruby programming gtk development"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 sakura-gtk2/receipt
--- a/sakura-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sakura-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -33,6 +33,6 @@
 	copy @std
 	TAGS="terminal"
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango vte-gtk2 \
-	xorg-libX11 xorg-libXext"
+	libx11 libxext"
 	PROVIDE="sakura"
 }
diff -r e167735ddedc -r 5669e8b3be70 sbxkb/receipt
--- a/sbxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sbxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,8 +24,8 @@
 genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base \
-	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
-	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
-	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
-	xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
+	gdk-pixbuf glib glibc-base gtk2 libffi libpng libxcb pango \
+	pixman libx11 libxau libxcomposite libxcursor \
+	libxdamage libxdmcp libxext libxfixes \
+	libxinerama libxrandr libxrender zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 scim-pinyin/receipt
--- a/scim-pinyin/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/scim-pinyin/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,18 +29,18 @@
 		scim-pinyin)
 			copy @std
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
-			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
-			pcre xorg-pixman scim xorg-libX11 xorg-libXau xorg-libXdmcp \
-			xorg-libXext xorg-libXrender zlib"
+			harfbuzz libffi libltdl liblzma libpng libxcb libxml2 pango \
+			pcre pixman scim libx11 libxau libxdmcp \
+			libxext libxrender zlib"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
 			gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev harfbuzz-dev libffi-dev \
-			xz-dev libpng16-dev libtool xorg-libxcb-dev libxml2-dev \
-			pango-dev pcre-dev xorg-pixman-dev scim-dev xorg-libX11-dev \
-			xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
-			xorg-libXrender-dev zlib-dev"
+			xz-dev libpng-dev libtool libxcb-dev libxml2-dev \
+			pango-dev pcre-dev pixman-dev scim-dev libx11-dev \
+			libxau-dev libxdmcp-dev libxext-dev \
+			libxrender-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 scim/receipt
--- a/scim/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/scim/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/scim-im/scim/archive/$TARBALL"
 
 BUILD_DEPENDS="gettext-dev automake intltool libtool doxygen coreutils-path \
-libxslt docbook-xsl gtk2-dev xorg-libX11-dev"
+libxslt docbook-xsl gtk2-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,19 +31,19 @@
 		scim)
 			copy @std
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
-			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
-			pcre xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
-			xorg-libXrender zlib"
+			harfbuzz libffi libltdl liblzma libpng libxcb libxml2 pango \
+			pcre pixman libx11 libxau libxdmcp libxext \
+			libxrender zlib"
 			CONFIG_FILES="/etc/scim/config /etc/scim/global"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="scim atk-dev bzip2-dev cairo-dev fontconfig-dev \
 			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev \
-			harfbuzz-dev libffi-dev xz-dev libpng16-dev libtool \
-			xorg-libxcb-dev libxml2-dev pango-dev pcre-dev xorg-pixman-dev \
-			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
-			xorg-libXrender-dev zlib-dev"
+			harfbuzz-dev libffi-dev xz-dev libpng-dev libtool \
+			libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev \
+			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
+			libxrender-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 scite/receipt
--- a/scite/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/scite/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,6 +35,6 @@
 	# Save space ~100kb
 	rm $fs/usr/share/scite/*.html
 	rm $fs/usr/share/scite/*.png
-	DEPENDS="gtk2 xorg-libXdamage gcc-lib-base"
+	DEPENDS="gtk2 libxdamage gcc-lib-base"
 	TAGS="text-editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 screenfetch/receipt
--- a/screenfetch/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/screenfetch/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -19,5 +19,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="bash procps xorg-xdpyinfo"
+	DEPENDS="bash procps xdpyinfo"
 }
diff -r e167735ddedc -r 5669e8b3be70 screengrab/receipt
--- a/screengrab/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/screengrab/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras xorg-libX11 \
-	xorg-libXext xorg-libxcb"
+	DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras libx11 \
+	libxext libxcb"
 }
diff -r e167735ddedc -r 5669e8b3be70 scribus/receipt
--- a/scribus/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/scribus/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="cmake qmake Qt4-dev freetype freetype-dev \
-cairo cairo-dev tiff tiff-dev lcms lcms-dev jpeg jpeg-dev libpng16 libpng16-dev \
-cups cups-dev fontconfig fontconfig-dev libxml2 libxml2-dev podofo-dev \
-ghostscript python python-dev python-pil aspell aspell-dev \
-boost-dev openssl openssl-dev zlib tk"
+BUILD_DEPENDS="cmake qmake Qt4-dev freetype-dev \
+cairo-dev tiff-dev lcms-dev jpeg-dev libpng-dev \
+cups-dev fontconfig-dev libxml2-dev podofo-dev \
+ghostscript python-dev python-pil aspell-dev \
+boost-dev openssl-dev zlib tk"
 
 compile_rules() {
 	cmake \
diff -r e167735ddedc -r 5669e8b3be70 scrot/receipt
--- a/scrot/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/scrot/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.linuxbrit.co.uk/downloads/$TARBALL"
 
-BUILD_DEPENDS="patch giblib-dev imlib2-dev xorg-libX11-dev"
+BUILD_DEPENDS="patch giblib-dev imlib2-dev libx11-dev"
 
 compile_rules() {
 	sed -i 's|prefix)/doc|prefix)/share/doc|' *
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="bzlib freetype giblib glibc-base imlib2 xorg-libxcb xorg-libX11 \
-	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
+	DEPENDS="bzlib freetype giblib glibc-base imlib2 libxcb libx11 \
+	libxau libxdmcp libxext zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 sddm/receipt
--- a/sddm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sddm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/sddm/sddm/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake extra-cmake-modules xorg-libxcb-dev qt5-dev mesa-dev \
+BUILD_DEPENDS="cmake extra-cmake-modules libxcb-dev qt5-dev mesa-dev \
 python-docutils"
 SPLIT="$PACKAGE-theme-elarun $PACKAGE-theme-maldives $PACKAGE-theme-maya $PACKAGE"
 
@@ -66,7 +66,7 @@
 		sddm)
 			copy @std @rm
 			rm -r $fs/etc/pam.d # PAM disabled, but installed anyway
-			DEPENDS="sddm-theme-maya qt5-base qt5-declarative xorg-libxcb"
+			DEPENDS="sddm-theme-maya qt5-base qt5-declarative libxcb"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 seamonkey/receipt
--- a/seamonkey/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/seamonkey/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$VERSION/source/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev zip libIDL coreutils xorg-libXft-dev libevent-dev \
+BUILD_DEPENDS="gtk2-dev zip libIDL coreutils libxft-dev libevent-dev \
 libvpx-dev perl alsa-lib alsa-lib-dev findutils python python-dev \
 wireless_tools-dev mesa-dev yasm libnotify-dev curl-dev hunspell-dev"
 
@@ -51,7 +51,7 @@
 
 	# Create default user preference file
 	cp $stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js
-	DEPENDS="gtk2 glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl \
+	DEPENDS="gtk2 glib jpeg libx11 libIDL alsa-lib libxt curl \
 	libnotify libevent libvpx"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 searchmonkey/receipt
--- a/searchmonkey/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/searchmonkey/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev libglade-dev xorg-libXdamage-dev"
+BUILD_DEPENDS="gtk2-dev libglade-dev libxdamage-dev"
 
 compile_rules() {
 	./configure &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk2 libglade xorg-libXdamage"
+	DEPENDS="gtk2 libglade libxdamage"
 }
diff -r e167735ddedc -r 5669e8b3be70 seed/receipt
--- a/seed/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/seed/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -38,11 +38,11 @@
 			DEPENDS="seed atk-dev bzip2-dev cairo-dev dbus-dev dbus-glib-dev \
 			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev gmp-dev \
 			gobject-introspection-dev gtk2-dev harfbuzz-dev icu-dev libffi-dev \
-			libpng16-dev webkitgtk-dev libxml2-dev mpfr-dev pango-dev pcre-dev \
+			libpng-dev webkitgtk-dev libxml2-dev mpfr-dev pango-dev pcre-dev \
 			readline-dev sqlite3-dev util-linux-blkid-dev util-linux-mount-dev \
-			util-linux-uuid-dev xorg-libX11-dev xorg-libXau-dev \
-			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
-			xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
+			util-linux-uuid-dev libx11-dev libxau-dev \
+			libxdmcp-dev libxext-dev libxrender-dev \
+			libxcb-dev pixman-dev xz-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 slang/receipt
--- a/slang/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slang/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.jedsoft.org/releases/slang/$TARBALL"
 
-BUILD_DEPENDS="pcre-dev oniguruma-dev libpng16-dev zlib-dev readline-dev"
+BUILD_DEPENDS="pcre-dev oniguruma-dev libpng-dev zlib-dev readline-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		slang)
 			copy @std
-			DEPENDS="libpcre libpng16 oniguruma readline zlib"
+			DEPENDS="libpcre libpng oniguruma readline zlib"
 			CONFIG_FILES="/etc/slsh.rc"
 			;;
 		*-dev) copy @dev;;
diff -r e167735ddedc -r 5669e8b3be70 slim/receipt
--- a/slim/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slim/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL"
 
-BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
-libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev \
-pam-dev   libunistring xorg-libXrandr-dev consolekit2-dev"
+BUILD_DEPENDS="cmake libx11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
+libpng-dev fontconfig-dev libxft-dev libxrender-dev libxmu-dev \
+pam-dev   libunistring libxrandr-dev consolekit2-dev"
 SPLIT="$PACKAGE-theme-default $PACKAGE" # $PACKAGE-pam:pam"
 
 compile_rules() {
@@ -59,16 +59,16 @@
 			;;
 		slim)
 			copy @std @rm
-			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
-			xorg-libXft xorg-libXmu xorg-libXrender zlib"
+			DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
+			libxft libxmu libxrender zlib"
 			CONFIG_FILES="/etc/slim.conf"
 			SUGGESTED="slim-theme-default slitaz-configs"
 			;;
 		slim-pam)
 			copy @std
 			rm -rf $fs/usr/share/slim/themes/default
-			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
-			xorg-libXft xorg-libXmu xorg-libXrender zlib pam"
+			DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
+			libxft libxmu libxrender zlib pam"
 			CONFIG_FILES="/etc/slim.conf"
 			SUGGESTED="slim-theme-default slitaz-configs"
 			PROVIDE="slim:pam"
diff -r e167735ddedc -r 5669e8b3be70 slitaz-configs/receipt
--- a/slitaz-configs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slitaz-configs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -93,8 +93,8 @@
 				/usr/share/templates/ \
 				/usr/share/webhome/ \
 				/root/
-			DEPENDS="slitaz-configs-base xorg-libXcomposite \
-			xorg-libXdamage transset-df ttf-dejavu slim compton"
+			DEPENDS="slitaz-configs-base libxcomposite \
+			libxdamage transset-df ttf-dejavu slim compton"
 			CAT="base-system|for GUI systems"
 			;;
 		slitaz-themes)
diff -r e167735ddedc -r 5669e8b3be70 slitaz-dev-pkgs/receipt
--- a/slitaz-dev-pkgs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slitaz-dev-pkgs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,6 +12,6 @@
 DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash bison \
 flex libtool gettext-dev m4 perl perl-xml-parser perl-xml-simple ncurses-dev \
 pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config fontconfig-dev freetype-dev \
-glibc-dev libpng16-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
+glibc-dev libpng-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
 pango-dev atk-dev cairo-dev expat-dev glib-dev gtk2-dev libIDL zip poppler-dev \
-python patch openssl mercurial rsync wget xorg-pixman-dev autoconf automake"
+python patch openssl mercurial rsync wget pixman-dev autoconf automake"
diff -r e167735ddedc -r 5669e8b3be70 slitaz-polar-cursors/receipt
--- a/slitaz-polar-cursors/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slitaz-polar-cursors/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL=$PACKAGE-$VERSION.tar.gz
 WGET_URL="ftp://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL"
 
-BUILD_DEPENDS="xorg-xcursorgen"
+BUILD_DEPENDS="xcursorgen"
 
 compile_rules() {
 	cd $src/Source
diff -r e167735ddedc -r 5669e8b3be70 slock/receipt
--- a/slock/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/slock/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev xorg-libXext-dev"
+BUILD_DEPENDS="xorgproto libx11-dev libxext-dev"
 
 compile_rules() {
 	mv config.mk config.mk.original
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext"
+	DEPENDS="libx11 libxau libxdmcp libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 smx/receipt
--- a/smx/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/smx/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -39,18 +39,18 @@
 		smx)
 			copy @std @rm
 			DEPENDS="bzlib fontconfig freetype glib openssl libgd \
-			libharfbuzz libjpeg-turbo liblzma libpng16 libsqlite3 libtdb \
-			libunixODBC libwebp libxml2 pcre perl-core tiff xorg-libX11 \
-			xorg-libXau xorg-libXdmcp xorg-libXpm xorg-libxcb zlib"
+			libharfbuzz libjpeg-turbo liblzma libpng libsqlite3 libtdb \
+			libunixODBC libwebp libxml2 pcre perl-core tiff libx11 \
+			libxau libxdmcp libxpm libxcb zlib"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="smx smx-fcgi \
 			bzip2-dev fontconfig-dev freetype-dev glib-dev harfbuzz-dev \
-			libjpeg-turbo-dev libgd-dev libpng16-dev libtdb-dev libwebp-dev \
+			libjpeg-turbo-dev libgd-dev libpng-dev libtdb-dev libwebp-dev \
 			libxml2-dev openssl-dev pcre-dev perl-dev sqlite3-dev tiff-dev \
-			unixODBC-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
-			xorg-libXpm-dev xorg-libxcb-dev xz-dev zlib-dev"
+			unixODBC-dev libx11-dev libxau-dev libxdmcp-dev \
+			libxpm-dev libxcb-dev xz-dev zlib-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 sox/receipt
--- a/sox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev \
-libvorbis-dev libpng16-dev lame-dev libsamplerate-dev alsa-lib-dev \
+libvorbis-dev libpng-dev lame-dev libsamplerate-dev alsa-lib-dev \
 libao-dev libogg-dev libmagic-dev flac-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -30,7 +30,7 @@
 		sox)
 			copy @std
 			DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad \
-			libvorbis libpng16 lame libmagic libgomp libao ffmpeg \
+			libvorbis libpng lame libmagic libgomp libao ffmpeg \
 			libsndfile flac"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 spacefm/receipt
--- a/spacefm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/spacefm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -51,14 +51,14 @@
 			copy @std @ico
 			CAT="system-tools|with GTK+2 interface"
 			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk2 pango \
-			startup-notification xorg-libX11   bash"
+			startup-notification libx11   bash"
 			TAGS="file-manager"
 			;;
 		spacefm-gtk3)
 			copy @std @ico
 			CAT="system-tools|with GTK+3 interface"
 			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk3 pango \
-			startup-notification xorg-libX11   bash"
+			startup-notification libx11   bash"
 			TAGS="file-manager"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 spectrwm/receipt
--- a/spectrwm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/spectrwm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="https://opensource.conformal.com/snapshots/spectrwm/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev \
-xorg-libXcursor-dev xorg-libXft-dev xorg-xcb-util-dev xorg-xcb-util-wm-dev \
-xorg-xcb-util-keysyms-dev xorg-libXt-dev"
+BUILD_DEPENDS="libx11-dev libxrandr-dev \
+libxcursor-dev libxft-dev xcb-util-dev xcb-util-wm-dev \
+xcb-util-keysyms-dev libxt-dev"
 
 compile_rules() {
 	cd linux
@@ -29,7 +29,7 @@
 	# "switch on" keyboard mapping
 	sed -i 's|# keyboard_mapping.*|keyboard_mapping = /etc/spectrwm_us.conf|' \
 		$fs/etc/spectrwm.conf
-	DEPENDS="xorg-xcb-util xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libXcursor xorg-libXft"
+	DEPENDS="xcb-util xcb-util-keysyms xcb-util-wm libxcursor libxft"
 	CONFIG_FILES="/etc/spectrwm.conf"
 	TAGS="tile window-manager"
 }
diff -r e167735ddedc -r 5669e8b3be70 speedcrunch/receipt
--- a/speedcrunch/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/speedcrunch/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="https://github.com/speedcrunch/SpeedCrunch/archive/$GITHASH.zip"
 
-BUILD_DEPENDS="cmake Qt4-dev qmake xorg-xorgproto xorg-libX11-dev"
+BUILD_DEPENDS="cmake Qt4-dev qmake xorgproto libx11-dev"
 
 compile_rules() {
 	mkdir build
diff -r e167735ddedc -r 5669e8b3be70 splashutils/receipt
--- a/splashutils/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/splashutils/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/fbsplash.berlios/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake libtool jpeg-dev gpm-dev libpng16-dev \
+BUILD_DEPENDS="autoconf automake libtool jpeg-dev gpm-dev libpng-dev \
 freetype-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 squeak-vm/receipt
--- a/squeak-vm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/squeak-vm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="Squeak-$VERSION-src.tar.gz"
 WGET_URL="http://squeakvm.org/unix/release/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev cmake"
+BUILD_DEPENDS="alsa-lib-dev dbus-dev libxrender-dev cmake"
 
 compile_rules() {
 	./unix/cmake/configure \
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib dbus xorg-libXrender"
+	DEPENDS="alsa-lib dbus libxrender"
 	SUGGESTED="scratch"
 }
diff -r e167735ddedc -r 5669e8b3be70 st/receipt
--- a/st/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/st/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/st/$TARBALL"
 
-BUILD_DEPENDS="fontconfig-dev freetype-dev xorg-xorgproto xorg-libX11-dev \
-xorg-libXft-dev"
+BUILD_DEPENDS="fontconfig-dev freetype-dev xorgproto libx11-dev \
+libxft-dev"
 
 compile_rules() {
 	# fix PREFIX
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fontconfig freetype xorg-libX11 xorg-libXft"
+	DEPENDS="fontconfig freetype libx11 libxft"
 }
diff -r e167735ddedc -r 5669e8b3be70 stardict/receipt
--- a/stardict/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stardict/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://stardict-3.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="bzip2 enchant-dev tar intltool popt libsigc++-dev gtk2-dev \
-xorg-libSM-dev zlib-dev util-linux-uuid-dev libffi"
+libsm-dev zlib-dev util-linux-uuid-dev libffi"
 
 compile_rules() {
 	sed -i 's/<vector>/&\n#include <stdio.h>/' stardict-plugins/stardict-wordnet-plugin/scene.hpp
@@ -35,5 +35,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="enchant libsigc++ gtk2 xorg-libSM"
+	DEPENDS="enchant libsigc++ gtk2 libsm"
 }
diff -r e167735ddedc -r 5669e8b3be70 startup-notification/receipt
--- a/startup-notification/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/startup-notification/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.freedesktop.org/software/startup-notification/releases/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libxcb-dev \
-xorg-xcb-util-dev"
+BUILD_DEPENDS="libx11-dev libice-dev libxcb-dev \
+xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		startup-notification)
 			copy @std
-			DEPENDS="xorg-libX11 xorg-libxcb xorg-xcb-util"
+			DEPENDS="libx11 libxcb xcb-util"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 stella/receipt
--- a/stella/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stella/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libsdl-dev libpng16-dev zlib-dev"
+BUILD_DEPENDS="libsdl-dev libpng-dev zlib-dev"
 
 compile_rules() {
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gcc-lib-base libsdl libpng16"
+	DEPENDS="gcc-lib-base libsdl libpng"
 	TAGS="emulator atari"
 }
diff -r e167735ddedc -r 5669e8b3be70 stellarium/receipt
--- a/stellarium/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stellarium/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gettext-dev perl cmake boost-dev boost-thread mesa-dev \
-qt4 Qt4-dev qmake zlib-dev xorg-libX11-dev libdrm glu-dev"
+qt4 Qt4-dev qmake zlib-dev libx11-dev libdrm glu-dev"
 
 compile_rules() {
 	sed -i 's/Ch.*reau/Chereau/' doc/stellarium*
@@ -29,6 +29,6 @@
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/stellarium $fs/usr/share
-	DEPENDS="libpng16 mesa glib freetype openssl libQtScript libQtOpenGL \
+	DEPENDS="libpng mesa glib freetype openssl libQtScript libQtOpenGL \
 	libQtSql libQtNetwork libQtGui zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 stjerm-terminal/receipt
--- a/stjerm-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stjerm-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="stjerm-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake xorg-libXinerama-dev"
+BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake libxinerama-dev"
 
 compile_rules() {
 	./autogen.sh
diff -r e167735ddedc -r 5669e8b3be70 strigi/receipt
--- a/strigi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/strigi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://www.vandenoever.info/software/strigi/$TARBALL"
 
 BUILD_DEPENDS="libQtXml libxml2-dev cmake Qt4-dev bzlib expat-dev sqlite3-dev \
-dbus-dev libQtCore libQtDBus qmake bzip2-dev xorg-libX11-dev"
+dbus-dev libQtCore libQtDBus qmake bzip2-dev libx11-dev"
 SPLIT="$PACKAGE-client $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 stuurman-desktop/receipt
--- a/stuurman-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stuurman-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/stuurman-desktop/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool libx11-dev \
 libsde-utils-x11-dev pango-dev shared-mime-info libsmfm-core-dev gtk2-dev \
 libsmfm-gtk-dev"
 
@@ -29,5 +29,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo gdk-pixbuf glib gtk2 libsde-utils-x11 libsmfm-core \
-	libsmfm-gtk pango xorg-libX11"
+	libsmfm-gtk pango libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 stuurman/receipt
--- a/stuurman/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/stuurman/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/stuurman/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool libx11-dev \
 pango-dev shared-mime-info libsmfm-core-dev gtk2-dev libsmfm-gtk-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 sudoku-savant/receipt
--- a/sudoku-savant/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sudoku-savant/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -33,7 +33,7 @@
 	cp -a $install/usr/games $fs/usr
 	cp $src/$PACKAGE.png $fs/usr/share/pixmaps
 	cp $src/$PACKAGE.desktop $fs/usr/share/applications
-	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
-	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXrandr \
-	xorg-libXrender xorg-libXinerama xorg-libXdamage gcc-lib-base"
+	DEPENDS="expat gtk2 libx11 libxau libxcomposite \
+	libxcursor libxdmcp libxext libxfixes libxrandr \
+	libxrender libxinerama libxdamage gcc-lib-base"
 }
diff -r e167735ddedc -r 5669e8b3be70 superswitcher/receipt
--- a/superswitcher/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/superswitcher/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="perl-xml-parser intltool glib-dev gtk2-dev libwnck2-dev \
-xorg-libXcomposite-dev xorg-libXrender-dev autoconf automake"
+libxcomposite-dev libxrender-dev autoconf automake"
 
 compile_rules() {
 	find . -name '*.[ch]*' | xargs sed -i 's|<glib/.*h|<glib.h|'
diff -r e167735ddedc -r 5669e8b3be70 surf/receipt
--- a/surf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/surf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,7 +26,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libsoup pango \
-	webkitgtk xorg-libX11"
+	webkitgtk libx11"
 	SUGGESTED="dmenu"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 surf2/receipt
--- a/surf2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/surf2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,7 +26,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsoup pango webkit2gtk \
-	xorg-libX11"
+	libx11"
 	SUGGESTED="dmenu"
 	PROVIDE="webkit2gtk:surf"
 	TAGS="web-browser"
diff -r e167735ddedc -r 5669e8b3be70 svkbd/receipt
--- a/svkbd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/svkbd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.suckless.org/svkbd/snapshot/svkbd-$GITHASH.tar.bz2"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev"
+BUILD_DEPENDS="libx11-dev libxtst-dev"
 SPLIT="$PACKAGE-de $PACKAGE-fr $PACKAGE-ru"
 
 compile_rules() {
@@ -34,5 +34,5 @@
 		svkbd-fr) copy svkbd-fr*; CAT="x-window|FR Layout";;
 		svkbd-ru) copy svkbd-ru*; CAT="x-window|RU Layout";;
 	esac
-	DEPENDS="xorg-libX11 xorg-libXtst"
+	DEPENDS="libx11 libxtst"
 }
diff -r e167735ddedc -r 5669e8b3be70 sylpheed/receipt
--- a/sylpheed/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/sylpheed/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -39,7 +39,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtk2 openssl gpgme gnupg xorg-libXdamage"
+			DEPENDS="gtk2 openssl gpgme gnupg libxdamage"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 synergy/receipt
--- a/synergy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/synergy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-Source.tar.gz"
 WGET_URL="http://synergy.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="xorg-dev-proto xorg-libXt-dev xorg-libXtst-dev cmake"
+BUILD_DEPENDS="xorg-dev-proto libxt-dev libxtst-dev cmake"
 
 compile_rules() {
 	cmake \
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXtst xorg-libSM xorg-libICE xorg-libXinerama"
+	DEPENDS="libx11 libxtst libsm libice libxinerama"
 }
diff -r e167735ddedc -r 5669e8b3be70 tabbed/receipt
--- a/tabbed/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tabbed/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	make CC=$HOST_SYSTEM-gcc &&
@@ -20,5 +20,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-xwininfo"
+	DEPENDS="libx11 xwininfo"
 }
diff -r e167735ddedc -r 5669e8b3be70 tea/receipt
--- a/tea/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tea/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,6 +27,6 @@
 	cp -a $src/bin/tea $fs/usr/bin
 	cp -a $src/icons/tea_icon_v2.png \
 		$fs/usr/share/pixmaps/tea.png
-	DEPENDS="xorg-libX11 qt5-base qt5-declarative"
+	DEPENDS="libx11 qt5-base qt5-declarative"
 	TAGS="text-editor"
 }
diff -r e167735ddedc -r 5669e8b3be70 terminus-font/receipt
--- a/terminus-font/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/terminus-font/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python3 xorg-bdftopcf patch"
+BUILD_DEPENDS="python3 bdftopcf patch"
 SPLIT="$PACKAGE-x11 $PACKAGE-base $PACKAGE"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 tesseract/receipt
--- a/tesseract/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tesseract/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/tesseract-ocr/tesseract/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="libtool autoconf automake libpng16-dev libjpeg-turbo-dev \
+BUILD_DEPENDS="libtool autoconf automake libpng-dev libjpeg-turbo-dev \
 tiff-dev giflib-dev zlib-dev icu-dev pango-dev cairo-dev leptonica-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		tesseract)
 			copy @std
-			DEPENDS="leptonica libpng16 libjpeg-turbo tiff giflib"
+			DEPENDS="leptonica libpng libjpeg-turbo tiff giflib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 texmacs/receipt
--- a/texmacs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/texmacs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="ftp://ftp.texmacs.org/pub/$PACKAGE/targz/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
+BUILD_DEPENDS="libx11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 thunar-vfs/receipt
--- a/thunar-vfs/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/thunar-vfs/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/xfce/4.8/src/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev libxfce4util-dev dbus-dev \
+BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev libxfce4util-dev dbus-dev \
 startup-notification-dev xfce4-panel-dev zlib-dev intltool exo-dev \
-dbus-glib-dev util-linux-uuid-dev hal-dev xorg-xcb-util-dev"
+dbus-glib-dev util-linux-uuid-dev hal-dev xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -33,8 +33,8 @@
 		thunar-vfs)
 			copy @std
 			DEPENDS="dbus dbus-glib exo freetype gdk-pixbuf glib gtk2 hal \
-			libjpeg-turbo libpng16 libxfce4util startup-notification \
-			xorg-libX11"
+			libjpeg-turbo libpng libxfce4util startup-notification \
+			libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 thunar-volman/receipt
--- a/thunar-volman/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/thunar-volman/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool exo-dev libgudev-dev libxfce4ui-dev libnotify-dev \
-eudev-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+eudev-dev libsm-dev startup-notification-dev xcb-util-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 thunar/receipt
--- a/thunar/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/thunar/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="Thunar-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev exo-dev libxfce4ui-dev \
+BUILD_DEPENDS="intltool libx11-dev libice-dev exo-dev libxfce4ui-dev \
 libgudev-dev libnotify-dev libexif-dev xfce4-panel-dev eudev-dev \
-xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+libsm-dev startup-notification-dev xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -32,7 +32,7 @@
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib exo gdk-pixbuf glib gtk2 libexif \
 			libgudev libnotify libpcre libxfce4ui libxfce4util pango \
-			xfce4-panel xfconf xorg-libICE xorg-libSM xorg-libX11"
+			xfce4-panel xfconf libice libsm libx11"
 			TAGS="Xfce file-manager"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 tightvnc/receipt
--- a/tightvnc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tightvnc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -10,10 +10,10 @@
 WEB_SITE="http://www.tightvnc.com/"
 WGET_URL="$SF_MIRROR/vnc-tight/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-cf-files xorg-libXp \
-xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev xorg-libXdmcp-dev \
-xorg-libXmu-dev xorg-xorgproto \
-xorg-xauth jpeg-dev zlib-dev xorg-libXrandr-dev"
+BUILD_DEPENDS="imake gccmakedep xorg-cf-files libxp \
+libxaw-dev libxt-dev libxau-dev libxdmcp-dev \
+libxmu-dev xorgproto \
+xauth jpeg-dev zlib-dev libxrandr-dev"
 SPLIT="$PACKAGE-extra $PACKAGE-java $PACKAGE-viewer"
 
 compile_rules() {
@@ -39,7 +39,7 @@
 	case $PACKAGE in
 		tightvnc)
 			TAGS="remote-desktop vnc"
-			DEPENDS="xorg-base-fonts jpeg zlib"
+			DEPENDS="font-misc-misc-base jpeg zlib"
 			mkdir -p $fs/usr/bin
 			cp -a $install/usr/bin/Xvnc $fs/usr/bin
 			cp $src/vncpasswd/vncpasswd $fs/usr/bin
@@ -65,8 +65,8 @@
 		tightvnc-extra)
 			CAT="x-window|extra tools"
 			TAGS="vnc"
-			DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
-			xorg-libXext"
+			DEPENDS="perl jpeg zlib libxdmcp libxau libx11 \
+			libxext"
 			mkdir -p $fs/usr/bin $fs/etc
 			cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
 			cp $src/tightvncserver.conf $fs/etc
@@ -84,9 +84,9 @@
 		tightvnc-viewer)
 			CAT="x-window|X client"
 			TAGS="vnc remote-desktop"
-			DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
-			xorg-libXext xorg-libXp xorg-libXpm xorg-libICE \
-			xorg-libSM xorg-libXt xorg-libXmu xorg-libXaw"
+			DEPENDS="jpeg zlib libxdmcp libxau libx11 \
+			libxext libxp libxpm libice \
+			libsm libxt libxmu libxaw"
 			mkdir -p $fs/usr/bin
 			cp -a $install/usr/bin/vncviewer $fs/usr/bin
 			;;
diff -r e167735ddedc -r 5669e8b3be70 tilda/receipt
--- a/tilda/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tilda/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk3 pango vte xorg-libX11"
+	DEPENDS="gdk-pixbuf glib gtk3 pango vte libx11"
 	TAGS="terminal"
 }
diff -r e167735ddedc -r 5669e8b3be70 timidity++/receipt
--- a/timidity++/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/timidity++/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/timidity/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev portaudio-dev jack-dev libao-dev libvorbis-dev \
-libogg-dev flac-dev speex-dev gtk2-dev xorg-libXaw-dev"
+libogg-dev flac-dev speex-dev gtk2-dev libxaw-dev"
 
 compile_rules() {
 	./configure \
@@ -30,5 +30,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="alsa-lib portaudio jack libao libvorbis libogg \
-	flac gtk2 xorg-libXaw"
+	flac gtk2 libxaw"
 }
diff -r e167735ddedc -r 5669e8b3be70 tint2/receipt
--- a/tint2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tint2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-v$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/o9000/tint2/-/archive/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake xorg-libX11-dev xorg-libXcomposite-dev \
-xorg-libXdamage-dev xorg-libXinerama-dev xorg-libXext-dev xorg-libXrender-dev \
-xorg-libXrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
+BUILD_DEPENDS="cmake libx11-dev libxcomposite-dev \
+libxdamage-dev libxinerama-dev libxext-dev libxrender-dev \
+libxrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
 gtk2-dev gettext-dev"
 
 compile_rules() {
@@ -39,8 +39,8 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo gdk-pixbuf glib gtk2 imlib2 librsvg pango \
-	startup-notification xorg-libX11 xorg-libXcomposite xorg-libXdamage \
-	xorg-libXext xorg-libXinerama xorg-libXrandr xorg-libXrender"
+	startup-notification libx11 libxcomposite libxdamage \
+	libxext libxinerama libxrandr libxrender"
 	CONFIG_FILES="/etc/xdg/tint2/tint2rc"
 	TAGS="desktop panel taskbar"
 }
diff -r e167735ddedc -r 5669e8b3be70 tix/receipt
--- a/tix/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tix/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,5 +29,5 @@
 
 genpkg_rules() {
 	cp -a $install/usr $fs
-	DEPENDS="tcl xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
+	DEPENDS="tcl libx11 libxau libxdmcp libxcb"
 }
diff -r e167735ddedc -r 5669e8b3be70 transset-df/receipt
--- a/transset-df/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/transset-df/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.forchheimer.se/transset-df/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXdamage-dev xorg-libXcomposite-dev xorg-libXrender-dev"
+BUILD_DEPENDS="libxdamage-dev libxcomposite-dev libxrender-dev"
 
 compile_rules() {
 	make &&
@@ -20,6 +20,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXdamage xorg-libXcomposite xorg-xcompmgr xorg-libXrender \
-	xorg-libXext"
+	DEPENDS="libxdamage libxcomposite xcompmgr libxrender \
+	libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 truecrypt/receipt
--- a/truecrypt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/truecrypt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://sources.archlinux.org/other/tc/$TARBALL"
 TARBALL_SHA512="b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a"
 
-BUILD_DEPENDS="pkcs nasm fuse2-dev wxWidgets28-dev xorg-libSM-dev"
+BUILD_DEPENDS="pkcs nasm fuse2-dev wxWidgets28-dev libsm-dev"
 
 compile_rules() {
 	make \
@@ -35,5 +35,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="fuse2 wxWidgets28 xorg-libSM dmsetup linux-md"
+	DEPENDS="fuse2 wxWidgets28 libsm dmsetup linux-md"
 }
diff -r e167735ddedc -r 5669e8b3be70 tsclient/receipt
--- a/tsclient/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tsclient/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,6 +32,6 @@
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $install/usr/share/applications $fs/usr/share
 	strip -s $fs/usr/lib/$PACKAGE/*
-	DEPENDS="gtk2 rdesktop xorg-libXdamage"
+	DEPENDS="gtk2 rdesktop libxdamage"
 	TAGS="remote-desktop"
 }
diff -r e167735ddedc -r 5669e8b3be70 tumbler/receipt
--- a/tumbler/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tumbler/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -77,7 +77,7 @@
 			;;
 		tumbler)
 			copy @std @rm
-			DEPENDS="dbus dbus-glib gdk-pixbuf glib libpng16"
+			DEPENDS="dbus dbus-glib gdk-pixbuf glib libpng"
 			CAT="graphics|main package"
 			CONFIG_FILES="/etc/xdg/tumbler/tumbler.rc"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 tuxpaint/receipt
--- a/tuxpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/tuxpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev fribidi-dev librsvg-dev cairo-dev libsdl-dev \
+BUILD_DEPENDS="libpng-dev fribidi-dev librsvg-dev cairo-dev libsdl-dev \
 libsdl-mixer-dev libsdl-pango-dev libsdl-image-dev libsdl-ttf-dev \
 libpaper-dev python-dev gettext-dev gperf"
 SPLIT="$PACKAGE-data"
@@ -19,7 +19,7 @@
 COPY_std="etc/tuxpaint/ usr/bin/ usr/lib/"
 COPY_data="share/applications/ share/pixmaps/ share/tuxpaint/"
 
-DEPENDS_std="tuxpaint-data cairo fribidi glib libpaper libpng16 librsvg libsdl \
+DEPENDS_std="tuxpaint-data cairo fribidi glib libpaper libpng librsvg libsdl \
 libsdl-image libsdl-mixer libsdl-pango libsdl-ttf zlib"
 DEPENDS_data="python"
 
diff -r e167735ddedc -r 5669e8b3be70 unclutter/receipt
--- a/unclutter/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/unclutter/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 PATCH="$(basename $PATCH_URL)"
 EXTRA_SOURCE_FILES="$PATCH"
 
-BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev"
+BUILD_DEPENDS="xorgproto libx11-dev"
 
 compile_rules() {
 	if [ ! -f "$SRC/$PATCH)" ]; then
@@ -37,5 +37,5 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
+	DEPENDS="libx11 libxcb libxau libxdmcp"
 }
diff -r e167735ddedc -r 5669e8b3be70 urxvt/receipt
--- a/urxvt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/urxvt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="rxvt-unicode-$VERSION.tar.bz2"
 WGET_URL="http://dist.schmorp.de/rxvt-unicode/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev gdk-pixbuf-dev \
-startup-notification-dev xorg-libXmu-dev xorg-libXft-dev perl-dev ncurses-extra"
+BUILD_DEPENDS="libx11-dev libice-dev gdk-pixbuf-dev \
+startup-notification-dev libxmu-dev libxft-dev perl-dev ncurses-extra"
 SPLIT="$PACKAGE-full:full"
 
 compile_rules() {
@@ -44,14 +44,14 @@
 	case $PACKAGE in
 		urxvt)
 			copy @std
-			DEPENDS="xorg-libX11"
+			DEPENDS="libx11"
 			;;
 		urxvt-full)
 			copy @std
 			CAT="utilities|everything enabled"
 			DEPENDS="fontconfig freetype gdk-pixbuf glib perl perl-core \
-			startup-notification xorg-libX11 xorg-libXft xorg-libXmu \
-			xorg-libXrender xorg-libXt"
+			startup-notification libx11 libxft libxmu \
+			libxrender libxt"
 			PROVIDE="urxvt"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 utox/receipt
--- a/utox/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/utox/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,5 +13,5 @@
 
 genpkg_rules() {
 	install -D $src/$TARBALL $fs/usr/bin/utox
-	DEPENDS="dbus bzlib xorg-libX11 gtk2"
+	DEPENDS="dbus bzlib libx11 gtk2"
 }
diff -r e167735ddedc -r 5669e8b3be70 vice/receipt
--- a/vice/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vice/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,10 +12,10 @@
 WGET_URL="$SF_MIRROR/vice-emu/$TARBALL"
 
 BUILD_DEPENDS="automake xa gettext-dev ffmpeg-dev alsa-lib-dev lame-dev \
-libvorbis-dev flac-dev pciutils-dev readline-dev libpng16-dev giflib-dev \
-libjpeg-turbo-dev portaudio-dev mpg123-dev xorg-libICE-dev gtk2-dev \
-vte-gtk2-dev gtkglext-dev mesa-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
-xorg-bdftopcf xorg-mkfontdir" # pulseaudio-dev
+libvorbis-dev flac-dev pciutils-dev readline-dev libpng-dev giflib-dev \
+libjpeg-turbo-dev portaudio-dev mpg123-dev libice-dev gtk2-dev \
+vte-gtk2-dev gtkglext-dev mesa-dev libxxf86vm-dev libxrandr-dev \
+bdftopcf mkfontdir" # pulseaudio-dev
 
 compile_rules() {
 	rm -r src/lib/liblame src/lib/libx264 src/lib/libffmpeg
@@ -42,6 +42,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk2 gtkglext \
-	libjpeg-turbo libogg libpng16 libvorbis mesa mpg123 pango pciutils \
-	portaudio readline vte-gtk2 xorg-libX11 xorg-libXrandr xorg-libXxf86vm zlib"
+	libjpeg-turbo libogg libpng libvorbis mesa mpg123 pango pciutils \
+	portaudio readline vte-gtk2 libx11 libxrandr libxxf86vm zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 vifm/receipt
--- a/vifm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vifm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev libmagic-dev xorg-libX11-dev util-linux-whereis vim \
+BUILD_DEPENDS="ncurses-dev libmagic-dev libx11-dev util-linux-whereis vim \
 file mandoc util-linux-column perl"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 virtualbox-ose/receipt
--- a/virtualbox-ose/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/virtualbox-ose/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,11 +13,11 @@
 WGET_URL="http://download.virtualbox.org/virtualbox/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="bin86 dev86 iasl libIDL libsdl-dev mesa-dev libxslt-dev \
-glu-dev Qt4-dev libsdl-ttf-dev alsa-lib-dev hal-dev xorg-libXtst-dev \
-xorg-libXrandr-dev python python-dev xalan-c curl-dev xalan-c-dev \
+glu-dev Qt4-dev libsdl-ttf-dev alsa-lib-dev hal-dev libxtst-dev \
+libxrandr-dev python python-dev xalan-c curl-dev xalan-c-dev \
 xerces-c-dev openssl-dev zlib-dev libcap-dev glib-dev libvncserver-dev \
 pam pam-dev bzip2 linux-module-headers tar vde2-dev \
-libpng16-dev gsoap-dev libdevmapper-dev makeself cdrkit flex"
+libpng-dev gsoap-dev libdevmapper-dev makeself cdrkit flex"
 SPLIT="$PACKAGE-guestutils"
 
 compile_rules() {
@@ -115,8 +115,8 @@
 			install -D -m644 vboxdrv.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxdrv.ko"
 			install -D -m644 vboxnetflt.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxnetflt.ko"
 			install -D -m644 vboxnetadp.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxnetadp.ko"
-			DEPENDS="libxml2 xorg-libXcursor libIDL xorg-libXinerama libsdl \
-			xorg-libXmu curl libvncserver libpng16 jpeg mesa glu vde2 \
+			DEPENDS="libxml2 libxcursor libIDL libxinerama libsdl \
+			libxmu curl libvncserver libpng jpeg mesa glu vde2 \
 			python libQtCore libQtGui libQtNetwork libQtOpenGL"
 			TAGS="virtualization"
 			PROVIDE="virtualbox"
@@ -168,7 +168,7 @@
 			install -D -m 0755 "$stuff/VBoxService" \
 				"$fs/etc/init.d/VBoxService"
 			CAT="misc|VirtualBox Guest userspace utilities, useful for running Slitaz inside a virtual machine"
-			DEPENDS="xorg-libXfixes xorg-libXmu xorg-xrandr"
+			DEPENDS="libxfixes libxmu xrandr"
 			TAGS="virtualization"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 vivaldi/receipt
--- a/vivaldi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vivaldi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -38,9 +38,9 @@
 genpkg_rules() {
 	copy opt/ usr/
 	DEPENDS="gconf alsa-lib atk cairo dbus expat fontconfig gdk-pixbuf glib \
-	gtk3 libcups nspr nss pango xorg-libX11 xorg-libXScrnSaver \
-	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
-	xorg-libXfixes xorg-libXi xorg-libXrandr xorg-libXrender xorg-libXtst \
-	xorg-libxcb   bash mesa"
+	gtk3 libcups nspr nss pango libx11 libxscrnsaver \
+	libxcomposite libxcursor libxdamage libxext \
+	libxfixes libxi libxrandr libxrender libxtst \
+	libxcb   bash mesa"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 vkeybd/receipt
--- a/vkeybd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vkeybd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://ftp.riken.jp/Linux/suse/people/tiwai/vkeybd/$TARBALL"
 
-BUILD_DEPENDS="tk-dev tcl-dev alsa-lib-dev xorg-libX11-dev"
+BUILD_DEPENDS="tk-dev tcl-dev alsa-lib-dev libx11-dev"
 
 compile_rules() {
 	# Hack makefile
@@ -32,5 +32,5 @@
 	cp -a $src/vkeybd.desktop $fs/usr/share/applications
 	cp -a $src/pixmaps/vkeybd_48x48.png $fs/usr/share/pixmaps
 	chown -R root.root $fs
-	DEPENDS="tk tcl alsa-lib xorg-libX11"
+	DEPENDS="tk tcl alsa-lib libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 vlc/receipt
--- a/vlc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vlc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 WGET_URL="http://download.videolan.org/pub/videolan/$PACKAGE/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="Qt4-dev alsa-lib-dev dbus-dev ffmpeg-dev gettext-dev \
-libmad-dev lua5.1-dev tar xorg-xcb-util-dev yasm expat-dev libxml2-dev \
+libmad-dev lua5.1-dev tar xcb-util-dev yasm expat-dev libxml2-dev \
 util-linux-uuid-dev x264-dev flac-dev taglib-dev gnutls-dev libupnp-dev \
 libsamplerate-dev fribidi-dev zvbi-dev opus-dev gmp-dev ncurses-dev x265-dev"
 SPLIT="libvlc-dev libvlc $PACKAGE-locale"
@@ -71,7 +71,7 @@
 			# Remove libtool archives
 			rm $fs/usr/lib/vlc/plugins/*/*.la
 			DEPENDS="alsa-lib dbus ffmpeg libmad lua5.1 tar x264 x265 \
-			xorg-xcb-util zvbi nettle"
+			xcb-util zvbi nettle"
 			CAT="multimedia|MPEG, VCD/DVD, and DivX library"
 			;;
 		vlc-locale)
diff -r e167735ddedc -r 5669e8b3be70 vnc2swf/receipt
--- a/vnc2swf/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vnc2swf/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
-xorg-libXaw-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXmu-dev \
-xorg-libXpm-dev xorg-libXt-dev zlib-dev"
+BUILD_DEPENDS="libice-dev libsm-dev libx11-dev libxau-dev \
+libxaw-dev libxdmcp-dev libxext-dev libxmu-dev \
+libxpm-dev libxt-dev zlib-dev"
 
 compile_rules() {
 	./configure \
@@ -26,9 +26,9 @@
 genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/X11R6/bin/ $fs/usr/
-	DEPENDS="gcc-lib-base glibc-base xorg-libICE xorg-libSM xorg-libX11 \
-	xorg-libXau xorg-libXaw xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm \
-	xorg-libXt zlib"
+	DEPENDS="gcc-lib-base glibc-base libice libsm libx11 \
+	libxau libxaw libxdmcp libxext libxmu libxpm \
+	libxt zlib"
 	SUGGESTED="x11vnc"
 	TAGS="vnc"
 }
diff -r e167735ddedc -r 5669e8b3be70 vte-gtk2/receipt
--- a/vte-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/vte-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -44,12 +44,12 @@
 			;;
 		vte-gtk2)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk2 ncurses pango xorg-libX11"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 ncurses pango libx11"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="vte-gtk2 vte-gtk2-terminal vte-gtk2-python \
-			cairo-dev glib-dev gtk2-dev pango-dev xorg-libX11-dev"
+			cairo-dev glib-dev gtk2-dev pango-dev libx11-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 warzone2100/receipt
--- a/warzone2100/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/warzone2100/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/warzone2100/$TARBALL"
 
-BUILD_DEPENDS="automake perl zip unzip gettext-dev qt5-dev xorg-libX11-dev \
-libsdl2-dev libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
-mesa-dev openssl-dev physfs-dev xorg-libXrandr-dev fribidi-dev \
+BUILD_DEPENDS="automake perl zip unzip gettext-dev qt5-dev libx11-dev \
+libsdl2-dev libpng-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
+mesa-dev openssl-dev physfs-dev libxrandr-dev fribidi-dev \
 freetype-dev fontconfig-dev openssl-dev git"
 
 compile_rules() {
@@ -34,6 +34,6 @@
 genpkg_rules() {
 	copy @std hicolor/ *.mo
 	DEPENDS="fontconfig freetype fribidi glew glib openssl glu \
-	libharfbuzz libogg libpng16 libsdl2 libtheora libvorbis mesa openal \
-	physfs qt5-base qt5-script xorg-libX11 xorg-libXrandr zlib   libsdl2-net"
+	libharfbuzz libogg libpng libsdl2 libtheora libvorbis mesa openal \
+	physfs qt5-base qt5-script libx11 libxrandr zlib   libsdl2-net"
 }
diff -r e167735ddedc -r 5669e8b3be70 waterline/receipt
--- a/waterline/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/waterline/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="automake gettext-dev intltool libtool gtk2-dev glib-dev \
 jansson-dev libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev \
-libsde-utils-gtk-dev xorg-libXcomposite-dev menu-cache-dev alsa-lib-dev"
+libsde-utils-gtk-dev libxcomposite-dev menu-cache-dev alsa-lib-dev"
 SPLIT="$PACKAGE-dev"
 
 COOKOPTS="!menus"
@@ -38,7 +38,7 @@
 			copy @std
 			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 jansson libsde-utils \
 			libsde-utils-gtk libsde-utils-jansson libsde-utils-x11 menu-cache \
-			pango xorg-libX11 xorg-libXcomposite"
+			pango libx11 libxcomposite"
 			TAGS="desktop panel taskbar"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 wbar/receipt
--- a/wbar/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wbar/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tbz2"
 WGET_URL="http://www.tecapli.com.ar/warlock/$TARBALL"
 
-BUILD_DEPENDS="imlib2-dev xorg-libX11-dev"
+BUILD_DEPENDS="imlib2-dev libx11-dev"
 
 compile_rules() {
 	sed -i 's|^LDFLAGS.*|& -lX11|' Makefile
diff -r e167735ddedc -r 5669e8b3be70 wbar2/receipt
--- a/wbar2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wbar2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="wbar-$VERSION.tgz"
 WGET_URL="http://wbar.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="imlib2-dev gtk2-dev libglade-dev xorg-libX11-dev intltool file"
+BUILD_DEPENDS="imlib2-dev gtk2-dev libglade-dev libx11-dev intltool file"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 webkit2gtk/receipt
--- a/webkit2gtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/webkit2gtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,7 +16,7 @@
 BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
 harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
 libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
-libnotify-dev gettext-dev sqlite3-dev xorg-libXt-dev"
+libnotify-dev gettext-dev sqlite3-dev libxt-dev"
 SPLIT="$PACKAGE-dev"
 
 CFLAGS="${CFLAGS/-Os/-O2}"
@@ -61,10 +61,10 @@
 			copy @std
 			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
 			gst1-plugins-base gstreamer1 gtk2 gtk3 icu libgcrypt libharfbuzz \
-			libharfbuzz-icu libicu libjpeg-turbo libnotify libpng16 libsecret \
+			libharfbuzz-icu libicu libjpeg-turbo libnotify libpng libsecret \
 			libsoup libsqlite3 libwebp libxml2 libxslt mesa mesa-libegl pango \
-			xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXrender \
-			xorg-libXt zlib"
+			libx11 libxcomposite libxdamage libxrender \
+			libxt zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 webkitgtk/receipt
--- a/webkitgtk/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/webkitgtk/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -18,9 +18,9 @@
 libnotify-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
-BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng16-dev \
+BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng-dev \
 libwebp-dev glib-dev icu-dev libxml2-dev pango-dev enchant-dev gtk2-dev \
-xorg-libXt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
+libxt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
 harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext-dev \
 autoconf automake libtool"
 
@@ -52,8 +52,8 @@
 			copy @std
 			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
 			gst1-plugins-base gstreamer1 gtk2 icu libharfbuzz libharfbuzz-icu \
-			libicu libjpeg-turbo libpng16 libsecret libsoup libsqlite3 libwebp \
-			libxml2 libxslt pango xorg-libX11 xorg-libXrender xorg-libXt zlib"
+			libicu libjpeg-turbo libpng libsecret libsoup libsqlite3 libwebp \
+			libxml2 libxslt pango libx11 libxrender libxt zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 wesnoth/receipt
--- a/wesnoth/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wesnoth/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cairo-dev pango-dev boost-dev boost-regex \
 boost-iostreams libsdl-dev libsdl-mixer-dev libsdl-ttf-dev libsdl-ttf \
-libsdl-image-dev libsdl-net-dev libpng16-dev freetype-dev fontconfig-dev \
+libsdl-image-dev libsdl-net-dev libpng-dev freetype-dev fontconfig-dev \
 findutils lua-dev boost-serialization autoconf automake fribidi-dev \
 boost-system boost-program-options boost-filesystem boost-locale \
 libvorbis-dev cmake gettext"
@@ -32,8 +32,8 @@
 		wesnoth)
 			DEPENDS="libsdl libsdl-mixer libsdl-ttf libsdl-net \
 			libsdl-image zlib pango cairo fontconfig \
-			boost-regex boost-iostreams libpng16 fribidi \
-			gcc-lib-base xorg-xcb-util boost-system \
+			boost-regex boost-iostreams libpng fribidi \
+			gcc-lib-base xcb-util boost-system \
 			boost-program-options"
 			# programs
 			mkdir -p $fs/usr/bin
diff -r e167735ddedc -r 5669e8b3be70 weston/receipt
--- a/weston/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/weston/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,9 +12,9 @@
 WGET_URL="http://wayland.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="wayland-dev mesa-dev cairo-gl-dev libxkbcommon-dev \
-libunwind-dev mtdev-dev xorg-libXcursor-dev pam-dev xz-dev \
-gegl-dev libdrm-dev xorg-libXxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \
-xorg-libxshmfence-dev"
+libunwind-dev mtdev-dev libxcursor-dev pam-dev xz-dev \
+gegl-dev libdrm-dev libxxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \
+libxshmfence-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -35,10 +35,10 @@
 	case $PACKAGE in
 		weston)
 			copy @std
-			DEPENDS="cairo-gl eudev libdrm libjpeg-turbo libpng16 libunwind \
+			DEPENDS="cairo-gl eudev libdrm libjpeg-turbo libpng libunwind \
 			libxkbcommon-wayland mesa mesa-libegl mesa-libgbm \
-			mesa-libwayland-egl mtdev pam wayland xorg-libX11 xorg-libXcursor \
-			xorg-libxcb xorg-pixman"
+			mesa-libwayland-egl mtdev pam wayland libx11 libxcursor \
+			libxcb pixman"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 wine-rt/receipt
--- a/wine-rt/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wine-rt/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/wine/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev glu-dev freetype-dev \
-libtool libxml2-dev libxslt-dev lcms-dev jpeg-dev libpng16-dev tiff-dev prelink"
+libtool libxml2-dev libxslt-dev lcms-dev jpeg-dev libpng-dev tiff-dev prelink"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -54,7 +54,7 @@
 			cp -a $install/usr/lib/lib* $fs/usr/lib
 			cp -a $install/usr/lib/wine/*.so $fs/usr/lib/wine
 			DEPENDS="alsa-lib libxml2 libxslt mesa glu xorg-dev lcms \
-			freetype jpeg libpng16 tiff"
+			freetype jpeg libpng tiff"
 			PROVIDE="wine"
 			TAGS="windows"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 wine/receipt
--- a/wine/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wine/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev freetype-dev libtool \
 glu-dev libxml2-dev libxslt-dev lcms-dev prelink cups-dev dbus-dev \
-jpeg-dev libpng16-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
+jpeg-dev libpng-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 winetricks/receipt
--- a/winetricks/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/winetricks/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,6 +15,6 @@
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE-$VERSION $fs/usr/bin/$PACKAGE
 	chmod a+x $fs/usr/bin/$PACKAGE
-	DEPENDS="wine cabextract xorg-xmessage unzip wget"
+	DEPENDS="wine cabextract xmessage unzip wget"
 	SUGGESTED="zenity-gtk2"
 }
diff -r e167735ddedc -r 5669e8b3be70 wireshark/receipt
--- a/wireshark/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wireshark/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -29,7 +29,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo gdk-pixbuf glib gtk2 libcap libgcrypt libgnutls libpcap \
-	libxml2 pango zlib   libgpg-error xorg-libXdamage libcomerr3 attr \
+	libxml2 pango zlib   libgpg-error libxdamage libcomerr3 attr \
 	portaudio libkrb5"
 	TAGS="network analysis"
 }
diff -r e167735ddedc -r 5669e8b3be70 wordwarvi/receipt
--- a/wordwarvi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wordwarvi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libvorbis-dev libogg-dev portaudio portaudio-dev gtk2-dev \
-xorg-libXrender-dev xorg-xorgproto xorg-pixman-dev \
+libxrender-dev xorgproto pixman-dev \
 glib-dev"
 
 compile_rules() {
@@ -24,9 +24,9 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="portaudio expat gtk2 libvorbis xorg-libX11 xorg-libXau \
-	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-	xorg-libXdamage"
+	DEPENDS="portaudio expat gtk2 libvorbis libx11 libxau \
+	libxcomposite libxcursor libxdmcp libxext \
+	libxfixes libxinerama libxrandr libxrender \
+	libxdamage"
 	TAGS="shooting"
 }
diff -r e167735ddedc -r 5669e8b3be70 workerfm/receipt
--- a/workerfm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/workerfm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
 BUILD_DEPENDS="avfs-dev dbus-glib-dev freetype-dev hal-dev libmagic-dev \
-xorg-libX11-dev xorg-libXft-dev xorg-libXinerama-dev"
+libx11-dev libxft-dev libxinerama-dev"
 
 compile_rules() {
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="avfs dbus hal libmagic xorg-libX11 xorg-libXinerama \
-	   xorg-xmessage"
+	DEPENDS="avfs dbus hal libmagic libx11 libxinerama \
+	   xmessage"
 }
diff -r e167735ddedc -r 5669e8b3be70 wv/receipt
--- a/wv/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wv/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.abisource.com/downloads/wv/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="libgsf-dev glib-dev libxml2-dev libpng16-dev"
+BUILD_DEPENDS="libgsf-dev glib-dev libxml2-dev libpng-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r e167735ddedc -r 5669e8b3be70 wxWidgets/receipt
--- a/wxWidgets/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wxWidgets/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
-xorg-dev xorg-xorgproto glu mesa-dev libpng16-dev tiff-dev \
-jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
+xorg-dev xorgproto glu mesa-dev libpng-dev tiff-dev \
+jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -44,11 +44,11 @@
 			# Remove devel files.
 			rm -rf $fs/usr/lib/wx/include
 			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
-			gtk2 cairo fontconfig freetype jpeg libpng16 tiff pango \
-			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
-			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
-			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
-			xorg-libXinerama xorg-libXrender xorg-libXxf86vm mesa"
+			gtk2 cairo fontconfig freetype jpeg libpng tiff pango \
+			pixman util-linux-uuid libsm libice libx11 \
+			libxau libxcomposite libxcursor libxdamage \
+			libxdmcp libxext glu libxfixes \
+			libxinerama libxrender libxxf86vm mesa"
 			;;
 		*-dev)
 			mkdir -p $fs/usr/lib/wx
@@ -59,8 +59,8 @@
 
 			cp -a $install/usr/share $fs/usr
 			rm -r $fs/usr/share/locale
-			DEPENDS="wxWidgets gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
-			xorg-libICE-dev expat zlib"
+			DEPENDS="wxWidgets gtk2-dev libxinerama-dev libsm-dev \
+			libice-dev expat zlib"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 wxWidgets28/receipt
--- a/wxWidgets28/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wxWidgets28/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
-xorg-dev xorg-xorgproto glu mesa-dev libpng12-dev tiff-dev \
-jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
+xorg-dev xorgproto glu mesa-dev libpng12-dev tiff-dev \
+jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -50,10 +50,10 @@
 			rm -rf $fs/usr/lib/wx/include
 			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
 			gtk2 cairo fontconfig freetype jpeg libpng12 tiff pango \
-			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
-			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
-			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
-			xorg-libXinerama xorg-libXrender xorg-libXxf86vm mesa"
+			pixman util-linux-uuid libsm libice libx11 \
+			libxau libxcomposite libxcursor libxdamage \
+			libxdmcp libxext glu libxfixes \
+			libxinerama libxrender libxxf86vm mesa"
 			;;
 		*-dev)
 			mkdir -p $fs/usr/lib/wx
@@ -64,8 +64,8 @@
 
 			cp -a $install/usr/share $fs/usr
 			rm -r $fs/usr/share/locale
-			DEPENDS="wxWidgets28 gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
-			xorg-libICE-dev expat zlib"
+			DEPENDS="wxWidgets28 gtk2-dev libxinerama-dev libsm-dev \
+			libice-dev expat zlib"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 wxdfast/receipt
--- a/wxdfast/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/wxdfast/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="wxWidgets28 xorg-libXdamage xorg-libXxf86vm"
+	DEPENDS="wxWidgets28 libxdamage libxxf86vm"
 }
diff -r e167735ddedc -r 5669e8b3be70 x11rec/receipt
--- a/x11rec/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/x11rec/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -15,5 +15,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/x11rec $fs/usr/bin
-	DEPENDS="ruby imagemagick xorg-xwininfo gifsicle"
+	DEPENDS="ruby imagemagick xwininfo gifsicle"
 }
diff -r e167735ddedc -r 5669e8b3be70 x11vnc/receipt
--- a/x11vnc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/x11vnc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/libvncserver/$TARBALL"
 
-BUILD_DEPENDS="openssl-dev jpeg-dev xorg-libX11-dev zlib-dev xorg-libXext-dev"
+BUILD_DEPENDS="openssl-dev jpeg-dev libx11-dev zlib-dev libxext-dev"
 SPLIT="$PACKAGE-extra"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		x11vnc)
 			copy x11vnc
-			DEPENDS="xorg-libXtst openssl jpeg xorg-libXdamage zlib"
+			DEPENDS="libxtst openssl jpeg libxdamage zlib"
 			TAGS="vnc server"
 			;;
 		x11vnc-extra)
diff -r e167735ddedc -r 5669e8b3be70 xaos/receipt
--- a/xaos/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xaos/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/xaos/$TARBALL"
 
-BUILD_DEPENDS="gettext-dev xorg-libX11-dev xorg-libICE-dev libpng16-dev \
-xorg-libXext-dev gsl-dev nasm"
+BUILD_DEPENDS="gettext-dev libx11-dev libice-dev libpng-dev \
+libxext-dev gsl-dev nasm"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy bin/ XaoS/ locale/
-	DEPENDS="gsl libpng16 xorg-libX11 xorg-libXext zlib"
+	DEPENDS="gsl libpng libx11 libxext zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 xarchive/receipt
--- a/xarchive/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xarchive/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -28,7 +28,7 @@
 	cp -a $install/usr/bin $fs/usr
 	sed -i 's|#!\s*/bin/bash|#!/bin/sh|' $install/usr/lib/xarchive/wrappers/*
 	cp $stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers
-	DEPENDS="gtk2 xorg-libXdamage"
+	DEPENDS="gtk2 libxdamage"
 	SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs \
 	cabextract xz lrzip"
 }
diff -r e167735ddedc -r 5669e8b3be70 xautomation/receipt
--- a/xautomation/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xautomation/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://hoopajoo.net/static/projects/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev libpng16-dev xorg-libXtst-dev"
+BUILD_DEPENDS="libx11-dev libpng-dev libxtst-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="xorg-libX11 libpng16"
+	DEPENDS="libx11 libpng"
 }
diff -r e167735ddedc -r 5669e8b3be70 xbattle/receipt
--- a/xbattle/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xbattle/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="$WEB_SITE/downloads/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-dev"
+BUILD_DEPENDS="imake xorg-dev"
 
 compile_rules() {
 	xmkmf
@@ -22,5 +22,5 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="xorg"
-	SUGGESTED="xorg-xhost"
+	SUGGESTED="xhost"
 }
diff -r e167735ddedc -r 5669e8b3be70 xbill/receipt
--- a/xbill/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xbill/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-libXaw-dev lesstif-dev"
+BUILD_DEPENDS="gtk2-dev libxaw-dev lesstif-dev"
 
 compile_rules() {
 	./configure \
@@ -29,5 +29,5 @@
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/xbill $fs/usr/share
-	DEPENDS="gtk2 xorg-libXaw lesstif"
+	DEPENDS="gtk2 libxaw lesstif"
 }
diff -r e167735ddedc -r 5669e8b3be70 xbindkeys/receipt
--- a/xbindkeys/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xbindkeys/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev"
+BUILD_DEPENDS="libx11-dev"
 
 compile_rules() {
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 	TAGS="keyboard"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcb-util-xrm/receipt
--- a/xcb-util-xrm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcb-util-xrm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/Airblader/xcb-util-xrm/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-libX11-dev"
+BUILD_DEPENDS="libxcb-dev xorg-xcb-util-dev libx11-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		xcb-util-xrm)
 			copy @std
-			DEPENDS="xorg-libxcb xorg-xcb-util"
+			DEPENDS="libxcb xorg-xcb-util"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="xcb-util-xrm xorg-libxcb-dev xorg-xcb-util-dev"
+			DEPENDS="xcb-util-xrm libxcb-dev xorg-xcb-util-dev"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 xchat/receipt
--- a/xchat/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xchat/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -46,11 +46,11 @@
 	case $PACKAGE in
 		xchat)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
+			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core libx11"
 			;;
 		xchat-plugin)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
+			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core libx11"
 			PROVIDE="xchat"
 			CAT="network|with plugins support"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 xchm/receipt
--- a/xchm/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xchm/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -24,5 +24,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
 	cp -a $install/usr/share/pixmaps $fs/usr/share
-	DEPENDS="wxWidgets28 chmlib xorg-libXdamage xorg-libXxf86vm"
+	DEPENDS="wxWidgets28 chmlib libxdamage libxxf86vm"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcircuit/receipt
--- a/xcircuit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcircuit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://opencircuitdesign.com/xcircuit/archive/$TARBALL"
 
-BUILD_DEPENDS="tk-dev tcl-dev xorg-libXpm-dev xorg-libXt-dev zlib-dev automake"
+BUILD_DEPENDS="tk-dev tcl-dev libxpm-dev libxt-dev zlib-dev automake"
 
 compile_rules() {
 	cd $src/$PACKAGE-$VERSION
@@ -28,5 +28,5 @@
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/$PACKAGE-${VERSION%.*} $fs/usr/lib
-	DEPENDS="tcl tk xorg-libXpm zlib"
+	DEPENDS="tcl tk libxpm zlib"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcursor-aero/receipt
--- a/xcursor-aero/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcursor-aero/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -19,6 +19,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXcursor"
+	DEPENDS="libxcursor"
 	TAGS="cursor-theme"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcursor-comix/receipt
--- a/xcursor-comix/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcursor-comix/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="ComixCursors-$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/limitland/comixcursors/repository/${COMMIT:-$VERSION}/archive.tar.bz2"
 
-BUILD_DEPENDS="bc rsvg-convert coreutils-numeric xorg-xcursorgen symlinks"
+BUILD_DEPENDS="bc rsvg-convert coreutils-numeric xcursorgen symlinks"
 SPLIT="$PACKAGE-opaque-white $PACKAGE"
 
 compile_rules() {
@@ -32,6 +32,6 @@
 			copy @std @rm
 			;;
 	esac
-	DEPENDS="xorg-libXcursor"
+	DEPENDS="libxcursor"
 	TAGS="cursor-theme"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcursor-human/receipt
--- a/xcursor-human/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcursor-human/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXcursor"
+	DEPENDS="libxcursor"
 	TAGS="cursor-theme"
 }
diff -r e167735ddedc -r 5669e8b3be70 xcursor-obsidian/receipt
--- a/xcursor-obsidian/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xcursor-obsidian/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXcursor"
+	DEPENDS="libxcursor"
 	TAGS="cursor-theme"
 }
diff -r e167735ddedc -r 5669e8b3be70 xdigger/receipt
--- a/xdigger/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xdigger/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$(dirname $WEB_SITE)/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-dev"
+BUILD_DEPENDS="imake xorg-dev"
 
 compile_rules() {
 	sed -i 's| inpause) step = Tr.*|&\nwait_count = 0;|;s| && cheat||' runlevels.c
diff -r e167735ddedc -r 5669e8b3be70 xdotool/receipt
--- a/xdotool/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xdotool/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://semicomplete.googlecode.com/files/$TARBALL" # FIXME
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev xorg-libXtst xorg-dev perl"
+BUILD_DEPENDS="libx11-dev libxtst-dev xorg-dev perl"
 
 compile_rules() {
 	make &&
@@ -25,5 +25,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $install/usr/lib $fs/usr
-	DEPENDS="xorg-libX11 xorg-libXtst"
+	DEPENDS="libx11 libxtst"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-battery-plugin/receipt
--- a/xfce4-battery-plugin/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-battery-plugin/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/panel-plugins/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev libxfce4util-dev libxfce4ui-dev \
-xfce4-panel-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+xfce4-panel-dev libsm-dev startup-notification-dev xcb-util-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 xfce4-dict/receipt
--- a/xfce4-dict/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-dict/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk2-dev libxfce4ui-dev xfce4-panel-dev xorg-libSM-dev \
-startup-notification-dev xorg-xcb-util-dev"
+BUILD_DEPENDS="intltool gtk2-dev libxfce4ui-dev xfce4-panel-dev libsm-dev \
+startup-notification-dev xcb-util-dev"
 
 compile_rules() {
 	./configure \
@@ -26,6 +26,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango xfce4-panel \
-	xorg-libX11"
+	libx11"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-mixer/receipt
--- a/xfce4-mixer/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-mixer/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool dbus-glib-dev gst0-plugins-base-dev gtk2-dev \
 libunique-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev keybinder-dev \
-startup-notification-dev xorg-xcb-util-dev"
+startup-notification-dev xcb-util-dev"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 xfce4-notifyd/receipt
--- a/xfce4-notifyd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-notifyd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev libxfce4util-dev \
+BUILD_DEPENDS="intltool libx11-dev libice-dev libxfce4util-dev \
 libxfce4ui-dev libnotify-dev"
 
 compile_rules() {
@@ -27,6 +27,6 @@
 	# */bin/*-config usually a dev file, but not in this case
 	copy @std xfce4-notifyd-config
 	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
-	libxfce4util xfconf xorg-libX11"
+	libxfce4util xfconf libx11"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-panel/receipt
--- a/xfce4-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev libxfce4util-dev \
-garcon-dev exo-dev libwnck2-dev xorg-libSM-dev"
+BUILD_DEPENDS="intltool libx11-dev libice-dev libxfce4util-dev \
+garcon-dev exo-dev libwnck2-dev libsm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -30,8 +30,8 @@
 		xfce4-panel)
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
-			libwnck2 libxfce4ui libxfce4util pango xfconf xorg-libX11 \
-			xorg-libXext"
+			libwnck2 libxfce4ui libxfce4util pango xfconf libx11 \
+			libxext"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 xfce4-power-manager/receipt
--- a/xfce4-power-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-power-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev dbus-dev dbus-glib-dev xfconf-dev \
-libxfce4ui-dev libnotify-dev upower-dev xorg-libXrandr-dev xfce4-panel-dev \
-xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+libxfce4ui-dev libnotify-dev upower-dev libxrandr-dev xfce4-panel-dev \
+libsm-dev startup-notification-dev xcb-util-dev"
 
 compile_rules() {
 	./configure \
@@ -27,7 +27,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
-	libxfce4util pango upower xfce4-panel xfconf xorg-libX11 xorg-libXext \
-	xorg-libXrandr"
+	libxfce4util pango upower xfce4-panel xfconf libx11 libxext \
+	libxrandr"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-screenshooter/receipt
--- a/xfce4-screenshooter/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-screenshooter/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xfce4-panel-dev libsoup-dev xorg-libXfixes-dev \
-libxfce4ui-dev exo-dev xorg-libSM-dev startup-notification-dev \
-xorg-xcb-util-dev"
+BUILD_DEPENDS="intltool xfce4-panel-dev libsoup-dev libxfixes-dev \
+libxfce4ui-dev exo-dev libsm-dev startup-notification-dev \
+xcb-util-dev"
 
 compile_rules() {
 	./configure \
@@ -27,6 +27,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="cairo exo gdk-pixbuf glib gtk2 libsoup libxfce4ui libxfce4util \
-	libxml2 xfce4-panel xorg-libX11 xorg-libXext xorg-libXfixes"
+	libxml2 xfce4-panel libx11 libxext libxfixes"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-session/receipt
--- a/xfce4-session/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-session/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev libxfce4util-dev libxfce4ui-dev \
-libwnck2-dev polkit-dev upower-dev xorg-iceauth xorg-libSM-dev"
+BUILD_DEPENDS="intltool libx11-dev libxfce4util-dev libxfce4ui-dev \
+libwnck2-dev polkit-dev upower-dev iceauth libsm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,8 +34,8 @@
 		xfce4-session)
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libwnck2 \
-			libxfce4ui libxfce4util pango polkit xfconf xorg-libICE xorg-libSM \
-			xorg-libX11   xorg-iceauth"
+			libxfce4ui libxfce4util pango polkit xfconf libice libsm \
+			libx11   iceauth"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 xfce4-settings/receipt
--- a/xfce4-settings/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-settings/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool exo-dev garcon-dev xorg-libXi-dev xorg-libXrandr-dev \
-upower-dev libnotify-dev xorg-libXcursor-dev xorg-xf86-input-libinput-dev \
+BUILD_DEPENDS="intltool exo-dev garcon-dev libxi-dev libxrandr-dev \
+upower-dev libnotify-dev libxcursor-dev xf86-input-libinput-dev \
 libxklavier-dev"
 
 compile_rules() {
@@ -30,6 +30,6 @@
 	copy @std hicolor/ # only 128 icons here
 	DEPENDS="cairo dbus dbus-glib exo fontconfig garcon gdk-pixbuf glib gtk2 \
 	libnotify libxfce4ui libxfce4util libxklavier pango upower xfconf \
-	xorg-libX11 xorg-libXcursor xorg-libXi xorg-libXrandr"
+	libx11 libxcursor libxi libxrandr"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfce4-terminal/receipt
--- a/xfce4-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfce4-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev vte-gtk2-dev \
-libxfce4ui-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
+BUILD_DEPENDS="intltool libx11-dev libice-dev gtk2-dev vte-gtk2-dev \
+libxfce4ui-dev libsm-dev startup-notification-dev xcb-util-dev"
 
 compile_rules(){
 	# warning: internationalized messages should not contain the '\r' escape sequence
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango vte-gtk2 \
-	xorg-libX11"
+	libx11"
 	TAGS="Xfce terminal"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfdesktop/receipt
--- a/xfdesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfdesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
+BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
 dbus-glib-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev exo-dev \
 thunar-dev garcon-dev libnotify-dev"
 SPLIT="$PACKAGE-extras $PACKAGE"
@@ -35,7 +35,7 @@
 			copy @std @rm
 			DEPENDS="cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
 			libnotify libwnck2 libxfce4ui libxfce4util pango thunar xfconf \
-			xorg-libX11"
+			libx11"
 			;;
 	esac
 	TAGS="Xfce"
diff -r e167735ddedc -r 5669e8b3be70 xfe/receipt
--- a/xfe/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfe/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev xorg-libXft-dev fox-dev \
-automake intltool gettext-dev xorg-libXrandr-dev xorg-libXi"
+BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev tiff-dev libxft-dev fox-dev \
+automake intltool gettext-dev libxrandr-dev libxi"
 SPLIT="$PACKAGE-extra-icons $PACKAGE xfi xfw xfp"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 
 genpkg_rules() {
 	COOKOPTS="!pixmaps !menus"
-	DEPENDS="fox xorg-libX11 xorg-libXft xorg-libXrandr" # the same depends
+	DEPENDS="fox libx11 libxft libxrandr" # the same depends
 	case $PACKAGE in
 		xfe-extra-icons)
 			copy kde-theme/ windows-theme/ xfe-theme/
diff -r e167735ddedc -r 5669e8b3be70 xfig/receipt
--- a/xfig/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfig/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-full-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/mcj/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep jpeg-dev \
-libpng16-dev xorg-libXp xorg-libX11-dev xorg-libXt-dev xorg-libXpm-dev \
-xorg-libXmu-dev xorg-libXaw-dev xorg-libXaw3d-dev xorg-libXt-dev"
+BUILD_DEPENDS="imake xorg-cf-files gccmakedep jpeg-dev \
+libpng-dev libxp libx11-dev libxt-dev libxpm-dev \
+libxmu-dev libxaw-dev libxaw3d-dev"
 SPLIT="transfig"
 
 compile_rules() {
@@ -39,12 +39,12 @@
 		xfig)
 			cp -a $install/xfig/* $fs
 			SUGGESTED="transfig"
-			DEPENDS="jpeg libpng16 xorg xorg-libXp"
+			DEPENDS="jpeg libpng xorg libxp"
 			;;
 		transfig)
 			cp -a $install/transfig/* $fs
 			SHORT_DESC="Utilities for converting XFig figure files"
-			DEPENDS="xorg xorg-libXpm libpng16 zlib"
+			DEPENDS="xorg libxpm libpng zlib"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 xfmedia/receipt
--- a/xfmedia/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfmedia/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="http://spuriousinterrupt.org/files/xfmedia/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info exo-dev util-linux-uuid-dev xine-lib-dev \
-intltool libxfcegui4-dev startup-notification-dev xorg-libxcb-dev \
-xorg-libX11-dev xorg-libXt-dev xorg-libXtst-dev xorg-xcb-util-dev"
+intltool libxfcegui4-dev startup-notification-dev libxcb-dev \
+libx11-dev libxt-dev libxtst-dev xcb-util-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0"
@@ -33,6 +33,6 @@
 	copy @std
 	rm -r $fs/usr/share/xfmedia/doc/
 	DEPENDS="exo gdk-pixbuf glib gtk2 libxfce4util libxfcegui4 pango xine-lib \
-	xorg-libX11 xorg-libXext xorg-libXtst"
+	libx11 libxext libxtst"
 	TAGS="Xfce"
 }
diff -r e167735ddedc -r 5669e8b3be70 xfmpc/receipt
--- a/xfmpc/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfmpc/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev \
-libxfce4ui-dev libmpd-dev xorg-libSM-dev startup-notification-dev \
-xorg-xcb-util-dev"
+BUILD_DEPENDS="intltool libx11-dev libice-dev gtk2-dev \
+libxfce4ui-dev libmpd-dev libsm-dev startup-notification-dev \
+xcb-util-dev"
 
 compile_rules() {
 	sed -i 's|\\r||' po/es.po # tiny patch
diff -r e167735ddedc -r 5669e8b3be70 xfprint/receipt
--- a/xfprint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfprint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libxfcegui4-dev libxfce4util-dev cups-dev intltool xfconf-dev \
 dbus-glib-dev startup-notification-dev util-linux-uuid-dev gtk2-dev \
-xorg-xcb-util-dev"
+xcb-util-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 			# Remove SVG icons
 			rm -rf $fs/usr/share/icons/hicolor/scalable
 			DEPENDS="gdk-pixbuf glib gtk2 libcups libxfce4util libxfcegui4 \
-			xfconf xorg-libX11"
+			xfconf libx11"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 xfwm4/receipt
--- a/xfwm4/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xfwm4/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libXext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
-libdrm-dev xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXfixes-dev \
-xorg-libXdamage-dev"
+BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
+libxext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
+libdrm-dev libxrandr-dev libxcomposite-dev libxfixes-dev \
+libxdamage-dev"
 SPLIT="$PACKAGE-themes $PACKAGE"
 
 compile_rules() {
@@ -35,9 +35,9 @@
 		xfwm4)
 			copy @std @rm
 			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libwnck2 libxfce4ui \
-			libxfce4util pango startup-notification xfconf xorg-libX11 \
-			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
-			xorg-libXrandr xorg-libXrender"
+			libxfce4util pango startup-notification xfconf libx11 \
+			libxcomposite libxdamage libxext libxfixes \
+			libxrandr libxrender"
 			TAGS="Xfce window-manager"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 xgalaga++/receipt
--- a/xgalaga++/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xgalaga++/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://marc.mongenet.ch/OSS/XGalaga/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXpm-dev"
+BUILD_DEPENDS="libx11-dev libxpm-dev"
 
 compile_rules() {
 	make xgalaga++ &&
@@ -20,5 +20,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 xorg-libXpm"
+	DEPENDS="libx11 libxpm"
 }
diff -r e167735ddedc -r 5669e8b3be70 xgalaga/receipt
--- a/xgalaga/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xgalaga/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -37,6 +37,6 @@
 	cp -a $install/usr/share/xgalaga $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp $stuff/*.desktop $fs/usr/share/applications
-	DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm \
-	xorg-libxcb xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
+	DEPENDS="libx11 libxmu libxt libxext libxpm \
+	libxcb libxau libxdmcp libsm libice util-linux-uuid"
 }
diff -r e167735ddedc -r 5669e8b3be70 xine-lib/receipt
--- a/xine-lib/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xine-lib/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/xine/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xorgproto \
+BUILD_DEPENDS="libxvmc-dev libxv-dev xorgproto \
 alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
-util-linux-uuid-dev xorg-libxcb-dev libcaca-dev ffmpeg-dev file \
-libmodplug-dev xorg-libXinerama-dev speex-dev gettext"
+util-linux-uuid-dev libxcb-dev libcaca-dev ffmpeg-dev file \
+libmodplug-dev libxinerama-dev speex-dev gettext"
 SPLIT="xine-fonts $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -50,9 +50,9 @@
 			;;
 		xine-lib)
 			copy @std @rm
-			DEPENDS="zlib xorg-libX11 xorg-libXv xorg-libXvMC alsa-lib \
-			libogg libvorbis libtheora xorg-libXvMC xorg-libXv \
-			xorg-libxcb ffmpeg libmodplug"
+			DEPENDS="zlib libx11 libxv libxvmc alsa-lib \
+			libogg libvorbis libtheora \
+			libxcb ffmpeg libmodplug"
 			SUGGESTED="xine-fonts faad2"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 xine-ui/receipt
--- a/xine-ui/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xine-ui/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="$SF_MIRROR/xine/$TARBALL"
 
 # Keep Xine small for Live system, we have MPlayer or VLC has big video player.
-BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-dev xorg-libXv-dev \
-xorg-libXxf86vm-dev libpng16-dev libjpeg-turbo-dev xorg-libXScrnSaver-dev"
+BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-dev libxv-dev \
+libxxf86vm-dev libpng-dev libjpeg-turbo-dev libxscrnsaver-dev"
 
 COOKOPTS="!menus" # Use a custom .desktop file
 
@@ -29,6 +29,6 @@
 genpkg_rules() {
 	copy @std
 	rm $fs/usr/share/xine/visuals/*.mpv # remove the sample
-	DEPENDS="xine-lib libvorbis xorg-libXtst xorg-libXv xorg-libXi libpng16 \
-	xorg-libXft xorg-libXxf86vm xorg-libXScrnSaver"
+	DEPENDS="xine-lib libvorbis libxtst libxv libxi libpng \
+	libxft libxxf86vm libxscrnsaver"
 }
diff -r e167735ddedc -r 5669e8b3be70 xinit/receipt
--- a/xinit/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xinit/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -14,7 +14,7 @@
 TARBALL_SHA1="fcdca692b09a45f546016fff78718d1cf7e7852f"
 
 BUILD_DEPENDS="util-macros libxmu-dev"
-DEPENDS="libx11   openssl xorg-xauth"
+DEPENDS="libx11   openssl xauth"
 
 compile_rules() {
 	sed -i '/$serverargs $vtarg/ s/serverargs/: #&/' startx.cpp
diff -r e167735ddedc -r 5669e8b3be70 xinput-calibrator/receipt
--- a/xinput-calibrator/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xinput-calibrator/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="xinput_calibrator-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/tias/xinput_calibrator/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev xorg-xorgproto"
+BUILD_DEPENDS="libx11-dev libxext-dev libxi-dev xorgproto"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 xlockmore/receipt
--- a/xlockmore/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xlockmore/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.tux.org/~bagleyd/xlock/$PACKAGE-$VERSION/$TARBALL" # FIXME
 
-BUILD_DEPENDS="xorg-libXdmcp-dev xorg-libXpm-dev xorg-libX11-dev \
-xorg-libXt-dev xorg-libXext-dev"
+BUILD_DEPENDS="libxdmcp-dev libxpm-dev libx11-dev \
+libxt-dev libxext-dev"
 
 compile_rules() {
 	./configure \
@@ -30,7 +30,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 freetype freetype1"
+	DEPENDS="libx11 freetype freetype1"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 xlunch/receipt
--- a/xlunch/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xlunch/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/Tomas-M/xlunch/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="xorg-libX11-dev findutils imlib2-dev"
+BUILD_DEPENDS="libx11-dev findutils imlib2-dev"
 
 compile_rules() {
 	make &&
@@ -20,7 +20,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="imlib2 xorg-libX11   bash"
+	DEPENDS="imlib2 libx11   bash"
 	CONFIG_FILES="/etc/xlunch/entries.dsv"
 }
 
diff -r e167735ddedc -r 5669e8b3be70 xmahjongg/receipt
--- a/xmahjongg/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xmahjongg/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.lcdf.org/xmahjongg/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev"
+BUILD_DEPENDS="libx11-dev libxt-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 xmgrace/receipt
--- a/xmgrace/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xmgrace/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="grace-$VERSION.tar.gz"
 WGET_URL="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/$TARBALL"
 
-BUILD_DEPENDS="jpeg-dev libpng16-dev fftw-dev lesstif-dev xorg-xorgproto bison \
-xorg-libXt-dev"
+BUILD_DEPENDS="jpeg-dev libpng-dev fftw-dev lesstif-dev xorgproto bison \
+libxt-dev"
 
 compile_rules() {
 	sed -i 's|/man/|/share&|' doc/Makefile*
@@ -45,5 +45,5 @@
 		$fs/usr/share/grace/doc/*.pdf \
 		$fs/usr/share/grace/doc/*.1 \
 		$fs/usr/man
-	DEPENDS="libjpeg libpng16 fftw lesstif"
+	DEPENDS="libjpeg libpng fftw lesstif"
 }
diff -r e167735ddedc -r 5669e8b3be70 xmountains/receipt
--- a/xmountains/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xmountains/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -16,7 +16,7 @@
 # original version 2.9 available here:
 # http://archive.ubuntu.com/ubuntu/pool/universe/x/xmountains/xmountains_2.9.orig.tar.gz
 
-BUILD_DEPENDS="xorg-imake xorg-xorgproto xorg-libX11-dev xorg-xbitmaps"
+BUILD_DEPENDS="imake xorgproto libx11-dev xbitmaps"
 
 compile_rules() {
 	xmkmf &&
@@ -33,5 +33,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 xombrero/receipt
--- a/xombrero/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xombrero/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -42,6 +42,6 @@
 	copy @std
 	CONFIG_FILES="/etc/xombrero.conf"
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libbsd \
-	libgnutls libsoup pango webkitgtk xorg-libX11"
+	libgnutls libsoup pango webkitgtk libx11"
 	TAGS="web-browser"
 }
diff -r e167735ddedc -r 5669e8b3be70 xorg/receipt
--- a/xorg/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xorg/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -17,7 +17,7 @@
 libxi libxinerama libxkbfile libxmu libxpm libxrandr libxrender libxscrnsaver \
 libxt libxtst libxxf86vm xkbcomp xkeyboard-config"
 DEPENDS_dev="libxdmcp-dev libxau-dev libx11-dev libxext-dev libxrender-dev \
-libxrandr-dev libxfixes-dev libfontenc-dev xorg-libxfont-dev libxft-dev \
+libxrandr-dev libxfixes-dev libfontenc-dev libxfont-dev libxft-dev \
 libxcomposite-dev libxkbfile-dev libice-dev libsm-dev libxt-dev \
 libxinerama-dev libxmu-dev libxpm-dev libxaw-dev libxtst-dev libxcursor-dev \
 libxdamage-dev libxi-dev"
diff -r e167735ddedc -r 5669e8b3be70 xosd/receipt
--- a/xosd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xosd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11"
+	DEPENDS="libx11"
 }
diff -r e167735ddedc -r 5669e8b3be70 xournal/receipt
--- a/xournal/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xournal/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -27,6 +27,6 @@
 	copy @std
 	rm -r $fs/usr/share/mimelnk/
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libart_lgpl \
-	libgnomecanvas pango poppler xorg-libX11 zlib" # poppler-apps?
+	libgnomecanvas pango poppler libx11 zlib" # poppler-apps?
 	SUGGESTED="ghostscript"
 }
diff -r e167735ddedc -r 5669e8b3be70 xpad/receipt
--- a/xpad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xpad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/xpad/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev xorg-libSM-dev intltool"
+BUILD_DEPENDS="gtk2-dev libsm-dev intltool"
 COOKOPTS="!pixmaps"
 
 HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
@@ -28,5 +28,5 @@
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps/
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/xpad.png $fs/usr/share/icons/hicolor/48x48/apps/
-	DEPENDS="gtk2 util-linux-uuid xorg-libICE xorg-libSM"
+	DEPENDS="gtk2 util-linux-uuid libice libsm"
 }
diff -r e167735ddedc -r 5669e8b3be70 xpaint/receipt
--- a/xpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev freetype-dev libXaw3dXft-dev \
-libjpeg-turbo-dev tiff-dev libtool xorg-libXpm-dev"
+BUILD_DEPENDS="libx11-dev libxft-dev freetype-dev libXaw3dXft-dev \
+libjpeg-turbo-dev tiff-dev libtool libxpm-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -28,9 +28,9 @@
 	case $PACKAGE in
 		xpaint)
 			copy @std
-			DEPENDS="fontconfig libXaw3dXft libjpeg-turbo libpng16 tiff \
-			xorg-libX11 xorg-libXext xorg-libXft xorg-libXmu xorg-libXpm \
-			xorg-libXt"
+			DEPENDS="fontconfig libXaw3dXft libjpeg-turbo libpng tiff \
+			libx11 libxext libxft libxmu libxpm \
+			libxt"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 xpat2/receipt
--- a/xpat2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xpat2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="http://www.ibiblio.org/pub/Linux/games/solitaires/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXaw-dev"
+BUILD_DEPENDS="libx11-dev libxt-dev libxaw-dev"
 
 compile_rules() {
 	cd src
@@ -28,5 +28,5 @@
 	cp -a $stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat
 	touch $fs/var/games/xpat2/xpat.log
 	chmod 666 $fs/var/games/xpat2/xpat.log
-	DEPENDS="xorg-libX11 xorg-libXt xorg-libXaw"
+	DEPENDS="libx11 libxt libxaw"
 }
diff -r e167735ddedc -r 5669e8b3be70 xpenguins/receipt
--- a/xpenguins/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xpenguins/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-BUILD_DEPENDS="xorg-libXpm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev"
-DEPENDS_std="xorg-libXpm xorg-libX11 xorg-libXext"
+BUILD_DEPENDS="libxpm-dev libx11-dev libxext-dev libxt-dev"
+DEPENDS_std="libxpm libx11 libxext"
 
 compile_rules() {
 	./configure \
diff -r e167735ddedc -r 5669e8b3be70 xplanet/receipt
--- a/xplanet/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xplanet/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="patch xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
-xorg-libXScrnSaver-dev freetype-dev pango-dev giflib-dev libjpeg-turbo-dev \
-libpng16-dev tiff-dev"
+BUILD_DEPENDS="patch libx11-dev libice-dev libxext-dev \
+libxscrnsaver-dev freetype-dev pango-dev giflib-dev libjpeg-turbo-dev \
+libpng-dev tiff-dev"
 
 compile_rules() {
 	./configure \
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="perl jpeg libpng16 zlib tiff xorg-libX11 freetype pango fontconfig \
-glib xorg-libXau xorg-libXdmcp expat giflib xorg-libXScrnSaver gcc-lib-base \
+	DEPENDS="perl jpeg libpng zlib tiff libx11 freetype pango fontconfig \
+glib libxau libxdmcp expat giflib libxscrnsaver gcc-lib-base \
  util-linux-uuid"
 }
diff -r e167735ddedc -r 5669e8b3be70 xpra/receipt
--- a/xpra/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xpra/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,9 +13,9 @@
 # integrity check: http://xpra.org/src/
 TARBALL_SHA1="5bcd554bff69a4077b7090f6871e939b5b3b47b2"
 
-BUILD_DEPENDS="python python-cython libvpx-dev xorg-libX11-dev x264-dev \
-x265-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
-xorg-libXfixes-dev xorg-libxkbfile-dev xorg-libXrandr-dev xorg-libXtst-dev \
+BUILD_DEPENDS="python python-cython libvpx-dev libx11-dev x264-dev \
+x265-dev libxcomposite-dev libxdamage-dev libxext-dev \
+libxfixes-dev libxkbfile-dev libxrandr-dev libxtst-dev \
 python-pygobject2-dev python-pygtk-dev python-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 genpkg_rules() {
 	copy @std
 
-	DEPENDS="glib gtk2 libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \
-	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi xorg-libXrandr \
-	xorg-libXtst xorg-libxkbfile   python-pygtk python-pygobject2" # maybe some other python-* too
+	DEPENDS="glib gtk2 libvpx python x264 x265 libx11 libxcomposite \
+	libxdamage libxext libxfixes libxi libxrandr \
+	libxtst libxkbfile   python-pygtk python-pygobject2" # maybe some other python-* too
 }
diff -r e167735ddedc -r 5669e8b3be70 xrdp/receipt
--- a/xrdp/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xrdp/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -35,7 +35,7 @@
 	case $PACKAGE in
 		xrdp)
 			copy @std
-			DEPENDS="openssl pam xorg-libX11 xorg-libXfixes xorg-libXrandr   \
+			DEPENDS="openssl pam libx11 libxfixes libxrandr   \
 			tightvnc"
 			;;
 		*-dev)
diff -r e167735ddedc -r 5669e8b3be70 xrestop/receipt
--- a/xrestop/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xrestop/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.yoctoproject.org/releases/xrestop/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev xorg-libXres-dev"
+BUILD_DEPENDS="ncurses-dev libxres-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
@@ -24,5 +24,5 @@
 genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
-	DEPENDS="ncurses xorg-libXres"
+	DEPENDS="ncurses libxres"
 }
diff -r e167735ddedc -r 5669e8b3be70 xruskb/receipt
--- a/xruskb/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xruskb/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.yars.free.net/pub/source/xruskb/$TARBALL"
 
-BUILD_DEPENDS="xorg-libXp-dev xorg-libXmu-dev lesstif-dev"
+BUILD_DEPENDS="libxp-dev libxmu-dev lesstif-dev"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="lesstif freetype xorg-libXp xorg-libXmu"
+	DEPENDS="lesstif freetype libxp libxmu"
 }
diff -r e167735ddedc -r 5669e8b3be70 xsane/receipt
--- a/xsane/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xsane/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -31,5 +31,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/sane $fs/usr/share
 	rm -rf $fs/usr/share/sane/xsane/doc
-	DEPENDS="sane-backends gtk2 tiff xorg-libXdamage lcms v4l-utils libltdl"
+	DEPENDS="sane-backends gtk2 tiff libxdamage lcms v4l-utils libltdl"
 }
diff -r e167735ddedc -r 5669e8b3be70 xscavenger/receipt
--- a/xscavenger/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xscavenger/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="https://www.linuxmotors.com/scavenger/downloads/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-xorgproto xorg-libX11-dev alsa-lib-dev \
-xorg-libXext-dev"
+BUILD_DEPENDS="imake xorgproto libx11-dev alsa-lib-dev \
+libxext-dev"
 
 compile_rules() {
 	cd $src/src
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib xorg-libX11 xorg-libXext"
+	DEPENDS="alsa-lib libx11 libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 xscreensaver/receipt
--- a/xscreensaver/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xscreensaver/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="bc xorg-libX11-dev xorg-libXmu-dev xorg-libXext-dev \
-xorg-libXinerama-dev xorg-libXi-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
-gtk2-dev libxml2-dev mesa-dev gdk-pixbuf-dev xorg-libXpm-dev jpeg-dev \
-xorg-libXt-dev libglade-dev intltool"
+BUILD_DEPENDS="bc libx11-dev libxmu-dev libxext-dev \
+libxinerama-dev libxi-dev libxxf86vm-dev libxrandr-dev \
+gtk2-dev libxml2-dev mesa-dev gdk-pixbuf-dev libxpm-dev jpeg-dev \
+libxt-dev libglade-dev intltool"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0 gdk-pixbuf-xlib-2.0 gl)"
diff -r e167735ddedc -r 5669e8b3be70 xsnow/receipt
--- a/xsnow/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xsnow/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-libX11-dev xorg-libXpm-dev \
-xorg-libXext-dev xorg-libXt-dev"
+BUILD_DEPENDS="imake gccmakedep libx11-dev libxpm-dev \
+libxext-dev libxt-dev"
 
 compile_rules() {
 	xmkmf &&
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXpm xorg-libXext"
+	DEPENDS="libxpm libxext"
 }
diff -r e167735ddedc -r 5669e8b3be70 xstroke/receipt
--- a/xstroke/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xstroke/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://davesource.com/Projects/xstroke/xstroke.tar.gz"
 
-BUILD_DEPENDS="xorg-libX11-dev"
-DEPENDS_std="xorg-libX11"
+BUILD_DEPENDS="libx11-dev"
+DEPENDS_std="libx11"
 
 compile_rules() {
 	sed \
diff -r e167735ddedc -r 5669e8b3be70 xtel/receipt
--- a/xtel/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xtel/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}download/$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep xorg-xbitmaps \
-xorg-libXp xorg-bdftopcf xorg-mkfontdir xorg-mkfontscale jpeg-dev \
-xorg-libXt-dev xorg-libXpm-dev xorg-libXaw-dev xorg-libXmu-dev"
+BUILD_DEPENDS="imake xorg-cf-files gccmakedep xbitmaps \
+libxp bdftopcf mkfontdir mkfontscale jpeg-dev \
+libxt-dev libxpm-dev libxaw-dev libxmu-dev"
 
 compile_rules() {
 	sed -i 's/sys_errlist.errno./strerror(errno)/' procedure.c teleinfo.c \
@@ -38,7 +38,7 @@
 	sed -i 's/`host/`nslookup/;s|/bin/bash|/bin/sh|' $fs/etc/ppp/ip*.iminitel
 	sed -i 's|X11R6/||' $fs/usr/bin/make_xtel_lignes
 	mv $fs/fonts $fs/usr/share/fonts/X11
-	DEPENDS="ncurses-extra jpeg xorg-libXp xorg"
+	DEPENDS="ncurses-extra jpeg libxp xorg"
 	CONFIG_FILES="/etc/xtel"
 	TAGS="emulator minitel"
 }
diff -r e167735ddedc -r 5669e8b3be70 xtrkcad/receipt
--- a/xtrkcad/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xtrkcad/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
 BUILD_DEPENDS="cmake gettext-dev zlib-dev gtk2-dev libxml2-dev libgtkhtml-dev \
-libgtkhtml doxygen xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
-xorg-libXdmcp-dev"
+libgtkhtml doxygen libx11-dev xorgproto libxau-dev \
+libxdmcp-dev"
 SPLIT="$PACKAGE-doc $PACKAGE"
 
 compile_rules() {
@@ -51,10 +51,10 @@
 		xtrkcad)
 			copy @std @rm
 			DEPENDS="menu-railroad glibc-base glib zlib expat libxml2 gtk2 \
-			libgtkhtml fontconfig freetype atk cairo libpng16 pango \
-			xorg-pixman xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
-			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
-			xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender"
+			libgtkhtml fontconfig freetype atk cairo libpng pango \
+			pixman libxcb xcb-util libx11 libxau \
+			libxcomposite libxcursor libxdamage libxdmcp \
+			libxext libxfixes libxinerama libxrender"
 			;;
 	esac
 }
diff -r e167735ddedc -r 5669e8b3be70 xtron/receipt
--- a/xtron/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xtron/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,5 +32,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libXpm xorg-libXau xorg-libxcb"
+	DEPENDS="libxpm libxau libxcb"
 }
diff -r e167735ddedc -r 5669e8b3be70 xvkbd/receipt
--- a/xvkbd/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/xvkbd/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \
-xorg-libXaw3d-dev xorg-xorgproto"
+BUILD_DEPENDS="imake libxaw-dev libxp-dev libxtst-dev \
+libxaw3d-dev xorgproto"
 
 compile_rules() {
 	# delete Xaw3d
@@ -33,7 +33,7 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d"
+	DEPENDS="libxp libxtst libxaw3d"
 }
 
 post_install() {
diff -r e167735ddedc -r 5669e8b3be70 yarock/receipt
--- a/yarock/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/yarock/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://launchpad.net/yarock/trunk/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="cmake Qt4-dev qmake qt4-phonon taglib-dev qjson-dev \
-xorg-libX11 xorg-libXext xorg-libX11-dev wget"
+libxext libx11-dev wget"
 
 compile_rules() {
 	sed -i 's/TAGLIB_VERSION STRLESS/TAGLIB_VERSION VERSION_LESS/' \
diff -r e167735ddedc -r 5669e8b3be70 yeahconsole/receipt
--- a/yeahconsole/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/yeahconsole/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://phrat.de/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
+BUILD_DEPENDS="libx11-dev xorgproto"
 
 compile_rules() {
 	make &&
diff -r e167735ddedc -r 5669e8b3be70 zbar/receipt
--- a/zbar/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zbar/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \
+BUILD_DEPENDS="xmlto libx11-dev libxext-dev libxv-dev \
 libjpeg-turbo-dev imagemagick6-dev gtk2-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -33,7 +33,7 @@
 		zbar)
 			copy @std
 			DEPENDS="gdk-pixbuf glib gtk2 imagemagick6 libjpeg-turbo \
-			xorg-libX11 xorg-libXv"
+			libx11 libxv"
 			;;
 		*-dev)
 			copy @dev
diff -r e167735ddedc -r 5669e8b3be70 zenity+webkit2/receipt
--- a/zenity+webkit2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zenity+webkit2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,7 +32,7 @@
 		zenity+webkit2)
 			copy @std @rm
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify libsoup \
-			pango webkit2gtk xorg-libX11"
+			pango webkit2gtk libx11"
 			PROVIDE="webkit2gtk:zenity"
 			TAGS="dialogs"
 			;;
diff -r e167735ddedc -r 5669e8b3be70 zenity-gtk2/receipt
--- a/zenity-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zenity-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -26,6 +26,6 @@
 	copy @std
 	rm -r $fs/usr/share/gnome/ $fs/usr/share/omf/ # GNOME stuff. Just remove it
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
-	xorg-libX11"
+	libx11"
 	TAGS="dialogs gui"
 }
diff -r e167735ddedc -r 5669e8b3be70 zenity/receipt
--- a/zenity/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zenity/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -32,7 +32,7 @@
 		zenity)
 			copy @std @rm
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify pango \
-			xorg-libX11"
+			libx11"
 			TAGS="dialogs"
 			;;
 	esac
diff -r e167735ddedc -r 5669e8b3be70 ziproxy/receipt
--- a/ziproxy/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/ziproxy/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="giflib-dev jasper-dev jpeg-dev cyrus-sasl-dev zlib-dev libpng16-dev"
+BUILD_DEPENDS="giflib-dev jasper-dev jpeg-dev cyrus-sasl-dev zlib-dev libpng-dev"
 
 compile_rules() {
 	sed -i 's/DGifCloseFile(GifFile/&,NULL/;s/input))/input,NULL))/' src/image.c
@@ -31,6 +31,6 @@
 	cp -a $src/etc $fs
 	cp -a $src/var $fs
 	chown -R root.root $fs
-	DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng16"
+	DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng"
 	CONFIG_FILES="/etc/ziproxy"
 }
diff -r e167735ddedc -r 5669e8b3be70 zsnes/receipt
--- a/zsnes/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zsnes/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE${VERSION//./}src.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="nasm libsdl-dev libpng16-dev ncurses-dev mesa-dev \
+BUILD_DEPENDS="nasm libsdl-dev libpng-dev ncurses-dev mesa-dev \
 automake autoconf zlib-dev patch"
 
 compile_rules() {
@@ -38,6 +38,6 @@
 	copy @std
 #	mkdir -p $fs/usr/bin
 #	cp -a $src/src/zsnes $fs/usr/bin
-	DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa zlib"
+	DEPENDS="gcc-lib-base libsdl libpng ncurses mesa zlib"
 	TAGS="emulator nintendo snes"
 }
diff -r e167735ddedc -r 5669e8b3be70 zvbi/receipt
--- a/zvbi/receipt	Fri Dec 21 04:44:58 2018 +0200
+++ b/zvbi/receipt	Sat Dec 22 04:52:35 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/zapping/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev xorg-libX11-dev gettext-dev doxygen"
+BUILD_DEPENDS="libpng-dev libx11-dev gettext-dev doxygen"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		zvbi)
 			copy @std
-			DEPENDS="libpng16 xorg-libX11 zlib"
+			DEPENDS="libpng libx11 zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="zvbi libpng16-dev zlib-dev"
+			DEPENDS="zvbi libpng-dev zlib-dev"
 			;;
 	esac
 }