wok-next rev 21078

Update png and Xorg in dependencies.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Dec 22 04:52:35 2018 +0200 (2018-12-22)
parents e167735ddedc
children 5a478bba6a54
files LibreOffice/receipt R/receipt aalib/receipt aaphoto/receipt abiword/receipt accessx/receipt aiksaurus/receipt amiwm/receipt amsn/receipt antimicro/receipt apng2gif/receipt apngasm/receipt apngdis/receipt apngopt/receipt ardour/receipt assaultcube/receipt asunder/receipt at-spi2-core/receipt aterm/receipt atril/receipt audacious-plugins/receipt avidemux/receipt awesome/receipt awn-extras/receipt awn/receipt ayttm/receipt azdrawing/receipt azpainter/receipt azpainter1/receipt bicon/receipt billardgl/receipt blackbox/receipt blender/receipt blueman/receipt bmpanel2/receipt brasero/receipt brasero2/receipt brisk-menu/receipt bzflag/receipt cairo-compmgr/receipt cairo-dock-plugins/receipt cairo-dock/receipt cairo/receipt caja/receipt celestia/receipt cellwriter/receipt chemtool/receipt cinepaint-stable/receipt cinepaint/receipt claws-mail/receipt clearlooks/receipt clipit/receipt clutter-gst/receipt clutter/receipt codeblocks/receipt cogl/receipt compicc/receipt compiz-plugins-experimental/receipt compiz-plugins-extra/receipt compiz-plugins-main/receipt compiz/receipt compizconfig-python/receipt compton/receipt conky/receipt consolekit2/receipt consonance/receipt cryptkeeper/receipt cups-filters/receipt cwallpaper-fltk/receipt dbus/receipt dcmtk/receipt ddd/receipt deadbeef/receipt devilspie/receipt dia/receipt dillo/receipt directfb/receipt dmenu/receipt dosbox/receipt dvdauthor/receipt dwm/receipt dzen2/receipt echinus/receipt efl/receipt eggwm-qt5/receipt eggwm/receipt ekiga/receipt emacs/receipt emelfm2/receipt emerald/receipt engrampa/receipt enlightenment/receipt enna/receipt eom/receipt epdfview-cups/receipt epdfview/receipt evolution-data-server/receipt exo/receipt extrema/receipt fbgrab/receipt fbida/receipt fbxkb/receipt fcitx-configtool/receipt fcitx/receipt feathernotes/receipt featherpad/receipt feh/receipt ffmpeg/receipt ffmpegthumbnailer/receipt filezilla/receipt firefox-official/receipt firefox/receipt flam3/receipt flmusic/receipt florence-gtk2/receipt florence/receipt flrec/receipt fltk-2.0.x/receipt fltk/receipt fluxbox/receipt flxine/receipt fontforge/receipt foobillard/receipt foobillardplus/receipt fox/receipt fox14/receipt fpm2/receipt freeciv/receipt freeglut/receipt freerdp/receipt freetype/receipt frogatto/receipt ftgl/receipt fuse-emulator/receipt gajim/receipt gambas2/receipt garcon/receipt gcc+gcj/receipt gcolor2/receipt gdk-pixbuf/receipt geany-plugins/receipt gegl/receipt get-google-earth/receipt gettext/receipt ghostscript/receipt giac/receipt giblib/receipt gifsicle/receipt gigolo/receipt gimp/receipt gitmail/receipt glew/receipt glu/receipt glw/receipt gmerlin/receipt gmpc/receipt gmtk/receipt gnet/receipt gnome-desktop/receipt gnome-desktop2/receipt gnome-mplayer/receipt gnubg/receipt gnuplot/receipt gnustep-back/receipt gnustep-gui/receipt gobby/receipt gocr/receipt gogglesmm/receipt gpicview/receipt gqview/receipt graphviz/receipt grisbi/receipt grsync/receipt gst0-plugins-bad/receipt gst0-plugins-base/receipt gst0-plugins-good/receipt gst1-plugins-base/receipt gtick/receipt gtk-engines/receipt gtk-gnutella/receipt gtk-screenshot/receipt gtk-sharp/receipt gtk2/receipt gtk3/receipt gtkballs/receipt gtkglext/receipt gtklife/receipt gtkmm/receipt gtktetris/receipt gucharmap/receipt guvcview/receipt gv/receipt gvim/receipt gvolwheel/receipt gxine/receipt gxmessage/receipt hardinfo/receipt hardware-thinkpad-600e/receipt homebank/receipt hsetroot/receipt ht/receipt htmldoc/receipt hydra/receipt i3/receipt ibus/receipt icedtea6-jdk/receipt icewm-xdgmenu/receipt icewm/receipt icoutils/receipt idesk/receipt imagemagick/receipt imagemagick6/receipt imlib2/receipt inkscape/receipt inxi/receipt irrlicht/receipt jbig2dec/receipt js/receipt jwm/receipt karmen/receipt kazehakase/receipt keepassx/receipt keybinder/receipt keybinder3/receipt kguiaddons/receipt kidletime/receipt kino/receipt klavaro/receipt kvantum/receipt kwindowsystem/receipt lbreakout2/receipt leafpad/receipt lensfun/receipt leocad/receipt leptonica/receipt lesstif/receipt libXaw3dXft/receipt libbonoboui/receipt libcaca/receipt libcanberra/receipt libcompizconfig/receipt libdbusmenu/receipt libdv/receipt libepoxy/receipt libfakekey/receipt libfm-qt/receipt libgd/receipt libgdiplus/receipt libgnomecanvas/receipt libgnomeprintui/receipt libgnomeui/receipt libgtkhtml/receipt libgtop/receipt libharu/receipt libheif/receipt libicns/receipt libkscreen/receipt liblxqt/receipt libmatchbox/receipt libmatekbd/receipt libmpeg2/receipt libpano13/receipt libplayer/receipt libproxy/receipt libquicktime/receipt libsde-utils-x11/receipt libsdl-gfx/receipt libsdl-image/receipt libsdl-pango/receipt libsdl/receipt libsdl2-image/receipt libsdl2-ttf/receipt libsdl2/receipt libsexy/receipt libstroke/receipt libtheora/receipt libunique/receipt libvips/receipt libvirt/receipt libvncserver/receipt libwebp/receipt libwmf/receipt libwnck2/receipt libwnck3/receipt libxcm/receipt libxfce4ui/receipt libxfcegui4/receipt libxklavier/receipt lightdm-qt/receipt lightdm/receipt lincity-ng/receipt linphone/receipt lirc/receipt listpatron/receipt lives/receipt lmms/receipt lockdis/receipt lxappearance-obconf/receipt lxappearance/receipt lxde/receipt lxdm/receipt lxhotkey/receipt lximage-qt/receipt lxinput/receipt lxlauncher/receipt lxpanel/receipt lxqt-appswitcher/receipt lxqt-config-randr/receipt lxqt-config/receipt lxqt-globalkeys/receipt lxqt-panel/receipt lxqt-session/receipt lxqt/receipt lxsession/receipt lxterminal/receipt lyx/receipt magicpoint/receipt magnifier/receipt mana/receipt manaplus/receipt mapserver/receipt marco/receipt matchbox-desktop-2/receipt matchbox-desktop/receipt matchbox-keyboard/receipt matchbox-panel-2/receipt matchbox-panel-manager/receipt matchbox-panel/receipt matchbox-window-manager-2/receipt matchbox-window-manager/receipt mate-applets/receipt mate-control-center/receipt mate-desktop/receipt mate-indicator-applet/receipt mate-netbook/receipt mate-notification-daemon-gtk2/receipt mate-notification-daemon/receipt mate-panel/receipt mate-power-manager/receipt mate-screensaver/receipt mate-session-manager/receipt mate-settings-daemon/receipt mate-terminal/receipt mate-user-share/receipt mate-utils/receipt matplotlib/receipt mesa-demos/receipt mesa12/receipt metacity/receipt mhwaveedit/receipt miam-player/receipt minetest/receipt mirage/receipt mjpegtools/receipt mono/receipt mozplugger/receipt mplayer-cli/receipt mplayer-svn/receipt mplayer/receipt mplayerplug-in/receipt mpv/receipt mrxvt-unicode/receipt mrxvt/receipt mtools/receipt mtpaint/receipt mupdf/receipt mupen64plus/receipt mygestures/receipt nabi/receipt nagios/receipt navit/receipt netsurf/receipt nitrogen/receipt notecase/receipt notes/receipt notification-daemon-gtk2/receipt notification-daemon/receipt ntk/receipt ntop/receipt numlockx/receipt nvclock/receipt nvidia-173xx/receipt obconf-qt/receipt obconf/receipt ocaml/receipt octave/receipt openbox/receipt opencv/receipt openjpeg/receipt openjpeg2/receipt openmotif/receipt openspades/receipt openttd/receipt openvas-client/receipt optipng/receipt orage/receipt oxine/receipt oxygen-gtk/receipt oyranos/receipt palemoon/receipt pango/receipt pangox-compat/receipt parcellite/receipt pari/receipt parole/receipt pavucontrol/receipt pce/receipt pcmanfm-legacy/receipt pcmanfm-qt/receipt pcmanfm/receipt pcsxr-svn/receipt peazip/receipt pekwm/receipt perl-tk/receipt pgadmin/receipt php/receipt pidgin/receipt pingus/receipt plotdrop/receipt ploticus/receipt pluma/receipt plymouth/receipt pngquant/receipt pngrewrite/receipt pnmixer/receipt podofo/receipt ponyprog/receipt poppler-qt4/receipt poppler/receipt powermanga/receipt prboom/receipt pulseaudio/receipt putty/receipt puzzles/receipt pwsafe/receipt python-pygame/receipt python-wxpython/receipt python/receipt python3/receipt pywebkitgtk/receipt qarma/receipt qca-ossl/receipt qedit/receipt qemacs/receipt qiv/receipt qiviewer/receipt qjackctl/receipt qlipper/receipt qoauth/receipt qps/receipt qrencode/receipt qt4-base/receipt qt4/receipt qt5/receipt qtav/receipt qterminal/receipt qtpanel/receipt qtractor/receipt qtstyleplugins/receipt qtwebkit/receipt quarry/receipt quesoglc/receipt qupzilla/receipt qutim/receipt qxkb/receipt radeontool/receipt rainbow-cm/receipt raine/receipt rapidsvn/receipt ratmenu/receipt ratpoison/receipt razorqt/receipt rdesktop/receipt rdpdesk/receipt realvnc-viewer/receipt recordmydesktop/receipt redshift/receipt remind/receipt remmina/receipt rhythmcat2/receipt ristretto/receipt rosegarden/receipt rox-filer/receipt rrdtool/receipt rubix/receipt ruby-gtk2/receipt sakura-gtk2/receipt sbxkb/receipt scim-pinyin/receipt scim/receipt scite/receipt screenfetch/receipt screengrab/receipt scribus/receipt scrot/receipt sddm/receipt seamonkey/receipt searchmonkey/receipt seed/receipt slang/receipt slim/receipt slitaz-configs/receipt slitaz-dev-pkgs/receipt slitaz-polar-cursors/receipt slock/receipt smx/receipt sox/receipt spacefm/receipt spectrwm/receipt speedcrunch/receipt splashutils/receipt squeak-vm/receipt st/receipt stardict/receipt startup-notification/receipt stella/receipt stellarium/receipt stjerm-terminal/receipt strigi/receipt stuurman-desktop/receipt stuurman/receipt sudoku-savant/receipt superswitcher/receipt surf/receipt surf2/receipt svkbd/receipt sylpheed/receipt synergy/receipt tabbed/receipt tea/receipt terminus-font/receipt tesseract/receipt texmacs/receipt thunar-vfs/receipt thunar-volman/receipt thunar/receipt tightvnc/receipt tilda/receipt timidity++/receipt tint2/receipt tix/receipt transset-df/receipt truecrypt/receipt tsclient/receipt tumbler/receipt tuxpaint/receipt unclutter/receipt urxvt/receipt utox/receipt vice/receipt vifm/receipt virtualbox-ose/receipt vivaldi/receipt vkeybd/receipt vlc/receipt vnc2swf/receipt vte-gtk2/receipt warzone2100/receipt waterline/receipt wbar/receipt wbar2/receipt webkit2gtk/receipt webkitgtk/receipt wesnoth/receipt weston/receipt wine-rt/receipt wine/receipt winetricks/receipt wireshark/receipt wordwarvi/receipt workerfm/receipt wv/receipt wxWidgets/receipt wxWidgets28/receipt wxdfast/receipt x11rec/receipt x11vnc/receipt xaos/receipt xarchive/receipt xautomation/receipt xbattle/receipt xbill/receipt xbindkeys/receipt xcb-util-xrm/receipt xchat/receipt xchm/receipt xcircuit/receipt xcursor-aero/receipt xcursor-comix/receipt xcursor-human/receipt xcursor-obsidian/receipt xdigger/receipt xdotool/receipt xfce4-battery-plugin/receipt xfce4-dict/receipt xfce4-mixer/receipt xfce4-notifyd/receipt xfce4-panel/receipt xfce4-power-manager/receipt xfce4-screenshooter/receipt xfce4-session/receipt xfce4-settings/receipt xfce4-terminal/receipt xfdesktop/receipt xfe/receipt xfig/receipt xfmedia/receipt xfmpc/receipt xfprint/receipt xfwm4/receipt xgalaga++/receipt xgalaga/receipt xine-lib/receipt xine-ui/receipt xinit/receipt xinput-calibrator/receipt xlockmore/receipt xlunch/receipt xmahjongg/receipt xmgrace/receipt xmountains/receipt xombrero/receipt xorg/receipt xosd/receipt xournal/receipt xpad/receipt xpaint/receipt xpat2/receipt xpenguins/receipt xplanet/receipt xpra/receipt xrdp/receipt xrestop/receipt xruskb/receipt xsane/receipt xscavenger/receipt xscreensaver/receipt xsnow/receipt xstroke/receipt xtel/receipt xtrkcad/receipt xtron/receipt xvkbd/receipt yarock/receipt yeahconsole/receipt zbar/receipt zenity+webkit2/receipt zenity-gtk2/receipt zenity/receipt ziproxy/receipt zsnes/receipt zvbi/receipt
line diff
     1.1 --- a/LibreOffice/receipt	Fri Dec 21 04:44:58 2018 +0200
     1.2 +++ b/LibreOffice/receipt	Sat Dec 22 04:52:35 2018 +0200
     1.3 @@ -90,8 +90,8 @@
     1.4  			glib gpgme gst1-plugins-base gstreamer1 gtk2 icu lcms2 libassuan \
     1.5  			libcomerr libcups libcurl libepoxy libgpg-error libicu libkrb5 \
     1.6  			libsqlite3 libxml2 libxslt neon nspr nss pango perl python \
     1.7 -			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXinerama \
     1.8 -			xorg-libXrandr xorg-libXrender zlib"
     1.9 +			libice libsm libx11 libxext libxinerama \
    1.10 +			libxrandr libxrender zlib"
    1.11  			SUGGESTED="mesa"
    1.12  
    1.13  			action 'Info: current size is...'; sizes
    1.14 @@ -160,7 +160,7 @@
    1.15  			copy @std *.inc @rm
    1.16  			CAT="office|extra files"
    1.17  			DEPENDS="glib gst0-plugins-base gstreamer0 libepoxy libicu libxml2 \
    1.18 -			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext"
    1.19 +			libice libsm libx11 libxext"
    1.20  			SUGGESTED="libQtCore libQtGui libQtNetwork"
    1.21  			;;
    1.22  	esac
     2.1 --- a/R/receipt	Fri Dec 21 04:44:58 2018 +0200
     2.2 +++ b/R/receipt	Sat Dec 22 04:52:35 2018 +0200
     2.3 @@ -12,8 +12,8 @@
     2.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     2.5  WGET_URL="http://cran.r-project.org/src/base/R-3/$TARBALL"
     2.6  
     2.7 -BUILD_DEPENDS="automake gfortran readline-dev xorg-imake icu-dev \
     2.8 -xorg-libX11-dev xorg-libICE-dev xorg-libXt-dev xorg-libXmu-dev cairo-dev \
     2.9 +BUILD_DEPENDS="automake gfortran readline-dev imake icu-dev \
    2.10 +libx11-dev libice-dev libxt-dev libxmu-dev cairo-dev \
    2.11  pango-dev tcl-dev tk-dev zlib-dev pcre-dev curl-dev libjpeg-turbo-dev libpaper"
    2.12  SPLIT="$PACKAGE-dev"
    2.13  
    2.14 @@ -40,9 +40,9 @@
    2.15  		R)
    2.16  			copy @std
    2.17  			DEPENDS="bzlib cairo gcc-lib-math glib icu libcurl libgfortran \
    2.18 -			libgomp libicu libjpeg-turbo liblzma libpng16 ncurses pango pcre \
    2.19 -			readline tcl tk xorg-libICE xorg-libSM xorg-libX11 xorg-libXext \
    2.20 -			xorg-libXmu xorg-libXt zlib   midori epdfview"
    2.21 +			libgomp libicu libjpeg-turbo liblzma libpng ncurses pango pcre \
    2.22 +			readline tcl tk libice libsm libx11 libxext \
    2.23 +			libxmu libxt zlib   midori epdfview"
    2.24  			;;
    2.25  		R-dev)
    2.26  			copy @dev
     3.1 --- a/aalib/receipt	Fri Dec 21 04:44:58 2018 +0200
     3.2 +++ b/aalib/receipt	Sat Dec 22 04:52:35 2018 +0200
     3.3 @@ -12,7 +12,7 @@
     3.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     3.5  WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
     3.6  
     3.7 -BUILD_DEPENDS="ncurses-dev xorg-libXt-dev xorg-libX11-dev"
     3.8 +BUILD_DEPENDS="ncurses-dev libxt-dev libx11-dev"
     3.9  SPLIT="$PACKAGE-dev"
    3.10  
    3.11  compile_rules() {
    3.12 @@ -28,7 +28,7 @@
    3.13  	case $PACKAGE in
    3.14  		aalib)
    3.15  			copy @std
    3.16 -			DEPENDS="ncurses xorg-libX11"
    3.17 +			DEPENDS="ncurses libx11"
    3.18  			;;
    3.19  		*-dev) copy @dev;;
    3.20  	esac
     4.1 --- a/aaphoto/receipt	Fri Dec 21 04:44:58 2018 +0200
     4.2 +++ b/aaphoto/receipt	Sat Dec 22 04:52:35 2018 +0200
     4.3 @@ -11,7 +11,7 @@
     4.4  TARBALL="aaphoto_sources_$VERSION.tar.gz"
     4.5  WGET_URL="http://log69.com/downloads/$TARBALL"
     4.6  
     4.7 -BUILD_DEPENDS="libgomp libjpeg-turbo-dev libpng16-dev"
     4.8 +BUILD_DEPENDS="libgomp libjpeg-turbo-dev libpng-dev"
     4.9  
    4.10  compile_rules() {
    4.11  	./configure $CONFIGURE_ARGS &&
    4.12 @@ -23,6 +23,6 @@
    4.13  
    4.14  genpkg_rules() {
    4.15  	copy @std
    4.16 -	DEPENDS="libgomp libjpeg-turbo libpng16"
    4.17 +	DEPENDS="libgomp libjpeg-turbo libpng"
    4.18  	TAGS="photo jpeg jpg png"
    4.19  }
     5.1 --- a/abiword/receipt	Fri Dec 21 04:44:58 2018 +0200
     5.2 +++ b/abiword/receipt	Sat Dec 22 04:52:35 2018 +0200
     5.3 @@ -45,14 +45,14 @@
     5.4  		abiword-plugins)
     5.5  			copy plugins/*.so
     5.6  			CAT="office|extra plugins: MSWord, OpenDocument, Wikipedia, etc."
     5.7 -			DEPENDS="abiword glib readline xorg-libXdamage fribidi libxslt"
     5.8 +			DEPENDS="abiword glib readline libxdamage fribidi libxslt"
     5.9  			TAGS="doc odf docx"
    5.10  			;;
    5.11  		abiword)
    5.12  			copy @std @rm
    5.13  			TAGS="word doc office"
    5.14  			DEPENDS="gtk3 fribidi libglade popt libxml2 libart_lgpl \
    5.15 -			libgsf glib enchant wv xorg-libXdamage gcc-lib-base \
    5.16 +			libgsf glib enchant wv libxdamage gcc-lib-base \
    5.17  			librsvg goffice glibc-locale libffi"
    5.18  			SUGGESTED="abiword-plugins"
    5.19  
     6.1 --- a/accessx/receipt	Fri Dec 21 04:44:58 2018 +0200
     6.2 +++ b/accessx/receipt	Sat Dec 22 04:52:35 2018 +0200
     6.3 @@ -11,7 +11,7 @@
     6.4  TARBALL="$PACKAGE${VERSION//./}.tar.gz"
     6.5  WGET_URL="http://cita.disability.uiuc.edu/software/accessx/files/$TARBALL"
     6.6  
     6.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev tk-dev"
     6.8 +BUILD_DEPENDS="libx11-dev libxext-dev tk-dev"
     6.9  
    6.10  compile_rules() {
    6.11  	sed -i 's|$(CC) $(OPTS) ax.C|$(CC) $(LDFLAGS) $(OPTS) ax.C|' Makefile
    6.12 @@ -30,5 +30,5 @@
    6.13  
    6.14  genpkg_rules() {
    6.15  	copy @std
    6.16 -	DEPENDS="xorg-libX11   tk tcl"
    6.17 +	DEPENDS="libx11   tk tcl"
    6.18  }
     7.1 --- a/aiksaurus/receipt	Fri Dec 21 04:44:58 2018 +0200
     7.2 +++ b/aiksaurus/receipt	Sat Dec 22 04:52:35 2018 +0200
     7.3 @@ -11,7 +11,7 @@
     7.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     7.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     7.6  
     7.7 -BUILD_DEPENDS="gtk2-dev patch expat-dev xorg-libXau-dev glib-dev"
     7.8 +BUILD_DEPENDS="gtk2-dev patch expat-dev libxau-dev glib-dev"
     7.9  SPLIT="$PACKAGE-dev"
    7.10  
    7.11  compile_rules() {
     8.1 --- a/amiwm/receipt	Fri Dec 21 04:44:58 2018 +0200
     8.2 +++ b/amiwm/receipt	Sat Dec 22 04:52:35 2018 +0200
     8.3 @@ -11,8 +11,8 @@
     8.4  TARBALL="$PACKAGE$VERSION.tar.gz"
     8.5  WGET_URL="ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/$TARBALL"
     8.6  
     8.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev xorg-libXt-dev \
     8.8 -xorg-libXmu-dev"
     8.9 +BUILD_DEPENDS="libx11-dev libxext-dev libice-dev libxt-dev \
    8.10 +libxmu-dev"
    8.11  
    8.12  compile_rules() {
    8.13  	./configure $CONFIGURE_ARGS &&
    8.14 @@ -29,5 +29,5 @@
    8.15  
    8.16  genpkg_rules() {
    8.17  	copy @std
    8.18 -	DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXmu"
    8.19 +	DEPENDS="libice libsm libx11 libxext libxmu"
    8.20  }
     9.1 --- a/amsn/receipt	Fri Dec 21 04:44:58 2018 +0200
     9.2 +++ b/amsn/receipt	Sat Dec 22 04:52:35 2018 +0200
     9.3 @@ -11,9 +11,9 @@
     9.4  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
     9.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     9.6  
     9.7 -BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev xorg-libICE-dev \
     9.8 -xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
     9.9 -xorg-libXScrnSaver-dev zlib-dev libpng16-dev v4l-utils-dev autoconf automake"
    9.10 +BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev libice-dev \
    9.11 +libsm-dev libx11-dev libxau-dev libxdmcp-dev \
    9.12 +libxscrnsaver-dev zlib-dev libpng-dev v4l-utils-dev autoconf automake"
    9.13  # for audio conversations: gst0-plugins-base-dev;
    9.14  # also need absent farstream-0.1 and farsight2-0.10 >= 0.0.9
    9.15  COOKOPTS="!pngz" # some png are really gif, and many problems with palette
    9.16 @@ -36,7 +36,7 @@
    9.17  
    9.18  genpkg_rules() {
    9.19  	copy @std
    9.20 -	DEPENDS="libjpeg-turbo libpng16 python xorg-libX11   tk glib tls v4l-utils"
    9.21 +	DEPENDS="libjpeg-turbo libpng python libx11   tk glib tls v4l-utils"
    9.22  	# /usr/share/amsn/plugins/amsnplus/snapshot depends on libImlib.so.11 - absent
    9.23  	TAGS="chat messenger im"
    9.24  }
    10.1 --- a/antimicro/receipt	Fri Dec 21 04:44:58 2018 +0200
    10.2 +++ b/antimicro/receipt	Sat Dec 22 04:52:35 2018 +0200
    10.3 @@ -11,7 +11,7 @@
    10.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    10.5  WGET_URL="https://github.com/AntiMicro/antimicro/archive/$VERSION.tar.gz"
    10.6  
    10.7 -BUILD_DEPENDS="qmake Qt4-dev libsdl-dev xorg-libXtst-dev xorg-libX11-dev"
    10.8 +BUILD_DEPENDS="qmake Qt4-dev libsdl-dev libxtst-dev libx11-dev"
    10.9  
   10.10  compile_rules() {
   10.11  	qmake INSTALL_PREFIX=/usr &&
   10.12 @@ -22,6 +22,6 @@
   10.13  
   10.14  genpkg_rules() {
   10.15  	copy @std
   10.16 -	DEPENDS="libsdl xorg-libXtst xorg-libX11 libQtGui libQtCore xorg-libXi \
   10.17 -	xorg-libXext xorg-libXau xorg-libXdmcp xorg-libxcb"
   10.18 +	DEPENDS="libsdl libxtst libx11 libQtGui libQtCore libxi \
   10.19 +	libxext libxau libxdmcp libxcb"
   10.20  }
    11.1 --- a/apng2gif/receipt	Fri Dec 21 04:44:58 2018 +0200
    11.2 +++ b/apng2gif/receipt	Sat Dec 22 04:52:35 2018 +0200
    11.3 @@ -11,7 +11,7 @@
    11.4  TARBALL="$PACKAGE-$VERSION-src.zip"
    11.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    11.6  
    11.7 -BUILD_DEPENDS="zlib-dev libpng16-dev"
    11.8 +BUILD_DEPENDS="zlib-dev libpng-dev"
    11.9  
   11.10  compile_rules() {
   11.11  	make &&
   11.12 @@ -22,5 +22,5 @@
   11.13  
   11.14  genpkg_rules() {
   11.15  	copy @std
   11.16 -	DEPENDS="libpng16 zlib"
   11.17 +	DEPENDS="libpng zlib"
   11.18  }
    12.1 --- a/apngasm/receipt	Fri Dec 21 04:44:58 2018 +0200
    12.2 +++ b/apngasm/receipt	Sat Dec 22 04:52:35 2018 +0200
    12.3 @@ -11,7 +11,7 @@
    12.4  TARBALL="$PACKAGE-$VERSION-src.zip"
    12.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    12.6  
    12.7 -BUILD_DEPENDS="zlib-dev libpng16-dev"
    12.8 +BUILD_DEPENDS="zlib-dev libpng-dev"
    12.9  
   12.10  compile_rules() {
   12.11  	make &&
   12.12 @@ -22,5 +22,5 @@
   12.13  
   12.14  genpkg_rules() {
   12.15  	copy @std
   12.16 -	DEPENDS="libpng16 zlib"
   12.17 +	DEPENDS="libpng zlib"
   12.18  }
    13.1 --- a/apngdis/receipt	Fri Dec 21 04:44:58 2018 +0200
    13.2 +++ b/apngdis/receipt	Sat Dec 22 04:52:35 2018 +0200
    13.3 @@ -11,7 +11,7 @@
    13.4  TARBALL="$PACKAGE-$VERSION-src.zip"
    13.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    13.6  
    13.7 -BUILD_DEPENDS="zlib-dev libpng16-dev"
    13.8 +BUILD_DEPENDS="zlib-dev libpng-dev"
    13.9  
   13.10  compile_rules() {
   13.11  	make &&
   13.12 @@ -22,5 +22,5 @@
   13.13  
   13.14  genpkg_rules() {
   13.15  	copy @std
   13.16 -	DEPENDS="libpng16 zlib"
   13.17 +	DEPENDS="libpng zlib"
   13.18  }
    14.1 --- a/apngopt/receipt	Fri Dec 21 04:44:58 2018 +0200
    14.2 +++ b/apngopt/receipt	Sat Dec 22 04:52:35 2018 +0200
    14.3 @@ -11,7 +11,7 @@
    14.4  TARBALL="$PACKAGE-$VERSION-src.zip"
    14.5  WGET_URL="$SF_MIRROR/apng/$TARBALL"
    14.6  
    14.7 -BUILD_DEPENDS="zlib-dev libpng16-dev"
    14.8 +BUILD_DEPENDS="zlib-dev libpng-dev"
    14.9  
   14.10  compile_rules() {
   14.11  	make &&
   14.12 @@ -22,5 +22,5 @@
   14.13  
   14.14  genpkg_rules() {
   14.15  	copy @std
   14.16 -	DEPENDS="libpng16 zlib"
   14.17 +	DEPENDS="libpng zlib"
   14.18  }
    15.1 --- a/ardour/receipt	Fri Dec 21 04:44:58 2018 +0200
    15.2 +++ b/ardour/receipt	Sat Dec 22 04:52:35 2018 +0200
    15.3 @@ -21,7 +21,7 @@
    15.4  fontconfig freetype gdk-pixbuf glib glibmm gtk2 gtkmm libarchive libcurl \
    15.5  libgiomm liblo liblrdf libogg libsamplerate libsigc++ libsndfile libusb \
    15.6  libxml2 lilv pango pangomm readline rubberband serd sord sratom taglib \
    15.7 -vamp-plugin-sdk xorg-libX11"
    15.8 +vamp-plugin-sdk libx11"
    15.9  TAGS_std="audio recorder mixer"
   15.10  
   15.11  compile_rules() {
    16.1 --- a/assaultcube/receipt	Fri Dec 21 04:44:58 2018 +0200
    16.2 +++ b/assaultcube/receipt	Sat Dec 22 04:52:35 2018 +0200
    16.3 @@ -13,7 +13,7 @@
    16.4  
    16.5  BUILD_DEPENDS="automake libtool clang-dev openal-dev libsdl-image-dev \
    16.6  libsdl-mixer-dev mesa-dev glu-dev zlib-dev curl-dev"
    16.7 -# xorg-libX11-dev libogg-dev libvorbis-dev
    16.8 +# libx11-dev libogg-dev libvorbis-dev
    16.9  SPLIT="$PACKAGE-data"
   16.10  COOKOPTS="skip-log-errors"
   16.11  
    17.1 --- a/asunder/receipt	Fri Dec 21 04:44:58 2018 +0200
    17.2 +++ b/asunder/receipt	Sat Dec 22 04:52:35 2018 +0200
    17.3 @@ -12,7 +12,7 @@
    17.4  WGET_URL="$WEB_SITE/releases/$TARBALL"
    17.5  
    17.6  BUILD_DEPENDS="gtk2-dev alsa-lib-dev libcddb-dev cdparanoia-dev \
    17.7 -xorg-libXdamage-dev intltool"
    17.8 +libxdamage-dev intltool"
    17.9  
   17.10  compile_rules() {
   17.11  	./configure \
    18.1 --- a/at-spi2-core/receipt	Fri Dec 21 04:44:58 2018 +0200
    18.2 +++ b/at-spi2-core/receipt	Sat Dec 22 04:52:35 2018 +0200
    18.3 @@ -12,7 +12,7 @@
    18.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    18.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    18.6  
    18.7 -BUILD_DEPENDS="meson ninja dbus-dev glib-dev xorg-libX11-dev xorg-libXtst-dev \
    18.8 +BUILD_DEPENDS="meson ninja dbus-dev glib-dev libx11-dev libxtst-dev \
    18.9  gobject-introspection-dev gettext-dev"
   18.10  SPLIT="$PACKAGE-dev"
   18.11  
   18.12 @@ -29,7 +29,7 @@
   18.13  	case $PACKAGE in
   18.14  		at-spi2-core)
   18.15  			copy @std
   18.16 -			DEPENDS="dbus glib xorg-libX11 xorg-libXtst"
   18.17 +			DEPENDS="dbus glib libx11 libxtst"
   18.18  			;;
   18.19  		*-dev)
   18.20  			copy @dev
    19.1 --- a/aterm/receipt	Fri Dec 21 04:44:58 2018 +0200
    19.2 +++ b/aterm/receipt	Sat Dec 22 04:52:35 2018 +0200
    19.3 @@ -11,7 +11,7 @@
    19.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    19.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    19.6  
    19.7 -BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev"
    19.8 +BUILD_DEPENDS="libsm-dev libxext-dev libxt-dev"
    19.9  
   19.10  compile_rules() {
   19.11  	./configure $CONFIGURE_ARGS &&
   19.12 @@ -21,6 +21,6 @@
   19.13  
   19.14  genpkg_rules() {
   19.15  	copy @std
   19.16 -	DEPENDS="xorg-libX11"
   19.17 +	DEPENDS="libx11"
   19.18  	TAGS="terminal"
   19.19  }
    20.1 --- a/atril/receipt	Fri Dec 21 04:44:58 2018 +0200
    20.2 +++ b/atril/receipt	Sat Dec 22 04:52:35 2018 +0200
    20.3 @@ -13,7 +13,7 @@
    20.4  
    20.5  BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev libsecret-dev \
    20.6  caja-dev gobject-introspection-dev poppler-dev libspectre-dev tiff-dev \
    20.7 -djvulibre-dev webkit2gtk-dev itstool xorg-libSM-dev"
    20.8 +djvulibre-dev webkit2gtk-dev itstool libsm-dev"
    20.9  SPLIT="\
   20.10  $PACKAGE-caja $PACKAGE-comics $PACKAGE-djvu $PACKAGE-epub $PACKAGE-pdf \
   20.11  $PACKAGE-psd  $PACKAGE-tiff   $PACKAGE      $PACKAGE-dev"
   20.12 @@ -78,7 +78,7 @@
   20.13  		atril)
   20.14  			copy @std @rm
   20.15  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsecret libxml2 pango \
   20.16 -			xorg-libICE xorg-libSM zlib"
   20.17 +			libice libsm zlib"
   20.18  			TAGS="MATE pdf djvu"
   20.19  			;;
   20.20  		*-dev)
    21.1 --- a/audacious-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
    21.2 +++ b/audacious-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
    21.3 @@ -16,7 +16,7 @@
    21.4  fluidsynth-dev mpg123-dev faad2-dev wavpack-dev libsndfile-dev libmodplug-dev \
    21.5  libsamplerate-dev alsa-lib-dev jack-dev pulseaudio-dev neon-dev libmms-dev \
    21.6  dbus-dev dbus-glib-dev libnotify-dev gdk-pixbuf-dev lirc-dev curl-dev \
    21.7 -xorg-libXrender-dev xorg-libXcomposite-dev ffmpeg-dev qt5-dev mesa-dev \
    21.8 +libxrender-dev libxcomposite-dev ffmpeg-dev qt5-dev mesa-dev \
    21.9  audacious-qt-dev"
   21.10  SPLIT="audacious-skins \
   21.11  $PACKAGE        $PACKAGE-extra \
   21.12 @@ -56,8 +56,8 @@
   21.13  			notify.so playlist-manager.so search-tool.so skins.so \
   21.14  			statusicon.so
   21.15  			DEPENDS="audacious-plugins-common audacious \
   21.16 -			cairo gdk-pixbuf glib gtk2 libnotify pango xorg-libX11 \
   21.17 -			xorg-libXcomposite xorg-libXrender"
   21.18 +			cairo gdk-pixbuf glib gtk2 libnotify pango libx11 \
   21.19 +			libxcomposite libxrender"
   21.20  			CAT="multimedia|GTK+2 based plugins"
   21.21  			;;
   21.22  		audacious-plugins-extra)
   21.23 @@ -65,7 +65,7 @@
   21.24  			amidi-plug.so vtx.so blur_scope.so cairo-spectrum.so gl-spectrum.so
   21.25  			DEPENDS="audacious-plugins-common-extra audacious \
   21.26  			cairo dbus-glib fluidsynth gdk-pixbuf glib gtk2 libxml2 mesa \
   21.27 -			pango xorg-libX11"
   21.28 +			pango libx11"
   21.29  			CAT="multimedia|GTK+2 based extra plugins"
   21.30  			;;
   21.31  
    22.1 --- a/avidemux/receipt	Fri Dec 21 04:44:58 2018 +0200
    22.2 +++ b/avidemux/receipt	Sat Dec 22 04:52:35 2018 +0200
    22.3 @@ -12,7 +12,7 @@
    22.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    22.5  
    22.6  BUILD_DEPENDS="tar coreutils-file-special coreutils-file-format cmake yasm \
    22.7 -gettext-dev xorg-libXv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
    22.8 +gettext-dev libxv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
    22.9  opencore-amr-dev x264-dev faac-dev faad2-dev libsamplerate-dev alsa-lib-dev \
   22.10  libxslt-dev libvpx-dev bash qt5-dev xorg-dev zlib-dev mesa-dev sqlite3-dev \
   22.11  glu-dev fribidi-dev"
   22.12 @@ -39,7 +39,7 @@
   22.13  	mkdir -p $fs/usr/lib $fs/usr/share/pixmaps $fs/usr/share/applications
   22.14  	cp -a $install/usr/bin $fs/usr
   22.15  	cp -a $install/usr/lib $fs/usr
   22.16 -	DEPENDS="alsa-lib libxml2 xorg-libXv cairo libxslt libvpx libvorbis \
   22.17 +	DEPENDS="alsa-lib libxml2 libxv cairo libxslt libvpx libvorbis \
   22.18  	qt5-base opencore-amr lame faac faad2 libsamplerate xvidcore x264"
   22.19  	TAGS="video movie editor avi mpeg mp4"
   22.20  }
    23.1 --- a/awesome/receipt	Fri Dec 21 04:44:58 2018 +0200
    23.2 +++ b/awesome/receipt	Sat Dec 22 04:52:35 2018 +0200
    23.3 @@ -12,8 +12,8 @@
    23.4  WGET_URL="https://github.com/awesomeWM/awesome-releases/raw/master/$TARBALL"
    23.5  
    23.6  BUILD_DEPENDS="cmake asciidoc xmlto docbook-xsl imagemagick lua-dev \
    23.7 -xorg-libxcb-dev glib-dev gdk-pixbuf-dev cairo-dev xorg-xcb-util-cursor-dev \
    23.8 -xorg-xcb-util-dev xorg-xcb-util-keysyms-dev xorg-xcb-util-wm-dev \
    23.9 +libxcb-dev glib-dev gdk-pixbuf-dev cairo-dev xcb-util-cursor-dev \
   23.10 +xcb-util-dev xcb-util-keysyms-dev xcb-util-wm-dev \
   23.11  libxkbcommon-dev startup-notification-dev libxdg-basedir-dev xcb-util-xrm-dev \
   23.12  dbus-dev lgi pango-dev"
   23.13  
   23.14 @@ -33,8 +33,8 @@
   23.15  genpkg_rules() {
   23.16  	copy @std
   23.17  	DEPENDS="cairo dbus gdk-pixbuf glib liblua libxdg-basedir libxkbcommon-x11 \
   23.18 -	libxkbcommon startup-notification xcb-util-xrm xorg-libX11 xorg-libxcb \
   23.19 -	xorg-xcb-util xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm \
   23.20 +	libxkbcommon startup-notification xcb-util-xrm libx11 libxcb \
   23.21 +	xcb-util xcb-util-cursor xcb-util-keysyms xcb-util-wm \
   23.22  	   pango-typelib lgi"
   23.23  	TAGS="window-manager"
   23.24  }
    24.1 --- a/awn-extras/receipt	Fri Dec 21 04:44:58 2018 +0200
    24.2 +++ b/awn-extras/receipt	Sat Dec 22 04:52:35 2018 +0200
    24.3 @@ -13,7 +13,7 @@
    24.4  WGET_URL="https://github.com/p12tic/awn-extras/archive/${COMMIT:-v$VERSION}.tar.gz"
    24.5  
    24.6  BUILD_DEPENDS="intltool automake gettext-dev libtool glib-dev awn-dev \
    24.7 -libgtop-dev libwnck2-dev xorg-libXcomposite-dev libnotify-dev vte-gtk2-dev \
    24.8 +libgtop-dev libwnck2-dev libxcomposite-dev libnotify-dev vte-gtk2-dev \
    24.9  gconf-dev notify-python-dev vala dbus-dev"
   24.10  
   24.11  compile_rules() {
   24.12 @@ -29,6 +29,6 @@
   24.13  genpkg_rules() {
   24.14  	copy @std
   24.15  	DEPENDS="atk awn cairo dbus dbus-glib gconf gdk-pixbuf glib gtk2 \
   24.16 -	libdesktop-agnostic libgtop libnotify libwnck2 python vte-gtk2 xorg-libX11 \
   24.17 -	xorg-libXcomposite xorg-libXrender   python notify-python"
   24.18 +	libdesktop-agnostic libgtop libnotify libwnck2 python vte-gtk2 libx11 \
   24.19 +	libxcomposite libxrender   python notify-python"
   24.20  }
    25.1 --- a/awn/receipt	Fri Dec 21 04:44:58 2018 +0200
    25.2 +++ b/awn/receipt	Sat Dec 22 04:52:35 2018 +0200
    25.3 @@ -15,7 +15,7 @@
    25.4  
    25.5  BUILD_DEPENDS="intltool gtk-doc libtool automake python-dev gtk2-dev \
    25.6  python-pycairo-dev python-pygtk-dev vala python-pyxdg glibmm-dev libdesktop-agnostic-dev \
    25.7 -gtkmm-dev dbus-glib-dev xorg-libXcomposite-dev libwnck2-dev libgtop-dev"
    25.8 +gtkmm-dev dbus-glib-dev libxcomposite-dev libwnck2-dev libgtop-dev"
    25.9  SPLIT="$PACKAGE-dev"
   25.10  COOKOPTS="skip-log-errors"
   25.11  
   25.12 @@ -37,8 +37,8 @@
   25.13  		awn)
   25.14  			copy @std
   25.15  			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
   25.16 -			libdesktop-agnostic libgtop libwnck2 pango python xorg-libX11 \
   25.17 -			xorg-libXext"
   25.18 +			libdesktop-agnostic libgtop libwnck2 pango python libx11 \
   25.19 +			libxext"
   25.20  			TAGS="panel"
   25.21  			PROVIDE="avant-window-navigator"
   25.22  			;;
    26.1 --- a/ayttm/receipt	Fri Dec 21 04:44:58 2018 +0200
    26.2 +++ b/ayttm/receipt	Sat Dec 22 04:52:35 2018 +0200
    26.3 @@ -11,8 +11,8 @@
    26.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    26.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    26.6  
    26.7 -BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xorg-xcb-util-dev openssl10-dev \
    26.8 -flex enchant-dev xorg-libXpm-dev libtool gettext-dev"
    26.9 +BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xcb-util-dev openssl10-dev \
   26.10 +flex enchant-dev libxpm-dev libtool gettext-dev"
   26.11  
   26.12  compile_rules() {
   26.13  	# remove -lfl
   26.14 @@ -40,7 +40,7 @@
   26.15  genpkg_rules() {
   26.16  	copy @std
   26.17  	rm -r $fs/usr/share/applnk/ $fs/usr/share/gnome/
   26.18 -	DEPENDS="enchant gdk-pixbuf glib gtk2 libltdl openssl10 pango xorg-libX11 \
   26.19 -	xorg-libXpm"
   26.20 +	DEPENDS="enchant gdk-pixbuf glib gtk2 libltdl openssl10 pango libx11 \
   26.21 +	libxpm"
   26.22  	CONFIG_FILES="/etc/ayttmrc"
   26.23  }
    27.1 --- a/azdrawing/receipt	Fri Dec 21 04:44:58 2018 +0200
    27.2 +++ b/azdrawing/receipt	Sat Dec 22 04:52:35 2018 +0200
    27.3 @@ -11,10 +11,10 @@
    27.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    27.5  WGET_URL="http://acc.dl.osdn.jp/azdrawing/63500/$TARBALL"
    27.6  
    27.7 -DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
    27.8 -xorg-libXft xorg-libXi zlib"
    27.9 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev libjpeg-turbo-dev \
   27.10 -xorg-libXext-dev xorg-libXi-dev"
   27.11 +DEPENDS="fontconfig freetype libjpeg-turbo libx11 libxext \
   27.12 +libxft libxi zlib"
   27.13 +BUILD_DEPENDS="libx11-dev libxft-dev libjpeg-turbo-dev \
   27.14 +libxext-dev libxi-dev"
   27.15  
   27.16  compile_rules() {
   27.17  	sed -i "s|/usr/local|$install/usr|; s|\$(MACRO) ||" Makefile
    28.1 --- a/azpainter/receipt	Fri Dec 21 04:44:58 2018 +0200
    28.2 +++ b/azpainter/receipt	Sat Dec 22 04:52:35 2018 +0200
    28.3 @@ -13,7 +13,7 @@
    28.4  
    28.5  # Use GNU wget because Busybox wget can't follow redirection
    28.6  BUILD_DEPENDS="wget freetype-dev fontconfig-dev libjpeg-turbo-dev \
    28.7 -xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev"
    28.8 +libx11-dev libxext-dev libxi-dev"
    28.9  
   28.10  compile_rules() {
   28.11  	# regenerate translations after patching
   28.12 @@ -33,6 +33,6 @@
   28.13  
   28.14  genpkg_rules() {
   28.15  	copy @std
   28.16 -	DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
   28.17 -	xorg-libXext xorg-libXi zlib"
   28.18 +	DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
   28.19 +	libxext libxi zlib"
   28.20  }
    29.1 --- a/azpainter1/receipt	Fri Dec 21 04:44:58 2018 +0200
    29.2 +++ b/azpainter1/receipt	Sat Dec 22 04:52:35 2018 +0200
    29.3 @@ -11,8 +11,8 @@
    29.4  TARBALL="azpainter-$VERSION.tar.bz2"
    29.5  WGET_URL="http://rwthaachen.dl.osdn.jp/azpainter/64397/$TARBALL"
    29.6  
    29.7 -BUILD_DEPENDS="libjpeg-turbo-dev freetype-dev xorg-libX11-dev xorg-libXext-dev \
    29.8 -xorg-libXi-dev xorg-libXft-dev"
    29.9 +BUILD_DEPENDS="libjpeg-turbo-dev freetype-dev libx11-dev libxext-dev \
   29.10 +libxi-dev libxft-dev"
   29.11  
   29.12  compile_rules() {
   29.13  	sed -i "s|/usr/local|$install/usr|; s|gtk|echo &|;s|\$(MACRO) ||" Makefile
   29.14 @@ -23,6 +23,6 @@
   29.15  
   29.16  genpkg_rules() {
   29.17  	copy @std
   29.18 -	DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
   29.19 -	xorg-libXft xorg-libXi zlib"
   29.20 +	DEPENDS="fontconfig freetype libjpeg-turbo libx11 libxext \
   29.21 +	libxft libxi zlib"
   29.22  }
    30.1 --- a/bicon/receipt	Fri Dec 21 04:44:58 2018 +0200
    30.2 +++ b/bicon/receipt	Sat Dec 22 04:52:35 2018 +0200
    30.3 @@ -26,5 +26,5 @@
    30.4  
    30.5  genpkg_rules() {
    30.6  	copy @std
    30.7 -	DEPENDS="kbd fribidi xorg-setxkbmap xorg-xkbcomp"
    30.8 +	DEPENDS="kbd fribidi setxkbmap xkbcomp"
    30.9  }
    31.1 --- a/billardgl/receipt	Fri Dec 21 04:44:58 2018 +0200
    31.2 +++ b/billardgl/receipt	Sat Dec 22 04:52:35 2018 +0200
    31.3 @@ -12,7 +12,7 @@
    31.4  TARBALL="$SOURCE-$VERSION.tar.gz"
    31.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    31.6  
    31.7 -BUILD_DEPENDS="glu xorg-libXmu-dev xorg-libXi-dev mesa-dev glu-dev freeglut-dev"
    31.8 +BUILD_DEPENDS="glu libxmu-dev libxi-dev mesa-dev glu-dev freeglut-dev"
    31.9  
   31.10  compile_rules() {
   31.11  	cd $src/src
    32.1 --- a/blackbox/receipt	Fri Dec 21 04:44:58 2018 +0200
    32.2 +++ b/blackbox/receipt	Sat Dec 22 04:52:35 2018 +0200
    32.3 @@ -11,8 +11,8 @@
    32.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    32.5  WGET_URL="https://github.com/bbidulock/blackboxwm/releases/download/$VERSION/$TARBALL"
    32.6  
    32.7 -BUILD_DEPENDS="cmark-gfm asciidoc links gettext xorg-libX11-dev \
    32.8 -xorg-libICE-dev xorg-libXext-dev xorg-libXft-dev"
    32.9 +BUILD_DEPENDS="cmark-gfm asciidoc links gettext libx11-dev \
   32.10 +libice-dev libxext-dev libxft-dev"
   32.11  SPLIT="$PACKAGE-dev"
   32.12  
   32.13  # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc
   32.14 @@ -33,12 +33,12 @@
   32.15  	case $PACKAGE in
   32.16  		blackbox)
   32.17  			copy @std
   32.18 -			DEPENDS="xorg-libX11 xorg-libXext xorg-libXft"
   32.19 +			DEPENDS="libx11 libxext libxft"
   32.20  			TAGS="window-manager"
   32.21  			;;
   32.22  		*-dev)
   32.23  			copy @dev
   32.24 -			DEPENDS="blackbox xorg-libXft-dev"
   32.25 +			DEPENDS="blackbox libxft-dev"
   32.26  			;;
   32.27  	esac
   32.28  }
    33.1 --- a/blender/receipt	Fri Dec 21 04:44:58 2018 +0200
    33.2 +++ b/blender/receipt	Sat Dec 22 04:52:35 2018 +0200
    33.3 @@ -11,11 +11,11 @@
    33.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    33.5  WGET_URL="http://download.blender.org/source/$TARBALL"
    33.6  
    33.7 -BUILD_DEPENDS="cmake xorg-libXmu ilmbase-dev yasm coreutils-file-format \
    33.8 +BUILD_DEPENDS="cmake libxmu ilmbase-dev yasm coreutils-file-format \
    33.9  gettext-dev mesa-dev freeglut-dev librsvg-dev openexr-dev tiff-dev openal-dev \
   33.10  glu libsdl-dev python3-dev libsamplerate-dev ffmpeg-dev lcms-dev openjpeg-dev \
   33.11  boost-dev boost-math boost-math-tr1 boost-filesystem \
   33.12 -glu-dev glew-dev xorg-libXi-dev"
   33.13 +glu-dev glew-dev libxi-dev"
   33.14  
   33.15  compile_rules() {
   33.16  	p3v=$(. $WOK/python3/receipt; echo ${VERSION%.*})
   33.17 @@ -48,7 +48,7 @@
   33.18  	LOCALE="fr de pt_BR es ru zh_CN"
   33.19  	copy @std
   33.20  	DEPENDS="python3 mesa libsdl libsamplerate libdrm jpeg glu openjpeg \
   33.21 -	ffmpeg lcms openexr desktop-file-utils libgomp tiff libpng16 freeglut \
   33.22 +	ffmpeg lcms openexr desktop-file-utils libgomp tiff libpng freeglut \
   33.23  	freetype openal zlib librsvg glew boost-filesystem boost-regex \
   33.24  	boost-thread boost-date-time boost-dev" #boost-dev?
   33.25  	SUGGESTED="nvidia"
    34.1 --- a/blueman/receipt	Fri Dec 21 04:44:58 2018 +0200
    34.2 +++ b/blueman/receipt	Sat Dec 22 04:52:35 2018 +0200
    34.3 @@ -13,7 +13,7 @@
    34.4  
    34.5  BUILD_DEPENDS="bluez-dev python-dev python-pygtk-dev notify-python-dev libnotify-dev \
    34.6  python-pyrex startup-notification-dev util-linux-uuid-dev dbus-dev \
    34.7 -python-dbus-dev intltool libtool xorg-xcb-util-dev"
    34.8 +python-dbus-dev intltool libtool xcb-util-dev"
    34.9  
   34.10  compile_rules() {
   34.11  	./configure \
    35.1 --- a/bmpanel2/receipt	Fri Dec 21 04:44:58 2018 +0200
    35.2 +++ b/bmpanel2/receipt	Sat Dec 22 04:52:35 2018 +0200
    35.3 @@ -11,7 +11,7 @@
    35.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    35.5  WGET_URL="https://github.com/nsf/bmpanel2/archive/$VERSION.tar.gz"
    35.6  
    35.7 -BUILD_DEPENDS="cmake xorg-libX11-dev cairo-dev pango-dev"
    35.8 +BUILD_DEPENDS="cmake libx11-dev cairo-dev pango-dev"
    35.9  SPLIT="$PACKAGE-themes bmpanel2cfg"
   35.10  
   35.11  compile_rules() {
   35.12 @@ -31,7 +31,7 @@
   35.13  	case $PACKAGE in
   35.14  		bmpanel2)
   35.15  			copy bmpanel2 native/ transpy/
   35.16 -			DEPENDS="cairo glib pango xorg-libX11 xorg-libXext"
   35.17 +			DEPENDS="cairo glib pango libx11 libxext"
   35.18  			TAGS="panel"
   35.19  			;;
   35.20  		bmpanel2-themes)
    36.1 --- a/brasero/receipt	Fri Dec 21 04:44:58 2018 +0200
    36.2 +++ b/brasero/receipt	Sat Dec 22 04:52:35 2018 +0200
    36.3 @@ -12,7 +12,7 @@
    36.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    36.5  
    36.6  BUILD_DEPENDS="glib-dev itstool libxml2-tools gstreamer1-dev \
    36.7 -gst1-plugins-base-dev libxml2-dev xorg-libSM-dev xorg-libICE-dev gtk3-dev \
    36.8 +gst1-plugins-base-dev libxml2-dev libsm-dev libice-dev gtk3-dev \
    36.9  libnotify-dev libcanberra-dev intltool libburn-dev libisofs-dev \
   36.10  gobject-introspection-dev"
   36.11  SPLIT="$PACKAGE-dev"
    37.1 --- a/brasero2/receipt	Fri Dec 21 04:44:58 2018 +0200
    37.2 +++ b/brasero2/receipt	Sat Dec 22 04:52:35 2018 +0200
    37.3 @@ -13,8 +13,8 @@
    37.4  WGET_URL="$GNOME_MIRROR/brasero/${VERSION%.*}/$TARBALL"
    37.5  
    37.6  BUILD_DEPENDS="glib-dev gnome-doc-utils gstreamer0-dev gst0-plugins-base-dev \
    37.7 -libunique-dev gconf-dev xorg-libSM-dev gtk2-dev libcanberra-dev libburn-dev \
    37.8 -libisofs-dev gobject-introspection-dev intltool xorg-libICE-dev"
    37.9 +libunique-dev gconf-dev libsm-dev gtk2-dev libcanberra-dev libburn-dev \
   37.10 +libisofs-dev gobject-introspection-dev intltool libice-dev"
   37.11  SPLIT="$PACKAGE-dev"
   37.12  
   37.13  compile_rules() {
   37.14 @@ -40,7 +40,7 @@
   37.15  			copy @std
   37.16  			DEPENDS="cairo gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk2 \
   37.17  			libburn libcanberra-gtk2 libisofs libunique libxml2 pango \
   37.18 -			xorg-libICE xorg-libSM"
   37.19 +			libice libsm"
   37.20  			;;
   37.21  		*-dev)
   37.22  			copy @dev
    38.1 --- a/brisk-menu/receipt	Fri Dec 21 04:44:58 2018 +0200
    38.2 +++ b/brisk-menu/receipt	Sat Dec 22 04:52:35 2018 +0200
    38.3 @@ -24,6 +24,6 @@
    38.4  
    38.5  genpkg_rules() {
    38.6  	copy @std *.mo
    38.7 -	DEPENDS="glib gtk3 mate-menus mate-panel xorg-libX11"
    38.8 +	DEPENDS="glib gtk3 mate-menus mate-panel libx11"
    38.9  	TAGS="MATE Solus menu GUI"
   38.10  }
    39.1 --- a/bzflag/receipt	Fri Dec 21 04:44:58 2018 +0200
    39.2 +++ b/bzflag/receipt	Sat Dec 22 04:52:35 2018 +0200
    39.3 @@ -12,7 +12,7 @@
    39.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    39.5  
    39.6  BUILD_DEPENDS="curl-dev mesa-dev libsdl-dev glew-dev util-linux-uuid-dev \
    39.7 -expat-dev xorg-libxshmfence-dev"
    39.8 +expat-dev libxshmfence-dev"
    39.9  
   39.10  compile_rules() {
   39.11  	./configure \
    40.1 --- a/cairo-compmgr/receipt	Fri Dec 21 04:44:58 2018 +0200
    40.2 +++ b/cairo-compmgr/receipt	Sat Dec 22 04:52:35 2018 +0200
    40.3 @@ -11,9 +11,9 @@
    40.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    40.5  WGET_URL="http://download.tuxfamily.org/ccm/$PACKAGE/$TARBALL"
    40.6  
    40.7 -BUILD_DEPENDS="xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
    40.8 -xorg-libXi-dev xorg-libSM-dev cairo-dev xorg-pixman-dev gtk2-dev vala \
    40.9 -xorg-libICE-dev xorg-libX11-dev util-linux-uuid-dev intltool"
   40.10 +BUILD_DEPENDS="libxcomposite-dev libxdamage-dev libxext-dev \
   40.11 +libxi-dev libsm-dev cairo-dev pixman-dev gtk2-dev vala \
   40.12 +libice-dev libx11-dev util-linux-uuid-dev intltool"
   40.13  SPLIT="$PACKAGE-dev"
   40.14  
   40.15  compile_rules() {
   40.16 @@ -38,9 +38,9 @@
   40.17  	case $PACKAGE in
   40.18  		cairo-compmgr)
   40.19  			copy @std
   40.20 -			DEPENDS="cairo gdk-pixbuf glib gtk2 pango vala xorg-libICE \
   40.21 -			xorg-libSM xorg-libX11 xorg-libXcomposite xorg-libXdamage \
   40.22 -			xorg-libXext xorg-libXfixes xorg-libXi xorg-pixman"
   40.23 +			DEPENDS="cairo gdk-pixbuf glib gtk2 pango vala libice \
   40.24 +			libsm libx11 libxcomposite libxdamage \
   40.25 +			libxext libxfixes libxi pixman"
   40.26  			;;
   40.27  		*-dev)
   40.28  			copy @dev
    41.1 --- a/cairo-dock-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
    41.2 +++ b/cairo-dock-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
    41.3 @@ -55,7 +55,7 @@
    41.4  			DEPENDS="alsa-lib cairo dbus-glib fftw gdk-pixbuf glib gtk3 \
    41.5  			libdbusmenu-gtk3 libetpan libexif libical libindicator-gtk3 \
    41.6  			librsvg libxklavier libxml2 libzeitgeist lm-sensors mesa pango \
    41.7 -			pulseaudio upower vte xorg-libX11 xorg-libXrandr xorg-libXxf86vm"
    41.8 +			pulseaudio upower vte libx11 libxrandr libxxf86vm"
    41.9  			;;
   41.10  	esac
   41.11  }
    42.1 --- a/cairo-dock/receipt	Fri Dec 21 04:44:58 2018 +0200
    42.2 +++ b/cairo-dock/receipt	Sat Dec 22 04:52:35 2018 +0200
    42.3 @@ -12,8 +12,8 @@
    42.4  WGET_URL="https://github.com/Cairo-Dock/cairo-dock-core/releases/download/$VERSION/$TARBALL"
    42.5  
    42.6  BUILD_DEPENDS="cmake glib-dev cairo-dev librsvg-dev dbus-dev dbus-glib-dev \
    42.7 -libxml2-dev mesa-dev glu-dev curl-dev xorg-libXtst-dev xorg-libXcomposite-dev \
    42.8 -xorg-libXrandr-dev gtk3-dev gettext-dev"
    42.9 +libxml2-dev mesa-dev glu-dev curl-dev libxtst-dev libxcomposite-dev \
   42.10 +libxrandr-dev gtk3-dev gettext-dev"
   42.11  SPLIT="$PACKAGE-dev"
   42.12  
   42.13  compile_rules() {
   42.14 @@ -33,8 +33,8 @@
   42.15  		cairo-dock)
   42.16  			copy @std
   42.17  			DEPENDS="cairo dbus-glib gdk-pixbuf glib glu gtk3 libcurl librsvg \
   42.18 -			libxml2 mesa pango xorg-libX11 xorg-libXcomposite xorg-libXinerama \
   42.19 -			xorg-libXrandr xorg-libXrender xorg-libXtst   bash" # xorg-xcompmgr
   42.20 +			libxml2 mesa pango libx11 libxcomposite libxinerama \
   42.21 +			libxrandr libxrender libxtst   bash" # xcompmgr
   42.22  			SUGGESTED="cairo-dock-plugins"
   42.23  			;;
   42.24  		*-dev)
   42.25 @@ -42,8 +42,8 @@
   42.26  			DEPENDS="cairo-dock \
   42.27  			cairo-dev curl-dev dbus-dev dbus-glib-dev glib-dev glu-dev \
   42.28  			gtk3-dev librsvg-dev libxml2-dev mesa-dev wayland-dev \
   42.29 -			xorg-libX11-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
   42.30 -			xorg-libXrender-dev xorg-libXtst-dev"
   42.31 +			libx11-dev libxcomposite-dev libxrandr-dev \
   42.32 +			libxrender-dev libxtst-dev"
   42.33  			;;
   42.34  	esac
   42.35  }
    43.1 --- a/cairo/receipt	Fri Dec 21 04:44:58 2018 +0200
    43.2 +++ b/cairo/receipt	Sat Dec 22 04:52:35 2018 +0200
    43.3 @@ -12,9 +12,9 @@
    43.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    43.5  WGET_URL="${WEB_SITE}releases/$TARBALL"
    43.6  
    43.7 -BUILD_DEPENDS="zlib-dev xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev \
    43.8 -xorg-libXrender-dev xorg-libxcb-dev libpng16-dev freetype-dev fontconfig-dev \
    43.9 -libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev"
   43.10 +BUILD_DEPENDS="zlib-dev libx11-dev libxext-dev libice-dev \
   43.11 +libxrender-dev libxcb-dev libpng-dev freetype-dev fontconfig-dev \
   43.12 +libspectre-dev poppler-dev librsvg-dev gtk2-dev pixman-dev"
   43.13  SPLIT="$PACKAGE-tools $PACKAGE-dev"
   43.14  
   43.15  COOKOPTS="skip-log-errors"
   43.16 @@ -24,13 +24,13 @@
   43.17  
   43.18  CAT_tools="development|development tools"
   43.19  
   43.20 -DEPENDS_std="fontconfig freetype glib libpng16 xorg-libX11 xorg-libxcb \
   43.21 -xorg-pixman zlib"
   43.22 -DEPENDS_tools="cairo glib xorg-libX11 xorg-libXrender xorg-libxcb xorg-pixman \
   43.23 +DEPENDS_std="fontconfig freetype glib libpng libx11 libxcb \
   43.24 +pixman zlib"
   43.25 +DEPENDS_tools="cairo glib libx11 libxrender libxcb pixman \
   43.26  zlib"
   43.27  DEPENDS_dev="cairo cairo-tools \
   43.28 -fontconfig-dev freetype-dev glib-dev libpng16-dev xorg-libX11-dev \
   43.29 -xorg-libXext-dev xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev zlib-dev"
   43.30 +fontconfig-dev freetype-dev glib-dev libpng-dev libx11-dev \
   43.31 +libxext-dev libxrender-dev libxcb-dev pixman-dev zlib-dev"
   43.32  
   43.33  compile_rules() {
   43.34  	./configure \
    44.1 --- a/caja/receipt	Fri Dec 21 04:44:58 2018 +0200
    44.2 +++ b/caja/receipt	Sat Dec 22 04:52:35 2018 +0200
    44.3 @@ -12,7 +12,7 @@
    44.4  WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
    44.5  
    44.6  BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev mate-desktop-dev \
    44.7 -pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev xorg-libSM-dev"
    44.8 +pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev libsm-dev"
    44.9  SPLIT="$PACKAGE-dev"
   44.10  
   44.11  compile_rules() {
   44.12 @@ -31,8 +31,8 @@
   44.13  		caja)
   44.14  			copy @std
   44.15  			DEPENDS="atk cairo exempi gdk-pixbuf glib gtk3 libexif \
   44.16 -			libnotify libxml2 mate-desktop pango xorg-libICE xorg-libSM \
   44.17 -			xorg-libX11   shared-mime-info"
   44.18 +			libnotify libxml2 mate-desktop pango libice libsm \
   44.19 +			libx11   shared-mime-info"
   44.20  			SUGGESTED="gvfs-smb"
   44.21  			TAGS="MATE file-manager"
   44.22  			;;
    45.1 --- a/celestia/receipt	Fri Dec 21 04:44:58 2018 +0200
    45.2 +++ b/celestia/receipt	Sat Dec 22 04:52:35 2018 +0200
    45.3 @@ -38,5 +38,5 @@
    45.4  genpkg_rules() {
    45.5  	copy @std
    45.6  	DEPENDS="cairo gdk-pixbuf glib glu gtk2 gtkglext libjpeg-turbo libogg \
    45.7 -	libpng16 libtheora mesa pango"
    45.8 +	libpng libtheora mesa pango"
    45.9  }
    46.1 --- a/cellwriter/receipt	Fri Dec 21 04:44:58 2018 +0200
    46.2 +++ b/cellwriter/receipt	Sat Dec 22 04:52:35 2018 +0200
    46.3 @@ -11,7 +11,7 @@
    46.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    46.5  WGET_URL="https://github.com/risujin/cellwriter/archive/$VERSION.tar.gz"
    46.6  
    46.7 -BUILD_DEPENDS="gtk2-dev xorg-libXtst-dev"
    46.8 +BUILD_DEPENDS="gtk2-dev libxtst-dev"
    46.9  
   46.10  compile_rules() {
   46.11  	./configure $CONFIGURE_ARGS &&
   46.12 @@ -21,5 +21,5 @@
   46.13  
   46.14  genpkg_rules() {
   46.15  	copy @std
   46.16 -	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11 xorg-libXtst"
   46.17 +	DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11 libxtst"
   46.18  }
    47.1 --- a/chemtool/receipt	Fri Dec 21 04:44:58 2018 +0200
    47.2 +++ b/chemtool/receipt	Sat Dec 22 04:52:35 2018 +0200
    47.3 @@ -11,7 +11,7 @@
    47.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    47.5  WGET_URL="$WEB_SITE$TARBALL"
    47.6  
    47.7 -BUILD_DEPENDS="gettext-dev gtk2-dev xorg-libX11-dev xorg-libICE-dev"
    47.8 +BUILD_DEPENDS="gettext-dev gtk2-dev libx11-dev libice-dev"
    47.9  
   47.10  compile_rules() {
   47.11  	./configure \
   47.12 @@ -34,6 +34,6 @@
   47.13  genpkg_rules() {
   47.14  	copy @std
   47.15  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
   47.16 -	xorg-libX11   shared-mime-info"
   47.17 +	libx11   shared-mime-info"
   47.18  	TAGS="chemistry"
   47.19  }
    48.1 --- a/cinepaint-stable/receipt	Fri Dec 21 04:44:58 2018 +0200
    48.2 +++ b/cinepaint-stable/receipt	Sat Dec 22 04:52:35 2018 +0200
    48.3 @@ -13,7 +13,7 @@
    48.4  WGET_URL="$SF_MIRROR/cinepaint/$TARBALL"
    48.5  
    48.6  BUILD_DEPENDS="patch gtk2-dev gettext-dev tiff-dev openexr-dev ilmbase-dev \
    48.7 -libjpeg-turbo-dev zlib-dev libpng16-dev lcms-dev xorg-libXmu-dev fltk-dev \
    48.8 +libjpeg-turbo-dev zlib-dev libpng-dev lcms-dev libxmu-dev fltk-dev \
    48.9  python"
   48.10  SPLIT="$PACKAGE-dev"
   48.11  
   48.12 @@ -34,19 +34,19 @@
   48.13  			copy @std
   48.14  			DEPENDS="atk bzlib cairo fltk fontconfig freetype gdk-pixbuf glib \
   48.15  			gtk2 ilmbase lcms libffi libharfbuzz libjpeg-turbo liblzma \
   48.16 -			libpng16 libxml2 openexr pango pcre tiff util-linux-blkid \
   48.17 -			util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \
   48.18 -			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXextxorg-libXfixes \
   48.19 -			xorg-libXft xorg-libXinerama xorg-libXmu xorg-libXrender \
   48.20 -			xorg-libXt xorg-libxcb xorg-pixman zlib"
   48.21 +			libpng libxml2 openexr pango pcre tiff util-linux-blkid \
   48.22 +			util-linux-mount util-linux-uuid libice libsm \
   48.23 +			libx11 libxau libxdmcp libxext libxfixes \
   48.24 +			libxft libxinerama libxmu libxrender \
   48.25 +			libxt libxcb pixman zlib"
   48.26  			;;
   48.27  		*-dev)
   48.28  			copy @dev
   48.29  			DEPENDS="cinepaint-stable fontconfig-dev freetype-dev glib-dev \
   48.30 -			harfbuzz-dev libjpeg-turbo-dev libpng16-dev libxml2-dev pcre-dev \
   48.31 -			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
   48.32 -			xorg-libXfixes xorg-libXft-dev xorg-libXinerama-dev \
   48.33 -			xorg-libXrender-dev xorg-libxcb-dev xz-dev"
   48.34 +			harfbuzz-dev libjpeg-turbo-dev libpng-dev libxml2-dev pcre-dev \
   48.35 +			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
   48.36 +			libxfixes libxft-dev libxinerama-dev \
   48.37 +			libxrender-dev libxcb-dev xz-dev"
   48.38  			;;
   48.39  	esac
   48.40  }
    49.1 --- a/cinepaint/receipt	Fri Dec 21 04:44:58 2018 +0200
    49.2 +++ b/cinepaint/receipt	Sat Dec 22 04:52:35 2018 +0200
    49.3 @@ -12,9 +12,9 @@
    49.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    49.5  
    49.6  BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special \
    49.7 -gettext-dev xorg-xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev \
    49.8 -mesa-dev ilmbase-dev xorg-libXpm-dev gtk2-dev libpng16-dev bash automake \
    49.9 -autoconf libtool python-dev glu-dev xorg-libXmu-dev xorg-libXext-dev" # libpng12-dev
   49.10 +gettext-dev xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev \
   49.11 +mesa-dev ilmbase-dev libxpm-dev gtk2-dev libpng-dev bash automake \
   49.12 +autoconf libtool python-dev glu-dev libxmu-dev libxext-dev" # libpng12-dev
   49.13  
   49.14  compile_rules() {
   49.15  	sh ./autogen.sh
   49.16 @@ -29,6 +29,6 @@
   49.17  
   49.18  genpkg_rules() {
   49.19  	copy @std
   49.20 -	DEPENDS="desktop-file-utils gtk2 lcms tiff jpeg fltk ftgl xorg-libXmu \
   49.21 -	xorg-libXpm gutenprint zlib mesa jbigkit openexr"
   49.22 +	DEPENDS="desktop-file-utils gtk2 lcms tiff jpeg fltk ftgl libxmu \
   49.23 +	libxpm gutenprint zlib mesa jbigkit openexr"
   49.24  }
    50.1 --- a/claws-mail/receipt	Fri Dec 21 04:44:58 2018 +0200
    50.2 +++ b/claws-mail/receipt	Sat Dec 22 04:52:35 2018 +0200
    50.3 @@ -11,11 +11,11 @@
    50.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    50.5  WGET_URL="http://www.claws-mail.org/releases/$TARBALL"
    50.6  
    50.7 -BUILD_DEPENDS="gettext-dev xorg-libSM-dev glib-dev gnutls-dev gtk2-dev \
    50.8 +BUILD_DEPENDS="gettext-dev libsm-dev glib-dev gnutls-dev gtk2-dev \
    50.9  enchant-dev startup-notification-dev dbus-dev dbus-glib-dev openldap-dev \
   50.10  librsvg-dev libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev \
   50.11  libarchive-dev libical-dev poppler-dev gpgme-dev python-dev python-pygtk-dev \
   50.12 -libcanberra-dev ytnef-dev libnotify-dev perl-dev lcms2-dev xorg-xcb-util-dev"
   50.13 +libcanberra-dev ytnef-dev libnotify-dev perl-dev lcms2-dev xcb-util-dev"
   50.14  SPLIT="\
   50.15  $PACKAGE-acpinotifier $PACKAGE-addresskeeper $PACKAGE-archive \
   50.16  $PACKAGE-attachwarner $PACKAGE-attremover    $PACKAGE-bsfilter \
   50.17 @@ -42,12 +42,12 @@
   50.18  			CAT="mail|the user-friendly, lightweight and fast email client"
   50.19  			DEPENDS="atk bzlib cairo dbus dbus-glib enchant fontconfig \
   50.20  			freetype gdk-pixbuf glib gmp gtk2 libcroco openssl libetpan \
   50.21 -			libffi libgnutls libharfbuzz libidn libldap liblzma libpng16 \
   50.22 +			libffi libgnutls libharfbuzz libidn libldap liblzma libpng \
   50.23  			librsvg libtasn1 libunistring libxml2 nettle p11-kit pango \
   50.24  			pcre startup-notification util-linux-blkid util-linux-mount \
   50.25 -			util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
   50.26 -			xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman \
   50.27 -			xorg-xcb-util zlib"
   50.28 +			util-linux-uuid libice libsm libx11 libxau \
   50.29 +			libxdmcp libxext libxrender libxcb pixman \
   50.30 +			xcb-util zlib"
   50.31  			TAGS="email client"
   50.32  			;;
   50.33  		*-acpinotifier)
   50.34 @@ -91,7 +91,7 @@
   50.35  			DEPENDS="claws-mail gst1-plugins-base gstreamer1 icu libatomic \
   50.36  			libcurl libgcrypt libgpg-error libharfbuzz-icu libicu libidn2 \
   50.37  			libjpeg-turbo libsecret libsoup libsoup-gnome libsqlite3 libssh2 \
   50.38 -			libwebp libxslt orc webkitgtk xorg-libXt"
   50.39 +			libwebp libxslt orc webkitgtk libxt"
   50.40  			;;
   50.41  		*-fetchinfo)
   50.42  			copy fetchinfo.so
   50.43 @@ -184,14 +184,14 @@
   50.44  			libjpeg-turbo-dev lcms2-dev libarchive-dev libassuan-dev \
   50.45  			libcanberra-dev libetpan-dev libffi-dev libgcrypt-dev \
   50.46  			libgpg-error-dev libical-dev libidn2-dev libnotify-dev libogg-dev \
   50.47 -			libpng16-dev libsecret-dev libsoup-dev libssh2-dev libtool \
   50.48 +			libpng-dev libsecret-dev libsoup-dev libssh2-dev libtool \
   50.49  			libvorbis-dev libwebp-dev libxml2-dev libxslt-dev lz4-lib lzo-dev \
   50.50  			nettle-dev openssl-dev orc-dev pango-dev pcre-dev perl-dev \
   50.51  			poppler-dev python-dev sqlite3-dev tiff-dev util-linux-blkid-dev \
   50.52  			util-linux-mount-dev util-linux-uuid-dev webkitgtk-dev \
   50.53 -			xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
   50.54 -			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
   50.55 -			xorg-libXt-dev xorg-libxcb-dev xorg-pixman-dev xz-dev ytnef-dev \
   50.56 +			libice-dev libsm-dev libx11-dev libxau-dev \
   50.57 +			libxdmcp-dev libxext-dev libxrender-dev \
   50.58 +			libxt-dev libxcb-dev pixman-dev xz-dev ytnef-dev \
   50.59  			zlib-dev   gnutls-dev"
   50.60  			PROVIDE="claws-mail-rssyl-dev"
   50.61  			;;
    51.1 --- a/clearlooks/receipt	Fri Dec 21 04:44:58 2018 +0200
    51.2 +++ b/clearlooks/receipt	Sat Dec 22 04:52:35 2018 +0200
    51.3 @@ -23,5 +23,5 @@
    51.4  genpkg_rules() {
    51.5  	copy @std
    51.6  	rm -rf $fs/usr/share/icons
    51.7 -	DEPENDS="gtk2 xorg-libXdamage"
    51.8 +	DEPENDS="gtk2 libxdamage"
    51.9  }
    52.1 --- a/clipit/receipt	Fri Dec 21 04:44:58 2018 +0200
    52.2 +++ b/clipit/receipt	Sat Dec 22 04:52:35 2018 +0200
    52.3 @@ -28,5 +28,5 @@
    52.4  
    52.5  genpkg_rules() {
    52.6  	copy @std
    52.7 -	DEPENDS="glib gtk2 pango xorg-libX11"
    52.8 +	DEPENDS="glib gtk2 pango libx11"
    52.9  }
    53.1 --- a/clutter-gst/receipt	Fri Dec 21 04:44:58 2018 +0200
    53.2 +++ b/clutter-gst/receipt	Sat Dec 22 04:52:35 2018 +0200
    53.3 @@ -28,7 +28,7 @@
    53.4  		clutter-gst)
    53.5  			copy @std
    53.6  			DEPENDS="clutter cogl gdk-pixbuf glib gst1-plugins-base \
    53.7 -			gstreamer1 libgudev xorg-libX11"
    53.8 +			gstreamer1 libgudev libx11"
    53.9  			;;
   53.10  		*-dev)
   53.11  			copy @dev
    54.1 --- a/clutter/receipt	Fri Dec 21 04:44:58 2018 +0200
    54.2 +++ b/clutter/receipt	Sat Dec 22 04:52:35 2018 +0200
    54.3 @@ -33,13 +33,13 @@
    54.4  		clutter)
    54.5  			copy @std
    54.6  			DEPENDS="atk cairo cogl fontconfig glib json-glib pango \
    54.7 -			xorg-libX11 xorg-libXcomposite xorg-libXdamage"
    54.8 +			libx11 libxcomposite libxdamage"
    54.9  			;;
   54.10  		*-dev)
   54.11  			copy @dev
   54.12  			DEPENDS="clutter atk-dev cairo-dev cogl-dev glib-dev json-glib-dev \
   54.13 -			pango-dev xorg-libX11-dev xorg-libXcomposite-dev \
   54.14 -			xorg-libXdamage-dev xorg-libXext-dev"
   54.15 +			pango-dev libx11-dev libxcomposite-dev \
   54.16 +			libxdamage-dev libxext-dev"
   54.17  			;;
   54.18  	esac
   54.19  }
    55.1 --- a/codeblocks/receipt	Fri Dec 21 04:44:58 2018 +0200
    55.2 +++ b/codeblocks/receipt	Sat Dec 22 04:52:35 2018 +0200
    55.3 @@ -11,7 +11,7 @@
    55.4  TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
    55.5  WGET_URL="http://download.berlios.de/codeblocks/$TARBALL"
    55.6  
    55.7 -BUILD_DEPENDS="wxWidgets28-dev xorg-libXdmcp-dev xorg-libXau-dev expat-dev \
    55.8 +BUILD_DEPENDS="wxWidgets28-dev libxdmcp-dev libxau-dev expat-dev \
    55.9  autoconf automake libtool zip gnome-icon-theme hunspell-dev gamin-dev \
   55.10  boost-dev"
   55.11  
    56.1 --- a/cogl/receipt	Fri Dec 21 04:44:58 2018 +0200
    56.2 +++ b/cogl/receipt	Sat Dec 22 04:52:35 2018 +0200
    56.3 @@ -12,9 +12,9 @@
    56.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    56.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    56.6  
    56.7 -BUILD_DEPENDS="glib-dev mesa-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
    56.8 +BUILD_DEPENDS="glib-dev mesa-dev libxcomposite-dev libxrandr-dev \
    56.9  gdk-pixbuf-dev gettext-dev cairo-dev pango-dev gobject-introspection-dev \
   56.10 -xorg-libxshmfence-dev expat-dev"
   56.11 +libxshmfence-dev expat-dev"
   56.12  SPLIT="$PACKAGE-dev"
   56.13  
   56.14  compile_rules() {
   56.15 @@ -45,15 +45,15 @@
   56.16  		cogl)
   56.17  			copy @std
   56.18  			DEPENDS="cairo gdk-pixbuf glib libdrm mesa-libegl mesa-libgbm \
   56.19 -			mesa-libwayland-egl pango wayland xorg-libX11 xorg-libXdamage \
   56.20 -			xorg-libXext xorg-libXfixes xorg-libXrandr"
   56.21 +			mesa-libwayland-egl pango wayland libx11 libxdamage \
   56.22 +			libxext libxfixes libxrandr"
   56.23  			;;
   56.24  		cogl-dev)
   56.25  			copy @dev
   56.26  			DEPENDS="cogl cairo-dev gdk-pixbuf-dev glib-dev libdrm-dev \
   56.27 -			mesa-dev wayland-dev xorg-libX11-dev xorg-libXcomposite-dev \
   56.28 -			xorg-libXdamage-dev xorg-libXext-dev xorg-libXfixes-dev \
   56.29 -			xorg-libXrandr-dev"
   56.30 +			mesa-dev wayland-dev libx11-dev libxcomposite-dev \
   56.31 +			libxdamage-dev libxext-dev libxfixes-dev \
   56.32 +			libxrandr-dev"
   56.33  			;;
   56.34  	esac
   56.35  }
    57.1 --- a/compicc/receipt	Fri Dec 21 04:44:58 2018 +0200
    57.2 +++ b/compicc/receipt	Sat Dec 22 04:52:35 2018 +0200
    57.3 @@ -11,10 +11,10 @@
    57.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    57.5  WGET_URL="https://gitlab.com/compiz/compicc/-/archive/$VERSION/$TARBALL"
    57.6  
    57.7 -BUILD_DEPENDS="oyranos-dev libxcm-dev xorg-libX11-dev compiz-dev mesa-dev"
    57.8 +BUILD_DEPENDS="oyranos-dev libxcm-dev libx11-dev compiz-dev mesa-dev"
    57.9  COOKOPTS="skip-log-errors"
   57.10  
   57.11 -DEPENDS_std="oyranos xorg-libX11 xorg-libXfixes xorg-libXrandr   compiz"
   57.12 +DEPENDS_std="oyranos libx11 libxfixes libxrandr   compiz"
   57.13  
   57.14  TAGS="compiz"
   57.15  
    58.1 --- a/compiz-plugins-experimental/receipt	Fri Dec 21 04:44:58 2018 +0200
    58.2 +++ b/compiz-plugins-experimental/receipt	Sat Dec 22 04:52:35 2018 +0200
    58.3 @@ -13,11 +13,11 @@
    58.4  
    58.5  BUILD_DEPENDS="automake gettext-dev libtool intltool compiz-dev \
    58.6  compiz-bcop-dev cairo-dev compiz-plugins-main-dev compiz-plugins-extra-dev \
    58.7 -xorg-libXScrnSaver-dev glew-dev curl-dev mesa-dev"
    58.8 +libxscrnsaver-dev glew-dev curl-dev mesa-dev"
    58.9  SPLIT="$PACKAGE-dev"
   58.10  
   58.11 -DEPENDS_std="cairo glew glu libcurl mesa xorg-libX11 xorg-libXScrnSaver \
   58.12 -xorg-libXext"
   58.13 +DEPENDS_std="cairo glew glu libcurl mesa libx11 libxscrnsaver \
   58.14 +libxext"
   58.15  
   58.16  TAGS="compiz"
   58.17  
    59.1 --- a/compiz-plugins-extra/receipt	Fri Dec 21 04:44:58 2018 +0200
    59.2 +++ b/compiz-plugins-extra/receipt	Sat Dec 22 04:52:35 2018 +0200
    59.3 @@ -15,7 +15,7 @@
    59.4  compiz-plugins-main-dev libnotify-dev gtk2-dev mesa-dev glu-dev"
    59.5  SPLIT="$PACKAGE-dev"
    59.6  
    59.7 -DEPENDS_std="cairo glib glu libnotify xorg-libX11 xorg-libXext xorg-libXfixes"
    59.8 +DEPENDS_std="cairo glib glu libnotify libx11 libxext libxfixes"
    59.9  
   59.10  TAGS="compiz"
   59.11  
    60.1 --- a/compiz-plugins-main/receipt	Fri Dec 21 04:44:58 2018 +0200
    60.2 +++ b/compiz-plugins-main/receipt	Sat Dec 22 04:52:35 2018 +0200
    60.3 @@ -15,8 +15,8 @@
    60.4  cairo-dev pango-dev glu-dev mesa-dev libjpeg-turbo-dev"
    60.5  SPLIT="$PACKAGE-dev"
    60.6  
    60.7 -DEPENDS_std="cairo glib glu libjpeg-turbo libxml2 pango xorg-libX11 \
    60.8 -xorg-libXfixes xorg-libXrender"
    60.9 +DEPENDS_std="cairo glib glu libjpeg-turbo libxml2 pango libx11 \
   60.10 +libxfixes libxrender"
   60.11  DEPENDS_dev="compiz-plugins-main cairo-dev compiz-dev pango-dev"
   60.12  
   60.13  TAGS="compiz"
    61.1 --- a/compiz/receipt	Fri Dec 21 04:44:58 2018 +0200
    61.2 +++ b/compiz/receipt	Sat Dec 22 04:52:35 2018 +0200
    61.3 @@ -12,23 +12,23 @@
    61.4  TARBALL="compiz-core-v$VERSION.tar.bz2"
    61.5  WGET_URL="https://gitlab.com/compiz/compiz-core/-/archive/v$VERSION/$TARBALL"
    61.6  
    61.7 -BUILD_DEPENDS="automake gettext-dev libtool intltool xorg-libX11-dev \
    61.8 -xorg-libXcomposite-dev xorg-libXext-dev xorg-libXfixes-dev xorg-libXdamage-dev \
    61.9 -xorg-libXrandr-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXcursor-dev \
   61.10 -xorg-libICE-dev xorg-libSM-dev libxml2-dev startup-notification-dev libxslt \
   61.11 -libpng16-dev libjpeg-turbo-dev glu-dev mesa-dev glib-dev dbus-dev libxml2-dev \
   61.12 +BUILD_DEPENDS="automake gettext-dev libtool intltool libx11-dev \
   61.13 +libxcomposite-dev libxext-dev libxfixes-dev libxdamage-dev \
   61.14 +libxrandr-dev libxi-dev libxinerama-dev libxcursor-dev \
   61.15 +libice-dev libsm-dev libxml2-dev startup-notification-dev libxslt \
   61.16 +libpng-dev libjpeg-turbo-dev glu-dev mesa-dev glib-dev dbus-dev libxml2-dev \
   61.17  dbus-glib-dev fuse2-dev cairo-dev librsvg-dev \
   61.18 -xorg-libXrender-dev gtk3-dev libwnck3-dev marco-dev"
   61.19 +libxrender-dev gtk3-dev libwnck3-dev marco-dev"
   61.20  SPLIT="$PACKAGE-dev"
   61.21  
   61.22 -DEPENDS_std="atk cairo dbus fuse2 gdk-pixbuf glib glu gtk3 libpng16 librsvg \
   61.23 -libwnck3 libxml2 marco mesa pango startup-notification xorg-libICE xorg-libSM \
   61.24 -xorg-libX11 xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
   61.25 -xorg-libXfixes xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender"
   61.26 -DEPENDS_dev="compiz libxml2-dev startup-notification-dev xorg-libICE-dev \
   61.27 -xorg-libSM-dev xorg-libX11-dev xorg-libXcomposite-dev xorg-libXcursor-dev \
   61.28 -xorg-libXdamage-dev xorg-libXext-dev xorg-libXfixes-dev xorg-libXi-dev \
   61.29 -xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXrender xorg-libXrender-dev"
   61.30 +DEPENDS_std="atk cairo dbus fuse2 gdk-pixbuf glib glu gtk3 libpng librsvg \
   61.31 +libwnck3 libxml2 marco mesa pango startup-notification libice libsm \
   61.32 +libx11 libxcomposite libxcursor libxdamage libxext \
   61.33 +libxfixes libxi libxinerama libxrandr libxrender"
   61.34 +DEPENDS_dev="compiz libxml2-dev startup-notification-dev libice-dev \
   61.35 +libsm-dev libx11-dev libxcomposite-dev libxcursor-dev \
   61.36 +libxdamage-dev libxext-dev libxfixes-dev libxi-dev \
   61.37 +libxinerama-dev libxrandr-dev libxrender-dev"
   61.38  
   61.39  TAGS="compiz"
   61.40  
    62.1 --- a/compizconfig-python/receipt	Fri Dec 21 04:44:58 2018 +0200
    62.2 +++ b/compizconfig-python/receipt	Sat Dec 22 04:52:35 2018 +0200
    62.3 @@ -17,9 +17,9 @@
    62.4  
    62.5  DEPENDS_std="libcompizconfig   python"
    62.6  DEPENDS_dev="compizconfig-python glib-dev libcompizconfig-dev libxml2-dev \
    62.7 -startup-notification-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
    62.8 -xorg-libXcomposite-dev xorg-libXcursor-dev xorg-libXdamage-dev xorg-libXext-dev \
    62.9 -xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev"
   62.10 +startup-notification-dev libice-dev libsm-dev libx11-dev \
   62.11 +libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev \
   62.12 +libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev"
   62.13  
   62.14  compile_rules() {
   62.15  	./autogen.sh \
    63.1 --- a/compton/receipt	Fri Dec 21 04:44:58 2018 +0200
    63.2 +++ b/compton/receipt	Sat Dec 22 04:52:35 2018 +0200
    63.3 @@ -12,9 +12,9 @@
    63.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    63.5  WGET_URL="https://github.com/chjj/compton/archive/${COMMIT:-v$VERSION}.tar.gz"
    63.6  
    63.7 -BUILD_DEPENDS="pcre-dev xorg-libX11-dev xorg-libXcomposite-dev \
    63.8 -xorg-libXfixes-dev xorg-libXdamage-dev xorg-libXrender-dev xorg-libXext-dev \
    63.9 -xorg-libXrandr-dev xorg-libXinerama-dev dbus-dev asciidoc libxml2-tools \
   63.10 +BUILD_DEPENDS="pcre-dev libx11-dev libxcomposite-dev \
   63.11 +libxfixes-dev libxdamage-dev libxrender-dev libxext-dev \
   63.12 +libxrandr-dev libxinerama-dev dbus-dev asciidoc libxml2-tools \
   63.13  docbook-xsl libconfig-dev"
   63.14  # Optional bdeps: libconfig-dev libdrm-dev mesa-dev
   63.15  
   63.16 @@ -34,8 +34,8 @@
   63.17  
   63.18  genpkg_rules() {
   63.19  	copy etc/ bin/	# skip icons
   63.20 -	DEPENDS="dbus libconfig libpcre xorg-libX11 xorg-libXcomposite \
   63.21 -	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXinerama \
   63.22 -	xorg-libXrandr xorg-libXrender   xorg-xwininfo xorg-xprop libconfig"
   63.23 +	DEPENDS="dbus libconfig libpcre libx11 libxcomposite \
   63.24 +	libxdamage libxext libxfixes libxinerama \
   63.25 +	libxrandr libxrender   xwininfo xprop libconfig"
   63.26  	CONFIG_FILES="/etc/xdg/compton/compton.conf"
   63.27  }
    64.1 --- a/conky/receipt	Fri Dec 21 04:44:58 2018 +0200
    64.2 +++ b/conky/receipt	Sat Dec 22 04:52:35 2018 +0200
    64.3 @@ -11,10 +11,10 @@
    64.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    64.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    64.6  
    64.7 -BUILD_DEPENDS="xorg-libXdamage-dev xorg-libXft-dev fontconfig-dev \
    64.8 +BUILD_DEPENDS="libxdamage-dev libxft-dev fontconfig-dev \
    64.9  expat-dev glib glib-dev pkg-config zlib-dev freetype-dev \
   64.10 -xorg-xorgproto ncurses-dev xorg-libxcb-dev wireless_tools-dev \
   64.11 -imlib2-dev lua-dev xorg-libXext-dev"
   64.12 +xorgproto ncurses-dev libxcb-dev wireless_tools-dev \
   64.13 +imlib2-dev lua-dev libxext-dev"
   64.14  
   64.15  compile_rules() {
   64.16  	./configure \
   64.17 @@ -32,8 +32,8 @@
   64.18  
   64.19  genpkg_rules() {
   64.20  	copy @std
   64.21 -	DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \
   64.22 -	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxcb \
   64.23 -	xorg-libXft xorg-libXrender zlib ncurses wireless_tools imlib2"
   64.24 +	DEPENDS="expat fontconfig freetype glib libx11 libxau \
   64.25 +	libxdamage libxdmcp libxext libxfixes libxcb \
   64.26 +	libxft libxrender zlib ncurses wireless_tools imlib2"
   64.27  	TAGS="desktop monitoring"
   64.28  }
    65.1 --- a/consolekit2/receipt	Fri Dec 21 04:44:58 2018 +0200
    65.2 +++ b/consolekit2/receipt	Sat Dec 22 04:52:35 2018 +0200
    65.3 @@ -13,7 +13,7 @@
    65.4  TARBALL="ConsoleKit2-$VERSION.tar.bz2"
    65.5  WGET_URL="https://github.com/Consolekit2/ConsoleKit2/releases/download/$VERSION/$TARBALL"
    65.6  
    65.7 -BUILD_DEPENDS="xorg-libX11-dev gettext-dev dbus-dev glib-dev polkit-dev \
    65.8 +BUILD_DEPENDS="libx11-dev gettext-dev dbus-dev glib-dev polkit-dev \
    65.9  eudev-dev xmlto libxslt docbook-xsl libxml2-tools acl-dev"
   65.10  SPLIT="$PACKAGE-dev"
   65.11  
   65.12 @@ -40,7 +40,7 @@
   65.13  	case $PACKAGE in
   65.14  		consolekit2)
   65.15  			copy @std
   65.16 -			DEPENDS="acl dbus eudev glib polkit xorg-libX11 zlib"
   65.17 +			DEPENDS="acl dbus eudev glib polkit libx11 zlib"
   65.18  			;;
   65.19  		*-dev)
   65.20  			copy @dev
    66.1 --- a/consonance/receipt	Fri Dec 21 04:44:58 2018 +0200
    66.2 +++ b/consonance/receipt	Sat Dec 22 04:52:35 2018 +0200
    66.3 @@ -32,6 +32,6 @@
    66.4  genpkg_rules() {
    66.5  	copy @std
    66.6  	DEPENDS="libao taglib libmad sqlite3 dbus-glib libnotify flac libsndfile \
    66.7 -	libvorbis curl libmodplug libcdio libcddb xorg-xcb-util"
    66.8 +	libvorbis curl libmodplug libcdio libcddb xcb-util"
    66.9  	TAGS="player audio music MP3 Ogg"
   66.10  }
    67.1 --- a/cryptkeeper/receipt	Fri Dec 21 04:44:58 2018 +0200
    67.2 +++ b/cryptkeeper/receipt	Sat Dec 22 04:52:35 2018 +0200
    67.3 @@ -11,7 +11,7 @@
    67.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    67.5  WGET_URL="https://github.com/tomm/cryptkeeper/archive/$COMMIT.tar.gz"
    67.6  
    67.7 -BUILD_DEPENDS="gtk2-dev gconf-dev xorg-libX11-dev"
    67.8 +BUILD_DEPENDS="gtk2-dev gconf-dev libx11-dev"
    67.9  
   67.10  compile_rules() {
   67.11  	mv po/ru_RU.gmo po/ru.gmo
    68.1 --- a/cups-filters/receipt	Fri Dec 21 04:44:58 2018 +0200
    68.2 +++ b/cups-filters/receipt	Sat Dec 22 04:52:35 2018 +0200
    68.3 @@ -11,7 +11,7 @@
    68.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
    68.5  WGET_URL="https://www.openprinting.org/download/cups-filters/$TARBALL"
    68.6  
    68.7 -BUILD_DEPENDS="cups-dev zlib-dev libjpeg-turbo-dev libpng16-dev tiff-dev \
    68.8 +BUILD_DEPENDS="cups-dev zlib-dev libjpeg-turbo-dev libpng-dev tiff-dev \
    68.9  glib-dev lcms2-dev freetype-dev fontconfig-dev ijs-dev qpdf-dev poppler-dev \
   68.10  dbus-dev"
   68.11  SPLIT="$PACKAGE-dev"
   68.12 @@ -34,7 +34,7 @@
   68.13  		cups-filters)
   68.14  			copy @std
   68.15  			DEPENDS="cups dbus fontconfig freetype glib ijs lcms2 libcups \
   68.16 -			libgnutls libjpeg-turbo libpng16 poppler qpdf tiff zlib"
   68.17 +			libgnutls libjpeg-turbo libpng poppler qpdf tiff zlib"
   68.18  			;;
   68.19  		*-dev)
   68.20  			copy @dev
    69.1 --- a/cwallpaper-fltk/receipt	Fri Dec 21 04:44:58 2018 +0200
    69.2 +++ b/cwallpaper-fltk/receipt	Sat Dec 22 04:52:35 2018 +0200
    69.3 @@ -12,7 +12,7 @@
    69.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    69.5  WGET_URL="$SF_MIRROR/cwallpaper/$TARBALL"
    69.6  
    69.7 -BUILD_DEPENDS="fltk-dev xorg-libX11-dev xorg-libXinerama-dev"
    69.8 +BUILD_DEPENDS="fltk-dev libx11-dev libxinerama-dev"
    69.9  
   69.10  compile_rules() {
   69.11  	sed -i "s#g++#${HOST_SYSTEM}-g++#" Makefile || return 1
    70.1 --- a/dbus/receipt	Fri Dec 21 04:44:58 2018 +0200
    70.2 +++ b/dbus/receipt	Sat Dec 22 04:52:35 2018 +0200
    70.3 @@ -12,8 +12,8 @@
    70.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    70.5  WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    70.6  
    70.7 -BUILD_DEPENDS="expat-dev xorg-libX11-dev glib-dev xorg-libICE-dev \
    70.8 -xorg-libSM-dev libxslt xmlto libxml2-tools" # docbook-xsl
    70.9 +BUILD_DEPENDS="expat-dev libx11-dev glib-dev libice-dev \
   70.10 +libsm-dev libxslt xmlto libxml2-tools" # docbook-xsl
   70.11  SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev"
   70.12  
   70.13  compile_rules() {
   70.14 @@ -55,7 +55,7 @@
   70.15  			;;
   70.16  		dbus)
   70.17  			copy @std @rm
   70.18 -			DEPENDS="expat xorg-libX11   slitaz-base-files"
   70.19 +			DEPENDS="expat libx11   slitaz-base-files"
   70.20  			CONFIG_FILES="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/"
   70.21  			;;
   70.22  		*-dev) copy @dev;;
    71.1 --- a/dcmtk/receipt	Fri Dec 21 04:44:58 2018 +0200
    71.2 +++ b/dcmtk/receipt	Sat Dec 22 04:52:35 2018 +0200
    71.3 @@ -11,7 +11,7 @@
    71.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    71.5  WGET_URL="ftp://dicom.offis.de/pub/dicom/offis/software/$PACKAGE/$PACKAGE${VERSION//./}/$TARBALL"
    71.6  
    71.7 -BUILD_DEPENDS="libxml2-dev tiff-dev libpng16-dev zlib-dev" # libwrap-dev
    71.8 +BUILD_DEPENDS="libxml2-dev tiff-dev libpng-dev zlib-dev" # libwrap-dev
    71.9  #SPLIT="$PACKAGE-dev"
   71.10  
   71.11  compile_rules() {
   71.12 @@ -26,7 +26,7 @@
   71.13  	case $PACKAGE in
   71.14  		dcmtk)
   71.15  			copy @std
   71.16 -			DEPENDS="libpng16 libxml2 tiff zlib" # libwrap
   71.17 +			DEPENDS="libpng libxml2 tiff zlib" # libwrap
   71.18  			;;
   71.19  		*-dev)
   71.20  			copy @dev
    72.1 --- a/ddd/receipt	Fri Dec 21 04:44:58 2018 +0200
    72.2 +++ b/ddd/receipt	Sat Dec 22 04:52:35 2018 +0200
    72.3 @@ -12,7 +12,7 @@
    72.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    72.5  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    72.6  
    72.7 -BUILD_DEPENDS="gawk lesstif-dev xorg-libXt-dev"
    72.8 +BUILD_DEPENDS="gawk lesstif-dev libxt-dev"
    72.9  
   72.10  compile_rules() {
   72.11  	# Need to include an additional header in a file to build with gcc 4.4.0
   72.12 @@ -39,7 +39,7 @@
   72.13  genpkg_rules() {
   72.14  	copy @std
   72.15  	DEPENDS="glibc-base gcc-lib-base ncurses freetype zlib util-linux-uuid \
   72.16 -	xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXaw \
   72.17 -	xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm xorg-libXt lesstif elfutils"
   72.18 +	libice libsm libx11 libxau libxaw \
   72.19 +	libxdmcp libxext libxmu libxpm libxt lesstif elfutils"
   72.20  	TAGS="debugger"
   72.21  }
    73.1 --- a/deadbeef/receipt	Fri Dec 21 04:44:58 2018 +0200
    73.2 +++ b/deadbeef/receipt	Sat Dec 22 04:52:35 2018 +0200
    73.3 @@ -13,8 +13,8 @@
    73.4  
    73.5  BUILD_DEPENDS="gettext-dev intltool yasm zlib-dev jansson-dev gtk2-dev \
    73.6  alsa-lib-dev dbus-dev curl-dev libmad-dev libvorbis-dev libogg-dev flac-dev \
    73.7 -libsndfile-dev libcdio-dev libcddb-dev cdparanoia-dev xorg-libX11-dev \
    73.8 -imlib2-dev libjpeg-turbo-dev libpng16-dev libsamplerate-dev faad2-dev "
    73.9 +libsndfile-dev libcdio-dev libcddb-dev cdparanoia-dev libx11-dev \
   73.10 +imlib2-dev libjpeg-turbo-dev libpng-dev libsamplerate-dev faad2-dev "
   73.11  SPLIT="$PACKAGE-plugins $PACKAGE-dev"
   73.12  
   73.13  compile_rules() {
   73.14 @@ -32,7 +32,7 @@
   73.15  			alsa.so ddb_gui_GTK2.so hotkeys.so m3u.so mms.so mp3.so notify.so \
   73.16  			supereq.so vorbis.so @ico
   73.17  			DEPENDS="alsa-lib atk cairo dbus gdk-pixbuf glib gtk2 jansson \
   73.18 -			libmad libvorbis pango xorg-libX11"
   73.19 +			libmad libvorbis pango libx11"
   73.20  			SUGGESTED="deadbeef-plugins"
   73.21  			TAGS="music audio player MP3 Ogg ape"
   73.22  			;;
    74.1 --- a/devilspie/receipt	Fri Dec 21 04:44:58 2018 +0200
    74.2 +++ b/devilspie/receipt	Sat Dec 22 04:52:35 2018 +0200
    74.3 @@ -27,7 +27,7 @@
    74.4  
    74.5  genpkg_rules() {
    74.6  	copy @std
    74.7 -	DEPENDS="libwnck2 expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
    74.8 -	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
    74.9 -	xorg-libXrandr xorg-libXrender xorg-libXdamage"
   74.10 +	DEPENDS="libwnck2 expat gtk2 libx11 libxau libxcomposite \
   74.11 +	libxcursor libxdmcp libxext libxfixes libxinerama \
   74.12 +	libxrandr libxrender libxdamage"
   74.13  }
    75.1 --- a/dia/receipt	Fri Dec 21 04:44:58 2018 +0200
    75.2 +++ b/dia/receipt	Sat Dec 22 04:52:35 2018 +0200
    75.3 @@ -34,6 +34,6 @@
    75.4  genpkg_rules() {
    75.5  	copy @std
    75.6  	DEPENDS="gtk2 libxml2 freetype fontconfig glib atk pango zlib libart_lgpl \
    75.7 -	libxslt popt xorg-libXdamage librsvg"
    75.8 +	libxslt popt libxdamage librsvg"
    75.9  	TAGS="office diagram creator editor visio"
   75.10  }
    76.1 --- a/dillo/receipt	Fri Dec 21 04:44:58 2018 +0200
    76.2 +++ b/dillo/receipt	Sat Dec 22 04:52:35 2018 +0200
    76.3 @@ -11,8 +11,8 @@
    76.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    76.5  WGET_URL="https://www.dillo.org/download/$TARBALL"
    76.6  
    76.7 -BUILD_DEPENDS="fltk-dev xorg-libX11-dev libjpeg-turbo-dev zlib-dev \
    76.8 -libpng16-dev openssl10-dev"
    76.9 +BUILD_DEPENDS="fltk-dev libx11-dev libjpeg-turbo-dev zlib-dev \
   76.10 +libpng-dev openssl10-dev"
   76.11  
   76.12  compile_rules() {
   76.13  	cp -f $stuff/pixmaps.slitaz.h src/pixmaps.h
   76.14 @@ -31,6 +31,6 @@
   76.15  
   76.16  genpkg_rules() {
   76.17  	copy @std
   76.18 -	DEPENDS="fltk libjpeg-turbo libpng16 openssl10 xorg-libX11 zlib"
   76.19 +	DEPENDS="fltk libjpeg-turbo libpng openssl10 libx11 zlib"
   76.20  	TAGS="web-browser"
   76.21  }
    77.1 --- a/directfb/receipt	Fri Dec 21 04:44:58 2018 +0200
    77.2 +++ b/directfb/receipt	Sat Dec 22 04:52:35 2018 +0200
    77.3 @@ -12,12 +12,12 @@
    77.4  TARBALL="$PACKAGE-$COMMIT.tar.gz"
    77.5  WGET_URL="https://github.com/DirectFB/directfb/archive/$COMMIT.tar.gz"
    77.6  
    77.7 -BUILD_DEPENDS="libtool automake gfortran libpng16-dev libjpeg-turbo-dev \
    77.8 -freetype-dev tslib-dev perl fluxcomp xorg-xorgproto xorg-libXext-dev libvdpau-dev"
    77.9 +BUILD_DEPENDS="libtool automake gfortran libpng-dev libjpeg-turbo-dev \
   77.10 +freetype-dev tslib-dev perl fluxcomp xorgproto libxext-dev libvdpau-dev"
   77.11  
   77.12 -BUILD_DEPENDS="libtool automake gfortran libpng16-dev libjpeg-turbo-dev \
   77.13 -freetype-dev fluxcomp mesa-dev xorg-libxshmfence-dev expat-dev \
   77.14 -xorg-libXcomposite-dev"
   77.15 +BUILD_DEPENDS="libtool automake gfortran libpng-dev libjpeg-turbo-dev \
   77.16 +freetype-dev fluxcomp mesa-dev libxshmfence-dev expat-dev \
   77.17 +libxcomposite-dev"
   77.18  SPLIT="$PACKAGE-dev"
   77.19  
   77.20  compile_rules() {
   77.21 @@ -34,7 +34,7 @@
   77.22  	case $PACKAGE in
   77.23  		directfb)
   77.24  			copy @std
   77.25 -			DEPENDS="freetype libjpeg-turbo libpng16 tslib"
   77.26 +			DEPENDS="freetype libjpeg-turbo libpng tslib"
   77.27  			;;
   77.28  		*-dev)
   77.29  			copy @dev
    78.1 --- a/dmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
    78.2 +++ b/dmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
    78.3 @@ -11,7 +11,7 @@
    78.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    78.5  WGET_URL="http://dl.suckless.org/tools/$TARBALL"
    78.6  
    78.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev xorg-libXinerama-dev"
    78.8 +BUILD_DEPENDS="libx11-dev libxft-dev libxinerama-dev"
    78.9  
   78.10  compile_rules() {
   78.11  	make &&
   78.12 @@ -20,6 +20,6 @@
   78.13  
   78.14  genpkg_rules() {
   78.15  	copy @std
   78.16 -	DEPENDS="fontconfig xorg-libX11 xorg-libXft xorg-libXinerama"
   78.17 +	DEPENDS="fontconfig libx11 libxft libxinerama"
   78.18  	TAGS="launchbar"
   78.19  }
    79.1 --- a/dosbox/receipt	Fri Dec 21 04:44:58 2018 +0200
    79.2 +++ b/dosbox/receipt	Sat Dec 22 04:52:35 2018 +0200
    79.3 @@ -11,7 +11,7 @@
    79.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    79.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    79.6  
    79.7 -BUILD_DEPENDS="libsdl-dev alsa-lib-dev libpng16-dev libsdl-net-dev mesa-dev \
    79.8 +BUILD_DEPENDS="libsdl-dev alsa-lib-dev libpng-dev libsdl-net-dev mesa-dev \
    79.9  glu-dev sdl-sound-dev"
   79.10  
   79.11  compile_rules() {
   79.12 @@ -22,7 +22,7 @@
   79.13  
   79.14  genpkg_rules() {
   79.15  	copy @std
   79.16 -	DEPENDS="alsa-lib libpng16 libsdl libsdl-net mesa sdl-sound xorg-libX11 \
   79.17 +	DEPENDS="alsa-lib libpng libsdl libsdl-net mesa sdl-sound libx11 \
   79.18  	zlib"
   79.19  	TAGS="emulator dos vm86 8086"
   79.20  }
    80.1 --- a/dvdauthor/receipt	Fri Dec 21 04:44:58 2018 +0200
    80.2 +++ b/dvdauthor/receipt	Sat Dec 22 04:52:35 2018 +0200
    80.3 @@ -11,7 +11,7 @@
    80.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    80.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    80.6  
    80.7 -BUILD_DEPENDS="libpng16-dev freetype-dev libdvdread-dev libxml2-dev   \
    80.8 +BUILD_DEPENDS="libpng-dev freetype-dev libdvdread-dev libxml2-dev   \
    80.9  fontconfig-dev fribidi-dev"
   80.10  
   80.11  compile_rules() {
   80.12 @@ -25,5 +25,5 @@
   80.13  
   80.14  genpkg_rules() {
   80.15  	copy @std
   80.16 -	DEPENDS="fontconfig freetype fribidi libdvdread libpng16 libxml2"
   80.17 +	DEPENDS="fontconfig freetype fribidi libdvdread libpng libxml2"
   80.18  }
    81.1 --- a/dwm/receipt	Fri Dec 21 04:44:58 2018 +0200
    81.2 +++ b/dwm/receipt	Sat Dec 22 04:52:35 2018 +0200
    81.3 @@ -11,8 +11,8 @@
    81.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    81.5  WGET_URL="http://dl.suckless.org/dwm/$TARBALL"
    81.6  
    81.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto \
    81.8 -xorg-libXinerama-dev"
    81.9 +BUILD_DEPENDS="libx11-dev xorgproto \
   81.10 +libxinerama-dev"
   81.11  
   81.12  compile_rules() {
   81.13  	# From blue to grey and have lighter grey
   81.14 @@ -32,7 +32,7 @@
   81.15  
   81.16  genpkg_rules() {
   81.17  	copy @std
   81.18 -	DEPENDS="xorg-libX11 xorg-xsetroot"
   81.19 +	DEPENDS="libx11 xsetroot"
   81.20  	TAGS="window-manager"
   81.21  }
   81.22  
    82.1 --- a/dzen2/receipt	Fri Dec 21 04:44:58 2018 +0200
    82.2 +++ b/dzen2/receipt	Sat Dec 22 04:52:35 2018 +0200
    82.3 @@ -12,7 +12,7 @@
    82.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    82.5  WGET_URL="http://gotmor.googlepages.com/$TARBALL"
    82.6  
    82.7 -BUILD_DEPENDS="xorg-libX11-dev"
    82.8 +BUILD_DEPENDS="libx11-dev"
    82.9  
   82.10  compile_rules() {
   82.11  	sed -e 's/\/usr\/local/\/usr/' < config.mk > config.mk.slitaz
   82.12 @@ -25,6 +25,6 @@
   82.13  genpkg_rules() {
   82.14  	mkdir -p $fs/usr
   82.15  	cp -a $install/usr/bin $fs/usr
   82.16 -	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp"
   82.17 +	DEPENDS="libx11 libxau libxdmcp"
   82.18  	TAGS="system monitor notification"
   82.19  }
    83.1 --- a/echinus/receipt	Fri Dec 21 04:44:58 2018 +0200
    83.2 +++ b/echinus/receipt	Sat Dec 22 04:52:35 2018 +0200
    83.3 @@ -11,7 +11,7 @@
    83.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
    83.5  WGET_URL="$WEB_SITE/$TARBALL"
    83.6  
    83.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev xorg-libXrandr-dev"
    83.8 +BUILD_DEPENDS="libx11-dev libxft-dev libxrandr-dev"
    83.9  
   83.10  compile_rules() {
   83.11  	cp $stuff/config.mk .
   83.12 @@ -22,6 +22,6 @@
   83.13  
   83.14  genpkg_rules() {
   83.15  	copy @std
   83.16 -	DEPENDS="xorg-libX11 xorg-libXft"
   83.17 +	DEPENDS="libx11 libxft"
   83.18  	TAGS="window-manager"
   83.19  }
    84.1 --- a/efl/receipt	Fri Dec 21 04:44:58 2018 +0200
    84.2 +++ b/efl/receipt	Sat Dec 22 04:52:35 2018 +0200
    84.3 @@ -13,11 +13,11 @@
    84.4  
    84.5  BUILD_DEPENDS="gettext-dev openssl-dev libunwind-dev libjpeg-turbo-dev \
    84.6  gstreamer1-dev luajit-dev freetype-dev fontconfig-dev fribidi-dev \
    84.7 -xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev mesa-dev giflib-dev \
    84.8 +libx11-dev libxext-dev libxrender-dev mesa-dev giflib-dev \
    84.9  tiff-dev libwebp-dev poppler-dev libspectre-dev libraw-dev librsvg-dev \
   84.10 -eudev-dev dbus-dev pulseaudio-dev xorg-libXcursor-dev xorg-libXcomposite-dev \
   84.11 -xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXScrnSaver-dev bullet-dev \
   84.12 -gst1-plugins-base-dev libsndfile-dev xorg-libXtst-dev"
   84.13 +eudev-dev dbus-dev pulseaudio-dev libxcursor-dev libxcomposite-dev \
   84.14 +libxinerama-dev libxrandr-dev libxscrnsaver-dev bullet-dev \
   84.15 +gst1-plugins-base-dev libsndfile-dev libxtst-dev"
   84.16  SPLIT="$PACKAGE-dev"
   84.17  
   84.18  compile_rules() {
   84.19 @@ -41,23 +41,23 @@
   84.20  			copy @std
   84.21  			DEPENDS="bullet cairo dbus eudev fontconfig freetype fribidi \
   84.22  			giflib glib gst1-plugins-base gstreamer1 libharfbuzz libjpeg-turbo \
   84.23 -			libpng16 libraw librsvg libspectre libunwind libwebp luajit mesa \
   84.24 -			openssl poppler python tiff util-linux-mount xorg-libX11 \
   84.25 -			xorg-libXScrnSaver xorg-libXcomposite xorg-libXcursor \
   84.26 -			xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi \
   84.27 -			xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst zlib"
   84.28 +			libpng libraw librsvg libspectre libunwind libwebp luajit mesa \
   84.29 +			openssl poppler python tiff util-linux-mount libx11 \
   84.30 +			libxscrnsaver libxcomposite libxcursor \
   84.31 +			libxdamage libxext libxfixes libxi \
   84.32 +			libxinerama libxrandr libxrender libxtst zlib"
   84.33  			TAGS="e enlightenment efl"
   84.34  			;;
   84.35  		efl-dev)
   84.36  			copy @dev
   84.37  			DEPENDS="shared-mime-info efl bullet-dev dbus-dev eudev-dev \
   84.38  			fontconfig-dev freetype-dev fribidi-dev glib-dev harfbuzz-dev \
   84.39 -			libjpeg-turbo-dev libpng16-dev luajit-dev openssl-dev \
   84.40 -			util-linux-mount-dev xorg-libX11-dev xorg-libXScrnSaver-dev \
   84.41 -			xorg-libXcomposite-dev xorg-libXcursor-dev xorg-libXdamage-dev \
   84.42 -			xorg-libXext-dev xorg-libXfixes-dev xorg-libXi-dev \
   84.43 -			xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXrender-dev \
   84.44 -			xorg-libXtst-dev xorg-libxcb-dev zlib-dev"
   84.45 +			libjpeg-turbo-dev libpng-dev luajit-dev openssl-dev \
   84.46 +			util-linux-mount-dev libx11-dev libxscrnsaver-dev \
   84.47 +			libxcomposite-dev libxcursor-dev libxdamage-dev \
   84.48 +			libxext-dev libxfixes-dev libxi-dev \
   84.49 +			libxinerama-dev libxrandr-dev libxrender-dev \
   84.50 +			libxtst-dev libxcb-dev zlib-dev"
   84.51  			;;
   84.52  	esac
   84.53  }
    85.1 --- a/eggwm-qt5/receipt	Fri Dec 21 04:44:58 2018 +0200
    85.2 +++ b/eggwm-qt5/receipt	Sat Dec 22 04:52:35 2018 +0200
    85.3 @@ -12,7 +12,7 @@
    85.4  TARBALL="$PACKAGE-$COMMIT.tar.gz"
    85.5  WGET_URL="https://github.com/MoonLightDE/mlde.w.eggwm/archive/$COMMIT.tar.gz"
    85.6  
    85.7 -BUILD_DEPENDS="qt5-dev xorg-libxcb-dev xorg-libX11-dev"
    85.8 +BUILD_DEPENDS="qt5-dev libxcb-dev libx11-dev"
    85.9  
   85.10  compile_rules() {
   85.11  	qmake -makefile &&
   85.12 @@ -24,5 +24,5 @@
   85.13  
   85.14  genpkg_rules() {
   85.15  	copy @std
   85.16 -	DEPENDS="libatomic mesa qt5-base qt5-x11extras xorg-libX11"
   85.17 +	DEPENDS="libatomic mesa qt5-base qt5-x11extras libx11"
   85.18  }
    86.1 --- a/eggwm/receipt	Fri Dec 21 04:44:58 2018 +0200
    86.2 +++ b/eggwm/receipt	Sat Dec 22 04:52:35 2018 +0200
    86.3 @@ -26,7 +26,7 @@
    86.4  	rm -rf $fs/usr/share/eggwm/themes/testtheme
    86.5  	find $fs/usr/share/eggwm -type f -exec chmod 0644 {} \;
    86.6  	cp -r $stuff/xsessions $fs/usr/share
    86.7 -	DEPENDS="xorg-libX11 libQtCore libQtGui"
    86.8 +	DEPENDS="libx11 libQtCore libQtGui"
    86.9  }
   86.10  
   86.11  post_install() {
    87.1 --- a/ekiga/receipt	Fri Dec 21 04:44:58 2018 +0200
    87.2 +++ b/ekiga/receipt	Sat Dec 22 04:52:35 2018 +0200
    87.3 @@ -12,7 +12,7 @@
    87.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    87.5  
    87.6  BUILD_DEPENDS="intltool gtk2-dev gnome-icon-theme boost-dev boost-signals \
    87.7 -gconf-dev libnotify-dev xorg-libXv-dev dbus-dev dbus-glib-dev ptlib-dev \
    87.8 +gconf-dev libnotify-dev libxv-dev dbus-dev dbus-glib-dev ptlib-dev \
    87.9  opal-dev"
   87.10  COOKOPTS="skip-log-errors"
   87.11  
   87.12 @@ -31,6 +31,6 @@
   87.13  genpkg_rules() {
   87.14  	copy @std @ico
   87.15  	DEPENDS="atk boost-signals dbus-glib gconf gdk-pixbuf glib gtk2 libnotify \
   87.16 -	libxml2 opal pango ptlib xorg-libX11 xorg-libXext xorg-libXv"
   87.17 +	libxml2 opal pango ptlib libx11 libxext libxv"
   87.18  	TAGS="telephony"
   87.19  }
    88.1 --- a/emacs/receipt	Fri Dec 21 04:44:58 2018 +0200
    88.2 +++ b/emacs/receipt	Sat Dec 22 04:52:35 2018 +0200
    88.3 @@ -12,7 +12,7 @@
    88.4  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    88.5  
    88.6  BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \
    88.7 -fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng16-dev \
    88.8 +fontconfig-dev glib-dev gnutls-dev gtk2-dev libjpeg-turbo-dev libpng-dev \
    88.9  librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev xorg-dev-proto lcms2-dev"
   88.10  # giflib-dev: version 4 needed, add --with-gif=no)
   88.11  SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE $PACKAGE-common"
   88.12 @@ -25,9 +25,9 @@
   88.13  DEPENDS_help="emacs"
   88.14  DEPENDS_lisp_sources="emacs"
   88.15  DEPENDS_std="dbus fontconfig freetype gdk-pixbuf glib gtk2 lcms2 libgnutls \
   88.16 -libpng16 librsvg libxml2 ncurses tiff xorg-libICE xorg-libSM xorg-libX11 \
   88.17 -xorg-libXext xorg-libXfixes xorg-libXft xorg-libXpm xorg-libXrender \
   88.18 -xorg-libxcb zlib"
   88.19 +libpng librsvg libxml2 ncurses tiff libice libsm libx11 \
   88.20 +libxext libxfixes libxft libxpm libxrender \
   88.21 +libxcb zlib"
   88.22  DEPENDS_common=" "
   88.23  
   88.24  CAT_help="development|help files"
    89.1 --- a/emelfm2/receipt	Fri Dec 21 04:44:58 2018 +0200
    89.2 +++ b/emelfm2/receipt	Sat Dec 22 04:52:35 2018 +0200
    89.3 @@ -11,7 +11,7 @@
    89.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    89.5  WGET_URL="http://emelfm2.net/rel/$TARBALL" # FIXME
    89.6  
    89.7 -BUILD_DEPENDS="gtk2-dev xorg-xorgproto libmagic-dev coreutils-operations gettext"
    89.8 +BUILD_DEPENDS="gtk2-dev xorgproto libmagic-dev coreutils-operations gettext"
    89.9  
   89.10  compile_rules() {
   89.11  	sed \
   89.12 @@ -34,6 +34,6 @@
   89.13  	cp -a $install/usr/share/pixmaps $fs/usr/share
   89.14  	cd $fs/usr/share/pixmaps
   89.15  	ln -s emelfm2/emelfm2_32.png emelfm2.png
   89.16 -	DEPENDS="gtk2 xorg-libXdamage"
   89.17 +	DEPENDS="gtk2 libxdamage"
   89.18  	TAGS="file-manager"
   89.19  }
    90.1 --- a/emerald/receipt	Fri Dec 21 04:44:58 2018 +0200
    90.2 +++ b/emerald/receipt	Sat Dec 22 04:52:35 2018 +0200
    90.3 @@ -11,15 +11,15 @@
    90.4  TARBALL="$PACKAGE-v$VERSION.tar.bz2"
    90.5  WGET_URL="https://gitlab.com/compiz/emerald/-/archive/v$VERSION/$TARBALL"
    90.6  
    90.7 -BUILD_DEPENDS="automake gettext-dev libtool intltool xorg-libXrender-dev \
    90.8 -xorg-libXi-dev gtk3-dev libwnck3-dev compiz-dev cairo-dev pango-dev"
    90.9 +BUILD_DEPENDS="automake gettext-dev libtool intltool libxrender-dev \
   90.10 +libxi-dev gtk3-dev libwnck3-dev compiz-dev cairo-dev pango-dev"
   90.11  SPLIT="$PACKAGE-dev"
   90.12  
   90.13 -DEPENDS_std="atk cairo compiz gdk-pixbuf glib gtk3 libwnck3 pango xorg-libX11 \
   90.14 -xorg-libXi xorg-libXrender"
   90.15 +DEPENDS_std="atk cairo compiz gdk-pixbuf glib gtk3 libwnck3 pango libx11 \
   90.16 +libxi libxrender"
   90.17  DEPENDS_dev="emerald atk-dev cairo-dev compiz-dev gdk-pixbuf-dev glib-dev \
   90.18 -gtk3-dev libwnck3-dev pango-dev xorg-libX11-dev xorg-libXi-dev \
   90.19 -xorg-libXrender-dev"
   90.20 +gtk3-dev libwnck3-dev pango-dev libx11-dev libxi-dev \
   90.21 +libxrender-dev"
   90.22  
   90.23  TAGS="compiz"
   90.24  
    91.1 --- a/engrampa/receipt	Fri Dec 21 04:44:58 2018 +0200
    91.2 +++ b/engrampa/receipt	Sat Dec 22 04:52:35 2018 +0200
    91.3 @@ -12,7 +12,7 @@
    91.4  WGET_URL="https://github.com/mate-desktop/engrampa/archive/v$VERSION.tar.gz"
    91.5  
    91.6  BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev caja-dev json-glib-dev \
    91.7 -itstool xorg-libSM-dev"
    91.8 +itstool libsm-dev"
    91.9  
   91.10  DEPENDS_std="cairo caja gdk-pixbuf glib gtk3 json-glib pango"
   91.11  SUGGESTED_std="unrar unace p7zip zip"
    92.1 --- a/enlightenment/receipt	Fri Dec 21 04:44:58 2018 +0200
    92.2 +++ b/enlightenment/receipt	Sat Dec 22 04:52:35 2018 +0200
    92.3 @@ -12,7 +12,7 @@
    92.4  WGET_URL="https://download.enlightenment.org/rel/apps/enlightenment/$TARBALL"
    92.5  
    92.6  BUILD_DEPENDS="pam-dev bluez-dev gettext-dev efl-dev alsa-lib-dev pulseaudio-dev \
    92.7 -xorg-xcb-util-keysyms-dev pm-utils"
    92.8 +xcb-util-keysyms-dev pm-utils"
    92.9  SPLIT="$PACKAGE-backgrounds $PACKAGE $PACKAGE-common $PACKAGE-dev \
   92.10  $PACKAGE-pam:pam"
   92.11  
   92.12 @@ -56,8 +56,8 @@
   92.13  			;;
   92.14  		enlightenment-common)
   92.15  			copy @std @rm *.mo
   92.16 -			DEPENDS="alsa-lib bluez efl pulseaudio xorg-libxcb \
   92.17 -			xorg-xcb-util-keysyms"
   92.18 +			DEPENDS="alsa-lib bluez efl pulseaudio libxcb \
   92.19 +			xcb-util-keysyms"
   92.20  			CAT="x-window|common files for PAM and non-PAM packages"
   92.21  			;;
   92.22  		enlightenment-dev)
    93.1 --- a/enna/receipt	Fri Dec 21 04:44:58 2018 +0200
    93.2 +++ b/enna/receipt	Sat Dec 22 04:52:35 2018 +0200
    93.3 @@ -16,7 +16,7 @@
    93.4  edje-dev edbus-dev emotion-dev ethumb-dev elementary-dev embryo-dev curl-dev \
    93.5  eio-dev xine-lib-dev libexif-dev alsa-lib-dev libplayer-dev libxml2-dev \
    93.6  libtool expat-dev jpeg-dev glib-dev ffmpeg-dev libvalhalla-dev libelementary \
    93.7 -xorg-libXrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext-dev"
    93.8 +libxrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext-dev"
    93.9  
   93.10  # Handle cross compilation
   93.11  case "$ARCH" in
   93.12 @@ -81,7 +81,7 @@
   93.13  	cp -a $install/usr/share/enna $fs/usr/share
   93.14  	DEPENDS="eina eet ecore evas efreet edje edbus emotion ethumb elementary \
   93.15  	embryo libvalhalla libcurl xine-lib libexif alsa-lib libplayer \
   93.16 -	xorg-libXrandr"
   93.17 +	libxrandr"
   93.18  	TAGS="images music video e17"
   93.19  }
   93.20  
    94.1 --- a/eom/receipt	Fri Dec 21 04:44:58 2018 +0200
    94.2 +++ b/eom/receipt	Sat Dec 22 04:52:35 2018 +0200
    94.3 @@ -19,7 +19,7 @@
    94.4  
    94.5  DEPENDS_std="atk cairo dbus-glib exempi gdk-pixbuf glib gobject-introspection \
    94.6  gtk3 lcms2 libexif libjpeg-turbo libpeas libpeas-gtk librsvg libxml2 \
    94.7 -mate-desktop xorg-libX11 zlib"
    94.8 +mate-desktop libx11 zlib"
    94.9  DEPENDS_dev="eom glib-dev gtk3-dev"
   94.10  
   94.11  TAGS_std="MATE"
    95.1 --- a/epdfview-cups/receipt	Fri Dec 21 04:44:58 2018 +0200
    95.2 +++ b/epdfview-cups/receipt	Sat Dec 22 04:52:35 2018 +0200
    95.3 @@ -41,6 +41,6 @@
    95.4  	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
    95.5  	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
    95.6  		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
    95.7 -	DEPENDS="gtk2 poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
    95.8 +	DEPENDS="gtk2 poppler glib libpng cups libxdamage gcc-lib-base libcomerr3"
    95.9  	PROVIDE="epdfview:cups"
   95.10  }
    96.1 --- a/epdfview/receipt	Fri Dec 21 04:44:58 2018 +0200
    96.2 +++ b/epdfview/receipt	Sat Dec 22 04:52:35 2018 +0200
    96.3 @@ -34,6 +34,6 @@
    96.4  	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
    96.5  	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
    96.6  		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
    96.7 -	DEPENDS="gtk2 poppler glib libpng16 xorg-libXdamage gcc-lib-base"
    96.8 +	DEPENDS="gtk2 poppler glib libpng libxdamage gcc-lib-base"
    96.9  	TAGS="pdf viewer"
   96.10  }
    97.1 --- a/evolution-data-server/receipt	Fri Dec 21 04:44:58 2018 +0200
    97.2 +++ b/evolution-data-server/receipt	Sat Dec 22 04:52:35 2018 +0200
    97.3 @@ -12,7 +12,7 @@
    97.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
    97.5  
    97.6  BUILD_DEPENDS="libglade-dev libsoup-dev gtk2-dev orbit2-dev libbonobo-dev \
    97.7 -gconf-dev libical-dev firefox-dev db-dev xorg-libxcb-dev popt-dev bison flex \
    97.8 +gconf-dev libical-dev firefox-dev db-dev libxcb-dev popt-dev bison flex \
    97.9  glib-dev sqlite3-dev"
   97.10  SPLIT="$PACKAGE-dev"
   97.11  
    98.1 --- a/exo/receipt	Fri Dec 21 04:44:58 2018 +0200
    98.2 +++ b/exo/receipt	Sat Dec 22 04:52:35 2018 +0200
    98.3 @@ -30,7 +30,7 @@
    98.4  			COOKOPTS="!menus !pixmaps"
    98.5  			copy *.so*
    98.6  			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
    98.7 -			xorg-libX11"
    98.8 +			libx11"
    98.9  			;;
   98.10  		*-tools)
   98.11  			copy @std @rm
    99.1 --- a/extrema/receipt	Fri Dec 21 04:44:58 2018 +0200
    99.2 +++ b/extrema/receipt	Sat Dec 22 04:52:35 2018 +0200
    99.3 @@ -29,6 +29,6 @@
    99.4  
    99.5  genpkg_rules() {
    99.6  	copy @std
    99.7 -	DEPENDS="gtk2 wxWidgets28 xorg-libXxf86vm libxml2"
    99.8 +	DEPENDS="gtk2 wxWidgets28 libxxf86vm libxml2"
    99.9  	TAGS="data visualization analysis"
   99.10  }
   100.1 --- a/fbgrab/receipt	Fri Dec 21 04:44:58 2018 +0200
   100.2 +++ b/fbgrab/receipt	Sat Dec 22 04:52:35 2018 +0200
   100.3 @@ -11,7 +11,7 @@
   100.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   100.5  WGET_URL="${WEB_SITE}$TARBALL"
   100.6  
   100.7 -BUILD_DEPENDS="libpng16-dev zlib-dev"
   100.8 +BUILD_DEPENDS="libpng-dev zlib-dev"
   100.9  
  100.10  compile_rules() {
  100.11  	#sed -i '/splint/d' Makefile
  100.12 @@ -21,5 +21,5 @@
  100.13  
  100.14  genpkg_rules() {
  100.15  	copy @std
  100.16 -	DEPENDS="libpng16 zlib"
  100.17 +	DEPENDS="libpng zlib"
  100.18  }
   101.1 --- a/fbida/receipt	Fri Dec 21 04:44:58 2018 +0200
   101.2 +++ b/fbida/receipt	Sat Dec 22 04:52:35 2018 +0200
   101.3 @@ -12,7 +12,7 @@
   101.4  WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL"
   101.5  
   101.6  BUILD_DEPENDS="freetype-dev fontconfig-dev libexif-dev curl-dev jpeg-dev \
   101.7 -libpng16-dev tiff-dev"
   101.8 +libpng-dev tiff-dev"
   101.9  
  101.10  compile_rules() {
  101.11  	make || return 1
  101.12 @@ -24,6 +24,6 @@
  101.13  
  101.14  genpkg_rules() {
  101.15  	copy @std
  101.16 -	DEPENDS="libpng16 giflib tiff jpeg ttf-bitstream-vera libexif zlib \
  101.17 +	DEPENDS="libpng giflib tiff jpeg ttf-bitstream-vera libexif zlib \
  101.18  	libcurl freetype fontconfig"
  101.19  }
   102.1 --- a/fbxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
   102.2 +++ b/fbxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
   102.3 @@ -11,7 +11,7 @@
   102.4  TARBALL="$PACKAGE-$VERSION.tgz"
   102.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   102.6  
   102.7 -BUILD_DEPENDS="gtk2-dev xorg-libXmu-dev"
   102.8 +BUILD_DEPENDS="gtk2-dev libxmu-dev"
   102.9  
  102.10  compile_rules() {
  102.11  	./configure &&
  102.12 @@ -21,5 +21,5 @@
  102.13  
  102.14  genpkg_rules() {
  102.15  	copy @std
  102.16 -	DEPENDS="gtk2 xorg-libXmu"
  102.17 +	DEPENDS="gtk2 libxmu"
  102.18  }
   103.1 --- a/fcitx-configtool/receipt	Fri Dec 21 04:44:58 2018 +0200
   103.2 +++ b/fcitx-configtool/receipt	Sat Dec 22 04:52:35 2018 +0200
   103.3 @@ -11,7 +11,7 @@
   103.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   103.5  WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
   103.6  
   103.7 -BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool xorg-libXrender-dev \
   103.8 +BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool libxrender-dev \
   103.9  cairo-dev pango-dev fcitx-dev file"
  103.10  
  103.11  compile_rules() {
   104.1 --- a/fcitx/receipt	Fri Dec 21 04:44:58 2018 +0200
   104.2 +++ b/fcitx/receipt	Sat Dec 22 04:52:35 2018 +0200
   104.3 @@ -46,7 +46,7 @@
   104.4  			cp -a $install/usr/share/icons/ $fs/usr/share/
   104.5  			;;
   104.6  		*-dev)
   104.7 -			DEPENDS="libfcitx xorg-libX11-dev"
   104.8 +			DEPENDS="libfcitx libx11-dev"
   104.9  			mkdir -p $fs/usr/lib/pkgconfig/ $fs/usr/share/
  104.10  			cp -a $install/usr/lib/libfcitx*.so $fs/usr/lib/
  104.11  			cp -a $install/usr/lib/pkgconfig/*.pc $fs/usr/lib/pkgconfig/
   105.1 --- a/feathernotes/receipt	Fri Dec 21 04:44:58 2018 +0200
   105.2 +++ b/feathernotes/receipt	Sat Dec 22 04:52:35 2018 +0200
   105.3 @@ -28,5 +28,5 @@
   105.4  
   105.5  genpkg_rules() {
   105.6  	copy @std
   105.7 -	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11"
   105.8 +	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11"
   105.9  }
   106.1 --- a/featherpad/receipt	Fri Dec 21 04:44:58 2018 +0200
   106.2 +++ b/featherpad/receipt	Sat Dec 22 04:52:35 2018 +0200
   106.3 @@ -27,5 +27,5 @@
   106.4  
   106.5  genpkg_rules() {
   106.6  	copy @std
   106.7 -	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11"
   106.8 +	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11"
   106.9  }
   107.1 --- a/feh/receipt	Fri Dec 21 04:44:58 2018 +0200
   107.2 +++ b/feh/receipt	Sat Dec 22 04:52:35 2018 +0200
   107.3 @@ -11,9 +11,9 @@
   107.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   107.5  WGET_URL="https://feh.finalrewind.org/$TARBALL"
   107.6  
   107.7 -BUILD_DEPENDS="imlib2-dev giblib-dev xorg-xorgproto \
   107.8 -xorg-libX11-dev libpng16-dev jpeg-dev curl-dev xorg-libXinerama-dev \
   107.9 -xorg-libXt-dev"
  107.10 +BUILD_DEPENDS="imlib2-dev giblib-dev xorgproto \
  107.11 +libx11-dev libpng-dev jpeg-dev curl-dev libxinerama-dev \
  107.12 +libxt-dev"
  107.13  
  107.14  compile_rules() {
  107.15  	sed -i 's|/usr/local|/usr|g' config.mk
  107.16 @@ -31,7 +31,7 @@
  107.17  
  107.18  genpkg_rules() {
  107.19  	copy @std
  107.20 -	DEPENDS="imlib2 giblib jpeg libpng16 xorg-libX11 freetype xorg-libXau \
  107.21 -	xorg-libXdmcp xorg-libXext xorg-libXinerama libcurl"
  107.22 +	DEPENDS="imlib2 giblib jpeg libpng libx11 freetype libxau \
  107.23 +	libxdmcp libxext libxinerama libcurl"
  107.24  	TAGS="image photo viewer"
  107.25  }
   108.1 --- a/ffmpeg/receipt	Fri Dec 21 04:44:58 2018 +0200
   108.2 +++ b/ffmpeg/receipt	Sat Dec 22 04:52:35 2018 +0200
   108.3 @@ -13,7 +13,7 @@
   108.4  WGET_URL="${WEB_SITE}releases/$TARBALL"
   108.5  
   108.6  BUILD_DEPENDS="coreutils-file-format libass-dev fdk-aac-dev lame-dev opus-dev \
   108.7 -libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev xorg-libX11-dev \
   108.8 +libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev libx11-dev \
   108.9  libsdl2-dev yasm"
  108.10  SPLIT="ffplay ffserver $PACKAGE-dev $PACKAGE"
  108.11  
  108.12 @@ -73,7 +73,7 @@
  108.13  			copy @dev examples/
  108.14  			DEPENDS="ffmpeg bzip2-dev fdk-aac-dev freetype-dev lame-dev \
  108.15  			libass-dev libogg-dev libtheora-dev libvorbis-dev libvpx-dev \
  108.16 -			opus-dev x264-dev x265-dev xorg-libX11-dev xorg-libxcb-dev xz-dev \
  108.17 +			opus-dev x264-dev x265-dev libx11-dev libxcb-dev xz-dev \
  108.18  			zlib-dev"
  108.19  			;;
  108.20  		ffmpeg)
  108.21 @@ -81,7 +81,7 @@
  108.22  			SUGGESTED="ffplay"
  108.23  			TAGS="audio video convert stream"
  108.24  			DEPENDS="bzlib fdk-aac freetype lame libass liblzma libtheora-enc \
  108.25 -			libvorbis libvpx opus x264 x265 xorg-libxcb zlib"
  108.26 +			libvorbis libvpx opus x264 x265 libxcb zlib"
  108.27  			;;
  108.28  	esac
  108.29  }
   109.1 --- a/ffmpegthumbnailer/receipt	Fri Dec 21 04:44:58 2018 +0200
   109.2 +++ b/ffmpegthumbnailer/receipt	Sat Dec 22 04:52:35 2018 +0200
   109.3 @@ -11,7 +11,7 @@
   109.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   109.5  WGET_URL="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$VERSION/$TARBALL"
   109.6  
   109.7 -BUILD_DEPENDS="cmake libjpeg-turbo-dev zlib-dev libpng16-dev ffmpeg-dev"
   109.8 +BUILD_DEPENDS="cmake libjpeg-turbo-dev zlib-dev libpng-dev ffmpeg-dev"
   109.9  SPLIT="$PACKAGE-dev"
  109.10  
  109.11  compile_rules() {
  109.12 @@ -40,7 +40,7 @@
  109.13  	case $PACKAGE in
  109.14  		ffmpegthumbnailer)
  109.15  			copy @std
  109.16 -			DEPENDS="ffmpeg libjpeg-turbo libpng16 zlib"
  109.17 +			DEPENDS="ffmpeg libjpeg-turbo libpng zlib"
  109.18  			;;
  109.19  		*-dev)
  109.20  			copy @dev
   110.1 --- a/filezilla/receipt	Fri Dec 21 04:44:58 2018 +0200
   110.2 +++ b/filezilla/receipt	Sat Dec 22 04:52:35 2018 +0200
   110.3 @@ -27,6 +27,6 @@
   110.4  genpkg_rules() {
   110.5  	copy @std
   110.6  	rm -rf $fs/usr/share/fileszilla/docs
   110.7 -	DEPENDS="wxWidgets28 gnutls libidn xorg-libXxf86vm libtasn1 sqlite3"
   110.8 +	DEPENDS="wxWidgets28 gnutls libidn libxxf86vm libtasn1 sqlite3"
   110.9  	TAGS="ftp client"
  110.10  }
   111.1 --- a/firefox-official/receipt	Fri Dec 21 04:44:58 2018 +0200
   111.2 +++ b/firefox-official/receipt	Sat Dec 22 04:52:35 2018 +0200
   111.3 @@ -87,7 +87,7 @@
   111.4  	CAT="network|$lang language"
   111.5  	cp -a $install/* $fs
   111.6  	DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf glib gtk2 \
   111.7 -	gtk3 pango xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \
   111.8 -	xorg-libXfixes xorg-libXrender xorg-libXt xorg-libxcb"
   111.9 +	gtk3 pango libx11 libxcomposite libxdamage libxext \
  111.10 +	libxfixes libxrender libxt libxcb"
  111.11  	TAGS="web-browser"
  111.12  }
   112.1 --- a/firefox/receipt	Fri Dec 21 04:44:58 2018 +0200
   112.2 +++ b/firefox/receipt	Sat Dec 22 04:52:35 2018 +0200
   112.3 @@ -109,15 +109,15 @@
   112.4  				$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
   112.5  
   112.6  			chown -R root.root $fs
   112.7 -			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
   112.8 -			xorg-libXdamage alsa-lib xorg-libXt libevent libvpx pango nss \
   112.9 +			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg libx11 \
  112.10 +			libxdamage alsa-lib libxt libevent libvpx pango nss \
  112.11  			libfirefox"
  112.12  			TAGS="web-browser"
  112.13  			;;
  112.14  		*-dev)
  112.15 -			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib xorg-libXt \
  112.16 -			xorg-libXinerama xorg-libXcursor xorg-libXcomposite xorg-libXext \
  112.17 -			xorg-libXdamage xorg-libxcb xorg-libSM xorg-libICE"
  112.18 +			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib libxt \
  112.19 +			libxinerama libxcursor libxcomposite libxext \
  112.20 +			libxdamage libxcb libsm libice"
  112.21  			mkdir -p $fs/usr/include/$WANTED-$VERSION
  112.22  			cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
  112.23  
  112.24 @@ -145,8 +145,8 @@
  112.25  			;;
  112.26  		libfirefox)
  112.27  			CAT="network|firefox/thunderbird common files"
  112.28 -			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
  112.29 -			xorg-libXdamage alsa-lib xorg-libXt"
  112.30 +			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg libx11 \
  112.31 +			libxdamage alsa-lib libxt"
  112.32  			# dictionaries/en-US.aff
  112.33  			# dictionaries/en-US.dic
  112.34  			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
   113.1 --- a/flam3/receipt	Fri Dec 21 04:44:58 2018 +0200
   113.2 +++ b/flam3/receipt	Sat Dec 22 04:52:35 2018 +0200
   113.3 @@ -12,7 +12,7 @@
   113.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   113.5  WGET_URL="https://github.com/scottdraves/flam3/archive/v$VERSION.tar.gz"
   113.6  
   113.7 -BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng16-dev libxml2-dev"
   113.8 +BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng-dev libxml2-dev"
   113.9  SPLIT="$PACKAGE-dev"
  113.10  
  113.11  compile_rules() {
  113.12 @@ -29,11 +29,11 @@
  113.13  	case $PACKAGE in
  113.14  		flam3)
  113.15  			copy @std
  113.16 -			DEPENDS="libjpeg-turbo libpng16 libxml2 zlib"
  113.17 +			DEPENDS="libjpeg-turbo libpng libxml2 zlib"
  113.18  			;;
  113.19  		*-dev)
  113.20  			copy @dev
  113.21 -			DEPENDS="flam3 libjpeg-turbo-dev libpng16-dev libxml2-dev"
  113.22 +			DEPENDS="flam3 libjpeg-turbo-dev libpng-dev libxml2-dev"
  113.23  			;;
  113.24  	esac
  113.25  }
   114.1 --- a/flmusic/receipt	Fri Dec 21 04:44:58 2018 +0200
   114.2 +++ b/flmusic/receipt	Sat Dec 22 04:52:35 2018 +0200
   114.3 @@ -11,7 +11,7 @@
   114.4  TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz"
   114.5  WGET_URL="http://home.arcor.de/szukw000/$TARBALL" # FIXME
   114.6  
   114.7 -BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev xorg-libX11-dev"
   114.8 +BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev libx11-dev"
   114.9  
  114.10  compile_rules() {
  114.11  	#sed -i '/ioctl.h/a #include <limits.h>' reader.c &&
   115.1 --- a/florence-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   115.2 +++ b/florence-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   115.3 @@ -12,8 +12,8 @@
   115.4  TARBALL="florence-$VERSION.tar.bz2"
   115.5  WGET_URL="$SF_MIRROR/florence/$TARBALL"
   115.6  
   115.7 -BUILD_DEPENDS="intltool gconf-dev xorg-libX11-dev glib-dev cairo-dev \
   115.8 -librsvg-dev libxml2-dev gtk2-dev gstreamer0-dev xorg-libXtst-dev \
   115.9 +BUILD_DEPENDS="intltool gconf-dev libx11-dev glib-dev cairo-dev \
  115.10 +librsvg-dev libxml2-dev gtk2-dev gstreamer0-dev libxtst-dev \
  115.11  at-spi2-core-dev at-spi2-atk-dev gtk2-dev"
  115.12  
  115.13  compile_rules() {
  115.14 @@ -29,6 +29,6 @@
  115.15  genpkg_rules() {
  115.16  	copy @std *.mo
  115.17  	DEPENDS="gconf at-spi2-core cairo gdk-pixbuf glib gstreamer0 gtk2 librsvg \
  115.18 -	libxml2 pango xorg-libX11 xorg-libXtst"
  115.19 +	libxml2 pango libx11 libxtst"
  115.20  	PROVIDE="florence"
  115.21  }
   116.1 --- a/florence/receipt	Fri Dec 21 04:44:58 2018 +0200
   116.2 +++ b/florence/receipt	Sat Dec 22 04:52:35 2018 +0200
   116.3 @@ -11,8 +11,8 @@
   116.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   116.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   116.6  
   116.7 -BUILD_DEPENDS="intltool glib-dev xorg-libXext-dev cairo-dev librsvg-dev \
   116.8 -libxml2-dev gstreamer1-dev gtk3-dev xorg-libXtst-dev"
   116.9 +BUILD_DEPENDS="intltool glib-dev libxext-dev cairo-dev librsvg-dev \
  116.10 +libxml2-dev gstreamer1-dev gtk3-dev libxtst-dev"
  116.11  SPLIT="$PACKAGE-dev"
  116.12  
  116.13  compile_rules() {
  116.14 @@ -35,7 +35,7 @@
  116.15  		florence)
  116.16  			copy @std *.mo
  116.17  			DEPENDS="cairo gdk-pixbuf glib gstreamer1 gtk3 librsvg libxml2 \
  116.18 -			pango xorg-libX11 xorg-libXext xorg-libXtst"
  116.19 +			pango libx11 libxext libxtst"
  116.20  			;;
  116.21  		*-dev)
  116.22  			copy @dev
   117.1 --- a/flrec/receipt	Fri Dec 21 04:44:58 2018 +0200
   117.2 +++ b/flrec/receipt	Sat Dec 22 04:52:35 2018 +0200
   117.3 @@ -11,7 +11,7 @@
   117.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   117.5  WGET_URL="http://matteolucarelli.altervista.org/flrec/$TARBALL"
   117.6  
   117.7 -BUILD_DEPENDS="fltk-dev sox-dev xorg-libX11-dev"
   117.8 +BUILD_DEPENDS="fltk-dev sox-dev libx11-dev"
   117.9  
  117.10  compile_rules() {
  117.11  	make CC=$HOST_SYSTEM-g++ &&
   118.1 --- a/fltk-2.0.x/receipt	Fri Dec 21 04:44:58 2018 +0200
   118.2 +++ b/fltk-2.0.x/receipt	Sat Dec 22 04:52:35 2018 +0200
   118.3 @@ -12,7 +12,7 @@
   118.4  WGET_URL="subversion|http://svn.easysw.com/public/fltk/fltk/trunk"
   118.5  BRANCH="${VERSION#r}"
   118.6  
   118.7 -BUILD_DEPENDS="xorg-libXft-dev glu glu-dev mesa mesa-dev \
   118.8 +BUILD_DEPENDS="libxft-dev glu glu-dev mesa mesa-dev \
   118.9  subversion autoconf xorg-dev libpng12-dev"
  118.10  SPLIT="$PACKAGE-dev $PACKAGE-fluid2 $PACKAGE-gl"
  118.11  
  118.12 @@ -42,10 +42,10 @@
  118.13  genpkg_rules() {
  118.14  	case $PACKAGE in
  118.15  		fltk-2.0.x)
  118.16 -			DEPENDS="expat fontconfig freetype jpeg xorg-libX11 \
  118.17 -			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
  118.18 -			xorg-libXrender zlib libpng12 xorg-libXi \
  118.19 -			xorg-libXinerama gcc-lib-base"
  118.20 +			DEPENDS="expat fontconfig freetype jpeg libx11 \
  118.21 +			libxau libxdmcp libxext libxft \
  118.22 +			libxrender zlib libpng12 libxi \
  118.23 +			libxinerama gcc-lib-base"
  118.24  			mkdir -p $fs/usr/lib
  118.25  			cp -a $install/usr/lib/*.so* $fs/usr/lib
  118.26  			# Remove gl support --> fltk-2.0.x-gl
  118.27 @@ -66,8 +66,8 @@
  118.28  			;;
  118.29  		*-gl)
  118.30  			CAT="x-window|GL library"
  118.31 -			DEPENDS="mesa glu expat fontconfig xorg-libXft \
  118.32 -			xorg-libXi xorg-libXinerama xorg-libXext gcc-lib-base"
  118.33 +			DEPENDS="mesa glu expat fontconfig libxft \
  118.34 +			libxi libxinerama libxext gcc-lib-base"
  118.35  			mkdir -p $fs/usr/lib
  118.36  			cp -a $install/usr/lib/libfltk2*gl*.so* $fs/usr/lib
  118.37  			;;
   119.1 --- a/fltk/receipt	Fri Dec 21 04:44:58 2018 +0200
   119.2 +++ b/fltk/receipt	Sat Dec 22 04:52:35 2018 +0200
   119.3 @@ -12,9 +12,9 @@
   119.4  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
   119.5  WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
   119.6  
   119.7 -BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng16-dev \
   119.8 -xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev mesa-dev xorg-libXinerama-dev \
   119.9 -freetype-dev xorg-libXft-dev xorg-libXcursor-dev xorg-xprop"
  119.10 +BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng-dev \
  119.11 +libx11-dev libice-dev libsm-dev mesa-dev libxinerama-dev \
  119.12 +freetype-dev libxft-dev libxcursor-dev xprop"
  119.13  SPLIT="$PACKAGE-blocks $PACKAGE-checkers $PACKAGE-sudoku $PACKAGE-colbrowser \
  119.14  $PACKAGE-editor $PACKAGE-doc $PACKAGE $PACKAGE-dev"
  119.15  COOKOPTS="!menus"
  119.16 @@ -59,34 +59,34 @@
  119.17  		fltk-blocks)
  119.18  			copy $PACKAGE*
  119.19  			CAT="games|FLTK Blocks game"
  119.20 -			DEPENDS="alsa-lib fontconfig xorg-libX11 xorg-libXcursor \
  119.21 -			xorg-libXext xorg-libXfixes xorg-libXft xorg-libXinerama \
  119.22 -			xorg-libXrender"
  119.23 +			DEPENDS="alsa-lib fontconfig libx11 libxcursor \
  119.24 +			libxext libxfixes libxft libxinerama \
  119.25 +			libxrender"
  119.26  			;;
  119.27  		fltk-checkers)
  119.28  			copy $PACKAGE*
  119.29  			CAT="games|FLTK Checkers game"
  119.30 -			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  119.31 -			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  119.32 +			DEPENDS="fontconfig libx11 libxcursor libxext \
  119.33 +			libxfixes libxft libxinerama libxrender"
  119.34  			;;
  119.35  		fltk-sudoku)
  119.36  			copy $PACKAGE*
  119.37  			CAT="games|FLTK Sudoku game"
  119.38 -			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng16 xorg-libX11 \
  119.39 -			xorg-libXcursor xorg-libXext xorg-libXfixes xorg-libXft \
  119.40 -			xorg-libXinerama xorg-libXrender"
  119.41 +			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng libx11 \
  119.42 +			libxcursor libxext libxfixes libxft \
  119.43 +			libxinerama libxrender"
  119.44  			;;
  119.45  		fltk-colbrowser)
  119.46  			copy $PACKAGE* rgb.txt
  119.47  			CAT="graphics|FLTK Color browser"
  119.48 -			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  119.49 -			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  119.50 +			DEPENDS="fontconfig libx11 libxcursor libxext \
  119.51 +			libxfixes libxft libxinerama libxrender"
  119.52  			;;
  119.53  		fltk-editor)
  119.54  			copy $PACKAGE*
  119.55  			CAT="development|FLTK text editor"
  119.56 -			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  119.57 -			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  119.58 +			DEPENDS="fontconfig libx11 libxcursor libxext \
  119.59 +			libxfixes libxft libxinerama libxrender"
  119.60  			;;
  119.61  		fltk-doc)
  119.62  			copy doc/
  119.63 @@ -94,9 +94,9 @@
  119.64  			;;
  119.65  		fltk)
  119.66  			copy @std @rm
  119.67 -			DEPENDS="fontconfig libjpeg-turbo libpng16 mesa \
  119.68 -			xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
  119.69 -			xorg-libXft xorg-libXinerama xorg-libXrender"
  119.70 +			DEPENDS="fontconfig libjpeg-turbo libpng mesa \
  119.71 +			libx11 libxcursor libxext libxfixes \
  119.72 +			libxft libxinerama libxrender"
  119.73  			;;
  119.74  		fltk-dev)
  119.75  			copy @dev @rm # remove examples in doc
   120.1 --- a/fluxbox/receipt	Fri Dec 21 04:44:58 2018 +0200
   120.2 +++ b/fluxbox/receipt	Sat Dec 22 04:52:35 2018 +0200
   120.3 @@ -24,7 +24,7 @@
   120.4  	case $PACKAGE in
   120.5  		fluxbox)
   120.6  			TAGS="window-manager"
   120.7 -			DEPENDS="xorg fontconfig imlib2 hsetroot xorg-xcompmgr"
   120.8 +			DEPENDS="xorg fontconfig imlib2 hsetroot xcompmgr"
   120.9  			mkdir -p $fs/usr/share/fluxbox/styles
  120.10  			cp -a $install/usr/bin $fs/usr
  120.11  			for f in apps keys overlay windowmenu init menu; do
   121.1 --- a/flxine/receipt	Fri Dec 21 04:44:58 2018 +0200
   121.2 +++ b/flxine/receipt	Sat Dec 22 04:52:35 2018 +0200
   121.3 @@ -12,7 +12,7 @@
   121.4  WGET_URL="http://home.arcor.de/szukw000/$TARBALL"
   121.5  
   121.6  BUILD_DEPENDS="shared-mime-info fltk-dev xine-lib-dev autoconf automake \
   121.7 -xorg-libX11-dev"
   121.8 +libx11-dev"
   121.9  
  121.10  compile_rules() {
  121.11  	#export ac_cv_lib_pthread_pthread_create=yes
   122.1 --- a/fontforge/receipt	Fri Dec 21 04:44:58 2018 +0200
   122.2 +++ b/fontforge/receipt	Sat Dec 22 04:52:35 2018 +0200
   122.3 @@ -12,10 +12,10 @@
   122.4  WGET_URL="https://github.com/fontforge/fontforge/releases/download/$VERSION/$TARBALL"
   122.5  
   122.6  BUILD_DEPENDS="libtool perl-dev tar autoconf automake bash coreutils-line \
   122.7 -xorg-libX11-dev xorg-libICE-dev zlib-dev freetype-dev libjpeg-turbo-dev \
   122.8 -libpng16-dev tiff-dev readline-dev cairo-dev pango-dev xorg-libXft-dev \
   122.9 +libx11-dev libice-dev zlib-dev freetype-dev libjpeg-turbo-dev \
  122.10 +libpng-dev tiff-dev readline-dev cairo-dev pango-dev libxft-dev \
  122.11  gtk2-dev python-dev libuninameslist-dev libspiro-dev util-linux-uuid-dev \
  122.12 -xorg-libSM-dev gettext-dev"
  122.13 +libsm-dev gettext-dev"
  122.14  SPLIT="$PACKAGE-fonts $PACKAGE $PACKAGE-dev"
  122.15  
  122.16  compile_rules() {
  122.17 @@ -39,7 +39,7 @@
  122.18  			;;
  122.19  		fontforge)
  122.20  			copy @std @rm *.mo
  122.21 -			DEPENDS="gtk2 libuninameslist python libspiro libltdl xorg-libSM"
  122.22 +			DEPENDS="gtk2 libuninameslist python libspiro libltdl libsm"
  122.23  			TAGS="editor font"
  122.24  			;;
  122.25  		*-dev)
   123.1 --- a/foobillard/receipt	Fri Dec 21 04:44:58 2018 +0200
   123.2 +++ b/foobillard/receipt	Sat Dec 22 04:52:35 2018 +0200
   123.3 @@ -11,7 +11,7 @@
   123.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   123.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   123.6  
   123.7 -BUILD_DEPENDS="libsdl-dev freetype-dev libpng16-dev glu mesa-dev \
   123.8 +BUILD_DEPENDS="libsdl-dev freetype-dev libpng-dev glu mesa-dev \
   123.9  zlib-dev glu-dev"
  123.10  
  123.11  compile_rules() {
  123.12 @@ -31,5 +31,5 @@
  123.13  	mkdir -p $fs/usr/share
  123.14  	cp -a $install/usr/bin $fs/usr
  123.15  	cp -a $install/usr/share/foobillard $fs/usr/share
  123.16 -	DEPENDS="libsdl freetype libpng16 mesa glu"
  123.17 +	DEPENDS="libsdl freetype libpng mesa glu"
  123.18  }
   124.1 --- a/foobillardplus/receipt	Fri Dec 21 04:44:58 2018 +0200
   124.2 +++ b/foobillardplus/receipt	Sat Dec 22 04:52:35 2018 +0200
   124.3 @@ -13,7 +13,7 @@
   124.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   124.5  
   124.6  BUILD_DEPENDS="automake autoconf libsdl-dev libsdl-mixer-dev libsdl-net-dev \
   124.7 -mesa-dev glu-dev freetype-dev libpng16-dev"
   124.8 +mesa-dev glu-dev freetype-dev libpng-dev"
   124.9  SPLIT="$PACKAGE-music $PACKAGE"
  124.10  
  124.11  compile_rules() {
  124.12 @@ -52,7 +52,7 @@
  124.13  			;;
  124.14  		foobillardplus)
  124.15  			copy @std @rm hicolor/ # 128px icons isn't copied with @std
  124.16 -			DEPENDS="freetype glu libpng16 libsdl libsdl-mixer libsdl-net mesa"
  124.17 +			DEPENDS="freetype glu libpng libsdl libsdl-mixer libsdl-net mesa"
  124.18  			;;
  124.19  	esac
  124.20  }
   125.1 --- a/fox/receipt	Fri Dec 21 04:44:58 2018 +0200
   125.2 +++ b/fox/receipt	Sat Dec 22 04:52:35 2018 +0200
   125.3 @@ -11,9 +11,9 @@
   125.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   125.5  WGET_URL="http://ftp.fox-toolkit.org/pub/$TARBALL"
   125.6  
   125.7 -BUILD_DEPENDS="libpng16-dev jpeg-dev tiff-dev xorg-libXft-dev mesa-dev \
   125.8 +BUILD_DEPENDS="libpng-dev jpeg-dev tiff-dev libxft-dev mesa-dev \
   125.9  glu-dev freetype-dev fontconfig-dev expat-dev libxml2-dev xorg-dev \
  125.10 -xorg-libxshmfence-dev"
  125.11 +libxshmfence-dev"
  125.12  SPLIT="adie calculator $PACKAGE-dev $PACKAGE-doc pathfinder shutterbug"
  125.13  
  125.14  compile_rules() {
  125.15 @@ -34,9 +34,9 @@
  125.16  		fox)
  125.17  			copy libCHART-*.so* libFOX-*.so*
  125.18  			SUGGESTED="adie calculator pathfinder shutterbug"
  125.19 -			DEPENDS="libpng16 jpeg tiff xorg-libXft bzlib mesa glu \
  125.20 -			xorg-libXcursor xorg-libXrandr xorg-libXxf86vm \
  125.21 -			xorg-libXdamage libdrm jbigkit"
  125.22 +			DEPENDS="libpng jpeg tiff libxft bzlib mesa glu \
  125.23 +			libxcursor libxrandr libxxf86vm \
  125.24 +			libxdamage libdrm jbigkit"
  125.25  			;;
  125.26  		adie)
  125.27  			copy adie Adie.stx
   126.1 --- a/fox14/receipt	Fri Dec 21 04:44:58 2018 +0200
   126.2 +++ b/fox14/receipt	Sat Dec 22 04:52:35 2018 +0200
   126.3 @@ -12,8 +12,8 @@
   126.4  TARBALL="fox-$VERSION.tar.gz"
   126.5  WGET_URL="http://ftp.fox-toolkit.org/pub/$TARBALL"
   126.6  
   126.7 -BUILD_DEPENDS="bzlib xorg-libXrender xorg-libXrender-dev fontconfig-dev \
   126.8 -freetype-dev libpng12-dev jpeg-dev tiff-dev xorg-libXft-dev mesa glu expat-dev \
   126.9 +BUILD_DEPENDS="bzlib libxrender-dev fontconfig-dev \
  126.10 +freetype-dev libpng12-dev jpeg-dev tiff-dev libxft-dev mesa glu expat-dev \
  126.11  libxml2-dev"
  126.12  SPLIT="$PACKAGE-dev"
  126.13  
  126.14 @@ -34,12 +34,12 @@
  126.15  	case $PACKAGE in
  126.16  		fox14)
  126.17  			copy @std
  126.18 -			DEPENDS="libpng12 jpeg tiff xorg-libXft bzlib mesa glu"
  126.19 +			DEPENDS="libpng12 jpeg tiff libxft bzlib mesa glu"
  126.20  			SUGGESTED="adie calculator pathfinder shutterbug"
  126.21  			;;
  126.22  		*-dev)
  126.23  			copy @dev
  126.24 -			DEPENDS="fox xorg-libX11-dev"
  126.25 +			DEPENDS="fox libx11-dev"
  126.26  			;;
  126.27  	esac
  126.28  }
   127.1 --- a/fpm2/receipt	Fri Dec 21 04:44:58 2018 +0200
   127.2 +++ b/fpm2/receipt	Sat Dec 22 04:52:35 2018 +0200
   127.3 @@ -10,9 +10,9 @@
   127.4  WEB_SITE="https://als.regnet.cz/fpm2/"
   127.5  WGET_URL="https://als.regnet.cz/fpm2/download/$TARBALL"
   127.6  
   127.7 -DEPENDS="expat gtk2 libxml2 xorg-libX11 xorg-libXau xorg-libXcomposite \
   127.8 -xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
   127.9 -xorg-libXrandr xorg-libXrender xorg-libXdamage"
  127.10 +DEPENDS="expat gtk2 libxml2 libx11 libxau libxcomposite \
  127.11 +libxcursor libxdmcp libxext libxfixes libxinerama \
  127.12 +libxrandr libxrender libxdamage"
  127.13  BUILD_DEPENDS="gtk2-dev libxml2-dev"
  127.14  
  127.15  compile_rules() {
   128.1 --- a/freeciv/receipt	Fri Dec 21 04:44:58 2018 +0200
   128.2 +++ b/freeciv/receipt	Sat Dec 22 04:52:35 2018 +0200
   128.3 @@ -28,7 +28,7 @@
   128.4  
   128.5  genpkg_rules() {
   128.6  	copy @std
   128.7 -	DEPENDS="zlib ncurses readline gtk2 gettext-base xorg-libXdamage \
   128.8 +	DEPENDS="zlib ncurses readline gtk2 gettext-base libxdamage \
   128.9  	libsdl-mixer bzip2"
  128.10  	TAGS="strategy"
  128.11  }
   129.1 --- a/freeglut/receipt	Fri Dec 21 04:44:58 2018 +0200
   129.2 +++ b/freeglut/receipt	Sat Dec 22 04:52:35 2018 +0200
   129.3 @@ -11,7 +11,7 @@
   129.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   129.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   129.6  
   129.7 -BUILD_DEPENDS="cmake mesa-dev glu-dev xorg-libXi-dev"
   129.8 +BUILD_DEPENDS="cmake mesa-dev glu-dev libxi-dev"
   129.9  SPLIT="$PACKAGE-dev"
  129.10  
  129.11  compile_rules() {
  129.12 @@ -33,12 +33,12 @@
  129.13  	case $PACKAGE in
  129.14  		freeglut)
  129.15  			copy @std
  129.16 -			DEPENDS="mesa xorg-libX11 xorg-libXi xorg-libXxf86vm"
  129.17 +			DEPENDS="mesa libx11 libxi libxxf86vm"
  129.18  			;;
  129.19  		*-dev)
  129.20  			copy @dev
  129.21 -			DEPENDS="freeglut mesa-dev xorg-libX11-dev xorg-libXrandr-dev \
  129.22 -			xorg-libXxf86vm-dev"
  129.23 +			DEPENDS="freeglut mesa-dev libx11-dev libxrandr-dev \
  129.24 +			libxxf86vm-dev"
  129.25  			;;
  129.26  	esac
  129.27  }
   130.1 --- a/freerdp/receipt	Fri Dec 21 04:44:58 2018 +0200
   130.2 +++ b/freerdp/receipt	Sat Dec 22 04:52:35 2018 +0200
   130.3 @@ -10,8 +10,8 @@
   130.4  WEB_SITE="http://www.freerdp.com/"
   130.5  WGET_URL="https://github.com/FreeRDP/FreeRDP/archive/$VERSION.zip"
   130.6  
   130.7 -BUILD_DEPENDS="zlib-dev openssl-dev cups-dev alsa-lib-dev xorg-libxcb-dev xorg-dev \
   130.8 -xorg-dev-proto cmake ffmpeg-dev xorg-libXv-dev pcsc-lite-dev"
   130.9 +BUILD_DEPENDS="zlib-dev openssl-dev cups-dev alsa-lib-dev libxcb-dev xorg-dev \
  130.10 +xorg-dev-proto cmake ffmpeg-dev libxv-dev pcsc-lite-dev"
  130.11  SPLIT="$PACKAGE-dev"
  130.12  
  130.13  compile_rules() {
  130.14 @@ -27,8 +27,8 @@
  130.15  	case $PACKAGE in
  130.16  		freerdp)
  130.17  			copy @std
  130.18 -			DEPENDS="zlib libkrb5 openssl libcomerr cups alsa-lib xorg-libxcb \
  130.19 -			xorg-libXcursor ffmpeg xorg-libXv pcsc-lite"
  130.20 +			DEPENDS="zlib libkrb5 openssl libcomerr cups alsa-lib libxcb \
  130.21 +			libxcursor ffmpeg libxv pcsc-lite"
  130.22  			TAGS="rdp remote-desktop"
  130.23  			;;
  130.24  		*-dev)
   131.1 --- a/freetype/receipt	Fri Dec 21 04:44:58 2018 +0200
   131.2 +++ b/freetype/receipt	Sat Dec 22 04:52:35 2018 +0200
   131.3 @@ -12,7 +12,7 @@
   131.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   131.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   131.6  
   131.7 -BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng16-dev"
   131.8 +BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng-dev"
   131.9  SPLIT="$PACKAGE-dev"
  131.10  
  131.11  # Option "--harfbuzz" used in the task to install build dependency harfbuzz-dev
  131.12 @@ -38,11 +38,11 @@
  131.13  	case $PACKAGE in
  131.14  		freetype)
  131.15  			copy @std
  131.16 -			DEPENDS="bzlib libharfbuzz libpng16 zlib"
  131.17 +			DEPENDS="bzlib libharfbuzz libpng zlib"
  131.18  			;;
  131.19  		freetype-dev)
  131.20  			copy @dev
  131.21 -			DEPENDS="freetype bzip2-dev harfbuzz-dev libpng16-dev zlib-dev"
  131.22 +			DEPENDS="freetype bzip2-dev harfbuzz-dev libpng-dev zlib-dev"
  131.23  			;;
  131.24  	esac
  131.25  }
   132.1 --- a/frogatto/receipt	Fri Dec 21 04:44:58 2018 +0200
   132.2 +++ b/frogatto/receipt	Sat Dec 22 04:52:35 2018 +0200
   132.3 @@ -11,8 +11,8 @@
   132.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   132.5  WGET_URL="https://github.com/frogatto/frogatto/archive/$VERSION.tar.gz"
   132.6  
   132.7 -BUILD_DEPENDS="xorg-libX11-dev libsdl-dev mesa-dev glu-dev glew-dev \
   132.8 -libsdl-image-dev libpng16-dev zlib-dev boost-dev libsdl-ttf-dev \
   132.9 +BUILD_DEPENDS="libx11-dev libsdl-dev mesa-dev glu-dev glew-dev \
  132.10 +libsdl-image-dev libpng-dev zlib-dev boost-dev libsdl-ttf-dev \
  132.11  libsdl-mixer-dev coreutils-file-format ccache"
  132.12  SPLIT="$PACKAGE-data"
  132.13  
  132.14 @@ -32,8 +32,8 @@
  132.15  		frogatto)
  132.16  			copy game server frogatto frogatto.desktop frogatto.png
  132.17  			DEPENDS="glew boost-iostreams boost-regex boost-system \
  132.18 -			boost-thread glu libpng16 libsdl libsdl-image \
  132.19 -			libsdl-mixer libsdl-ttf mesa xorg-libX11 zlib"
  132.20 +			boost-thread glu libpng libsdl libsdl-image \
  132.21 +			libsdl-mixer libsdl-ttf mesa libx11 zlib"
  132.22  			;;
  132.23  		frogatto-data)
  132.24  			copy data/ images/ modules/ music/ *.ttf
   133.1 --- a/ftgl/receipt	Fri Dec 21 04:44:58 2018 +0200
   133.2 +++ b/ftgl/receipt	Sat Dec 22 04:52:35 2018 +0200
   133.3 @@ -12,7 +12,7 @@
   133.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   133.5  
   133.6  BUILD_DEPENDS="freetype-dev freeglut-dev mesa-dev glu-dev \
   133.7 -expat-dev xorg-libxshmfence-dev"
   133.8 +expat-dev libxshmfence-dev"
   133.9  SPLIT="$PACKAGE-dev"
  133.10  
  133.11  compile_rules() {
   134.1 --- a/fuse-emulator/receipt	Fri Dec 21 04:44:58 2018 +0200
   134.2 +++ b/fuse-emulator/receipt	Sat Dec 22 04:52:35 2018 +0200
   134.3 @@ -11,7 +11,7 @@
   134.4  TARBALL="fuse-$VERSION.tar.gz"
   134.5  WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL"
   134.6  
   134.7 -BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk2-dev \
   134.8 +BUILD_DEPENDS="perl libspectrum-dev libx11-dev libice-dev gtk2-dev \
   134.9  gtk3-dev alsa-lib-dev libsdl-dev libgcrypt-dev"
  134.10  SPLIT="$PACKAGE-gtk3:gtk3"
  134.11  
  134.12 @@ -31,14 +31,14 @@
  134.13  	case $PACKAGE in
  134.14  		fuse-emulator)
  134.15  			copy @std @ico # only 16 and 48
  134.16 -			DEPENDS="alsa-lib gdk-pixbuf glib gtk2 libpng16 libsdl libspectrum \
  134.17 -			libxml2 pango xorg-libX11 zlib"
  134.18 +			DEPENDS="alsa-lib gdk-pixbuf glib gtk2 libpng libsdl libspectrum \
  134.19 +			libxml2 pango libx11 zlib"
  134.20  			;;
  134.21  		fuse-emulator-gtk3)
  134.22  			copy @std @ico # only 16 and 48
  134.23  			CAT="games|with GTK+3 interface"
  134.24 -			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk3 libpng16 libsdl \
  134.25 -			libspectrum libxml2 pango xorg-libX11 zlib"
  134.26 +			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk3 libpng libsdl \
  134.27 +			libspectrum libxml2 pango libx11 zlib"
  134.28  			;;
  134.29  	esac
  134.30  	TAGS="emulator spectrum"
   135.1 --- a/gajim/receipt	Fri Dec 21 04:44:58 2018 +0200
   135.2 +++ b/gajim/receipt	Sat Dec 22 04:52:35 2018 +0200
   135.3 @@ -11,7 +11,7 @@
   135.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   135.5  WGET_URL="http://www.gajim.org/downloads/${VERSION%.*}/$TARBALL"
   135.6  
   135.7 -BUILD_DEPENDS="gettext-dev xorg-xcb-util-dev enchant-dev xorg-xorgproto \
   135.8 +BUILD_DEPENDS="gettext-dev xcb-util-dev enchant-dev xorgproto \
   135.9  python-dev libffi-dev intltool python-pygtk-dev"
  135.10  
  135.11  compile_rules() {
  135.12 @@ -24,5 +24,5 @@
  135.13  genpkg_rules() {
  135.14  	copy @std
  135.15  	DEPENDS="gtkspell python python-dbus python-pygtk python-pygobject2 python-pyopenssl \
  135.16 -	python-pysqlite xorg-libXScrnSaver bind-client"
  135.17 +	python-pysqlite libxscrnsaver bind-client"
  135.18  }
   136.1 --- a/gambas2/receipt	Fri Dec 21 04:44:58 2018 +0200
   136.2 +++ b/gambas2/receipt	Sat Dec 22 04:52:35 2018 +0200
   136.3 @@ -12,7 +12,7 @@
   136.4  WGET_URL="$SF_MIRROR/gambas/$TARBALL"
   136.5  
   136.6  BUILD_DEPENDS="poppler-dev util-linux-uuid-dev lcms2-dev tiff-dev jpeg-dev \
   136.7 -libpng16-dev autoconf automake libtool freetype-dev fontconfig-dev"
   136.8 +libpng-dev autoconf automake libtool freetype-dev fontconfig-dev"
   136.9  
  136.10  COOKOPTS="skip-log-errors"
  136.11  
  136.12 @@ -29,6 +29,6 @@
  136.13  
  136.14  genpkg_rules() {
  136.15  	copy @std
  136.16 -	DEPENDS="poppler util-linux-uuid lcms2 tiff jpeg libpng16"
  136.17 +	DEPENDS="poppler util-linux-uuid lcms2 tiff jpeg libpng"
  136.18  	TAGS="interpreter basic"
  136.19  }
   137.1 --- a/garcon/receipt	Fri Dec 21 04:44:58 2018 +0200
   137.2 +++ b/garcon/receipt	Sat Dec 22 04:52:35 2018 +0200
   137.3 @@ -12,7 +12,7 @@
   137.4  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   137.5  
   137.6  BUILD_DEPENDS="intltool libxfce4util-dev gtk2-dev libxfce4ui-dev \
   137.7 -xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   137.8 +libsm-dev startup-notification-dev xcb-util-dev"
   137.9  SPLIT="$PACKAGE-dev"
  137.10  
  137.11  compile_rules() {
   138.1 --- a/gcc+gcj/receipt	Fri Dec 21 04:44:58 2018 +0200
   138.2 +++ b/gcc+gcj/receipt	Sat Dec 22 04:52:35 2018 +0200
   138.3 @@ -19,8 +19,8 @@
   138.4  TAGS="compiler C C++ objective-C java"
   138.5  
   138.6  BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev mpc-library \
   138.7 -expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
   138.8 -xorg-libXtst \
   138.9 +expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorgproto \
  138.10 +libxtst \
  138.11  elfutils elfutils-dev util-linux-uuid-dev"
  138.12  
  138.13  compile_rules() {
  138.14 @@ -98,11 +98,11 @@
  138.15  	# Include files.
  138.16  	cp -a $install/usr/include $fs/usr
  138.17  	DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr \
  138.18 -	python gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 \
  138.19 -	xorg-libxcb xorg-xcb-util xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
  138.20 -	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
  138.21 -	xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
  138.22 -	xorg-libXtst alsa-lib elfutils"
  138.23 +	python gtk2 atk cairo expat fontconfig freetype pango pixman libpng \
  138.24 +	libxcb xcb-util libice libsm libx11 libxau \
  138.25 +	libxcomposite libxcursor libxdamage libxdmcp \
  138.26 +	libxext libxfixes libxinerama libxrandr libxrender \
  138.27 +	libxtst alsa-lib elfutils"
  138.28  }
  138.29  
  138.30  post_install() {
   139.1 --- a/gcolor2/receipt	Fri Dec 21 04:44:58 2018 +0200
   139.2 +++ b/gcolor2/receipt	Sat Dec 22 04:52:35 2018 +0200
   139.3 @@ -27,5 +27,5 @@
   139.4  	COOKOPTS="!pixmaps"
   139.5  	copy bin/
   139.6  	DEPENDS="atk gdk-pixbuf glib gtk2"
   139.7 -	SUGGESTED="xorg-rgb"
   139.8 +	SUGGESTED="rgb"
   139.9  }
   140.1 --- a/gdk-pixbuf/receipt	Fri Dec 21 04:44:58 2018 +0200
   140.2 +++ b/gdk-pixbuf/receipt	Sat Dec 22 04:52:35 2018 +0200
   140.3 @@ -12,8 +12,8 @@
   140.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   140.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   140.6  
   140.7 -BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng16-dev \
   140.8 -libjpeg-turbo-dev tiff-dev gobject-introspection-dev xorg-libX11-dev \
   140.9 +BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng-dev \
  140.10 +libjpeg-turbo-dev tiff-dev gobject-introspection-dev libx11-dev \
  140.11  gettext-dev libxslt docbook-xsl libxml2-tools"
  140.12  SPLIT="$PACKAGE-dev $PACKAGE"
  140.13  
  140.14 @@ -34,12 +34,12 @@
  140.15  	case $PACKAGE in
  140.16  		*-dev)
  140.17  			copy @dev gdk-pixbuf-csource
  140.18 -			DEPENDS="gdk-pixbuf glib-dev shared-mime-info-dev xorg-libX11-dev"
  140.19 +			DEPENDS="gdk-pixbuf glib-dev shared-mime-info-dev libx11-dev"
  140.20  			# gdk-pixbuf-csource use shared-mime-info to detect the image file format
  140.21  			;;
  140.22  		*)
  140.23  			copy @std @rm
  140.24 -			DEPENDS="glib libjpeg-turbo libpng16 tiff xorg-libX11"
  140.25 +			DEPENDS="glib libjpeg-turbo libpng tiff libx11"
  140.26  			;;
  140.27  	esac
  140.28  }
   141.1 --- a/geany-plugins/receipt	Fri Dec 21 04:44:58 2018 +0200
   141.2 +++ b/geany-plugins/receipt	Sat Dec 22 04:52:35 2018 +0200
   141.3 @@ -24,5 +24,5 @@
   141.4  genpkg_rules() {
   141.5  	copy @std
   141.6  	DEPENDS="geany atk cairo enchant fontconfig freetype gdk-pixbuf glib gtk2 \
   141.7 -	gtkspell libxml2 pango python vte-gtk2 xorg-libX11 xorg-libXext"
   141.8 +	gtkspell libxml2 pango python vte-gtk2 libx11 libxext"
   141.9  }
   142.1 --- a/gegl/receipt	Fri Dec 21 04:44:58 2018 +0200
   142.2 +++ b/gegl/receipt	Sat Dec 22 04:52:35 2018 +0200
   142.3 @@ -12,7 +12,7 @@
   142.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   142.5  WGET_URL="https://download.gimp.org/pub/gegl/${VERSION%.*}/$TARBALL"
   142.6  
   142.7 -BUILD_DEPENDS="babl-dev glib-dev json-glib-dev libjpeg-turbo-dev libpng16-dev \
   142.8 +BUILD_DEPENDS="babl-dev glib-dev json-glib-dev libjpeg-turbo-dev libpng-dev \
   142.9  gobject-introspection-dev gettext-dev gexiv2-dev cairo-dev pango-dev \
  142.10  gdk-pixbuf-dev lensfun-dev librsvg-dev v4l-utils-dev openexr-dev ilmbase-dev \
  142.11  libsdl-dev libraw-dev jasper-dev lua-dev ffmpeg-dev lcms-dev libspiro-dev \
  142.12 @@ -39,7 +39,7 @@
  142.13  			copy gcut gegl gegl-imgcmp gegl-c*.so gegl-g*.so grey2.json \
  142.14  			jpg-*.so npy-*.so png-*.so ppm-*.so rgbe-*.so seamless-*.so \
  142.15  			transformops.so libgegl*.so*
  142.16 -			DEPENDS="babl gexiv2 glib json-glib libjpeg-turbo libpng16 libspiro"
  142.17 +			DEPENDS="babl gexiv2 glib json-glib libjpeg-turbo libpng libspiro"
  142.18  			;;
  142.19  		*-extra)
  142.20  			copy @std @rm
   143.1 --- a/get-google-earth/receipt	Fri Dec 21 04:44:58 2018 +0200
   143.2 +++ b/get-google-earth/receipt	Sat Dec 22 04:52:35 2018 +0200
   143.3 @@ -16,6 +16,6 @@
   143.4  
   143.5  genpkg_rules() {
   143.6  	copy @std
   143.7 -	DEPENDS="bzip2 xorg-base-fonts"
   143.8 +	DEPENDS="bzip2 font-misc-misc-base"
   143.9  	TAGS="map visualization"
  143.10  }
   144.1 --- a/gettext/receipt	Fri Dec 21 04:44:58 2018 +0200
   144.2 +++ b/gettext/receipt	Sat Dec 22 04:52:35 2018 +0200
   144.3 @@ -13,7 +13,7 @@
   144.4  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
   144.5  
   144.6  BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev emacs \
   144.7 -xorg-libXrandr-dev xorg-libXfixes-dev"
   144.8 +libxrandr-dev libxfixes-dev"
   144.9  SPLIT="$PACKAGE-base $PACKAGE emacs-pkg-po-mode $PACKAGE-dev"
  144.10  
  144.11  compile_rules() {
   145.1 --- a/ghostscript/receipt	Fri Dec 21 04:44:58 2018 +0200
   145.2 +++ b/ghostscript/receipt	Sat Dec 22 04:52:35 2018 +0200
   145.3 @@ -13,7 +13,7 @@
   145.4  
   145.5  # build depends are optional; ghostscripts still build but does not compile in cups support
   145.6  BUILD_DEPENDS="cairo-dev gtk2-dev expat-dev fontconfig-dev freetype-dev \
   145.7 -gnutls-dev libgcrypt-dev libgpg-error-dev libpng16-dev tiff-dev \
   145.8 +gnutls-dev libgcrypt-dev libgpg-error-dev libpng-dev tiff-dev \
   145.9  zlib-dev cups-dev jbig2dec jasper-dev libjpeg-turbo-dev"
  145.10  SPLIT="$PACKAGE-dev"
  145.11  
  145.12 @@ -49,7 +49,7 @@
  145.13  			ln -s gsc $fs/usr/bin/gs
  145.14  
  145.15  			DEPENDS="atk cairo cups fontconfig freetype gdk-pixbuf glib gtk2 \
  145.16 -			libcups libgnutls libidn libjpeg-turbo libpng16 pango tiff zlib"
  145.17 +			libcups libgnutls libidn libjpeg-turbo libpng pango tiff zlib"
  145.18  			;;
  145.19  		*-dev)
  145.20  			copy @dev
   146.1 --- a/giac/receipt	Fri Dec 21 04:44:58 2018 +0200
   146.2 +++ b/giac/receipt	Sat Dec 22 04:52:35 2018 +0200
   146.3 @@ -11,10 +11,10 @@
   146.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   146.5  WGET_URL="http://www-fourier.ujf-grenoble.fr/~parisse/giac/$TARBALL"
   146.6  
   146.7 -BUILD_DEPENDS="gmp-dev mpfr-dev libpng16-dev gsl-dev pari-dev ntl readline-dev \
   146.8 -cocoalib fltk-dev xorg-libX11-dev gf2x-dev xorg-libXinerama-dev libxml2-dev \
   146.9 +BUILD_DEPENDS="gmp-dev mpfr-dev libpng-dev gsl-dev pari-dev ntl readline-dev \
  146.10 +cocoalib fltk-dev libx11-dev gf2x-dev libxinerama-dev libxml2-dev \
  146.11  fltk-2.0.x-gl bison gfortran mesa-dev expat-dev gf2x-dev boost-dev \
  146.12 -boost-system xorg-libxshmfence-dev" # lapack
  146.13 +boost-system libxshmfence-dev" # lapack
  146.14  
  146.15  compile_rules() {
  146.16  	sed -i 's| doc | |' Makefile*
  146.17 @@ -34,5 +34,5 @@
  146.18  
  146.19  genpkg_rules() {
  146.20  	copy @std @dev
  146.21 -	DEPENDS="gmp mpfr libpng16 gsl pari ntl readline cocoalib fltk gf2x"
  146.22 +	DEPENDS="gmp mpfr libpng gsl pari ntl readline cocoalib fltk gf2x"
  146.23  }
   147.1 --- a/giblib/receipt	Fri Dec 21 04:44:58 2018 +0200
   147.2 +++ b/giblib/receipt	Sat Dec 22 04:52:35 2018 +0200
   147.3 @@ -11,8 +11,8 @@
   147.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   147.5  WGET_URL="http://linuxbrit.co.uk/downloads/$TARBALL"
   147.6  
   147.7 -BUILD_DEPENDS="gfortran imlib2-dev imlib2 xorg-xorgproto freetype-dev \
   147.8 -xorg-libXext-dev"
   147.9 +BUILD_DEPENDS="gfortran imlib2-dev imlib2 xorgproto freetype-dev \
  147.10 +libxext-dev"
  147.11  SPLIT="$PACKAGE-dev"
  147.12  
  147.13  compile_rules() {
  147.14 @@ -28,8 +28,8 @@
  147.15  	case $PACKAGE in
  147.16  		giblib)
  147.17  			copy @std
  147.18 -			DEPENDS="imlib2 freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
  147.19 -			xorg-libXext"
  147.20 +			DEPENDS="imlib2 freetype libx11 libxau libxdmcp \
  147.21 +			libxext"
  147.22  			;;
  147.23  		*-dev)
  147.24  			copy @dev
   148.1 --- a/gifsicle/receipt	Fri Dec 21 04:44:58 2018 +0200
   148.2 +++ b/gifsicle/receipt	Sat Dec 22 04:52:35 2018 +0200
   148.3 @@ -11,7 +11,7 @@
   148.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   148.5  WGET_URL="http://www.lcdf.org/gifsicle/$TARBALL"
   148.6  
   148.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev"
   148.8 +BUILD_DEPENDS="libx11-dev libice-dev libsm-dev"
   148.9  SPLIT="gifview $PACKAGE"
  148.10  
  148.11  compile_rules() {
  148.12 @@ -24,7 +24,7 @@
  148.13  	case $PACKAGE in
  148.14  		gifview)
  148.15  			copy gifview
  148.16 -			DEPENDS="xorg-libX11"
  148.17 +			DEPENDS="libx11"
  148.18  			CAT="graphics|GIF viewer"
  148.19  			;;
  148.20  		gifsicle)
   149.1 --- a/gigolo/receipt	Fri Dec 21 04:44:58 2018 +0200
   149.2 +++ b/gigolo/receipt	Sat Dec 22 04:52:35 2018 +0200
   149.3 @@ -11,7 +11,7 @@
   149.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   149.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   149.6  
   149.7 -BUILD_DEPENDS="xfce4-dev-tools gtk2-dev xorg-libX11-dev"
   149.8 +BUILD_DEPENDS="xfce4-dev-tools gtk2-dev libx11-dev"
   149.9  
  149.10  compile_rules() {
  149.11  	./autogen.sh \
  149.12 @@ -22,6 +22,6 @@
  149.13  
  149.14  genpkg_rules() {
  149.15  	copy @std
  149.16 -	DEPENDS="glib gtk2 xorg-libX11"
  149.17 +	DEPENDS="glib gtk2 libx11"
  149.18  	TAGS="Xfce"
  149.19  }
   150.1 --- a/gimp/receipt	Fri Dec 21 04:44:58 2018 +0200
   150.2 +++ b/gimp/receipt	Sat Dec 22 04:52:35 2018 +0200
   150.3 @@ -12,11 +12,11 @@
   150.4  WGET_URL="https://download.gimp.org/pub/gimp/v${VERSION%.*}/$TARBALL"
   150.5  
   150.6  BUILD_DEPENDS="intltool iso-codes-dev babl-dev gegl-dev atk-dev glib-dev \
   150.7 -glib-networking xorg-libX11-dev xorg-libICE-dev gtk2-dev gexiv2-dev \
   150.8 -xorg-libXmu-dev xorg-libXfixes-dev ghostscript-dev libmng-dev aalib-dev \
   150.9 -xorg-libXpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
  150.10 +glib-networking libx11-dev libice-dev gtk2-dev gexiv2-dev \
  150.11 +libxmu-dev libxfixes-dev ghostscript-dev libmng-dev aalib-dev \
  150.12 +libxpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
  150.13  mypaint-brushes-dev librsvg-dev poppler-dev poppler-data libwmf-dev \
  150.14 -openjpeg2-dev xorg-libXcursor-dev libgudev-dev xdg-utils libxslt \
  150.15 +openjpeg2-dev libxcursor-dev libgudev-dev xdg-utils libxslt \
  150.16  shared-mime-info-dev desktop-file-utils-extra gtk-doc tiff-dev"
  150.17  SPLIT="$PACKAGE-brushes $PACKAGE-console $PACKAGE-dev $PACKAGE-plug-ins \
  150.18  $PACKAGE"
  150.19 @@ -59,15 +59,15 @@
  150.20  				-o -name screenshot \) -delete # -> main package
  150.21  			CAT="graphics|plug-ins suite for advanced users"
  150.22  			DEPENDS="aalib babl bzlib cairo gdk-pixbuf gegl gexiv2 gimp glib \
  150.23 -			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng16 \
  150.24 +			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng \
  150.25  			librsvg libwebp libwmf openexr openjpeg2 pango poppler tiff \
  150.26 -			xorg-libX11 xorg-libXcursor xorg-libXpm zlib"
  150.27 +			libx11 libxcursor libxpm zlib"
  150.28  			;;
  150.29  		gimp)
  150.30  			copy @std @rm # all the rest
  150.31  			DEPENDS="babl cairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
  150.32  			glib gtk2 lcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
  150.33 -			libpng16 pango xorg-libX11 xorg-libXext xorg-libXfixes xorg-libXmu \
  150.34 +			libpng pango libx11 libxext libxfixes libxmu \
  150.35  			zlib"
  150.36  			SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
  150.37  			gimp-plugin-ufraw mypaint-brushes gegl-extra"
   151.1 --- a/gitmail/receipt	Fri Dec 21 04:44:58 2018 +0200
   151.2 +++ b/gitmail/receipt	Sat Dec 22 04:52:35 2018 +0200
   151.3 @@ -29,5 +29,5 @@
   151.4  
   151.5  genpkg_rules() {
   151.6  	copy @std
   151.7 -	DEPENDS="gtk2 xorg-libXdamage"
   151.8 +	DEPENDS="gtk2 libxdamage"
   151.9  }
   152.1 --- a/glew/receipt	Fri Dec 21 04:44:58 2018 +0200
   152.2 +++ b/glew/receipt	Sat Dec 22 04:52:35 2018 +0200
   152.3 @@ -11,10 +11,10 @@
   152.4  TARBALL="$PACKAGE-$VERSION.tgz"
   152.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   152.6  
   152.7 -BUILD_DEPENDS="xorg-libX11-dev mesa-dev"
   152.8 +BUILD_DEPENDS="libx11-dev mesa-dev"
   152.9  SPLIT="$PACKAGE-dev"
  152.10  
  152.11 -DEPENDS_std="mesa xorg-libX11"
  152.12 +DEPENDS_std="mesa libx11"
  152.13  DEPENDS_dev="glew glu-dev"
  152.14  
  152.15  compile_rules() {
   153.1 --- a/glu/receipt	Fri Dec 21 04:44:58 2018 +0200
   153.2 +++ b/glu/receipt	Sat Dec 22 04:52:35 2018 +0200
   153.3 @@ -13,7 +13,7 @@
   153.4  WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glu/$TARBALL"
   153.5  
   153.6  BUILD_DEPENDS="mesa-dev automake autoconf libtool expat-dev xorg-dev \
   153.7 -xorg-libxshmfence-dev"
   153.8 +libxshmfence-dev"
   153.9  SPLIT="$PACKAGE-dev"
  153.10  
  153.11  compile_rules() {
   154.1 --- a/glw/receipt	Fri Dec 21 04:44:58 2018 +0200
   154.2 +++ b/glw/receipt	Sat Dec 22 04:52:35 2018 +0200
   154.3 @@ -13,7 +13,7 @@
   154.4  WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glw/$TARBALL"
   154.5  
   154.6  BUILD_DEPENDS="mesa-dev automake autoconf libtool util-linux-uuid-dev \
   154.7 -expat-dev xorg-dev intltool gettext-dev xorg-libxshmfence-dev"
   154.8 +expat-dev xorg-dev intltool gettext-dev libxshmfence-dev"
   154.9  SPLIT="$PACKAGE-dev"
  154.10  
  154.11  compile_rules() {
  154.12 @@ -30,8 +30,8 @@
  154.13  		glw)
  154.14  			copy @std
  154.15  			DEPENDS="glibc-base util-linux-uuid zlib freetype lesstif mesa \
  154.16 -			xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
  154.17 -			xorg-libXt"
  154.18 +			libice libsm libx11 libxau libxdmcp \
  154.19 +			libxt"
  154.20  			PROVIDE="libglw"
  154.21  			;;
  154.22  		*-dev)
   155.1 --- a/gmerlin/receipt	Fri Dec 21 04:44:58 2018 +0200
   155.2 +++ b/gmerlin/receipt	Sat Dec 22 04:52:35 2018 +0200
   155.3 @@ -12,7 +12,7 @@
   155.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   155.5  
   155.6  BUILD_DEPENDS="texinfo libxml2-dev expat-dev gavl-dev gtk2-dev alsa-lib-dev \
   155.7 -libpng16-dev mesa-dev xorg-libxshmfence-dev gettext-dev"
   155.8 +libpng-dev mesa-dev libxshmfence-dev gettext-dev"
   155.9  COOKOPTS="skip-log-errors"
  155.10  
  155.11  compile_rules() {
  155.12 @@ -34,5 +34,5 @@
  155.13  
  155.14  genpkg_rules() {
  155.15  	copy @std
  155.16 -	DEPENDS="libxml2 expat gavl gtk2 alsa-lib libpng16"
  155.17 +	DEPENDS="libxml2 expat gavl gtk2 alsa-lib libpng"
  155.18  }
   156.1 --- a/gmpc/receipt	Fri Dec 21 04:44:58 2018 +0200
   156.2 +++ b/gmpc/receipt	Sat Dec 22 04:52:35 2018 +0200
   156.3 @@ -12,7 +12,7 @@
   156.4  WGET_URL="http://download.sarine.nl/Programs/$PACKAGE/${VERSION%.*}/$TARBALL"
   156.5  
   156.6  BUILD_DEPENDS="gob2-dev libglade-dev libmpd libmpd-dev curl-dev sqlite3-dev \
   156.7 -xorg-libSM-dev libsoup-dev xorg-xcb-util-dev util-linux-uuid-dev flex intltool \
   156.8 +libsm-dev libsoup-dev xcb-util-dev util-linux-uuid-dev flex intltool \
   156.9  vala"
  156.10  SPLIT="$PACKAGE-dev"
  156.11  
  156.12 @@ -33,7 +33,7 @@
  156.13  	case $PACKAGE in
  156.14  		gmpc)
  156.15  			copy @std
  156.16 -			DEPENDS="libglade libmpd curl xorg-libSM libsoup libsexy mpd \
  156.17 +			DEPENDS="libglade libmpd curl libsm libsoup libsexy mpd \
  156.18  			sqlite3 libtasn1"
  156.19  			;;
  156.20  		*-dev)
   157.1 --- a/gmtk/receipt	Fri Dec 21 04:44:58 2018 +0200
   157.2 +++ b/gmtk/receipt	Sat Dec 22 04:52:35 2018 +0200
   157.3 @@ -11,7 +11,7 @@
   157.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   157.5  WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz"
   157.6  
   157.7 -BUILD_DEPENDS="gettext-dev intltool xorg-libX11-dev gtk3-dev gtk2-dev glib-dev \
   157.8 +BUILD_DEPENDS="gettext-dev intltool libx11-dev gtk3-dev gtk2-dev glib-dev \
   157.9  gconf-dev alsa-lib-dev pulseaudio-dev"
  157.10  SPLIT="gmlib $PACKAGE gmtk3 $PACKAGE-dev"
  157.11  
   158.1 --- a/gnet/receipt	Fri Dec 21 04:44:58 2018 +0200
   158.2 +++ b/gnet/receipt	Sat Dec 22 04:52:35 2018 +0200
   158.3 @@ -11,7 +11,7 @@
   158.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   158.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   158.6  
   158.7 -BUILD_DEPENDS="glib-dev util-linux-uuid-dev xorg-libXt"
   158.8 +BUILD_DEPENDS="glib-dev util-linux-uuid-dev libxt"
   158.9  SPLIT="$PACKAGE-dev"
  158.10  
  158.11  compile_rules() {
   159.1 --- a/gnome-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   159.2 +++ b/gnome-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   159.3 @@ -11,8 +11,8 @@
   159.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   159.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   159.6  
   159.7 -BUILD_DEPENDS="xorg-libX11-dev eudev-dev libseccomp-dev gdk-pixbuf-dev \
   159.8 -gtk3-dev glib-dev gsettings-desktop-schemas-dev xorg-xkeyboard-config-dev \
   159.9 +BUILD_DEPENDS="libx11-dev eudev-dev libseccomp-dev gdk-pixbuf-dev \
  159.10 +gtk3-dev glib-dev gsettings-desktop-schemas-dev xkeyboard-config-dev \
  159.11  iso-codes-dev itstool libxml2-tools gettext-dev gobject-introspection-dev"
  159.12  SPLIT="$PACKAGE-dev"
  159.13  
   160.1 --- a/gnome-desktop2/receipt	Fri Dec 21 04:44:58 2018 +0200
   160.2 +++ b/gnome-desktop2/receipt	Sat Dec 22 04:52:35 2018 +0200
   160.3 @@ -11,8 +11,8 @@
   160.4  TARBALL="gnome-desktop-$VERSION.tar.bz2"
   160.5  WGET_URL="$GNOME_MIRROR/gnome-desktop/${VERSION%.*}/$TARBALL"
   160.6  
   160.7 -BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev \
   160.8 -xorg-libXrandr-dev gdk-pixbuf-dev gtk2-dev glib-dev gconf-dev gnome-doc-utils \
   160.9 +BUILD_DEPENDS="intltool startup-notification-dev libx11-dev \
  160.10 +libxrandr-dev gdk-pixbuf-dev gtk2-dev glib-dev gconf-dev gnome-doc-utils \
  160.11  rarian-dev"
  160.12  SPLIT="$PACKAGE-about $PACKAGE $PACKAGE-dev"
  160.13  
  160.14 @@ -36,7 +36,7 @@
  160.15  		gnome-desktop2)
  160.16  			copy @std @rm
  160.17  			DEPENDS="cairo gconf gdk-pixbuf glib gtk2 startup-notification \
  160.18 -			xorg-libX11 xorg-libXrandr"
  160.19 +			libx11 libxrandr"
  160.20  			;;
  160.21  		*-dev)
  160.22  			copy @dev
   161.1 --- a/gnome-mplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
   161.2 +++ b/gnome-mplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
   161.3 @@ -11,8 +11,8 @@
   161.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   161.5  WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL"
   161.6  
   161.7 -BUILD_DEPENDS="gettext-dev xorg-libX11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev \
   161.8 -dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \
   161.9 +BUILD_DEPENDS="gettext-dev libx11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev \
  161.10 +dbus-dev dbus-glib-dev libxscrnsaver-dev alsa-lib-dev pulseaudio-dev \
  161.11  libnotify-dev libgpod-dev"
  161.12  SPLIT="$PACKAGE-gtk3:gtk3"
  161.13  
  161.14 @@ -43,13 +43,13 @@
  161.15  		gnome-mplayer)
  161.16  			copy @std
  161.17  			DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk2 \
  161.18 -			libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
  161.19 +			libgpod libnotify libx11 libxscrnsaver   mplayer"
  161.20  			CAT="multimedia|with GTK2"
  161.21  			;;
  161.22  		gnome-mplayer-gtk3)
  161.23  			copy @std
  161.24  			DEPENDS="alsa-lib cairo dbus dbus-glib gdk-pixbuf glib gmlib gmtk3 \
  161.25 -			gtk3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
  161.26 +			gtk3 libgpod libnotify libx11 libxscrnsaver   mplayer"
  161.27  			CAT="multimedia|with GTK3"
  161.28  			;;
  161.29  	esac
   162.1 --- a/gnubg/receipt	Fri Dec 21 04:44:58 2018 +0200
   162.2 +++ b/gnubg/receipt	Sat Dec 22 04:52:35 2018 +0200
   162.3 @@ -12,7 +12,7 @@
   162.4  WGET_URL="http://files.gnubg.org/media/sources/$TARBALL"
   162.5  
   162.6  BUILD_DEPENDS="autoconf automake bison flex libtool \
   162.7 -glib-dev libpng16-dev freetype-dev gtk2-dev cairo-dev libcanberra-dev \
   162.8 +glib-dev libpng-dev freetype-dev gtk2-dev cairo-dev libcanberra-dev \
   162.9  gtkglext-dev readline-dev python sqlite3-dev gmp-dev"
  162.10  
  162.11  compile_rules() {
   163.1 --- a/gnuplot/receipt	Fri Dec 21 04:44:58 2018 +0200
   163.2 +++ b/gnuplot/receipt	Sat Dec 22 04:52:35 2018 +0200
   163.3 @@ -12,8 +12,8 @@
   163.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   163.5  
   163.6  BUILD_DEPENDS="zlib-dev readline-dev ncurses-dev libgd-dev jpeg-dev \
   163.7 -freetype-dev libpng16-dev xorg-libXpm-dev xorg-libX11-dev xorg-libXau-dev \
   163.8 -xorg-libXdmcp-dev fontconfig-dev expat-dev wxWidgets-dev pango-dev cairo-dev"
   163.9 +freetype-dev libpng-dev libxpm-dev libx11-dev libxau-dev \
  163.10 +libxdmcp-dev fontconfig-dev expat-dev wxWidgets-dev pango-dev cairo-dev"
  163.11  
  163.12  compile_rules() {
  163.13  	./configure $CONFIGURE_ARGS &&
  163.14 @@ -23,7 +23,7 @@
  163.15  
  163.16  genpkg_rules() {
  163.17  	copy @std
  163.18 -	DEPENDS="zlib readline ncurses libgd jpeg freetype libpng16 gcc-lib-base \
  163.19 -	xorg-libXpm xorg-libX11 xorg-libXau xorg-libXdmcp fontconfig expat \
  163.20 -	wxWidgets xorg-libXxf86vm"
  163.21 +	DEPENDS="zlib readline ncurses libgd jpeg freetype libpng gcc-lib-base \
  163.22 +	libxpm libx11 libxau libxdmcp fontconfig expat \
  163.23 +	wxWidgets libxxf86vm"
  163.24  }
   164.1 --- a/gnustep-back/receipt	Fri Dec 21 04:44:58 2018 +0200
   164.2 +++ b/gnustep-back/receipt	Sat Dec 22 04:52:35 2018 +0200
   164.3 @@ -13,7 +13,7 @@
   164.4  
   164.5  BUILD_DEPENDS="gnustep-make tar gnustep-base-dev gnustep-gui-dev libart_lgpl-dev \
   164.6  audiofile-dev aspell-dev giflib-dev gnutls-dev util-linux-uuid-dev \
   164.7 -libtasn1-dev xorg-libXmu-dev freetype-dev xorg-libXt-dev xorg-libXrender-dev \
   164.8 +libtasn1-dev libxmu-dev freetype-dev libxt-dev libxrender-dev \
   164.9  freetype-dev cairo-dev"
  164.10  
  164.11  compile_rules() {
  164.12 @@ -29,5 +29,5 @@
  164.13  	cp -a $install/usr/bin $fs/usr
  164.14  	cp -a $install/usr/lib/GNUstep $fs/usr/lib
  164.15  	DEPENDS="gnustep-base gnustep-gui libart_lgpl audiofile aspell \
  164.16 -	giflib gnutls libbfd util-linux-uuid libtasn1 xorg-libXmu freetype"
  164.17 +	giflib gnutls libbfd util-linux-uuid libtasn1 libxmu freetype"
  164.18  }
   165.1 --- a/gnustep-gui/receipt	Fri Dec 21 04:44:58 2018 +0200
   165.2 +++ b/gnustep-gui/receipt	Sat Dec 22 04:52:35 2018 +0200
   165.3 @@ -12,7 +12,7 @@
   165.4  WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
   165.5  
   165.6  BUILD_DEPENDS="gnustep-make gnustep-base-dev audiofile-dev aspell-dev giflib-dev \
   165.7 -portaudio-dev cups-dev libtasn1-dev tar jpeg-dev tiff-dev libpng16-dev"
   165.8 +portaudio-dev cups-dev libtasn1-dev tar jpeg-dev tiff-dev libpng-dev"
   165.9  SPLIT="$PACKAGE-dev"
  165.10  
  165.11  compile_rules() {
  165.12 @@ -31,7 +31,7 @@
  165.13  			cp -a $install/usr/lib/*.so* $fs/usr/lib
  165.14  			cp -a $install/usr/lib/GNUstep $fs/usr/lib
  165.15  			DEPENDS="gnustep-base audiofile aspell giflib portaudio cups \
  165.16 -			libcomerr3 libtasn1 jpeg tiff libpng16"
  165.17 +			libcomerr3 libtasn1 jpeg tiff libpng"
  165.18  			;;
  165.19  		*-dev)
  165.20  			mkdir -p $fs/usr/share
   166.1 --- a/gobby/receipt	Fri Dec 21 04:44:58 2018 +0200
   166.2 +++ b/gobby/receipt	Sat Dec 22 04:52:35 2018 +0200
   166.3 @@ -29,6 +29,6 @@
   166.4  	cp -a $install/usr/share/icons/hicolor/48x48/apps/* \
   166.5  		$fs/usr/share/pixmaps
   166.6  	DEPENDS="gnutls libgpg-error libgcrypt gtk2 cairomm glibmm gtkmm \
   166.7 -	gtksourceview libsigc++ libxml++ net6 obby xorg-libXdamage gcc-lib-base \
   166.8 +	gtksourceview libsigc++ libxml++ net6 obby libxdamage gcc-lib-base \
   166.9  	libtasn1"
  166.10  }
   167.1 --- a/gocr/receipt	Fri Dec 21 04:44:58 2018 +0200
   167.2 +++ b/gocr/receipt	Sat Dec 22 04:52:35 2018 +0200
   167.3 @@ -23,5 +23,5 @@
   167.4  
   167.5  genpkg_rules() {
   167.6  	copy @std
   167.7 -	DEPENDS="libpng16"
   167.8 +	DEPENDS="libpng"
   167.9  }
   168.1 --- a/gogglesmm/receipt	Fri Dec 21 04:44:58 2018 +0200
   168.2 +++ b/gogglesmm/receipt	Sat Dec 22 04:52:35 2018 +0200
   168.3 @@ -12,8 +12,8 @@
   168.4  WGET_URL="http://gogglesmm.googlecode.com/files/$TARBALL" # FIXME
   168.5  
   168.6  BUILD_DEPENDS="shared-mime-info fox-dev sqlite3 taglib dbus-dev xine-lib-dev \
   168.7 -sqlite3-dev taglib-dev curl-dev expat-dev xorg-xorgproto \
   168.8 -xorg-libX11-dev libgcrypt-dev mesa-dev glu-dev"
   168.9 +sqlite3-dev taglib-dev curl-dev expat-dev xorgproto \
  168.10 +libx11-dev libgcrypt-dev mesa-dev glu-dev"
  168.11  
  168.12  compile_rules() {
  168.13  	sed -i 's/0x80/-128/g' src/gmutils.cpp
  168.14 @@ -35,6 +35,6 @@
  168.15  
  168.16  genpkg_rules() {
  168.17  	copy @std
  168.18 -	DEPENDS="fox xine-lib dbus curl sqlite3 taglib libpng16 jpeg expat tiff \
  168.19 +	DEPENDS="fox xine-lib dbus curl sqlite3 taglib libpng jpeg expat tiff \
  168.20  	mesa glu"
  168.21  }
   169.1 --- a/gpicview/receipt	Fri Dec 21 04:44:58 2018 +0200
   169.2 +++ b/gpicview/receipt	Sat Dec 22 04:52:35 2018 +0200
   169.3 @@ -26,6 +26,6 @@
   169.4  genpkg_rules() {
   169.5  	# skip pixmaps and icons (found in the icon theme)
   169.6  	copy bin/ *.desktop *.ui
   169.7 -	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo xorg-libX11"
   169.8 +	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo libx11"
   169.9  	TAGS="LXDE"
  169.10  }
   170.1 --- a/gqview/receipt	Fri Dec 21 04:44:58 2018 +0200
   170.2 +++ b/gqview/receipt	Sat Dec 22 04:52:35 2018 +0200
   170.3 @@ -26,5 +26,5 @@
   170.4  
   170.5  genpkg_rules() {
   170.6  	copy @std
   170.7 -	DEPENDS="gtk2 xorg-libXdamage"
   170.8 +	DEPENDS="gtk2 libxdamage"
   170.9  }
   171.1 --- a/graphviz/receipt	Fri Dec 21 04:44:58 2018 +0200
   171.2 +++ b/graphviz/receipt	Sat Dec 22 04:52:35 2018 +0200
   171.3 @@ -12,7 +12,7 @@
   171.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   171.5  WGET_URL="http://graphviz.org/pub/graphviz/stable/SOURCES/$TARBALL"
   171.6  
   171.7 -BUILD_DEPENDS="automake xorg-dev expat-dev zlib-dev libpng16-dev \
   171.8 +BUILD_DEPENDS="automake xorg-dev expat-dev zlib-dev libpng-dev \
   171.9  libjpeg-turbo-dev libgd-dev swig ocaml python-dev tcl-dev tk-dev librsvg-dev \
  171.10  ruby-dev libcroco-dev util-linux-uuid-dev pango-dev libxml2-dev gdk-pixbuf-dev \
  171.11  guile-dev gmp-dev pcre-dev perl-dev libtool" # php-dev lua-dev
  171.12 @@ -82,8 +82,8 @@
  171.13  			;;
  171.14  		graphviz)
  171.15  			copy @std @rm
  171.16 -			DEPENDS="cairo expat glib libgd libltdl librsvg pango xorg-libX11 \
  171.17 -			xorg-libXaw xorg-libXmu xorg-libXt zlib"
  171.18 +			DEPENDS="cairo expat glib libgd libltdl librsvg pango libx11 \
  171.19 +			libxaw libxmu libxt zlib"
  171.20  			;;
  171.21  	esac
  171.22  	find $fs -type f -name '*.la' -delete
   172.1 --- a/grisbi/receipt	Fri Dec 21 04:44:58 2018 +0200
   172.2 +++ b/grisbi/receipt	Sat Dec 22 04:52:35 2018 +0200
   172.3 @@ -23,5 +23,5 @@
   172.4  
   172.5  genpkg_rules() {
   172.6  	copy @std
   172.7 -	DEPENDS="gtk2 xorg-libXdamage libofx libofx openssl"
   172.8 +	DEPENDS="gtk2 libxdamage libofx libofx openssl"
   172.9  }
   173.1 --- a/grsync/receipt	Fri Dec 21 04:44:58 2018 +0200
   173.2 +++ b/grsync/receipt	Sat Dec 22 04:52:35 2018 +0200
   173.3 @@ -11,7 +11,7 @@
   173.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   173.5  WGET_URL="http://www.opbyte.it/release/$TARBALL"
   173.6  
   173.7 -BUILD_DEPENDS="gtk2-dev xorg-xorgproto perl-xml-parser intltool"
   173.8 +BUILD_DEPENDS="gtk2-dev xorgproto perl-xml-parser intltool"
   173.9  
  173.10  compile_rules() {
  173.11  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
  173.12 @@ -34,5 +34,5 @@
  173.13  	cp -a $install/usr/share/grsync $fs/usr/share
  173.14  	sed -i s'|#!/bin/bash|#!/bin/sh|' $fs/usr/bin/grsync-batch
  173.15  	chmod +x $fs/usr/bin/*
  173.16 -	DEPENDS="gtk2 rsync xorg-libXdamage acl"
  173.17 +	DEPENDS="gtk2 rsync libxdamage acl"
  173.18  }
   174.1 --- a/gst0-plugins-bad/receipt	Fri Dec 21 04:44:58 2018 +0200
   174.2 +++ b/gst0-plugins-bad/receipt	Sat Dec 22 04:52:35 2018 +0200
   174.3 @@ -14,7 +14,7 @@
   174.4  
   174.5  BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev \
   174.6  gettext-dev \
   174.7 -faac-dev libpng16-dev libvpx-dev openssl-dev xvidcore-dev libjpeg-turbo-dev \
   174.8 +faac-dev libpng-dev libvpx-dev openssl-dev xvidcore-dev libjpeg-turbo-dev \
   174.9  faad2-dev jasper-dev libmms-dev libmodplug-dev libsndfile-dev libsdl-dev \
  174.10  expat-dev flac-dev mjpegtools-dev curl-dev neon-dev schroedinger-dev opus-dev \
  174.11  zvbi-dev"
  174.12 @@ -38,20 +38,20 @@
  174.13  		*-bad)
  174.14  			copy @std
  174.15  			DEPENDS="bzlib faac faad2 glib gst0-plugins-base gstreamer0 jasper \
  174.16 -			openssl libcurl libffi liblzma libmms libmodplug libpng16 libsdl \
  174.17 +			openssl libcurl libffi liblzma libmms libmodplug libpng libsdl \
  174.18  			libsndfile libvpx libxml2 mjpegtools opus orc pcre \
  174.19 -			schroedinger xorg-libX11 xvidcore zlib zvbi"
  174.20 +			schroedinger libx11 xvidcore zlib zvbi"
  174.21  			;;
  174.22  		*-dev)
  174.23  			copy @dev
  174.24  			DEPENDS="gst0-plugins-bad \
  174.25  			bzip2-dev curl-dev faac-dev faad2-dev flac-dev glib-dev \
  174.26  			gst0-plugins-base-dev gstreamer0-dev jasper-dev libffi-dev \
  174.27 -			libmms-dev libmodplug-dev libogg-dev libpng16-dev libsdl-dev \
  174.28 +			libmms-dev libmodplug-dev libogg-dev libpng-dev libsdl-dev \
  174.29  			libsndfile-dev libvorbis-dev libvpx-dev libxml2-dev mjpegtools-dev \
  174.30  			openssl-dev opus-dev orc-dev pcre-dev schroedinger-dev \
  174.31  			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
  174.32 -			xorg-libX11-dev xorg-libXau-dev xorg-libxcb-dev xorg-libXdmcp-dev \
  174.33 +			libx11-dev libxau-dev libxcb-dev libxdmcp-dev \
  174.34  			xvidcore-dev xz-dev zlib-dev zvbi-dev"
  174.35  			;;
  174.36  	esac
   175.1 --- a/gst0-plugins-base/receipt	Fri Dec 21 04:44:58 2018 +0200
   175.2 +++ b/gst0-plugins-base/receipt	Sat Dec 22 04:52:35 2018 +0200
   175.3 @@ -14,7 +14,7 @@
   175.4  WGET_URL="$GNOME_MIRROR/gst-plugins-base/0.10/$TARBALL"
   175.5  
   175.6  BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev libtheora-dev \
   175.7 -libtheora-enc libvorbis-dev eudev-dev xorg-libXv-dev xorg-libXvMC-dev \
   175.8 +libtheora-enc libvorbis-dev eudev-dev libxv-dev libxvmc-dev \
   175.9  util-linux-uuid-dev cdparanoia-dev orc-dev gobject-introspection-dev \
  175.10  xorg-dev gettext-dev"
  175.11  SPLIT="$PACKAGE-dev"
  175.12 @@ -38,8 +38,8 @@
  175.13  		*-base)
  175.14  			copy @std
  175.15  			DEPENDS="alsa-lib cairo cdparanoia glib gstreamer0 libogg \
  175.16 -			libtheora-enc libvorbis libxml2 orc pango xorg-libX11 xorg-libXext \
  175.17 -			xorg-libXv zlib"
  175.18 +			libtheora-enc libvorbis libxml2 orc pango libx11 libxext \
  175.19 +			libxv zlib"
  175.20  			;;
  175.21  		*-dev)
  175.22  			copy @dev
   176.1 --- a/gst0-plugins-good/receipt	Fri Dec 21 04:44:58 2018 +0200
   176.2 +++ b/gst0-plugins-good/receipt	Sat Dec 22 04:52:35 2018 +0200
   176.3 @@ -15,10 +15,10 @@
   176.4  
   176.5  BUILD_DEPENDS="gettext-dev gconf-dev gtk-doc python glib-dev orc-dev \
   176.6  gstreamer0-dev gst0-plugins-base-dev gtk2-dev libgudev-dev v4l-utils-dev \
   176.7 -xorg-libXfixes-dev xorg-libXdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
   176.8 +libxfixes-dev libxdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
   176.9  jack2-dev libcaca-dev libdv-dev libraw1394-dev libiec61883-dev libavc1394-dev \
  176.10  libshout-dev libsoup-dev speex-dev taglib-dev wavpack-dev libjpeg-turbo-dev \
  176.11 -xorg-xorgproto xorg-libXv-dev"
  176.12 +xorgproto libxv-dev"
  176.13  SPLIT="$PACKAGE-extra $PACKAGE"
  176.14  
  176.15  compile_rules() {
  176.16 @@ -52,15 +52,15 @@
  176.17  			CAT="multimedia|extra plugins"
  176.18  			DEPENDS="glib gst0-plugins-base gstreamer0 jack2 libdv libgudev \
  176.19  			libshout libsoup libsoup-gnome libxml2 orc taglib v4l-utils \
  176.20 -			wavpack xorg-libX11 xorg-libXext xorg-libXv"
  176.21 +			wavpack libx11 libxext libxv"
  176.22  			MAINTAINER="psychomaniak@xakep.ru"
  176.23  			;;
  176.24  		*-good)
  176.25  			copy @std @rm
  176.26  			DEPENDS="gconf aalib bzlib cairo flac gdk-pixbuf glib \
  176.27  			gst0-plugins-base gstreamer0 libavc1394 libcaca libiec61883 \
  176.28 -			libjpeg-turbo libpng16 libraw1394 libxml2 ncurses orc speex \
  176.29 -			xorg-libX11 xorg-libXdamage xorg-libXext xorg-libXfixes zlib"
  176.30 +			libjpeg-turbo libpng libraw1394 libxml2 ncurses orc speex \
  176.31 +			libx11 libxdamage libxext libxfixes zlib"
  176.32  			SUGGESTED="gst0-plugins-good-extra"
  176.33  			;;
  176.34  	esac
   177.1 --- a/gst1-plugins-base/receipt	Fri Dec 21 04:44:58 2018 +0200
   177.2 +++ b/gst1-plugins-base/receipt	Sat Dec 22 04:52:35 2018 +0200
   177.3 @@ -13,7 +13,7 @@
   177.4  WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$TARBALL"
   177.5  
   177.6  BUILD_DEPENDS="gettext-dev valgrind-dev python gstreamer1-dev \
   177.7 -orc-dev xorg-libX11-dev xorg-libXv-dev alsa-lib-dev cdparanoia-dev \
   177.8 +orc-dev libx11-dev libxv-dev alsa-lib-dev cdparanoia-dev \
   177.9  libvorbis-dev libogg-dev opus-dev pango-dev libtheora-dev"
  177.10  SPLIT="$PACKAGE-dev"
  177.11  
  177.12 @@ -34,8 +34,8 @@
  177.13  		gst1-plugins-base)
  177.14  			copy @std
  177.15  			DEPENDS="alsa-lib cairo cdparanoia glib gstreamer1 libogg \
  177.16 -			libtheora-enc libvorbis opus orc pango xorg-libX11 xorg-libXext \
  177.17 -			xorg-libXv zlib"
  177.18 +			libtheora-enc libvorbis opus orc pango libx11 libxext \
  177.19 +			libxv zlib"
  177.20  			;;
  177.21  		*-dev)
  177.22  			copy @dev
   178.1 --- a/gtick/receipt	Fri Dec 21 04:44:58 2018 +0200
   178.2 +++ b/gtick/receipt	Sat Dec 22 04:52:35 2018 +0200
   178.3 @@ -11,7 +11,7 @@
   178.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   178.5  WGET_URL="http://www.antcom.de/gtick/download/$TARBALL"
   178.6  
   178.7 -BUILD_DEPENDS="gtk2-dev xorg-xorgproto"
   178.8 +BUILD_DEPENDS="gtk2-dev xorgproto"
   178.9  
  178.10  compile_rules() {
  178.11  	./configure \
  178.12 @@ -24,5 +24,5 @@
  178.13  
  178.14  genpkg_rules() {
  178.15  	copy @std
  178.16 -	DEPENDS="gtk2 xorg-libXdamage libsndfile libogg"
  178.17 +	DEPENDS="gtk2 libxdamage libsndfile libogg"
  178.18  }
   179.1 --- a/gtk-engines/receipt	Fri Dec 21 04:44:58 2018 +0200
   179.2 +++ b/gtk-engines/receipt	Sat Dec 22 04:52:35 2018 +0200
   179.3 @@ -32,7 +32,7 @@
   179.4  		gtk-engines)
   179.5  			copy @std @rm
   179.6  			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
   179.7 -			DEPENDS="gtk2 xorg-libXdamage"
   179.8 +			DEPENDS="gtk2 libxdamage"
   179.9  			;;
  179.10  		*-dev)
  179.11  			copy @dev
   180.1 --- a/gtk-gnutella/receipt	Fri Dec 21 04:44:58 2018 +0200
   180.2 +++ b/gtk-gnutella/receipt	Sat Dec 22 04:52:35 2018 +0200
   180.3 @@ -30,8 +30,8 @@
   180.4  	cp -a $install/usr/share/applications/* $fs/usr/share/applications/
   180.5  	cp -a $install/usr/share/pixmaps/* $fs/usr/share/pixmaps
   180.6  	cp -a $install/usr/share/gtk-gnutella/pixmaps/* $fs/usr/share/gtk-gnutella/pixmaps/
   180.7 -	DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 xorg-libX11 \
   180.8 -	xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
   180.9 -	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
  180.10 -	xorg-libXdamage libtasn1"
  180.11 +	DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 libx11 \
  180.12 +	libxau libxcomposite libxcursor libxdmcp libxext \
  180.13 +	libxfixes libxinerama libxrandr libxrender \
  180.14 +	libxdamage libtasn1"
  180.15  }
   181.1 --- a/gtk-screenshot/receipt	Fri Dec 21 04:44:58 2018 +0200
   181.2 +++ b/gtk-screenshot/receipt	Sat Dec 22 04:52:35 2018 +0200
   181.3 @@ -12,7 +12,7 @@
   181.4  TARBALL="${PACKAGE}_$VERSION.tar.gz"
   181.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   181.6  
   181.7 -BUILD_DEPENDS="gtk2-dev libxml2-dev automake autoconf xorg-libXext-dev intltool"
   181.8 +BUILD_DEPENDS="gtk2-dev libxml2-dev automake autoconf libxext-dev intltool"
   181.9  
  181.10  compile_rules() {
  181.11  	cp $stuff/ru.po $src/po
   182.1 --- a/gtk-sharp/receipt	Fri Dec 21 04:44:58 2018 +0200
   182.2 +++ b/gtk-sharp/receipt	Sat Dec 22 04:52:35 2018 +0200
   182.3 @@ -26,11 +26,11 @@
   182.4  		gtk-sharp)
   182.5  			copy *.so *.dll *.config
   182.6  			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib \
   182.7 -			glibc-base gtk2 harfbuzz libffi libglade libpng16 xorg-libxcb \
   182.8 -			libxml2 pango pcre xorg-pixman xorg-libX11 xorg-libXau \
   182.9 -			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
  182.10 -			xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
  182.11 -			xorg-libXrender zlib"
  182.12 +			glibc-base gtk2 harfbuzz libffi libglade libpng libxcb \
  182.13 +			libxml2 pango pcre pixman libx11 libxau \
  182.14 +			libxcomposite libxcursor libxdamage libxdmcp \
  182.15 +			libxext libxfixes libxinerama libxrandr \
  182.16 +			libxrender zlib"
  182.17  			;;
  182.18  		*-dev)
  182.19  			copy bin/ *.a *.la *.pc *.xml *.exe *.pl
   183.1 --- a/gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   183.2 +++ b/gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   183.3 @@ -15,9 +15,9 @@
   183.4  BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
   183.5  symlinks \
   183.6  glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
   183.7 -gobject-introspection-dev gtk-doc automake gettext-dev xorg-libXinerama-dev"
   183.8 +gobject-introspection-dev gtk-doc automake gettext-dev libxinerama-dev"
   183.9  BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
  183.10 -gobject-introspection-dev gtk-doc gettext-dev xorg-libXinerama-dev \
  183.11 +gobject-introspection-dev gtk-doc gettext-dev libxinerama-dev \
  183.12  shared-mime-info-dev"
  183.13  SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
  183.14  
  183.15 @@ -52,7 +52,7 @@
  183.16  			COOKOPTS="!menus"
  183.17  			copy @std @rm
  183.18  			DEPENDS="atk cairo fontconfig gdk-pixbuf glib libcups pango \
  183.19 -			xorg-libX11 xorg-libXext xorg-libXinerama xorg-libXrender"
  183.20 +			libx11 libxext libxinerama libxrender"
  183.21  			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
  183.22  			SUGGESTED="cups gnutls libgcrypt libgpg-error"
  183.23  			;;
   184.1 --- a/gtk3/receipt	Fri Dec 21 04:44:58 2018 +0200
   184.2 +++ b/gtk3/receipt	Sat Dec 22 04:52:35 2018 +0200
   184.3 @@ -13,10 +13,10 @@
   184.4  TARBALL="gtk+-$VERSION.tar.xz"
   184.5  WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
   184.6  
   184.7 -BUILD_DEPENDS="xorg-libSM-dev"
   184.8 +BUILD_DEPENDS="libsm-dev"
   184.9  BUILD_DEPENDS="gettext-dev wayland-protocols-dev wayland-dev glib-dev atk-dev \
  184.10 -pango-dev cairo-dev gdk-pixbuf-dev xorg-libXinerama-dev xorg-libXi-dev \
  184.11 -xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXdamage-dev libxkbcommon-dev \
  184.12 +pango-dev cairo-dev gdk-pixbuf-dev libxinerama-dev libxi-dev \
  184.13 +libxrandr-dev libxcomposite-dev libxdamage-dev libxkbcommon-dev \
  184.14  mesa-dev libepoxy-dev at-spi2-atk-dev iso-codes-dev cups-dev rest-dev \
  184.15  json-glib-dev gobject-introspection-dev colord-dev gtk-doc libxslt "
  184.16  SPLIT="$PACKAGE-demo $PACKAGE-widget-factory $PACKAGE-icon-browser \
  184.17 @@ -78,19 +78,19 @@
  184.18  			DEPENDS="gtk3 \
  184.19  			at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \
  184.20  			glib-dev libepoxy-dev libxkbcommon-dev mesa-dev pango-dev \
  184.21 -			wayland-dev wayland-protocols-dev xorg-libX11-dev \
  184.22 -			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
  184.23 -			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
  184.24 -			xorg-libXrandr-dev"
  184.25 +			wayland-dev wayland-protocols-dev libx11-dev \
  184.26 +			libxcomposite-dev libxdamage-dev libxext-dev \
  184.27 +			libxfixes-dev libxi-dev libxinerama-dev \
  184.28 +			libxrandr-dev"
  184.29  			;;
  184.30  		*)
  184.31  			COOKOPTS="!menus"
  184.32  			copy etc/ bin/ themes/ *.so* *.xml @rm
  184.33  			DEPENDS="at-spi2-atk atk cairo colord fontconfig freetype \
  184.34  			gdk-pixbuf glib json-glib libcups libepoxy libharfbuzz \
  184.35 -			libxkbcommon mesa-libwayland-egl pango rest wayland xorg-libX11 \
  184.36 -			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
  184.37 -			xorg-libXi xorg-libXinerama xorg-libXrandr"
  184.38 +			libxkbcommon mesa-libwayland-egl pango rest wayland libx11 \
  184.39 +			libxcomposite libxdamage libxext libxfixes \
  184.40 +			libxi libxinerama libxrandr"
  184.41  			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
  184.42  			;;
  184.43  	esac
   185.1 --- a/gtkballs/receipt	Fri Dec 21 04:44:58 2018 +0200
   185.2 +++ b/gtkballs/receipt	Sat Dec 22 04:52:35 2018 +0200
   185.3 @@ -49,7 +49,7 @@
   185.4  			;;
   185.5  		gtkballs)
   185.6  			copy @std @rm
   185.7 -			DEPENDS="gtk2 xorg-libXdamage"
   185.8 +			DEPENDS="gtk2 libxdamage"
   185.9  			SUGGESTED="gtkballs-themes"
  185.10  			;;
  185.11  	esac
   186.1 --- a/gtkglext/receipt	Fri Dec 21 04:44:58 2018 +0200
   186.2 +++ b/gtkglext/receipt	Sat Dec 22 04:52:35 2018 +0200
   186.3 @@ -12,7 +12,7 @@
   186.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   186.5  
   186.6  BUILD_DEPENDS="gtk2-dev glu glu-dev mesa-dev \
   186.7 -util-linux-uuid-dev autoconf pangox-compat-dev expat-dev xorg-libxshmfence-dev"
   186.8 +util-linux-uuid-dev autoconf pangox-compat-dev expat-dev libxshmfence-dev"
   186.9  SPLIT="$PACKAGE-dev"
  186.10  
  186.11  compile_rules() {
   187.1 --- a/gtklife/receipt	Fri Dec 21 04:44:58 2018 +0200
   187.2 +++ b/gtklife/receipt	Sat Dec 22 04:52:35 2018 +0200
   187.3 @@ -31,5 +31,5 @@
   187.4  
   187.5  genpkg_rules() {
   187.6  	copy @std
   187.7 -	DEPENDS="gtk2 xorg-libXdamage"
   187.8 +	DEPENDS="gtk2 libxdamage"
   187.9  }
   188.1 --- a/gtkmm/receipt	Fri Dec 21 04:44:58 2018 +0200
   188.2 +++ b/gtkmm/receipt	Sat Dec 22 04:52:35 2018 +0200
   188.3 @@ -29,7 +29,7 @@
   188.4  	case $PACKAGE in
   188.5  		gtkmm)
   188.6  			copy @std
   188.7 -			DEPENDS="gtk2 atkmm glibmm cairomm libsigc++ xorg-libXdamage \
   188.8 +			DEPENDS="gtk2 atkmm glibmm cairomm libsigc++ libxdamage \
   188.9  			libgiomm pangomm gcc-lib-base"
  188.10  			;;
  188.11  		*-dev)
   189.1 --- a/gtktetris/receipt	Fri Dec 21 04:44:58 2018 +0200
   189.2 +++ b/gtktetris/receipt	Sat Dec 22 04:52:35 2018 +0200
   189.3 @@ -25,5 +25,5 @@
   189.4  	cp -a $src/gtktetris $fs/usr/games
   189.5  	touch $fs/var/games/gtktetris/highscore.dat
   189.6  	chmod 666 $fs/var/games/gtktetris/highscore.dat
   189.7 -	DEPENDS="gtk2 xorg-libXdamage"
   189.8 +	DEPENDS="gtk2 libxdamage"
   189.9  }
   190.1 --- a/gucharmap/receipt	Fri Dec 21 04:44:58 2018 +0200
   190.2 +++ b/gucharmap/receipt	Sat Dec 22 04:52:35 2018 +0200
   190.3 @@ -31,7 +31,7 @@
   190.4  	case $PACKAGE in
   190.5  		gucharmap)
   190.6  			copy @std
   190.7 -			DEPENDS="gtk2 xorg-libXdamage"
   190.8 +			DEPENDS="gtk2 libxdamage"
   190.9  			;;
  190.10  		*-dev)
  190.11  			copy @dev
   191.1 --- a/guvcview/receipt	Fri Dec 21 04:44:58 2018 +0200
   191.2 +++ b/guvcview/receipt	Sat Dec 22 04:52:35 2018 +0200
   191.3 @@ -12,7 +12,7 @@
   191.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   191.5  
   191.6  BUILD_DEPENDS="intltool v4l-utils-dev eudev-dev libusb-dev ffmpeg-dev \
   191.7 -libpng16-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
   191.8 +libpng-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
   191.9  SPLIT="$PACKAGE-dev"
  191.10  
  191.11  compile_rules() {
  191.12 @@ -30,7 +30,7 @@
  191.13  	case $PACKAGE in
  191.14  		guvcview)
  191.15  			copy @std *.mo
  191.16 -			DEPENDS="eudev ffmpeg glib gsl gtk3 libpng16 libsdl2 libusb \
  191.17 +			DEPENDS="eudev ffmpeg glib gsl gtk3 libpng libsdl2 libusb \
  191.18  			portaudio v4l-utils"
  191.19  			;;
  191.20  		*-dev)
   192.1 --- a/gv/receipt	Fri Dec 21 04:44:58 2018 +0200
   192.2 +++ b/gv/receipt	Sat Dec 22 04:52:35 2018 +0200
   192.3 @@ -11,7 +11,7 @@
   192.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   192.5  WGET_URL="http://ftp.gnu.org/gnu/gv/$TARBALL"
   192.6  
   192.7 -BUILD_DEPENDS="xorg-libXaw3d-dev xorg-libXinerama-dev"
   192.8 +BUILD_DEPENDS="libxaw3d-dev libxinerama-dev"
   192.9  
  192.10  compile_rules() {
  192.11  	./configure \
  192.12 @@ -24,5 +24,5 @@
  192.13  genpkg_rules() {
  192.14  	cp -a $install/usr $fs
  192.15  	rm -rf $fs/usr/share/man
  192.16 -	DEPENDS="ghostscript xorg-libXaw3d xorg-libXinerama"
  192.17 +	DEPENDS="ghostscript libxaw3d libxinerama"
  192.18  }
   193.1 --- a/gvim/receipt	Fri Dec 21 04:44:58 2018 +0200
   193.2 +++ b/gvim/receipt	Sat Dec 22 04:52:35 2018 +0200
   193.3 @@ -52,7 +52,7 @@
   193.4  	cp -a $src/runtime/vim16x16.png $fs/usr/share/icons/hicolor/16x16/apps/gvim.png
   193.5  	cp -a $stuff/gvim.desktop $fs/usr/share/applications
   193.6  	cp -a $install/etc/vim $fs/etc
   193.7 -	DEPENDS="ncurses gtk2 xorg-libXt xorg-libXau xorg-libXdmcp"
   193.8 +	DEPENDS="ncurses gtk2 libxt libxau libxdmcp"
   193.9  	CONFIG_FILES="/etc/vim/vimrc"
  193.10  	TAGS="text-editor"
  193.11  }
   194.1 --- a/gvolwheel/receipt	Fri Dec 21 04:44:58 2018 +0200
   194.2 +++ b/gvolwheel/receipt	Sat Dec 22 04:52:35 2018 +0200
   194.3 @@ -26,8 +26,8 @@
   194.4  genpkg_rules() {
   194.5  	copy @std
   194.6  	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base gdk-pixbuf \
   194.7 -	glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango xorg-pixman \
   194.8 -	xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
   194.9 -	xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
  194.10 -	xorg-libXrender zlib"
  194.11 +	glib glibc-base gtk2 libffi libpng libxcb pango pixman \
  194.12 +	libx11 libxau libxcomposite libxcursor libxdamage \
  194.13 +	libxdmcp libxext libxfixes libxinerama libxrandr \
  194.14 +	libxrender zlib"
  194.15  }
   195.1 --- a/gxine/receipt	Fri Dec 21 04:44:58 2018 +0200
   195.2 +++ b/gxine/receipt	Sat Dec 22 04:52:35 2018 +0200
   195.3 @@ -12,8 +12,8 @@
   195.4  WGET_URL="$SF_MIRROR/xine/$TARBALL"
   195.5  
   195.6  BUILD_DEPENDS="shared-mime-info spidermonkey-dev xine-lib-dev xorg-dev \
   195.7 -dbus-dev gtk2-dev xorg-libXinerama-dev xorg-libXext-dev perl \
   195.8 -xorg-libXv-dev xorg-xorgproto"
   195.9 +dbus-dev gtk2-dev libxinerama-dev libxext-dev perl \
  195.10 +libxv-dev xorgproto"
  195.11  
  195.12  compile_rules() {
  195.13  	# Fix for glib2 (-lm)
   196.1 --- a/gxmessage/receipt	Fri Dec 21 04:44:58 2018 +0200
   196.2 +++ b/gxmessage/receipt	Sat Dec 22 04:52:35 2018 +0200
   196.3 @@ -23,5 +23,5 @@
   196.4  
   196.5  genpkg_rules() {
   196.6  	copy @std
   196.7 -	DEPENDS="gtk2 expat xorg-libXdamage"
   196.8 +	DEPENDS="gtk2 expat libxdamage"
   196.9  }
   197.1 --- a/hardinfo/receipt	Fri Dec 21 04:44:58 2018 +0200
   197.2 +++ b/hardinfo/receipt	Sat Dec 22 04:52:35 2018 +0200
   197.3 @@ -31,5 +31,5 @@
   197.4  	cd $fs/usr/share/pixmaps
   197.5  	rm ../$PACKAGE/pixmaps/logo.xcf
   197.6  	ln -s ../$PACKAGE/pixmaps/logo.png hardinfo.png
   197.7 -	DEPENDS="gtk2 pciutils xorg-libXdamage"
   197.8 +	DEPENDS="gtk2 pciutils libxdamage"
   197.9  }
   198.1 --- a/hardware-thinkpad-600e/receipt	Fri Dec 21 04:44:58 2018 +0200
   198.2 +++ b/hardware-thinkpad-600e/receipt	Sat Dec 22 04:52:35 2018 +0200
   198.3 @@ -11,7 +11,7 @@
   198.4  genpkg_rules() {
   198.5  	mkdir -p $fs/etc
   198.6  	DEPENDS="linux-acpi linux-mwave tp_smapi linux-sound \
   198.7 -	xorg-xf86-video-neomagic"
   198.8 +	xf86-video-neomagic"
   198.9  }
  198.10  
  198.11  post_install() {
   199.1 --- a/homebank/receipt	Fri Dec 21 04:44:58 2018 +0200
   199.2 +++ b/homebank/receipt	Sat Dec 22 04:52:35 2018 +0200
   199.3 @@ -28,6 +28,6 @@
   199.4  	cp -a $install/usr/bin $fs/usr
   199.5  	cp -a $install/usr/share/homebank/images $fs/usr/share/homebank
   199.6  	cp -a $install/usr/share/icons/hicolor/48x48 $fs/usr/share/icons/hicolor
   199.7 -	DEPENDS="gtk2 xorg-libXdamage"
   199.8 +	DEPENDS="gtk2 libxdamage"
   199.9  	TAGS="office finance"
  199.10  }
   200.1 --- a/hsetroot/receipt	Fri Dec 21 04:44:58 2018 +0200
   200.2 +++ b/hsetroot/receipt	Sat Dec 22 04:52:35 2018 +0200
   200.3 @@ -11,7 +11,7 @@
   200.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   200.5  WGET_URL="http://thegraveyard.org/files/$TARBALL" # FIXME
   200.6  
   200.7 -BUILD_DEPENDS="imlib2-dev libpng16-dev xorg-libX11-dev"
   200.8 +BUILD_DEPENDS="imlib2-dev libpng-dev libx11-dev"
   200.9  # ARM: imlib2-dev must be installed in build chroot
  200.10  
  200.11  compile_rules() {
  200.12 @@ -24,7 +24,7 @@
  200.13  
  200.14  genpkg_rules() {
  200.15  	copy @std
  200.16 -	DEPENDS="imlib2 libpng16 freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
  200.17 -	xorg-libXext"
  200.18 +	DEPENDS="imlib2 libpng freetype libx11 libxau libxdmcp \
  200.19 +	libxext"
  200.20  	TAGS="wallpaper"
  200.21  }
   201.1 --- a/ht/receipt	Fri Dec 21 04:44:58 2018 +0200
   201.2 +++ b/ht/receipt	Sat Dec 22 04:52:35 2018 +0200
   201.3 @@ -28,6 +28,6 @@
   201.4  
   201.5  genpkg_rules() {
   201.6  	cp -a $install/usr $fs
   201.7 -	DEPENDS="lzo ncurses xorg-libX11 xorg-libXau xorg-libXdmcp"
   201.8 +	DEPENDS="lzo ncurses libx11 libxau libxdmcp"
   201.9  	TAGS="viewer text-editor analysis"
  201.10  }
   202.1 --- a/htmldoc/receipt	Fri Dec 21 04:44:58 2018 +0200
   202.2 +++ b/htmldoc/receipt	Sat Dec 22 04:52:35 2018 +0200
   202.3 @@ -11,8 +11,8 @@
   202.4  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
   202.5  WGET_URL="https://github.com/michaelrsweet/htmldoc/releases/download/v$VERSION/$TARBALL"
   202.6  
   202.7 -BUILD_DEPENDS="fltk-dev libgcrypt-dev libjpeg-turbo-dev libpng16-dev \
   202.8 -xorg-libXpm-dev"
   202.9 +BUILD_DEPENDS="fltk-dev libgcrypt-dev libjpeg-turbo-dev libpng-dev \
  202.10 +libxpm-dev"
  202.11  
  202.12  compile_rules() {
  202.13  	echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
  202.14 @@ -26,6 +26,6 @@
  202.15  
  202.16  genpkg_rules() {
  202.17  	copy @std
  202.18 -	DEPENDS="fltk fontconfig libjpeg-turbo libpng16 xorg-libX11 xorg-libXext \
  202.19 -	xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXpm zlib"
  202.20 +	DEPENDS="fltk fontconfig libjpeg-turbo libpng libx11 libxext \
  202.21 +	libxfixes libxft libxinerama libxpm zlib"
  202.22  }
   203.1 --- a/hydra/receipt	Fri Dec 21 04:44:58 2018 +0200
   203.2 +++ b/hydra/receipt	Sat Dec 22 04:52:35 2018 +0200
   203.3 @@ -30,6 +30,6 @@
   203.4  	mkdir -p $fs/usr/bin
   203.5  	cp -a $src/hydra $fs/usr/bin
   203.6  	cp -a $src/xhydra $fs/usr/bin
   203.7 -	DEPENDS="gtk2 openssl xorg-libXdamage apr libssh libmysqlclient \
   203.8 +	DEPENDS="gtk2 openssl libxdamage apr libssh libmysqlclient \
   203.9  	libidn libpostgresqlclient libsvn"
  203.10  }
   204.1 --- a/i3/receipt	Fri Dec 21 04:44:58 2018 +0200
   204.2 +++ b/i3/receipt	Sat Dec 22 04:52:35 2018 +0200
   204.3 @@ -11,10 +11,10 @@
   204.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   204.5  WGET_URL="$WEB_SITE/downloads/$TARBALL"
   204.6  
   204.7 -BUILD_DEPENDS="make gcc xorg-xcb-proto xorg-libxcb-dev xorg-xcb-util-dev \
   204.8 -libev-dev flex bison yajl-dev t2 docbook-xml xorg-libXcursor-dev \
   204.9 -xorg-libX11-dev pcre-dev startup-notification-dev xorg-xcb-util-keysyms-dev \
  204.10 -xorg-xcb-util-wm-dev pango-dev"
  204.11 +BUILD_DEPENDS="make gcc xcb-proto libxcb-dev xcb-util-dev \
  204.12 +libev-dev flex bison yajl-dev t2 docbook-xml libxcursor-dev \
  204.13 +libx11-dev pcre-dev startup-notification-dev xcb-util-keysyms-dev \
  204.14 +xcb-util-wm-dev pango-dev"
  204.15  SPLIT="$PACKAGE-dev"
  204.16  
  204.17  compile_rules() {
  204.18 @@ -29,8 +29,8 @@
  204.19  		i3)
  204.20  			copy @std
  204.21  			DEPENDS="cairo glib libev libpcre pango startup-notification \
  204.22 -			xorg-libX11 xorg-libXcursor xorg-libxcb xorg-xcb-util \
  204.23 -			xorg-xcb-util-keysyms xorg-xcb-util-wm yajl   dmenu"
  204.24 +			libx11 libxcursor libxcb xcb-util \
  204.25 +			xcb-util-keysyms xcb-util-wm yajl   dmenu"
  204.26  			;;
  204.27  		*-dev)
  204.28  			copy @dev
   205.1 --- a/ibus/receipt	Fri Dec 21 04:44:58 2018 +0200
   205.2 +++ b/ibus/receipt	Sat Dec 22 04:52:35 2018 +0200
   205.3 @@ -28,7 +28,7 @@
   205.4  	case $PACKAGE in
   205.5  		ibus)
   205.6  			copy @std
   205.7 -			DEPENDS="gconf glib gtk2 pango python xorg-libX11"
   205.8 +			DEPENDS="gconf glib gtk2 pango python libx11"
   205.9  			;;
  205.10  		*-dev)
  205.11  			copy @dev
   206.1 --- a/icedtea6-jdk/receipt	Fri Dec 21 04:44:58 2018 +0200
   206.2 +++ b/icedtea6-jdk/receipt	Sat Dec 22 04:52:35 2018 +0200
   206.3 @@ -16,8 +16,8 @@
   206.4  BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk cups-dev cpio \
   206.5  coreutils-file-special coreutils-file-summarize alsa-lib-dev file patch perl \
   206.6  zip unzip findutils  bzip2 tar glib-dev fastjar rhino ecj apache-ant jpeg-dev \
   206.7 -xalan-xerces-j gtk2-dev giflib-dev libpng16-dev xorg-dev xorg-libXtst-dev \
   206.8 -xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
   206.9 +xalan-xerces-j gtk2-dev giflib-dev libpng-dev xorg-dev libxtst-dev \
  206.10 +libxp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
  206.11  openjdk-6-src"
  206.12  SPLIT="icedtea6-jre java-jdk java-jre"
  206.13  
  206.14 @@ -156,16 +156,16 @@
  206.15  			mkdir -p $fs/usr/lib/jvm/java-icedtea
  206.16  			cp -a $install/usr/lib/jvm/java-icedtea/bin $fs/usr/lib/jvm/java-icedtea
  206.17  			cp -a $install/usr/lib/jvm/java-icedtea/lib $fs/usr/lib/jvm/java-icedtea
  206.18 -			DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
  206.19 +			DEPENDS="icedtea6-jre xorg libxtst libxp cups"
  206.20  			;;
  206.21  		icedtea6-jre)
  206.22  			mkdir -p $fs/usr/lib/jvm/java-icedtea
  206.23  			cp -a $install/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
  206.24  			CAT="development|JRE"
  206.25  			DEPENDS="glibc-base gcc-lib-base util-linux-uuid alsa-lib \
  206.26 -			freetype giflib libjpeg libpng16 zlib xorg-libICE \
  206.27 -			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
  206.28 -			xorg-libXext xorg-libXi xorg-libXrender xorg-libXtst"
  206.29 +			freetype giflib libjpeg libpng zlib libice \
  206.30 +			libsm libx11 libxau libxdmcp \
  206.31 +			libxext libxi libxrender libxtst"
  206.32  			;;
  206.33  		java-jdk)
  206.34  			mkdir -p $fs/usr
   207.1 --- a/icewm-xdgmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
   207.2 +++ b/icewm-xdgmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
   207.3 @@ -12,7 +12,7 @@
   207.4  TARBALL=$SOURCE
   207.5  WGET_URL="http://distro.ibiblio.org/puppylinux/sources/x/$TARBALL"
   207.6  
   207.7 -BUILD_DEPENDS="gnome-menus gnome-menus-dev glib-dev xorg-libXpm xorg-libXext"
   207.8 +BUILD_DEPENDS="gnome-menus gnome-menus-dev glib-dev libxpm libxext"
   207.9  
  207.10  compile_rules() {
  207.11  	cd $src/$PACKAGE
   208.1 --- a/icewm/receipt	Fri Dec 21 04:44:58 2018 +0200
   208.2 +++ b/icewm/receipt	Sat Dec 22 04:52:35 2018 +0200
   208.3 @@ -11,9 +11,9 @@
   208.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   208.5  WGET_URL="https://github.com/bbidulock/icewm/releases/download/$VERSION/$TARBALL"
   208.6  
   208.7 -BUILD_DEPENDS="xorg-mkfontdir gettext-dev fontconfig-dev xorg-libXext-dev \
   208.8 -xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \
   208.9 -xorg-libXft-dev alsa-lib-dev libsndfile-dev xorg-libXinerama-dev fribidi-dev \
  208.10 +BUILD_DEPENDS="mkfontdir gettext-dev fontconfig-dev libxext-dev \
  208.11 +libx11-dev libice-dev libsm-dev libxrandr-dev \
  208.12 +libxft-dev alsa-lib-dev libsndfile-dev libxinerama-dev fribidi-dev \
  208.13  gdk-pixbuf-dev flac-dev"
  208.14  
  208.15  compile_rules() {
  208.16 @@ -31,6 +31,6 @@
  208.17  genpkg_rules() {
  208.18  	copy @std
  208.19  	TAGS="window-manager"
  208.20 -	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis xorg-libSM \
  208.21 -	xorg-libXft xorg-libXinerama xorg-libXrandr"
  208.22 +	DEPENDS="alsa-lib flac fribidi gdk-pixbuf libsndfile libvorbis libsm \
  208.23 +	libxft libxinerama libxrandr"
  208.24  }
   209.1 --- a/icoutils/receipt	Fri Dec 21 04:44:58 2018 +0200
   209.2 +++ b/icoutils/receipt	Sat Dec 22 04:52:35 2018 +0200
   209.3 @@ -11,7 +11,7 @@
   209.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   209.5  WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
   209.6  
   209.7 -BUILD_DEPENDS="libpng16-dev"
   209.8 +BUILD_DEPENDS="libpng-dev"
   209.9  
  209.10  compile_rules() {
  209.11  	./configure \
  209.12 @@ -24,5 +24,5 @@
  209.13  
  209.14  genpkg_rules() {
  209.15  	copy @std
  209.16 -	DEPENDS="libpng16"
  209.17 +	DEPENDS="libpng"
  209.18  }
   210.1 --- a/idesk/receipt	Fri Dec 21 04:44:58 2018 +0200
   210.2 +++ b/idesk/receipt	Sat Dec 22 04:52:35 2018 +0200
   210.3 @@ -11,7 +11,7 @@
   210.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   210.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   210.6  
   210.7 -BUILD_DEPENDS="imlib2-dev xorg-libXft-dev"
   210.8 +BUILD_DEPENDS="imlib2-dev libxft-dev"
   210.9  
  210.10  compile_rules() {
  210.11  	./configure \
  210.12 @@ -30,5 +30,5 @@
  210.13  	rm -f \
  210.14  		$fs/usr/share/idesk/*.xpm \
  210.15  		$fs/usr/share/idesk/README
  210.16 -	DEPENDS="imlib2 xorg-libXft"
  210.17 +	DEPENDS="imlib2 libxft"
  210.18  }
   211.1 --- a/imagemagick/receipt	Fri Dec 21 04:44:58 2018 +0200
   211.2 +++ b/imagemagick/receipt	Sat Dec 22 04:52:35 2018 +0200
   211.3 @@ -12,9 +12,9 @@
   211.4  TARBALL="ImageMagick-$VERSION.tar.xz"
   211.5  WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
   211.6  
   211.7 -BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
   211.8 -xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
   211.9 -libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
  211.10 +BUILD_DEPENDS="bzip2-dev libx11-dev libice-dev libxext-dev \
  211.11 +libxt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
  211.12 +libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \
  211.13  libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
  211.14  openexr-dev libgsf-dev libcroco-dev" # graphviz-dev
  211.15  SPLIT="perl-image-magick $PACKAGE $PACKAGE-dev"
  211.16 @@ -58,16 +58,16 @@
  211.17    <policy domain="coder" rights="none" pattern="PLT" />
  211.18  EOT
  211.19  			DEPENDS="bzlib cairo fftw fontconfig freetype glib lcms2 libgomp \
  211.20 -			libjpeg-turbo libltdl liblzma libpng16 librsvg libxml2 openexr \
  211.21 -			pango tiff xorg-libX11 xorg-libXext zlib"
  211.22 +			libjpeg-turbo libltdl liblzma libpng librsvg libxml2 openexr \
  211.23 +			pango tiff libx11 libxext zlib"
  211.24  			TAGS="image photo toolkit"
  211.25  			;;
  211.26  		*-dev)
  211.27  			copy @dev
  211.28  			DEPENDS="imagemagick \
  211.29  			bzip2-dev fftw-dev fontconfig-dev freetype-dev lcms2-dev libgomp \
  211.30 -			libltdl xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
  211.31 -			xorg-libXext-dev xorg-libXt-dev xz-dev zlib-dev"
  211.32 +			libltdl libice-dev libsm-dev libx11-dev \
  211.33 +			libxext-dev libxt-dev xz-dev zlib-dev"
  211.34  			;;
  211.35  	esac
  211.36  }
   212.1 --- a/imagemagick6/receipt	Fri Dec 21 04:44:58 2018 +0200
   212.2 +++ b/imagemagick6/receipt	Sat Dec 22 04:52:35 2018 +0200
   212.3 @@ -13,9 +13,9 @@
   212.4  #WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"	# not available here now
   212.5  WGET_URL="ftp://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/$TARBALL"
   212.6  
   212.7 -BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
   212.8 -xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
   212.9 -libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
  212.10 +BUILD_DEPENDS="bzip2-dev libx11-dev libice-dev libxext-dev \
  212.11 +libxt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
  212.12 +libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \
  212.13  libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
  212.14  openexr-dev libgsf-dev" # graphviz-dev
  212.15  SPLIT="$PACKAGE-dev"
  212.16 @@ -49,16 +49,16 @@
  212.17    <policy domain="coder" rights="none" pattern="PLT" />
  212.18  EOT
  212.19  			DEPENDS="bzlib cairo fftw fontconfig freetype glib lcms2 libgomp \
  212.20 -			libjpeg-turbo libltdl liblzma libpng16 libxml2 openexr pango tiff \
  212.21 -			xorg-libX11 xorg-libXext zlib"
  212.22 +			libjpeg-turbo libltdl liblzma libpng libxml2 openexr pango tiff \
  212.23 +			libx11 libxext zlib"
  212.24  			TAGS="image photo toolkit"
  212.25  			;;
  212.26  		*-dev)
  212.27  			copy @dev
  212.28  			DEPENDS="imagemagick6 \
  212.29  			bzip2-dev fftw-dev fontconfig-dev freetype-dev lcms2-dev libgomp \
  212.30 -			libltdl xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
  212.31 -			xorg-libXext-dev xorg-libXt-dev xz-dev zlib-dev"
  212.32 +			libltdl libice-dev libsm-dev libx11-dev \
  212.33 +			libxext-dev libxt-dev xz-dev zlib-dev"
  212.34  			;;
  212.35  	esac
  212.36  }
   213.1 --- a/imlib2/receipt	Fri Dec 21 04:44:58 2018 +0200
   213.2 +++ b/imlib2/receipt	Sat Dec 22 04:52:35 2018 +0200
   213.3 @@ -11,8 +11,8 @@
   213.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   213.5  WGET_URL="$SF_MIRROR/enlightenment/$TARBALL"
   213.6  
   213.7 -BUILD_DEPENDS="freetype-dev xorg-libX11-dev xorg-libICE-dev libjpeg-turbo-dev \
   213.8 -tiff-dev giflib-dev libid3tag-dev xorg-libXext-dev xz-dev"
   213.9 +BUILD_DEPENDS="freetype-dev libx11-dev libice-dev libjpeg-turbo-dev \
  213.10 +tiff-dev giflib-dev libid3tag-dev libxext-dev xz-dev"
  213.11  SPLIT="$PACKAGE-test $PACKAGE-dev"
  213.12  
  213.13  compile_rules() {
  213.14 @@ -30,13 +30,13 @@
  213.15  	case $PACKAGE in
  213.16  		imlib2)
  213.17  			copy *.so* imlib2_conv imlib2_grab imlib2_view
  213.18 -			DEPENDS="bzlib freetype giflib libid3tag libjpeg-turbo libpng16 \
  213.19 -			tiff xorg-libX11 xorg-libXext zlib"
  213.20 +			DEPENDS="bzlib freetype giflib libid3tag libjpeg-turbo libpng \
  213.21 +			tiff libx11 libxext zlib"
  213.22  			;;
  213.23  		imlib2-test)
  213.24  			copy @std @rm
  213.25  			CAT="development|testing utilities"
  213.26 -			DEPENDS="imlib2 xorg-libX11"
  213.27 +			DEPENDS="imlib2 libx11"
  213.28  			;;
  213.29  		imlib2-dev)
  213.30  			copy @dev
   214.1 --- a/inkscape/receipt	Fri Dec 21 04:44:58 2018 +0200
   214.2 +++ b/inkscape/receipt	Sat Dec 22 04:52:35 2018 +0200
   214.3 @@ -57,9 +57,9 @@
   214.4  			copy @std @rm
   214.5  			DEPENDS="aspell atk atkmm cairo cairomm fontconfig freetype gc \
   214.6  			gdk-pixbuf glib glibmm gnome-vfs gsl gtk2 gtkmm gtkspell \
   214.7 -			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng16 \
   214.8 +			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng \
   214.9  			librevenge libsigc++ libvisio libwpg libxml2 libxslt pango pangomm \
  214.10 -			perl poppler popt potrace python xorg-libX11 zlib"
  214.11 +			perl poppler popt potrace python libx11 zlib"
  214.12  			TAGS="image vector editor svg"
  214.13  			;;
  214.14  	esac
   215.1 --- a/inxi/receipt	Fri Dec 21 04:44:58 2018 +0200
   215.2 +++ b/inxi/receipt	Sat Dec 22 04:52:35 2018 +0200
   215.3 @@ -29,9 +29,9 @@
   215.4  	sed -i 's|uname:uname|uname:coreutils-context-system|' $inxi
   215.5  	sed -i 's|wc:coreutils|wc:coreutils-file-summarize|' $inxi
   215.6  	sed -i 's|glxinfo:mesa-utils|glxinfo:mesa-demos|' $inxi
   215.7 -	sed -i 's|xdpyinfo:X11-utils|xdpyinfo:xorg-xdpyinfo|' $inxi
   215.8 -	sed -i 's|xprop:X11-utils|xprop:xorg-xprop|' $inxi
   215.9 -	sed -i 's|xrandr:x11-xserver-utils|xrandr:xorg-xrandr|' $inxi
  215.10 +	sed -i 's|xdpyinfo:X11-utils|xdpyinfo:xdpyinfo|' $inxi
  215.11 +	sed -i 's|xprop:X11-utils|xprop:xprop|' $inxi
  215.12 +	sed -i 's|xrandr:x11-xserver-utils|xrandr:xrandr|' $inxi
  215.13  	sed -i 's|dig:dnsutils|dig:bind-client|' $inxi
  215.14  	sed -i 's|hddtemp:hddtemp|hddtemp:|' $inxi # no package
  215.15  	sed -i 's|ip:iproute|ip:iproute2|' $inxi
   216.1 --- a/irrlicht/receipt	Fri Dec 21 04:44:58 2018 +0200
   216.2 +++ b/irrlicht/receipt	Sat Dec 22 04:52:35 2018 +0200
   216.3 @@ -26,7 +26,7 @@
   216.4  	case $PACKAGE in
   216.5  		irrlicht)
   216.6  			copy @std
   216.7 -			DEPENDS="mesa gcc-lib-base xorg-libxcb xorg-libXfixes"
   216.8 +			DEPENDS="mesa gcc-lib-base libxcb libxfixes"
   216.9  			;;
  216.10  		*-dev)
  216.11  			copy @dev
   217.1 --- a/jbig2dec/receipt	Fri Dec 21 04:44:58 2018 +0200
   217.2 +++ b/jbig2dec/receipt	Sat Dec 22 04:52:35 2018 +0200
   217.3 @@ -11,7 +11,7 @@
   217.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   217.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   217.6  
   217.7 -BUILD_DEPENDS="libpng16-dev"
   217.8 +BUILD_DEPENDS="libpng-dev"
   217.9  SPLIT="$PACKAGE-dev"
  217.10  
  217.11  compile_rules() {
   218.1 --- a/js/receipt	Fri Dec 21 04:44:58 2018 +0200
   218.2 +++ b/js/receipt	Sat Dec 22 04:52:35 2018 +0200
   218.3 @@ -16,7 +16,7 @@
   218.4  # Use BLFS 8.1 source mirror:
   218.5  WGET_URL="http://ftp.osuosl.org/pub/blfs/8.1/m/$TARBALL"
   218.6  
   218.7 -BUILD_DEPENDS="autoconf213 xorg-libXt-dev python-dev xorg-libX11-dev nspr-dev \
   218.8 +BUILD_DEPENDS="autoconf213 libxt-dev python-dev libx11-dev nspr-dev \
   218.9  zlib-dev icu-dev coreutils-file-special"
  218.10  SPLIT="$PACKAGE-dev"
  218.11  
   219.1 --- a/jwm/receipt	Fri Dec 21 04:44:58 2018 +0200
   219.2 +++ b/jwm/receipt	Sat Dec 22 04:52:35 2018 +0200
   219.3 @@ -11,9 +11,9 @@
   219.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   219.5  WGET_URL="http://joewing.net/projects/jwm/releases/$TARBALL"
   219.6  
   219.7 -BUILD_DEPENDS="xorg-libX11-dev libpng16-dev libjpeg-turbo-dev cairo-dev \
   219.8 -librsvg-dev freetype-dev xorg-libXft-dev xorg-libXrender-dev fribidi-dev \
   219.9 -xorg-libXpm-dev xorg-libXmu-dev gettext xorg-libXinerama-dev \
  219.10 +BUILD_DEPENDS="libx11-dev libpng-dev libjpeg-turbo-dev cairo-dev \
  219.11 +librsvg-dev freetype-dev libxft-dev libxrender-dev fribidi-dev \
  219.12 +libxpm-dev libxmu-dev gettext libxinerama-dev \
  219.13  libxslt libxml2-tools"
  219.14  
  219.15  compile_rules() {
  219.16 @@ -48,9 +48,9 @@
  219.17  
  219.18  genpkg_rules() {
  219.19  	copy @std
  219.20 -	DEPENDS="cairo fribidi glib libjpeg-turbo libpng16 librsvg xorg-libX11 \
  219.21 -	xorg-libXext xorg-libXft xorg-libXinerama xorg-libXmu xorg-libXpm \
  219.22 -	xorg-libXrender   slitaz-configs-base xorg-xload xorg-xclock imlib2 \
  219.23 +	DEPENDS="cairo fribidi glib libjpeg-turbo libpng librsvg libx11 \
  219.24 +	libxext libxft libxinerama libxmu libxpm \
  219.25 +	libxrender   slitaz-configs-base xload xclock imlib2 \
  219.26  	hsetroot compton nano"
  219.27  	TAGS="window-manager"
  219.28  }
   220.1 --- a/karmen/receipt	Fri Dec 21 04:44:58 2018 +0200
   220.2 +++ b/karmen/receipt	Sat Dec 22 04:52:35 2018 +0200
   220.3 @@ -11,7 +11,7 @@
   220.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   220.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   220.6  
   220.7 -BUILD_DEPENDS="xorg-libX11-dev"
   220.8 +BUILD_DEPENDS="libx11-dev"
   220.9  
  220.10  compile_rules() {
  220.11  	./configure \
  220.12 @@ -30,7 +30,7 @@
  220.13  	cp -a $stuff/xsessions $fs/usr/share
  220.14  	cp -a $stuff/etc $fs
  220.15  	chown 0.0 $fs/usr/bin/*
  220.16 -	DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
  220.17 +	DEPENDS="libx11 xsetroot nano xterm xclock dialog"
  220.18  	TAGS="window-manager"
  220.19  }
  220.20  
   221.1 --- a/kazehakase/receipt	Fri Dec 21 04:44:58 2018 +0200
   221.2 +++ b/kazehakase/receipt	Sat Dec 22 04:52:35 2018 +0200
   221.3 @@ -13,7 +13,7 @@
   221.4  PATCH_URL="http://http.debian.net/debian/pool/main/k/kazehakase/kazehakase_0.5.8-4.diff.gz"
   221.5  
   221.6  BUILD_DEPENDS="libtool automake autoconf intltool \
   221.7 -gtk2-dev dbus-glib-dev webkitgtk-dev gnutls-dev xorg-libSM-dev zlib-dev \
   221.8 +gtk2-dev dbus-glib-dev webkitgtk-dev gnutls-dev libsm-dev zlib-dev \
   221.9  util-linux-uuid-dev libxslt-dev"
  221.10  
  221.11  compile_rules() {
   222.1 --- a/keepassx/receipt	Fri Dec 21 04:44:58 2018 +0200
   222.2 +++ b/keepassx/receipt	Sat Dec 22 04:52:35 2018 +0200
   222.3 @@ -13,7 +13,7 @@
   222.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   222.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   222.6  
   222.7 -BUILD_DEPENDS="Qt4-dev xorg-libXtst-dev xorg-libXtst qmake mesa-libegl"
   222.8 +BUILD_DEPENDS="Qt4-dev libxtst-dev qmake mesa-libegl"
   222.9  
  222.10  compile_rules() {
  222.11  	cd $src/src
  222.12 @@ -33,6 +33,6 @@
  222.13  	cp -a $install/usr/share/keepassx/license.html $fs/usr/share/licenses/$PACKAGE.html
  222.14  	ln -s /usr/share/keepassx/icons/keepassx_small.png $fs/usr/share/icons/hicolor/16x16/apps/keepassx.png
  222.15  	ln -s /usr/share/keepassx/icons/keepassx_large.png $fs/usr/share/icons/hicolor/48x48/apps/keepassx.png
  222.16 -	DEPENDS="xorg-libXtst libQtCore libQtGui libQtXml gcc-lib-base"
  222.17 +	DEPENDS="libxtst libQtCore libQtGui libQtXml gcc-lib-base"
  222.18  	TAGS="password key"
  222.19  }
   223.1 --- a/keybinder/receipt	Fri Dec 21 04:44:58 2018 +0200
   223.2 +++ b/keybinder/receipt	Sat Dec 22 04:52:35 2018 +0200
   223.3 @@ -11,7 +11,7 @@
   223.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   223.5  WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/v$VERSION/$TARBALL"
   223.6  
   223.7 -BUILD_DEPENDS="gtk2-dev gobject-introspection-dev xorg-libXext-dev python-dev \
   223.8 +BUILD_DEPENDS="gtk2-dev gobject-introspection-dev libxext-dev python-dev \
   223.9  python-pygtk-dev python-pygobject2-dev automake autoconf libtool"
  223.10  SPLIT="$PACKAGE-python $PACKAGE-dev"
  223.11  
  223.12 @@ -27,7 +27,7 @@
  223.13  	case $PACKAGE in
  223.14  		keybinder)
  223.15  			copy libkeybinder.so*
  223.16 -			DEPENDS="glib gtk2 xorg-libX11"
  223.17 +			DEPENDS="glib gtk2 libx11"
  223.18  			;;
  223.19  		keybinder-python)
  223.20  			copy @std @rm
   224.1 --- a/keybinder3/receipt	Fri Dec 21 04:44:58 2018 +0200
   224.2 +++ b/keybinder3/receipt	Sat Dec 22 04:52:35 2018 +0200
   224.3 @@ -12,8 +12,8 @@
   224.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   224.5  WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$VERSION/keybinder-3.0-$VERSION.tar.gz"
   224.6  
   224.7 -BUILD_DEPENDS="gtk3-dev gobject-introspection-dev xorg-libXext-dev \
   224.8 -xorg-libXrender-dev"
   224.9 +BUILD_DEPENDS="gtk3-dev gobject-introspection-dev libxext-dev \
  224.10 +libxrender-dev"
  224.11  SPLIT="$PACKAGE-dev"
  224.12  
  224.13  compile_rules() {
  224.14 @@ -27,7 +27,7 @@
  224.15  	case $PACKAGE in
  224.16  		keybinder3)
  224.17  			copy @std
  224.18 -			DEPENDS="glib gtk3 xorg-libX11"
  224.19 +			DEPENDS="glib gtk3 libx11"
  224.20  			;;
  224.21  		*-dev)
  224.22  			copy @dev
   225.1 --- a/kguiaddons/receipt	Fri Dec 21 04:44:58 2018 +0200
   225.2 +++ b/kguiaddons/receipt	Sat Dec 22 04:52:35 2018 +0200
   225.3 @@ -32,8 +32,8 @@
   225.4  	case $PACKAGE in
   225.5  		kguiaddons)
   225.6  			copy @std
   225.7 -			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
   225.8 -			xorg-libxcb"
   225.9 +			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
  225.10 +			libxcb"
  225.11  			;;
  225.12  		*-dev)
  225.13  			copy @dev
   226.1 --- a/kidletime/receipt	Fri Dec 21 04:44:58 2018 +0200
   226.2 +++ b/kidletime/receipt	Sat Dec 22 04:52:35 2018 +0200
   226.3 @@ -32,8 +32,8 @@
   226.4  	case $PACKAGE in
   226.5  		kidletime)
   226.6  			copy @std
   226.7 -			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
   226.8 -			xorg-libxcb"
   226.9 +			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
  226.10 +			libxcb"
  226.11  			;;
  226.12  		*-dev)
  226.13  			copy @dev
   227.1 --- a/kino/receipt	Fri Dec 21 04:44:58 2018 +0200
   227.2 +++ b/kino/receipt	Sat Dec 22 04:52:35 2018 +0200
   227.3 @@ -12,10 +12,10 @@
   227.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   227.5  
   227.6  BUILD_DEPENDS="intltool libdv perl xorg-dev xorg-dev-proto gtk2-dev libglade-dev \
   227.7 -libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev xorg-libXv-dev \
   227.8 -libiec61883-dev libxml2-dev bash libpng16-dev freetype-dev fontconfig-dev \
   227.9 -libiec61883 ffmpeg-dev xorg-libXv libsamplerate util-linux-uuid-dev \
  227.10 -alsa-lib xorg-libXext v4l-utils-dev"
  227.11 +libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev libxv-dev \
  227.12 +libiec61883-dev libxml2-dev bash libpng-dev freetype-dev fontconfig-dev \
  227.13 +libiec61883 ffmpeg-dev libsamplerate util-linux-uuid-dev \
  227.14 +alsa-lib libxext v4l-utils-dev"
  227.15  
  227.16  compile_rules() {
  227.17  	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
  227.18 @@ -36,7 +36,7 @@
  227.19  	# Remove Help files
  227.20  	rm -rf $fs/usr/share/kino/help
  227.21  	DEPENDS="gtk2 libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
  227.22 -	libiec61883 xorg-libXv linux-firewire xorg-libXdamage ffmpeg"
  227.23 +	libiec61883 libxv linux-firewire libxdamage ffmpeg"
  227.24  	SUGGESTED="lame vorbis-tools mjpegtools dvdauthor"
  227.25  	TAGS="video editor"
  227.26  }
   228.1 --- a/klavaro/receipt	Fri Dec 21 04:44:58 2018 +0200
   228.2 +++ b/klavaro/receipt	Sat Dec 22 04:52:35 2018 +0200
   228.3 @@ -11,7 +11,7 @@
   228.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   228.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   228.6  
   228.7 -BUILD_DEPENDS="xorg-libXdamage gtk2-dev xorg-xorgproto gtkdatabox-dev curl-dev \
   228.8 +BUILD_DEPENDS="libxdamage gtk2-dev xorgproto gtkdatabox-dev curl-dev \
   228.9  libsexy-dev"
  228.10  
  228.11  compile_rules() {
  228.12 @@ -29,6 +29,6 @@
  228.13  	cp -a $install/usr/share/klavaro $fs/usr/share
  228.14  	cp -a $install/usr/share/icons/hicolor/24x24/apps/* \
  228.15  		$fs/usr/share/pixmaps
  228.16 -	DEPENDS="gtk2 xorg-libXdamage gtkdatabox libcurl libsexy"
  228.17 +	DEPENDS="gtk2 libxdamage gtkdatabox libcurl libsexy"
  228.18  	TAGS="typing"
  228.19  }
   229.1 --- a/kvantum/receipt	Fri Dec 21 04:44:58 2018 +0200
   229.2 +++ b/kvantum/receipt	Sat Dec 22 04:52:35 2018 +0200
   229.3 @@ -11,7 +11,7 @@
   229.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   229.5  WGET_URL="https://github.com/tsujan/Kvantum/archive/V$VERSION.tar.gz"
   229.6  
   229.7 -BUILD_DEPENDS="qt5-dev xorg-libX11-dev"
   229.8 +BUILD_DEPENDS="qt5-dev libx11-dev"
   229.9  
  229.10  compile_rules() {
  229.11  	mkdir build
  229.12 @@ -27,6 +27,6 @@
  229.13  
  229.14  genpkg_rules() {
  229.15  	copy @std
  229.16 -	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras xorg-libX11 \
  229.17 -	xorg-libXext"
  229.18 +	DEPENDS="libatomic mesa qt5-base qt5-svg qt5-x11extras libx11 \
  229.19 +	libxext"
  229.20  }
   230.1 --- a/kwindowsystem/receipt	Fri Dec 21 04:44:58 2018 +0200
   230.2 +++ b/kwindowsystem/receipt	Sat Dec 22 04:52:35 2018 +0200
   230.3 @@ -13,7 +13,7 @@
   230.4  WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
   230.5  
   230.6  BUILD_DEPENDS="cmake qt5-dev extra-cmake-modules mesa-dev \
   230.7 -xorg-xcb-util-keysyms-dev"
   230.8 +xcb-util-keysyms-dev"
   230.9  SPLIT="$PACKAGE-dev"
  230.10  
  230.11  compile_rules() {
  230.12 @@ -33,8 +33,8 @@
  230.13  	case $PACKAGE in
  230.14  		kwindowsystem)
  230.15  			copy @std
  230.16 -			DEPENDS="qt5-base qt5-x11extras xorg-libX11 xorg-libXext \
  230.17 -			xorg-libXfixes xorg-libXrender xorg-libxcb xorg-xcb-util-keysyms"
  230.18 +			DEPENDS="qt5-base qt5-x11extras libx11 libxext \
  230.19 +			libxfixes libxrender libxcb xcb-util-keysyms"
  230.20  			;;
  230.21  		*-dev)
  230.22  			copy @dev
   231.1 --- a/lbreakout2/receipt	Fri Dec 21 04:44:58 2018 +0200
   231.2 +++ b/lbreakout2/receipt	Sat Dec 22 04:52:35 2018 +0200
   231.3 @@ -11,7 +11,7 @@
   231.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   231.5  WGET_URL="$SF_MIRROR/lgames/$TARBALL"
   231.6  
   231.7 -BUILD_DEPENDS="libpng16-dev libsdl-dev"
   231.8 +BUILD_DEPENDS="libpng-dev libsdl-dev"
   231.9  
  231.10  compile_rules() {
  231.11  	sed -i 's|/usr/doc|/usr/share/doc|' configure*
  231.12 @@ -32,5 +32,5 @@
  231.13  	cp -a $install/usr/share $fs/usr
  231.14  	rm -rf $fs/usr/share/doc
  231.15  	cp -a $stuff/* $fs
  231.16 -	DEPENDS="libpng16 libsdl libsdl-mixer zlib"
  231.17 +	DEPENDS="libpng libsdl libsdl-mixer zlib"
  231.18  }
   232.1 --- a/leafpad/receipt	Fri Dec 21 04:44:58 2018 +0200
   232.2 +++ b/leafpad/receipt	Sat Dec 22 04:52:35 2018 +0200
   232.3 @@ -11,7 +11,7 @@
   232.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   232.5  WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
   232.6  
   232.7 -BUILD_DEPENDS="gtk2-dev xorg-libXrender-dev xorg-xorgproto intltool"
   232.8 +BUILD_DEPENDS="gtk2-dev libxrender-dev xorgproto intltool"
   232.9  
  232.10  COOKOPTS="!pixmaps"
  232.11  
  232.12 @@ -25,6 +25,6 @@
  232.13  
  232.14  genpkg_rules() {
  232.15  	copy leafpad
  232.16 -	DEPENDS="gtk2 xorg-libXdamage"
  232.17 +	DEPENDS="gtk2 libxdamage"
  232.18  	TAGS="text-editor"
  232.19  }
   233.1 --- a/lensfun/receipt	Fri Dec 21 04:44:58 2018 +0200
   233.2 +++ b/lensfun/receipt	Sat Dec 22 04:52:35 2018 +0200
   233.3 @@ -12,7 +12,7 @@
   233.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   233.5  WGET_URL="$SF_MIRROR/lensfun/$TARBALL"
   233.6  
   233.7 -BUILD_DEPENDS="cmake glib-dev libpng16-dev"
   233.8 +BUILD_DEPENDS="cmake glib-dev libpng-dev"
   233.9  SPLIT="lenstool $PACKAGE $PACKAGE-dev"
  233.10  
  233.11  compile_rules() {
  233.12 @@ -38,7 +38,7 @@
  233.13  		lenstool)
  233.14  			copy lenstool
  233.15  			CAT="multimedia|reference implementation for Lenstool"
  233.16 -			DEPENDS="glib lensfun libpng16"
  233.17 +			DEPENDS="glib lensfun libpng"
  233.18  			;;
  233.19  		lensfun)
  233.20  			copy @std @rm
   234.1 --- a/leocad/receipt	Fri Dec 21 04:44:58 2018 +0200
   234.2 +++ b/leocad/receipt	Sat Dec 22 04:52:35 2018 +0200
   234.3 @@ -35,8 +35,8 @@
   234.4  	chmod +x $fs/usr/bin/leocad
   234.5  	cp -a $install/* $fs
   234.6  	DEPENDS="glibc-base gcc-lib-base glib expat zlib leocad-pieces gtk2 atk \
   234.7 -	cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb \
   234.8 -	xorg-xcb-util xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
   234.9 -	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft \
  234.10 -	xorg-libXinerama xorg-libXrender mesa glu"
  234.11 +	cairo pixman pango jpeg libpng fontconfig freetype libxcb \
  234.12 +	xcb-util libx11 libxau libxcomposite libxcursor \
  234.13 +	libxdamage libxdmcp libxext libxfixes libxft \
  234.14 +	libxinerama libxrender mesa glu"
  234.15  }
   235.1 --- a/leptonica/receipt	Fri Dec 21 04:44:58 2018 +0200
   235.2 +++ b/leptonica/receipt	Sat Dec 22 04:52:35 2018 +0200
   235.3 @@ -11,7 +11,7 @@
   235.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   235.5  WGET_URL="http://www.leptonica.org/source/$TARBALL"
   235.6  
   235.7 -BUILD_DEPENDS="giflib-dev jpeg-dev libpng16-dev tiff-dev xorg-dev"
   235.8 +BUILD_DEPENDS="giflib-dev jpeg-dev libpng-dev tiff-dev xorg-dev"
   235.9  SPLIT="$PACKAGE-dev"
  235.10  
  235.11  compile_rules() {
  235.12 @@ -25,8 +25,8 @@
  235.13  	case $PACKAGE in
  235.14  		leptonica)
  235.15  			copy @std
  235.16 -			DEPENDS="giflib jpeg libpng16 tiff xorg-libX11 xorg-libXau \
  235.17 -			xorg-libXdmcp xorg-libxcb"
  235.18 +			DEPENDS="giflib jpeg libpng tiff libx11 libxau \
  235.19 +			libxdmcp libxcb"
  235.20  			;;
  235.21  		*-dev)
  235.22  			copy @dev
   236.1 --- a/lesstif/receipt	Fri Dec 21 04:44:58 2018 +0200
   236.2 +++ b/lesstif/receipt	Sat Dec 22 04:52:35 2018 +0200
   236.3 @@ -11,7 +11,7 @@
   236.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   236.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   236.6  
   236.7 -BUILD_DEPENDS="xorg-xorgproto xorg-libXt-dev xorg-libXext-dev \
   236.8 +BUILD_DEPENDS="xorgproto libxt-dev libxext-dev \
   236.9  util-linux-uuid-dev automake"
  236.10  SPLIT="$PACKAGE-dev"
  236.11  
  236.12 @@ -26,9 +26,9 @@
  236.13  	case $PACKAGE in
  236.14  		lesstif)
  236.15  			copy @std
  236.16 -			DEPENDS="glibc-base xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
  236.17 -			xorg-libXdmcp xorg-libXext xorg-libXt util-linux-uuid freetype \
  236.18 -			xorg-libXp"
  236.19 +			DEPENDS="glibc-base libice libsm libx11 libxau \
  236.20 +			libxdmcp libxext libxt util-linux-uuid freetype \
  236.21 +			libxp"
  236.22  			;;
  236.23  		*-dev)
  236.24  			copy @dev
   237.1 --- a/libXaw3dXft/receipt	Fri Dec 21 04:44:58 2018 +0200
   237.2 +++ b/libXaw3dXft/receipt	Sat Dec 22 04:52:35 2018 +0200
   237.3 @@ -12,8 +12,8 @@
   237.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   237.5  WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
   237.6  
   237.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXmu-dev xorg-libXext-dev \
   237.8 -xorg-libXft-dev xorg-libXpm-dev"
   237.9 +BUILD_DEPENDS="libx11-dev libxt-dev libxmu-dev libxext-dev \
  237.10 +libxft-dev libxpm-dev"
  237.11  SPLIT="$PACKAGE-dev"
  237.12  
  237.13  compile_rules() {
  237.14 @@ -31,14 +31,14 @@
  237.15  	case $PACKAGE in
  237.16  		libXaw3dXft)
  237.17  			copy @std
  237.18 -			DEPENDS="xorg-libX11 xorg-libXext xorg-libXft xorg-libXmu \
  237.19 -			xorg-libXpm xorg-libXt"
  237.20 +			DEPENDS="libx11 libxext libxft libxmu \
  237.21 +			libxpm libxt"
  237.22  			;;
  237.23  		*-dev)
  237.24  			copy @dev
  237.25 -			DEPENDS="libXaw3dXft fontconfig-dev xorg-libX11-dev \
  237.26 -			xorg-libXext-dev xorg-libXft-dev xorg-libXmu-dev xorg-libXt-dev \
  237.27 -			xorg-xorgproto"
  237.28 +			DEPENDS="libXaw3dXft fontconfig-dev libx11-dev \
  237.29 +			libxext-dev libxft-dev libxmu-dev libxt-dev \
  237.30 +			xorgproto"
  237.31  			;;
  237.32  	esac
  237.33  }
   238.1 --- a/libbonoboui/receipt	Fri Dec 21 04:44:58 2018 +0200
   238.2 +++ b/libbonoboui/receipt	Sat Dec 22 04:52:35 2018 +0200
   238.3 @@ -11,9 +11,9 @@
   238.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   238.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   238.6  
   238.7 -BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev xorg-libICE-dev popt-dev \
   238.8 +BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev libice-dev popt-dev \
   238.9  libgnomecanvas-dev libbonobo-dev libgnome-dev gconf-dev libglade-dev \
  238.10 -xorg-libSM-dev libgcrypt-dev"
  238.11 +libsm-dev libgcrypt-dev"
  238.12  SPLIT="$PACKAGE-dev"
  238.13  
  238.14  compile_rules() {
  238.15 @@ -30,7 +30,7 @@
  238.16  		libbonoboui)
  238.17  			copy @std
  238.18  			DEPENDS="atk gconf gdk-pixbuf glib gtk2 libart_lgpl libbonobo \
  238.19 -			libglade libgnome libgnomecanvas libxml2 orbit2 popt xorg-libX11"
  238.20 +			libglade libgnome libgnomecanvas libxml2 orbit2 popt libx11"
  238.21  			;;
  238.22  		*-dev)
  238.23  			copy @dev
   239.1 --- a/libcaca/receipt	Fri Dec 21 04:44:58 2018 +0200
   239.2 +++ b/libcaca/receipt	Sat Dec 22 04:52:35 2018 +0200
   239.3 @@ -11,7 +11,7 @@
   239.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   239.5  WGET_URL="http://caca.zoy.org/files/libcaca/$TARBALL"
   239.6  
   239.7 -BUILD_DEPENDS="zlib-dev xorg-libX11-dev mesa-dev ncurses-dev python imlib2-dev \
   239.8 +BUILD_DEPENDS="zlib-dev libx11-dev mesa-dev ncurses-dev python imlib2-dev \
   239.9  pango-dev doxygen cppunit-dev"
  239.10  SPLIT="python-caca $PACKAGE-dev"
  239.11  
  239.12 @@ -27,7 +27,7 @@
  239.13  		libcaca)
  239.14  			copy @std
  239.15  			rm -rf $fs/usr/lib/python2.7/
  239.16 -			DEPENDS="imlib2 ncurses xorg-libX11 zlib"
  239.17 +			DEPENDS="imlib2 ncurses libx11 zlib"
  239.18  			;;
  239.19  		python-caca)
  239.20  			copy *.py
  239.21 @@ -35,8 +35,8 @@
  239.22  			;;
  239.23  		*-dev)
  239.24  			copy @dev
  239.25 -			DEPENDS="libcaca python-caca ncurses-dev xorg-libX11-dev \
  239.26 -			xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev zlib-dev"
  239.27 +			DEPENDS="libcaca python-caca ncurses-dev libx11-dev \
  239.28 +			libxau-dev libxdmcp-dev libxcb-dev zlib-dev"
  239.29  			;;
  239.30  	esac
  239.31  }
   240.1 --- a/libcanberra/receipt	Fri Dec 21 04:44:58 2018 +0200
   240.2 +++ b/libcanberra/receipt	Sat Dec 22 04:52:35 2018 +0200
   240.3 @@ -42,12 +42,12 @@
   240.4  		*-gtk2)
   240.5  			copy gtk-2.0/modules/*.so libcanberra-gtk.so*
   240.6  			CAT="sound|GTK+2 integration"
   240.7 -			DEPENDS="glib gtk2 libcanberra xorg-libX11"
   240.8 +			DEPENDS="glib gtk2 libcanberra libx11"
   240.9  			;;
  240.10  		*-gtk3)
  240.11  			copy gtk-3.0/modules/*.so libcanberra-gtk3.so* canberra-gtk-play
  240.12  			CAT="sound|GTK+3 integration"
  240.13 -			DEPENDS="glib gtk3 libcanberra xorg-libX11"
  240.14 +			DEPENDS="glib gtk3 libcanberra libx11"
  240.15  			;;
  240.16  		libcanberra)
  240.17  			copy @std @rm
  240.18 @@ -56,7 +56,7 @@
  240.19  		*-dev)
  240.20  			copy @dev
  240.21  			DEPENDS="${SPLIT/$PACKAGE/} \
  240.22 -			gtk2-dev gtk3-dev xorg-libX11-dev"
  240.23 +			gtk2-dev gtk3-dev libx11-dev"
  240.24  			;;
  240.25  	esac
  240.26  }
   241.1 --- a/libcompizconfig/receipt	Fri Dec 21 04:44:58 2018 +0200
   241.2 +++ b/libcompizconfig/receipt	Sat Dec 22 04:52:35 2018 +0200
   241.3 @@ -11,11 +11,11 @@
   241.4  TARBALL="$PACKAGE-v$VERSION.tar.bz2"
   241.5  WGET_URL="https://gitlab.com/compiz/libcompizconfig/-/archive/v$VERSION/$TARBALL"
   241.6  
   241.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev compiz-dev protobuf-dev \
   241.8 +BUILD_DEPENDS="automake libtool libx11-dev compiz-dev protobuf-dev \
   241.9  libxslt-dev mesa-dev"
  241.10  SPLIT="$PACKAGE-dev"
  241.11  
  241.12 -DEPENDS_std="libxml2 xorg-libX11"
  241.13 +DEPENDS_std="libxml2 libx11"
  241.14  DEPENDS_dev="libcompizconfig compiz-dev"
  241.15  
  241.16  TAGS="compiz"
   242.1 --- a/libdbusmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
   242.2 +++ b/libdbusmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
   242.3 @@ -35,7 +35,7 @@
   242.4  	case $PACKAGE in
   242.5  		libdbusmenu-gtk2-apps)
   242.6  			copy libexec/
   242.7 -			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk2 xorg-libX11"
   242.8 +			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk2 libx11"
   242.9  			CAT="development|GTK+2 applications"
  242.10  			;;
  242.11  		libdbusmenu-gtk2)
  242.12 @@ -52,7 +52,7 @@
  242.13  
  242.14  		libdbusmenu-gtk3-apps)
  242.15  			copy libexec/ # note "gtk2" in depends
  242.16 -			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk3 xorg-libX11"
  242.17 +			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk3 libx11"
  242.18  			CAT="development|GTK+3 applications"
  242.19  			;;
  242.20  		libdbusmenu-gtk3)
   243.1 --- a/libdv/receipt	Fri Dec 21 04:44:58 2018 +0200
   243.2 +++ b/libdv/receipt	Sat Dec 22 04:52:35 2018 +0200
   243.3 @@ -12,7 +12,7 @@
   243.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   243.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   243.6  
   243.7 -# With no effect on final binaries: xorg-libX11-dev xorg-libXt-dev libsdl-dev
   243.8 +# With no effect on final binaries: libx11-dev libxt-dev libsdl-dev
   243.9  BUILD_DEPENDS="gfortran"
  243.10  SPLIT="$PACKAGE-dev"
  243.11  
   244.1 --- a/libepoxy/receipt	Fri Dec 21 04:44:58 2018 +0200
   244.2 +++ b/libepoxy/receipt	Sat Dec 22 04:52:35 2018 +0200
   244.3 @@ -12,7 +12,7 @@
   244.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   244.5  WGET_URL="https://github.com/anholt/libepoxy/releases/download/$VERSION/$TARBALL"
   244.6  
   244.7 -BUILD_DEPENDS="meson ninja xorg-libX11-dev mesa-dev"
   244.8 +BUILD_DEPENDS="meson ninja libx11-dev mesa-dev"
   244.9  SPLIT="$PACKAGE-dev"
  244.10  
  244.11  compile_rules() {
   245.1 --- a/libfakekey/receipt	Fri Dec 21 04:44:58 2018 +0200
   245.2 +++ b/libfakekey/receipt	Sat Dec 22 04:52:35 2018 +0200
   245.3 @@ -11,7 +11,7 @@
   245.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   245.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot/$TARBALL"
   245.6  
   245.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXtst-dev"
   245.8 +BUILD_DEPENDS="automake libtool libx11-dev libxtst-dev"
   245.9  SPLIT="$PACKAGE-dev"
  245.10  
  245.11  compile_rules() {
  245.12 @@ -26,12 +26,12 @@
  245.13  	case $PACKAGE in
  245.14  		libfakekey)
  245.15  			copy @std
  245.16 -			DEPENDS="xorg-libX11 xorg-libXtst"
  245.17 +			DEPENDS="libx11 libxtst"
  245.18  			;;
  245.19  		*-dev)
  245.20  			copy @dev
  245.21  			DEPENDS="libfakekey \
  245.22 -			xorg-libX11-dev xorg-libXtst-dev"
  245.23 +			libx11-dev libxtst-dev"
  245.24  			;;
  245.25  	esac
  245.26  	TAGS="matchbox"
   246.1 --- a/libfm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
   246.2 +++ b/libfm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
   246.3 @@ -35,7 +35,7 @@
   246.4  		libfm-qt)
   246.5  			copy @std
   246.6  			rm -rf $fs/usr/share/mime	# useless, see shared-mime-info package
   246.7 -			DEPENDS="glib libfm menu-cache qt5-base qt5-x11extras xorg-libxcb"
   246.8 +			DEPENDS="glib libfm menu-cache qt5-base qt5-x11extras libxcb"
   246.9  			;;
  246.10  		*-dev)
  246.11  			copy @dev
   247.1 --- a/libgd/receipt	Fri Dec 21 04:44:58 2018 +0200
   247.2 +++ b/libgd/receipt	Sat Dec 22 04:52:35 2018 +0200
   247.3 @@ -12,8 +12,8 @@
   247.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   247.5  WGET_URL="$GITHUB/libgd/libgd/tarball/gd-$VERSION"
   247.6  
   247.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev zlib-dev libpng16-dev \
   247.8 -freetype-dev fontconfig-dev libjpeg-turbo-dev xorg-libXpm-dev tiff-dev \
   247.9 +BUILD_DEPENDS="automake libtool libx11-dev zlib-dev libpng-dev \
  247.10 +freetype-dev fontconfig-dev libjpeg-turbo-dev libxpm-dev tiff-dev \
  247.11  libwebp-dev"
  247.12  SPLIT="$PACKAGE-dev"
  247.13  
  247.14 @@ -29,13 +29,13 @@
  247.15  	case $PACKAGE in
  247.16  		libgd)
  247.17  			copy @std
  247.18 -			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 libwebp tiff \
  247.19 -			xorg-libXpm zlib"
  247.20 +			DEPENDS="fontconfig freetype libjpeg-turbo libpng libwebp tiff \
  247.21 +			libxpm zlib"
  247.22  			;;
  247.23  		*-dev)
  247.24  			copy @dev
  247.25  			DEPENDS="libgd fontconfig-dev freetype-dev libjpeg-turbo-dev \
  247.26 -			libpng16-dev libwebp-dev tiff-dev xorg-libX11-dev xorg-libXpm-dev \
  247.27 +			libpng-dev libwebp-dev tiff-dev libx11-dev libxpm-dev \
  247.28  			zlib-dev"
  247.29  			;;
  247.30  	esac
   248.1 --- a/libgdiplus/receipt	Fri Dec 21 04:44:58 2018 +0200
   248.2 +++ b/libgdiplus/receipt	Sat Dec 22 04:52:35 2018 +0200
   248.3 @@ -14,7 +14,7 @@
   248.4  
   248.5  BUILD_DEPENDS="m4 bison glib-dev xorg-dev libxml2-dev \
   248.6  cairo-dev expat-dev freetype-dev fontconfig-dev giflib giflib-dev jpeg-dev \
   248.7 -libpng16-dev tiff-dev xorg-pixman-dev libexif-dev libexif zlib-dev \
   248.8 +libpng-dev tiff-dev pixman-dev libexif-dev libexif zlib-dev \
   248.9  util-linux-uuid-dev automake autoconf libtool"
  248.10  SPLIT="$PACKAGE-dev"
  248.11  
  248.12 @@ -35,9 +35,9 @@
  248.13  	case $PACKAGE in
  248.14  		libgdiplus)
  248.15  			copy @std
  248.16 -			DEPENDS="glib glibc-base xorg-libICE xorg-libSM xorg-libX11 \
  248.17 -			xorg-libXau xorg-libXdmcp xorg-libXrender cairo expat \
  248.18 -			freetype fontconfig giflib jpeg libpng16 tiff xorg-pixman \
  248.19 +			DEPENDS="glib glibc-base libice libsm libx11 \
  248.20 +			libxau libxdmcp libxrender cairo expat \
  248.21 +			freetype fontconfig giflib jpeg libpng tiff pixman \
  248.22  			libexif zlib util-linux-uuid"
  248.23  			;;
  248.24  		*-dev)
   249.1 --- a/libgnomecanvas/receipt	Fri Dec 21 04:44:58 2018 +0200
   249.2 +++ b/libgnomecanvas/receipt	Sat Dec 22 04:52:35 2018 +0200
   249.3 @@ -11,7 +11,7 @@
   249.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   249.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   249.6  
   249.7 -BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev xorg-libXcursor-dev \
   249.8 +BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev libxcursor-dev \
   249.9  intltool"
  249.10  SPLIT="$PACKAGE-dev"
  249.11  
   250.1 --- a/libgnomeprintui/receipt	Fri Dec 21 04:44:58 2018 +0200
   250.2 +++ b/libgnomeprintui/receipt	Sat Dec 22 04:52:35 2018 +0200
   250.3 @@ -12,8 +12,8 @@
   250.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   250.5  
   250.6  BUILD_DEPENDS="gnome-icon-theme flex libgnomeprint-dev \
   250.7 -xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXcursor-dev \
   250.8 -xorg-libXcomposite-dev xorg-libXdamage-dev \
   250.9 +libxinerama-dev libxrandr-dev libxcursor-dev \
  250.10 +libxcomposite-dev libxdamage-dev \
  250.11  libgnomecanvas-dev libart_lgpl-dev intltool"
  250.12  SPLIT="$PACKAGE-dev"
  250.13  
   251.1 --- a/libgnomeui/receipt	Fri Dec 21 04:44:58 2018 +0200
   251.2 +++ b/libgnomeui/receipt	Sat Dec 22 04:52:35 2018 +0200
   251.3 @@ -13,8 +13,8 @@
   251.4  
   251.5  BUILD_DEPENDS="libgnome-dev libgnomecanvas-dev gnome-keyring \
   251.6  libgnome-keyring-dev libbonoboui-dev util-linux-uuid-dev libgcrypt-dev \
   251.7 -dbus-glib-dev esound-dev audiofile-dev libglade-dev intltool xorg-libICE-dev \
   251.8 -xorg-libSM-dev"
   251.9 +dbus-glib-dev esound-dev audiofile-dev libglade-dev intltool libice-dev \
  251.10 +libsm-dev"
  251.11  SPLIT="$PACKAGE-dev"
  251.12  
  251.13  compile_rules() {
  251.14 @@ -32,14 +32,14 @@
  251.15  			copy @std
  251.16  			DEPENDS="gconf atk gdk-pixbuf glib gnome-vfs gtk2 libart_lgpl \
  251.17  			libbonoboui libglade libgnome libgnome-keyring libgnomecanvas \
  251.18 -			pango xorg-libICE xorg-libSM"
  251.19 +			pango libice libsm"
  251.20  			;;
  251.21  		*-dev)
  251.22  			copy @dev
  251.23  			DEPENDS="libgnomeui gconf-dev gdk-pixbuf-dev gnome-vfs-dev \
  251.24  			gtk2-dev libart_lgpl-dev libbonoboui-dev libgnome-dev \
  251.25 -			libgnome-keyring-dev libgnomecanvas-dev xorg-libICE-dev \
  251.26 -			xorg-libSM-dev"
  251.27 +			libgnome-keyring-dev libgnomecanvas-dev libice-dev \
  251.28 +			libsm-dev"
  251.29  			;;
  251.30  	esac
  251.31  }
   252.1 --- a/libgtkhtml/receipt	Fri Dec 21 04:44:58 2018 +0200
   252.2 +++ b/libgtkhtml/receipt	Sat Dec 22 04:52:35 2018 +0200
   252.3 @@ -12,7 +12,7 @@
   252.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   252.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   252.6  
   252.7 -BUILD_DEPENDS="libxml2-dev gtk2-dev xorg-libXdamage-dev expat-dev"
   252.8 +BUILD_DEPENDS="libxml2-dev gtk2-dev libxdamage-dev expat-dev"
   252.9  SPLIT="$PACKAGE-dev"
  252.10  
  252.11  compile_rules() {
  252.12 @@ -27,10 +27,10 @@
  252.13  		libgtkhtml)
  252.14  			copy @std
  252.15  			DEPENDS="glibc-base glib expat libxml2 zlib gtk2 cairo atk \
  252.16 -			fontconfig freetype pango xorg-pixman libpng16 xorg-libX11 \
  252.17 -			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXcursor \
  252.18 -			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
  252.19 -			xorg-libXinerama xorg-libXrender"
  252.20 +			fontconfig freetype pango pixman libpng libx11 \
  252.21 +			libxau libxcomposite libxcursor \
  252.22 +			libxdamage libxdmcp libxext libxfixes \
  252.23 +			libxinerama libxrender"
  252.24  			;;
  252.25  		*-dev)
  252.26  			copy @dev
   253.1 --- a/libgtop/receipt	Fri Dec 21 04:44:58 2018 +0200
   253.2 +++ b/libgtop/receipt	Sat Dec 22 04:52:35 2018 +0200
   253.3 @@ -12,7 +12,7 @@
   253.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   253.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   253.6  
   253.7 -BUILD_DEPENDS="glib-dev intltool xorg-libX11-dev xorg-libXau-dev gtk-doc"
   253.8 +BUILD_DEPENDS="glib-dev intltool libx11-dev libxau-dev gtk-doc"
   253.9  SPLIT="$PACKAGE-dev"
  253.10  
  253.11  compile_rules() {
  253.12 @@ -26,7 +26,7 @@
  253.13  	case $PACKAGE in
  253.14  		libgtop)
  253.15  			copy @std
  253.16 -			DEPENDS="glib xorg-libXau"
  253.17 +			DEPENDS="glib libxau"
  253.18  			;;
  253.19  		*-dev)
  253.20  			copy @dev
   254.1 --- a/libharu/receipt	Fri Dec 21 04:44:58 2018 +0200
   254.2 +++ b/libharu/receipt	Sat Dec 22 04:52:35 2018 +0200
   254.3 @@ -11,7 +11,7 @@
   254.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   254.5  WGET_URL="https://github.com/libharu/libharu/archive/RELEASE_${VERSION//./_}.tar.gz"
   254.6  
   254.7 -BUILD_DEPENDS="automake libtool zlib-dev libpng16-dev"
   254.8 +BUILD_DEPENDS="automake libtool zlib-dev libpng-dev"
   254.9  SPLIT="$PACKAGE-dev"
  254.10  
  254.11  compile_rules() {
  254.12 @@ -31,11 +31,11 @@
  254.13  	case $PACKAGE in
  254.14  		libharu)
  254.15  			copy @std
  254.16 -			DEPENDS="libpng16 zlib"
  254.17 +			DEPENDS="libpng zlib"
  254.18  			;;
  254.19  		*-dev)
  254.20  			copy @dev
  254.21 -			DEPENDS="libharu libpng16-dev zlib-dev"
  254.22 +			DEPENDS="libharu libpng-dev zlib-dev"
  254.23  			;;
  254.24  	esac
  254.25  }
   255.1 --- a/libheif/receipt	Fri Dec 21 04:44:58 2018 +0200
   255.2 +++ b/libheif/receipt	Sat Dec 22 04:52:35 2018 +0200
   255.3 @@ -11,7 +11,7 @@
   255.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   255.5  WGET_URL="https://github.com/strukturag/libheif/releases/download/v$VERSION/$TARBALL"
   255.6  
   255.7 -BUILD_DEPENDS="libde265-dev x265-dev libjpeg-turbo-dev libpng16-dev"
   255.8 +BUILD_DEPENDS="libde265-dev x265-dev libjpeg-turbo-dev libpng-dev"
   255.9  SPLIT="$PACKAGE-dev"
  255.10  
  255.11  compile_rules() {
  255.12 @@ -27,7 +27,7 @@
  255.13  	case $PACKAGE in
  255.14  		libheif)
  255.15  			copy @std
  255.16 -			DEPENDS="libde265 libjpeg-turbo libpng16 x265"
  255.17 +			DEPENDS="libde265 libjpeg-turbo libpng x265"
  255.18  			;;
  255.19  		*-dev)
  255.20  			copy @dev
   256.1 --- a/libicns/receipt	Fri Dec 21 04:44:58 2018 +0200
   256.2 +++ b/libicns/receipt	Sat Dec 22 04:52:35 2018 +0200
   256.3 @@ -11,7 +11,7 @@
   256.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   256.5  WGET_URL="$SF_MIRROR/icns/$TARBALL"
   256.6  
   256.7 -BUILD_DEPENDS="libpng16-dev jasper-dev"
   256.8 +BUILD_DEPENDS="libpng-dev jasper-dev"
   256.9  SPLIT="$PACKAGE-dev"
  256.10  
  256.11  compile_rules() {
  256.12 @@ -25,7 +25,7 @@
  256.13  	case $PACKAGE in
  256.14  		libicns)
  256.15  			copy @std
  256.16 -			DEPENDS="jasper libpng16"
  256.17 +			DEPENDS="jasper libpng"
  256.18  			;;
  256.19  		*-dev)
  256.20  			copy @dev
   257.1 --- a/libkscreen/receipt	Fri Dec 21 04:44:58 2018 +0200
   257.2 +++ b/libkscreen/receipt	Sat Dec 22 04:52:35 2018 +0200
   257.3 @@ -33,7 +33,7 @@
   257.4  	case $PACKAGE in
   257.5  		libkscreen)
   257.6  			copy @std
   257.7 -			DEPENDS="kwayland qt5-base qt5-x11extras xorg-libxcb"
   257.8 +			DEPENDS="kwayland qt5-base qt5-x11extras libxcb"
   257.9  			;;
  257.10  		*-dev)
  257.11  			copy @dev
   258.1 --- a/liblxqt/receipt	Fri Dec 21 04:44:58 2018 +0200
   258.2 +++ b/liblxqt/receipt	Sat Dec 22 04:52:35 2018 +0200
   258.3 @@ -12,8 +12,8 @@
   258.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   258.5  WGET_URL="https://github.com/lxde/liblxqt/releases/download/$VERSION/$TARBALL"
   258.6  
   258.7 -BUILD_DEPENDS="lxqt-build-tools xorg-libX11-dev mesa-dev libqtxdg-dev \
   258.8 -kwindowsystem-dev xorg-libXScrnSaver-dev"
   258.9 +BUILD_DEPENDS="lxqt-build-tools libx11-dev mesa-dev libqtxdg-dev \
  258.10 +kwindowsystem-dev libxscrnsaver-dev"
  258.11  SPLIT="$PACKAGE-dev"
  258.12  
  258.13  compile_rules() {
  258.14 @@ -35,7 +35,7 @@
  258.15  		liblxqt)
  258.16  			copy @std
  258.17  			DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras \
  258.18 -			xorg-libX11 xorg-libXScrnSaver"
  258.19 +			libx11 libxscrnsaver"
  258.20  			;;
  258.21  		*-dev)
  258.22  			copy @dev
   259.1 --- a/libmatchbox/receipt	Fri Dec 21 04:44:58 2018 +0200
   259.2 +++ b/libmatchbox/receipt	Sat Dec 22 04:52:35 2018 +0200
   259.3 @@ -11,8 +11,8 @@
   259.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   259.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot/$TARBALL"
   259.6  
   259.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXext-dev pango-dev \
   259.8 -libpng16-dev libjpeg-turbo-dev"
   259.9 +BUILD_DEPENDS="automake libtool libx11-dev libxext-dev pango-dev \
  259.10 +libpng-dev libjpeg-turbo-dev"
  259.11  SPLIT="$PACKAGE-dev"
  259.12  
  259.13  compile_rules() {
  259.14 @@ -30,13 +30,13 @@
  259.15  	case $PACKAGE in
  259.16  		libmatchbox)
  259.17  			copy @std
  259.18 -			DEPENDS="glib libjpeg-turbo libpng16 pango xorg-libX11 \
  259.19 -			xorg-libXext xorg-libXft"
  259.20 +			DEPENDS="glib libjpeg-turbo libpng pango libx11 \
  259.21 +			libxext libxft"
  259.22  			;;
  259.23  		*-dev)
  259.24  			copy @dev
  259.25 -			DEPENDS="libmatchbox libjpeg-turbo-dev libpng16-dev pango-dev \
  259.26 -			xorg-libX11-dev xorg-libXext-dev"
  259.27 +			DEPENDS="libmatchbox libjpeg-turbo-dev libpng-dev pango-dev \
  259.28 +			libx11-dev libxext-dev"
  259.29  			;;
  259.30  	esac
  259.31  	TAGS="matchbox"
   260.1 --- a/libmatekbd/receipt	Fri Dec 21 04:44:58 2018 +0200
   260.2 +++ b/libmatekbd/receipt	Sat Dec 22 04:52:35 2018 +0200
   260.3 @@ -25,7 +25,7 @@
   260.4  	case $PACKAGE in
   260.5  		libmatekbd)
   260.6  			copy @std
   260.7 -			DEPENDS="cairo gdk-pixbuf glib gtk3 libxklavier pango xorg-libX11"
   260.8 +			DEPENDS="cairo gdk-pixbuf glib gtk3 libxklavier pango libx11"
   260.9  			;;
  260.10  		*-dev)
  260.11  			copy @dev
   261.1 --- a/libmpeg2/receipt	Fri Dec 21 04:44:58 2018 +0200
   261.2 +++ b/libmpeg2/receipt	Sat Dec 22 04:52:35 2018 +0200
   261.3 @@ -12,8 +12,8 @@
   261.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   261.5  WGET_URL="http://libmpeg2.sourceforge.net/files/$TARBALL" # no $SF_MIRROR
   261.6  
   261.7 -BUILD_DEPENDS="gfortran xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
   261.8 -xorg-libSM-dev xorg-libXv-dev"
   261.9 +BUILD_DEPENDS="gfortran libx11-dev libice-dev libxext-dev \
  261.10 +libsm-dev libxv-dev"
  261.11  SPLIT="$PACKAGE-dev"
  261.12  
  261.13  compile_rules() {
  261.14 @@ -34,7 +34,7 @@
  261.15  	case $PACKAGE in
  261.16  		libmpeg2)
  261.17  			copy @std
  261.18 -			DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXv"
  261.19 +			DEPENDS="libice libsm libx11 libxext libxv"
  261.20  			TAGS="mpeg-1 mpeg-2 decoder"
  261.21  			;;
  261.22  		*-dev)
   262.1 --- a/libpano13/receipt	Fri Dec 21 04:44:58 2018 +0200
   262.2 +++ b/libpano13/receipt	Sat Dec 22 04:52:35 2018 +0200
   262.3 @@ -11,7 +11,7 @@
   262.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   262.5  WGET_URL="$SF_MIRROR/panotools/$TARBALL"
   262.6  
   262.7 -BUILD_DEPENDS="zlib-dev libpng16-dev libjpeg-turbo-dev tiff-dev"
   262.8 +BUILD_DEPENDS="zlib-dev libpng-dev libjpeg-turbo-dev tiff-dev"
   262.9  SPLIT="$PACKAGE-dev"
  262.10  
  262.11  compile_rules() {
  262.12 @@ -28,7 +28,7 @@
  262.13  	case $PACKAGE in
  262.14  		libpano13)
  262.15  			copy @std
  262.16 -			DEPENDS="libjpeg-turbo libpng16 tiff"
  262.17 +			DEPENDS="libjpeg-turbo libpng tiff"
  262.18  			;;
  262.19  		*-dev)
  262.20  			copy @dev
   263.1 --- a/libplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
   263.2 +++ b/libplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
   263.3 @@ -11,8 +11,8 @@
   263.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   263.5  WGET_URL="http://libplayer.geexbox.org/releases/$TARBALL"
   263.6  
   263.7 -BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-libxcb-dev"
   263.8 -# xorg-libX11-dev libvdpau-dev with --enable-xlib-hack
   263.9 +BUILD_DEPENDS="shared-mime-info xine-lib-dev libxcb-dev"
  263.10 +# libx11-dev libvdpau-dev with --enable-xlib-hack
  263.11  SPLIT="$PACKAGE-dev"
  263.12  
  263.13  compile_rules() {
  263.14 @@ -31,11 +31,11 @@
  263.15  	case $PACKAGE in
  263.16  		libplayer)
  263.17  			copy @std
  263.18 -			DEPENDS="xine-lib xorg-libxcb"
  263.19 +			DEPENDS="xine-lib libxcb"
  263.20  			;;
  263.21  		*-dev)
  263.22  			copy @dev
  263.23 -			DEPENDS="libplayer xine-lib-dev xorg-libxcb-dev"
  263.24 +			DEPENDS="libplayer xine-lib-dev libxcb-dev"
  263.25  			;;
  263.26  	esac
  263.27  }
   264.1 --- a/libproxy/receipt	Fri Dec 21 04:44:58 2018 +0200
   264.2 +++ b/libproxy/receipt	Sat Dec 22 04:52:35 2018 +0200
   264.3 @@ -30,7 +30,7 @@
   264.4  	case $PACKAGE in
   264.5  		libproxy)
   264.6  			copy @std
   264.7 -			DEPENDS="glib gtk2 xorg-libXmu webkitgtk libtasn1"
   264.8 +			DEPENDS="glib gtk2 libxmu webkitgtk libtasn1"
   264.9  			SUGGESTED="python icu libcurl libxslt"
  264.10  			;;
  264.11  		*-dev)
   265.1 --- a/libquicktime/receipt	Fri Dec 21 04:44:58 2018 +0200
   265.2 +++ b/libquicktime/receipt	Sat Dec 22 04:52:35 2018 +0200
   265.3 @@ -11,7 +11,7 @@
   265.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   265.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   265.6  
   265.7 -BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev \
   265.8 +BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev libxv-dev libxaw-dev \
   265.9  x264-dev zlib-dev mesa-dev"
  265.10  SPLIT="$PACKAGE-dev"
  265.11  
  265.12 @@ -31,7 +31,7 @@
  265.13  	case $PACKAGE in
  265.14  		libquicktime)
  265.15  			copy @std
  265.16 -			DEPENDS="gtk2 ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264"
  265.17 +			DEPENDS="gtk2 ffmpeg alsa-lib libxv mesa libxaw x264"
  265.18  			;;
  265.19  		*-dev)
  265.20  			copy @dev
   266.1 --- a/libsde-utils-x11/receipt	Fri Dec 21 04:44:58 2018 +0200
   266.2 +++ b/libsde-utils-x11/receipt	Sat Dec 22 04:52:35 2018 +0200
   266.3 @@ -12,7 +12,7 @@
   266.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   266.5  WGET_URL="https://github.com/sde-gui/libsde-utils-x11/archive/$COMMIT.tar.gz"
   266.6  
   266.7 -BUILD_DEPENDS="automake libtool libsde-utils-dev xorg-libX11-dev"
   266.8 +BUILD_DEPENDS="automake libtool libsde-utils-dev libx11-dev"
   266.9  SPLIT="$PACKAGE-dev"
  266.10  
  266.11  compile_rules() {
  266.12 @@ -27,11 +27,11 @@
  266.13  	case $PACKAGE in
  266.14  		libsde-utils-x11)
  266.15  			copy @std
  266.16 -			DEPENDS="glib libsde-utils xorg-libX11"
  266.17 +			DEPENDS="glib libsde-utils libx11"
  266.18  			;;
  266.19  		*-dev)
  266.20  			copy @dev
  266.21 -			DEPENDS="libsde-utils-x11 xorg-libX11-dev"
  266.22 +			DEPENDS="libsde-utils-x11 libx11-dev"
  266.23  			;;
  266.24  	esac
  266.25  }
   267.1 --- a/libsdl-gfx/receipt	Fri Dec 21 04:44:58 2018 +0200
   267.2 +++ b/libsdl-gfx/receipt	Sat Dec 22 04:52:35 2018 +0200
   267.3 @@ -12,7 +12,7 @@
   267.4  TARBALL="SDL_gfx-$VERSION.tar.gz"
   267.5  WGET_URL="http://www.ferzkopp.net/Software/SDL_gfx-2.0/$TARBALL"
   267.6  
   267.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libICE-dev libsdl-dev"
   267.8 +BUILD_DEPENDS="automake libtool libx11-dev libice-dev libsdl-dev"
   267.9  SPLIT="$PACKAGE-dev"
  267.10  
  267.11  compile_rules() {
   268.1 --- a/libsdl-image/receipt	Fri Dec 21 04:44:58 2018 +0200
   268.2 +++ b/libsdl-image/receipt	Sat Dec 22 04:52:35 2018 +0200
   268.3 @@ -12,7 +12,7 @@
   268.4  TARBALL="SDL_image-$VERSION.tar.gz"
   268.5  WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
   268.6  
   268.7 -BUILD_DEPENDS="libsdl-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
   268.8 +BUILD_DEPENDS="libsdl-dev libjpeg-turbo-dev libpng-dev tiff-dev libwebp-dev"
   268.9  SPLIT="$PACKAGE-dev"
  268.10  
  268.11  compile_rules() {
   269.1 --- a/libsdl-pango/receipt	Fri Dec 21 04:44:58 2018 +0200
   269.2 +++ b/libsdl-pango/receipt	Sat Dec 22 04:52:35 2018 +0200
   269.3 @@ -31,7 +31,7 @@
   269.4  		*-dev)
   269.5  			copy @dev
   269.6  			DEPENDS="libsdl-pango bzip2-dev fontconfig-dev freetype-dev \
   269.7 -			glib-dev harfbuzz-dev libffi-dev libpng16-dev libxml2-dev \
   269.8 +			glib-dev harfbuzz-dev libffi-dev libpng-dev libxml2-dev \
   269.9  			pango-dev pcre-dev xz-dev zlib-dev"
  269.10  			;;
  269.11  	esac
   270.1 --- a/libsdl/receipt	Fri Dec 21 04:44:58 2018 +0200
   270.2 +++ b/libsdl/receipt	Sat Dec 22 04:52:35 2018 +0200
   270.3 @@ -13,8 +13,8 @@
   270.4  TARBALL="SDL-$VERSION.tar.gz"
   270.5  WGET_URL="http://www.libsdl.org/release/$TARBALL"
   270.6  
   270.7 -BUILD_DEPENDS="nasm alsa-lib-dev xorg-libX11-dev xorg-libICE-dev \
   270.8 -xorg-libXrandr-dev mesa-dev glu-dev tslib-dev libusb-dev"
   270.9 +BUILD_DEPENDS="nasm alsa-lib-dev libx11-dev libice-dev \
  270.10 +libxrandr-dev mesa-dev glu-dev tslib-dev libusb-dev"
  270.11  SPLIT="$PACKAGE-dev"
  270.12  
  270.13  compile_rules() {
  270.14 @@ -40,7 +40,7 @@
  270.15  			;;
  270.16  		*-dev)
  270.17  			copy @dev
  270.18 -			DEPENDS="libsdl tslib-dev xorg-libX11-dev"
  270.19 +			DEPENDS="libsdl tslib-dev libx11-dev"
  270.20  			;;
  270.21  	esac
  270.22  }
   271.1 --- a/libsdl2-image/receipt	Fri Dec 21 04:44:58 2018 +0200
   271.2 +++ b/libsdl2-image/receipt	Sat Dec 22 04:52:35 2018 +0200
   271.3 @@ -12,7 +12,7 @@
   271.4  TARBALL="SDL2_image-$VERSION.tar.gz"
   271.5  WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
   271.6  
   271.7 -BUILD_DEPENDS="libsdl2-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
   271.8 +BUILD_DEPENDS="libsdl2-dev libjpeg-turbo-dev libpng-dev tiff-dev libwebp-dev"
   271.9  SPLIT="$PACKAGE-dev"
  271.10  
  271.11  compile_rules() {
  271.12 @@ -27,7 +27,7 @@
  271.13  		libsdl2-image)
  271.14  			copy @std
  271.15  			DEPENDS="libsdl2 tslib"
  271.16 -			SUGGESTED="libjpeg-turbo libpng16 tiff libwebp"
  271.17 +			SUGGESTED="libjpeg-turbo libpng tiff libwebp"
  271.18  			;;
  271.19  		*-dev)
  271.20  			copy @dev
   272.1 --- a/libsdl2-ttf/receipt	Fri Dec 21 04:44:58 2018 +0200
   272.2 +++ b/libsdl2-ttf/receipt	Sat Dec 22 04:52:35 2018 +0200
   272.3 @@ -12,8 +12,8 @@
   272.4  TARBALL="SDL2_ttf-$VERSION.tar.gz"
   272.5  WGET_URL="http://www.libsdl.org/projects/SDL_ttf/release/$TARBALL"
   272.6  
   272.7 -BUILD_DEPENDS="freetype-dev libsdl2-dev xorg-libX11-dev xorg-libICE-dev \
   272.8 -mesa-dev expat-dev xorg-libxshmfence-dev"
   272.9 +BUILD_DEPENDS="freetype-dev libsdl2-dev libx11-dev libice-dev \
  272.10 +mesa-dev expat-dev libxshmfence-dev"
  272.11  SPLIT="$PACKAGE-dev"
  272.12  
  272.13  compile_rules() {
   273.1 --- a/libsdl2/receipt	Fri Dec 21 04:44:58 2018 +0200
   273.2 +++ b/libsdl2/receipt	Sat Dec 22 04:52:35 2018 +0200
   273.3 @@ -13,8 +13,8 @@
   273.4  TARBALL="SDL2-$VERSION.tar.gz"
   273.5  WGET_URL="http://www.libsdl.org/release/$TARBALL"
   273.6  
   273.7 -BUILD_DEPENDS="alsa-lib-dev doxygen pulseaudio-dev xorg-libXcursor-dev \
   273.8 -xorg-libXinerama-dev xorg-libXScrnSaver-dev xorg-libXxf86vm-dev mesa-dev \
   273.9 +BUILD_DEPENDS="alsa-lib-dev doxygen pulseaudio-dev libxcursor-dev \
  273.10 +libxinerama-dev libxscrnsaver-dev libxxf86vm-dev mesa-dev \
  273.11  wayland-dev wayland-protocols-dev libxkbcommon-dev eudev-dev dbus-dev ibus-dev \
  273.12  tslib-dev graphviz" # + fcitx-dev -> broken
  273.13  SPLIT="$PACKAGE-dev"
   274.1 --- a/libsexy/receipt	Fri Dec 21 04:44:58 2018 +0200
   274.2 +++ b/libsexy/receipt	Sat Dec 22 04:52:35 2018 +0200
   274.3 @@ -11,7 +11,7 @@
   274.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   274.5  WGET_URL="http://releases.chipx86.com/libsexy/libsexy/$TARBALL"
   274.6  
   274.7 -BUILD_DEPENDS="gtk2-dev xorg-xorgproto libxml2-dev"
   274.8 +BUILD_DEPENDS="gtk2-dev xorgproto libxml2-dev"
   274.9  SPLIT="$PACKAGE-dev"
  274.10  
  274.11  compile_rules() {
  274.12 @@ -25,7 +25,7 @@
  274.13  	case $PACKAGE in
  274.14  		libsexy)
  274.15  			copy @std
  274.16 -			DEPENDS="gtk2 xorg-libXdamage"
  274.17 +			DEPENDS="gtk2 libxdamage"
  274.18  			;;
  274.19  		*-dev)
  274.20  			copy @dev
   275.1 --- a/libstroke/receipt	Fri Dec 21 04:44:58 2018 +0200
   275.2 +++ b/libstroke/receipt	Sat Dec 22 04:52:35 2018 +0200
   275.3 @@ -11,7 +11,7 @@
   275.4  TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
   275.5  WGET_URL="http://archive.ubuntu.com/ubuntu/pool/universe/libs/libstroke/$TARBALL"
   275.6  
   275.7 -BUILD_DEPENDS="patch gfortran xorg-libXt-dev"
   275.8 +BUILD_DEPENDS="patch gfortran libxt-dev"
   275.9  SPLIT="$PACKAGE-dev"
  275.10  
  275.11  compile_rules() {
  275.12 @@ -25,7 +25,7 @@
  275.13  	case $PACKAGE in
  275.14  		libstroke)
  275.15  			copy @std
  275.16 -			DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
  275.17 +			DEPENDS="libx11 libxau libxdmcp libxcb"
  275.18  			;;
  275.19  		*-dev)
  275.20  			copy @dev
   276.1 --- a/libtheora/receipt	Fri Dec 21 04:44:58 2018 +0200
   276.2 +++ b/libtheora/receipt	Sat Dec 22 04:52:35 2018 +0200
   276.3 @@ -11,7 +11,7 @@
   276.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   276.5  WGET_URL="http://downloads.xiph.org/releases/theora/$TARBALL"
   276.6  
   276.7 -BUILD_DEPENDS="libogg-dev libvorbis-dev libpng16-dev"
   276.8 +BUILD_DEPENDS="libogg-dev libvorbis-dev libpng-dev"
   276.9  SPLIT="$PACKAGE-enc $PACKAGE-dev"
  276.10  
  276.11  compile_rules() {
   277.1 --- a/libunique/receipt	Fri Dec 21 04:44:58 2018 +0200
   277.2 +++ b/libunique/receipt	Sat Dec 22 04:52:35 2018 +0200
   277.3 @@ -14,7 +14,7 @@
   277.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   277.5  
   277.6  BUILD_DEPENDS="patch automake glib-dev gettext-dev libtool gtk2-dev \
   277.7 -xorg-libICE-dev gobject-introspection-dev gtk-doc"
   277.8 +libice-dev gobject-introspection-dev gtk-doc"
   277.9  SPLIT="$PACKAGE-dev"
  277.10  
  277.11  compile_rules() {
  277.12 @@ -33,7 +33,7 @@
  277.13  	case $PACKAGE in
  277.14  		libunique)
  277.15  			copy @std
  277.16 -			DEPENDS="glib gtk2 xorg-libX11"
  277.17 +			DEPENDS="glib gtk2 libx11"
  277.18  			;;
  277.19  		*-dev)
  277.20  			copy @dev
   278.1 --- a/libvips/receipt	Fri Dec 21 04:44:58 2018 +0200
   278.2 +++ b/libvips/receipt	Sat Dec 22 04:52:35 2018 +0200
   278.3 @@ -12,7 +12,7 @@
   278.4  WGET_URL="$WEB_SITE/supported/${VERSION%.*}/$TARBALL" # FIXME
   278.5  
   278.6  BUILD_DEPENDS="gtk-doc libtool swig \
   278.7 -gobject-introspection-dev fftw-dev lcms-dev libpng16-dev jpeg-dev \
   278.8 +gobject-introspection-dev fftw-dev lcms-dev libpng-dev jpeg-dev \
   278.9  imagemagick-dev tiff-dev zlib-dev libexif-dev gettext-dev"
  278.10  SPLIT="$PACKAGE-dev"
  278.11  
  278.12 @@ -30,7 +30,7 @@
  278.13  	case $PACKAGE in
  278.14  		libvips)
  278.15  			copy @std
  278.16 -			DEPENDS="fftw lcms pango libpng16 jpeg imagemagick tiff zlib \
  278.17 +			DEPENDS="fftw lcms pango libpng jpeg imagemagick tiff zlib \
  278.18  			glib libexif openexr liboil"
  278.19  			TAGS="image"
  278.20  			;;
   279.1 --- a/libvirt/receipt	Fri Dec 21 04:44:58 2018 +0200
   279.2 +++ b/libvirt/receipt	Sat Dec 22 04:52:35 2018 +0200
   279.3 @@ -12,10 +12,10 @@
   279.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   279.5  WGET_URL="https://libvirt.org/sources/$TARBALL"
   279.6  
   279.7 -BUILD_DEPENDS="xorg-libX11-dev acl-dev attr-dev util-linux-blkid-dev curl-dev \
   279.8 +BUILD_DEPENDS="libx11-dev acl-dev attr-dev util-linux-blkid-dev curl-dev \
   279.9  dbus-dev libdevmapper-dev fuse2-dev glusterfs-dev gnutls-dev netcf-dev \
  279.10  libnl-dev parted-dev libpcap-dev libssh-dev libxml2-dev gettext-dev \
  279.11 -xorg-libpciaccess-dev libsasl cyrus-sasl-dev libtirpc-dev yajl-dev \
  279.12 +libpciaccess-dev libsasl cyrus-sasl-dev libtirpc-dev yajl-dev \
  279.13  rpcsvc-proto lvm2-dev open-iscsi"
  279.14  SPLIT="$PACKAGE-dev"
  279.15  
  279.16 @@ -50,7 +50,7 @@
  279.17  			copy @std
  279.18  			DEPENDS="acl dbus eudev fuse2 glusterfs libcurl libdevmapper \
  279.19  			libgnutls libnl libpcap libsasl libssh libssh2 libtirpc libxml2 \
  279.20 -			netcf parted util-linux-blkid xorg-libpciaccess yajl"
  279.21 +			netcf parted util-linux-blkid libpciaccess yajl"
  279.22  			CONFIG_FILES="/etc/libvirt/"
  279.23  			;;
  279.24  		*-dev)
   280.1 --- a/libvncserver/receipt	Fri Dec 21 04:44:58 2018 +0200
   280.2 +++ b/libvncserver/receipt	Sat Dec 22 04:52:35 2018 +0200
   280.3 @@ -11,7 +11,7 @@
   280.4  TARBALL="LibVNCServer-$VERSION.tar.gz"
   280.5  WGET_URL="https://github.com/LibVNC/libvncserver/archive/$TARBALL"
   280.6  
   280.7 -BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng16-dev"
   280.8 +BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng-dev"
   280.9  SPLIT="$PACKAGE-novnc $PACKAGE-dev"
  280.10  
  280.11  compile_rules() {
  280.12 @@ -29,7 +29,7 @@
  280.13  	case $PACKAGE in
  280.14  		libvncserver)
  280.15  			copy *.so*
  280.16 -			DEPENDS="openssl libjpeg-turbo libpng16 zlib"
  280.17 +			DEPENDS="openssl libjpeg-turbo libpng zlib"
  280.18  			;;
  280.19  		libvncserver-novnc)
  280.20  			copy novnc/
  280.21 @@ -39,7 +39,7 @@
  280.22  		*-dev)
  280.23  			copy @dev
  280.24  			rm -r $fs/var	# it includes 'include/' too and false recognized as dev files
  280.25 -			DEPENDS="libvncserver libjpeg-turbo-dev libpng16-dev openssl-dev \
  280.26 +			DEPENDS="libvncserver libjpeg-turbo-dev libpng-dev openssl-dev \
  280.27  			zlib-dev"
  280.28  			;;
  280.29  	esac
   281.1 --- a/libwebp/receipt	Fri Dec 21 04:44:58 2018 +0200
   281.2 +++ b/libwebp/receipt	Sat Dec 22 04:52:35 2018 +0200
   281.3 @@ -12,7 +12,7 @@
   281.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   281.5  WGET_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$TARBALL"
   281.6  
   281.7 -BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev giflib-dev"
   281.8 +BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev"
   281.9  SPLIT="$PACKAGE-apps $PACKAGE-dev"
  281.10  
  281.11  compile_rules() {
  281.12 @@ -36,7 +36,7 @@
  281.13  		libwebp-apps)
  281.14  			copy bin/
  281.15  			CAT="graphics|applications"
  281.16 -			DEPENDS="giflib libjpeg-turbo libpng16 libwebp tiff"
  281.17 +			DEPENDS="giflib libjpeg-turbo libpng libwebp tiff"
  281.18  			;;
  281.19  		libwebp-dev)
  281.20  			copy @dev
   282.1 --- a/libwmf/receipt	Fri Dec 21 04:44:58 2018 +0200
   282.2 +++ b/libwmf/receipt	Sat Dec 22 04:52:35 2018 +0200
   282.3 @@ -11,7 +11,7 @@
   282.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   282.5  WGET_URL="$SF_MIRROR/wvware/$TARBALL"
   282.6  
   282.7 -BUILD_DEPENDS="gfortran xorg-libXt-dev expat-dev libxml2-dev freetype-dev \
   282.8 +BUILD_DEPENDS="gfortran libxt-dev expat-dev libxml2-dev freetype-dev \
   282.9  libjpeg-turbo-dev libgd-dev gdk-pixbuf-dev gtk2-dev"
  282.10  SPLIT="$PACKAGE-dev"
  282.11  
  282.12 @@ -26,8 +26,8 @@
  282.13  	case $PACKAGE in
  282.14  		libwmf)
  282.15  			copy @std
  282.16 -			DEPENDS="expat freetype gdk-pixbuf glib libjpeg-turbo libpng16 \
  282.17 -			xorg-libX11 zlib"
  282.18 +			DEPENDS="expat freetype gdk-pixbuf glib libjpeg-turbo libpng \
  282.19 +			libx11 zlib"
  282.20  			;;
  282.21  		*-dev)
  282.22  			copy @dev
   283.1 --- a/libwnck2/receipt	Fri Dec 21 04:44:58 2018 +0200
   283.2 +++ b/libwnck2/receipt	Sat Dec 22 04:52:35 2018 +0200
   283.3 @@ -11,8 +11,8 @@
   283.4  TARBALL="libwnck-$VERSION.tar.xz"
   283.5  WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
   283.6  
   283.7 -BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev gtk2-dev \
   283.8 -gobject-introspection-dev xorg-xcb-util-dev"
   283.9 +BUILD_DEPENDS="intltool startup-notification-dev libx11-dev gtk2-dev \
  283.10 +gobject-introspection-dev xcb-util-dev"
  283.11  SPLIT="$PACKAGE-dev"
  283.12  
  283.13  compile_rules() {
  283.14 @@ -28,13 +28,13 @@
  283.15  			copy @std
  283.16  			PROVIDE="libwnck"
  283.17  			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango startup-notification \
  283.18 -			xorg-libX11"
  283.19 +			libx11"
  283.20  			;;
  283.21  		*-dev)
  283.22  			copy @dev
  283.23  			PROVIDE="libwnck-dev"
  283.24  			DEPENDS="libwnck2 cairo-dev glib-dev gtk2-dev pango-dev \
  283.25 -			startup-notification-dev xorg-libX11-dev"
  283.26 +			startup-notification-dev libx11-dev"
  283.27  			;;
  283.28  	esac
  283.29  }
   284.1 --- a/libwnck3/receipt	Fri Dec 21 04:44:58 2018 +0200
   284.2 +++ b/libwnck3/receipt	Sat Dec 22 04:52:35 2018 +0200
   284.3 @@ -12,8 +12,8 @@
   284.4  TARBALL="libwnck-$VERSION.tar.xz"
   284.5  WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
   284.6  
   284.7 -BUILD_DEPENDS="gettext-dev startup-notification-dev xorg-libX11-dev gtk3-dev \
   284.8 -xorg-libXres-dev gtk-doc xorg-xcb-util-dev"
   284.9 +BUILD_DEPENDS="gettext-dev startup-notification-dev libx11-dev gtk3-dev \
  284.10 +libxres-dev gtk-doc xcb-util-dev"
  284.11  SPLIT="$PACKAGE-dev"
  284.12  
  284.13  compile_rules() {
  284.14 @@ -28,12 +28,12 @@
  284.15  		libwnck3)
  284.16  			copy @std
  284.17  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango \
  284.18 -			startup-notification xorg-libX11 xorg-libXrender xorg-libXres"
  284.19 +			startup-notification libx11 libxrender libxres"
  284.20  			;;
  284.21  		*-dev)
  284.22  			copy @dev
  284.23  			DEPENDS="libwnck3 cairo-dev glib-dev gtk3-dev pango-dev \
  284.24 -			startup-notification-dev xorg-libX11-dev xorg-libXres-dev"
  284.25 +			startup-notification-dev libx11-dev libxres-dev"
  284.26  			;;
  284.27  	esac
  284.28  }
   285.1 --- a/libxcm/receipt	Fri Dec 21 04:44:58 2018 +0200
   285.2 +++ b/libxcm/receipt	Sat Dec 22 04:52:35 2018 +0200
   285.3 @@ -11,11 +11,11 @@
   285.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   285.5  WGET_URL="https://github.com/oyranos-cms/libxcm/archive/$VERSION.tar.gz"
   285.6  
   285.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXfixes-dev xorg-libXmu-dev"
   285.8 +BUILD_DEPENDS="libx11-dev libxfixes-dev libxmu-dev"
   285.9  SPLIT="$PACKAGE-dev"
  285.10  
  285.11 -DEPENDS_std="xorg-libX11 xorg-libXfixes xorg-libXmu"
  285.12 -DEPENDS_dev="libxcm xorg-libX11-dev xorg-xorgproto"
  285.13 +DEPENDS_std="libx11 libxfixes libxmu"
  285.14 +DEPENDS_dev="$PACKAGE libx11-dev xorgproto"
  285.15  
  285.16  compile_rules() {
  285.17  	./configure $CONFIGURE_ARGS &&
  285.18 @@ -23,10 +23,3 @@
  285.19  	make &&
  285.20  	make install
  285.21  }
  285.22 -
  285.23 -genpkg_rules() {
  285.24 -	case $PACKAGE in
  285.25 -		libxcm) copy @std; DEPENDS="$DEPENDS_std";;
  285.26 -		*-dev)  copy @dev; DEPENDS="$DEPENDS_dev";;
  285.27 -	esac
  285.28 -}
   286.1 --- a/libxfce4ui/receipt	Fri Dec 21 04:44:58 2018 +0200
   286.2 +++ b/libxfce4ui/receipt	Sat Dec 22 04:52:35 2018 +0200
   286.3 @@ -11,9 +11,9 @@
   286.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   286.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   286.6  
   286.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
   286.8 +BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
   286.9  gtk2-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \
  286.10 -xorg-xcb-util-dev"
  286.11 +xcb-util-dev"
  286.12  SPLIT="$PACKAGE-dev $PACKAGE-glade3 $PACKAGE"
  286.13  
  286.14  compile_rules() {
  286.15 @@ -42,7 +42,7 @@
  286.16  		libxfce4ui)
  286.17  			copy @std @rm
  286.18  			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
  286.19 -			startup-notification xfconf xorg-libICE xorg-libSM xorg-libX11"
  286.20 +			startup-notification xfconf libice libsm libx11"
  286.21  			;;
  286.22  	esac
  286.23  	TAGS="Xfce"
   287.1 --- a/libxfcegui4/receipt	Fri Dec 21 04:44:58 2018 +0200
   287.2 +++ b/libxfcegui4/receipt	Sat Dec 22 04:52:35 2018 +0200
   287.3 @@ -12,7 +12,7 @@
   287.4  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   287.5  
   287.6  BUILD_DEPENDS="gtk2-dev libxfce4util-dev xfconf-dev startup-notification-dev \
   287.7 -libglade-dev xorg-xcb-util-dev intltool util-linux-uuid-dev"
   287.8 +libglade-dev xcb-util-dev intltool util-linux-uuid-dev"
   287.9  SPLIT="$PACKAGE-dev"
  287.10  
  287.11  compile_rules() {
   288.1 --- a/libxklavier/receipt	Fri Dec 21 04:44:58 2018 +0200
   288.2 +++ b/libxklavier/receipt	Sat Dec 22 04:52:35 2018 +0200
   288.3 @@ -13,8 +13,8 @@
   288.4  WGET_URL="https://people.freedesktop.org/~svu/$TARBALL"
   288.5  
   288.6  BUILD_DEPENDS="gettext-dev gobject-introspection-dev vala gtk-doc \
   288.7 -xorg-libX11-dev xorg-server-dev xorg-xkbcomp-dev xorg-libxkbfile-dev \
   288.8 -xorg-libXi-dev libxml2-dev iso-codes-dev"
   288.9 +libx11-dev xorg-server-dev xkbcomp-dev libxkbfile-dev \
  288.10 +libxi-dev libxml2-dev iso-codes-dev"
  288.11  SPLIT="$PACKAGE-dev"
  288.12  
  288.13  compile_rules() {
  288.14 @@ -33,7 +33,7 @@
  288.15  	case $PACKAGE in
  288.16  		libxklavier)
  288.17  			copy @std
  288.18 -			DEPENDS="glib libxml2 xorg-libX11 xorg-libXi xorg-libxkbfile \
  288.19 +			DEPENDS="glib libxml2 libx11 libxi libxkbfile \
  288.20  			   iso-codes"
  288.21  			;;
  288.22  		*-dev)
   289.1 --- a/lightdm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
   289.2 +++ b/lightdm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
   289.3 @@ -15,8 +15,8 @@
   289.4  WGET_URL="https://launchpad.net/lightdm/1.8/$VERSION/+download/$TARBALL"
   289.5  
   289.6  BUILD_DEPENDS="Qt4-dev gobject-introspection-dev pam-dev itstool \
   289.7 -libxklavier-dev libgcrypt-dev wget xorg-libXdmcp-dev xorg-libX11-dev \
   289.8 -xorg-libXi-dev xorg-libxkbfile-dev gettext-dev intltool"
   289.9 +libxklavier-dev libgcrypt-dev wget libxdmcp-dev libx11-dev \
  289.10 +libxi-dev libxkbfile-dev gettext-dev intltool"
  289.11  SPLIT="$PACKAGE-dev"
  289.12  
  289.13  compile_rules() {
  289.14 @@ -42,8 +42,8 @@
  289.15  			;;
  289.16  		*-dev)
  289.17  			copy @dev
  289.18 -			DEPENDS="Qt4-dev lightdm-dev lightdm-qt xorg-libXi-dev \
  289.19 -			xorg-libxkbfile-dev"
  289.20 +			DEPENDS="Qt4-dev lightdm-dev lightdm-qt libxi-dev \
  289.21 +			libxkbfile-dev"
  289.22  			;;
  289.23  	esac
  289.24  }
   290.1 --- a/lightdm/receipt	Fri Dec 21 04:44:58 2018 +0200
   290.2 +++ b/lightdm/receipt	Sat Dec 22 04:52:35 2018 +0200
   290.3 @@ -35,13 +35,13 @@
   290.4  	case $PACKAGE in
   290.5  		lightdm)
   290.6  			copy @std *.mo
   290.7 -			DEPENDS="libgcrypt glib libxklavier pam xorg-libX11"
   290.8 +			DEPENDS="libgcrypt glib libxklavier pam libx11"
   290.9  			CONFIG_FILES="/etc/init/lightdm.conf /etc/lightdm/keys.conf \
  290.10  			/etc/lightdm/lightdm.conf /etc/lightdm/users.conf"
  290.11  			;;
  290.12  		*-dev)
  290.13  			copy @dev
  290.14 -			DEPENDS="lightdm glib-dev libxklavier-dev xorg-libX11-dev"
  290.15 +			DEPENDS="lightdm glib-dev libxklavier-dev libx11-dev"
  290.16  			;;
  290.17  	esac
  290.18  }
   291.1 --- a/lincity-ng/receipt	Fri Dec 21 04:44:58 2018 +0200
   291.2 +++ b/lincity-ng/receipt	Sat Dec 22 04:52:35 2018 +0200
   291.3 @@ -31,5 +31,5 @@
   291.4  	cp -a $install/usr/share/lincity-ng $fs/usr/share
   291.5  	cp -a $install/usr/share/pixmaps $fs/usr/share
   291.6  	DEPENDS="mesa libxml2 physfs libsdl-gfx libsdl-image libsdl-mixer \
   291.7 -	libsdl-ttf xorg-libxcb"
   291.8 +	libsdl-ttf libxcb"
   291.9  }
   292.1 --- a/linphone/receipt	Fri Dec 21 04:44:58 2018 +0200
   292.2 +++ b/linphone/receipt	Sat Dec 22 04:52:35 2018 +0200
   292.3 @@ -12,7 +12,7 @@
   292.4  WGET_URL="http://download-mirror.savannah.gnu.org/releases/linphone/${VERSION%.*}.x/sources/$TARBALL"
   292.5  
   292.6  BUILD_DEPENDS="intltool libsdl-dev ffmpeg-dev osip-dev exosip-dev speex-dev \
   292.7 -xorg-libXv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
   292.8 +libxv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
   292.9  SPLIT="$PACKAGE-dev"
  292.10  
  292.11  COOKOPTS="skip-log-errors"
  292.12 @@ -42,7 +42,7 @@
  292.13  	case $PACKAGE in
  292.14  		linphone)
  292.15  			copy @std
  292.16 -			DEPENDS="osip exosip speex ffmpeg xorg-libXv v4l-utils libglade gtk2 \
  292.17 +			DEPENDS="osip exosip speex ffmpeg libxv v4l-utils libglade gtk2 \
  292.18  			glib"
  292.19  			TAGS="softphone telephony"
  292.20  			;;
   293.1 --- a/lirc/receipt	Fri Dec 21 04:44:58 2018 +0200
   293.2 +++ b/lirc/receipt	Sat Dec 22 04:52:35 2018 +0200
   293.3 @@ -37,7 +37,7 @@
   293.4  	case $PACKAGE in
   293.5  		lirc)
   293.6  			copy @std
   293.7 -			DEPENDS="glibc-base libusb libusb-compat libftdi xorg-libXau \
   293.8 +			DEPENDS="glibc-base libusb libusb-compat libftdi libxau \
   293.9  			libirman portaudio alsa-lib util-linux-uuid"
  293.10  			;;
  293.11  		*-dev)
   294.1 --- a/listpatron/receipt	Fri Dec 21 04:44:58 2018 +0200
   294.2 +++ b/listpatron/receipt	Sat Dec 22 04:52:35 2018 +0200
   294.3 @@ -30,5 +30,5 @@
   294.4  	cp -a $install/usr/share/xml $fs/usr/share
   294.5  	cd $fs/usr/share/pixmaps
   294.6  	ln -s listpatron/icons/listpatron-col-add.png listpatron.png
   294.7 -	DEPENDS="gtk2 xorg-libXdamage"
   294.8 +	DEPENDS="gtk2 libxdamage"
   294.9  }
   295.1 --- a/lives/receipt	Fri Dec 21 04:44:58 2018 +0200
   295.2 +++ b/lives/receipt	Sat Dec 22 04:52:35 2018 +0200
   295.3 @@ -11,7 +11,7 @@
   295.4  TARBALL="LiVES-$VERSION.tar.bz2"
   295.5  WGET_URL="http://lives-video.com/releases/$TARBALL"
   295.6  
   295.7 -BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng16-dev gtk2-dev procps expat-dev \
   295.8 +BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng-dev gtk2-dev procps expat-dev \
   295.9  perl gettext"
  295.10  
  295.11  compile_rules() {
  295.12 @@ -28,5 +28,5 @@
  295.13  
  295.14  genpkg_rules() {
  295.15  	copy @std
  295.16 -	DEPENDS="alsa-lib libpng16 gtk2 sox mjpegtools libavc1394 liboil libtheora"
  295.17 +	DEPENDS="alsa-lib libpng gtk2 sox mjpegtools libavc1394 liboil libtheora"
  295.18  }
   296.1 --- a/lmms/receipt	Fri Dec 21 04:44:58 2018 +0200
   296.2 +++ b/lmms/receipt	Sat Dec 22 04:52:35 2018 +0200
   296.3 @@ -11,8 +11,8 @@
   296.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   296.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   296.6  
   296.7 -BUILD_DEPENDS="libsdl-dev glib-dev fftw-dev fluidsynth-dev libpng16-dev \
   296.8 -libogg-dev libvorbis-dev alsa-lib-dev xorg-libXft-dev xorg-libXinerama-dev \
   296.9 +BUILD_DEPENDS="libsdl-dev glib-dev fftw-dev fluidsynth-dev libpng-dev \
  296.10 +libogg-dev libvorbis-dev alsa-lib-dev libxft-dev libxinerama-dev \
  296.11  libsndfile-dev libsamplerate-dev Qt4-dev qt4-phonon qmake cmake freetype-dev"
  296.12  
  296.13  compile_rules() {
  296.14 @@ -27,6 +27,6 @@
  296.15  
  296.16  genpkg_rules() {
  296.17  	copy @std
  296.18 -	DEPENDS="libsdl glib fluidsynth libpng16 libvorbis fftw xorg-libXft \
  296.19 -	xorg-libXinerama libsamplerate libQtGui libQtXml"
  296.20 +	DEPENDS="libsdl glib fluidsynth libpng libvorbis fftw libxft \
  296.21 +	libxinerama libsamplerate libQtGui libQtXml"
  296.22  }
   297.1 --- a/lockdis/receipt	Fri Dec 21 04:44:58 2018 +0200
   297.2 +++ b/lockdis/receipt	Sat Dec 22 04:52:35 2018 +0200
   297.3 @@ -11,8 +11,8 @@
   297.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   297.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   297.6  
   297.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXau-dev xorg-libXpm-dev \
   297.8 -xorg-libXdmcp-dev"
   297.9 +BUILD_DEPENDS="libx11-dev libxau-dev libxpm-dev \
  297.10 +libxdmcp-dev"
  297.11  
  297.12  compile_rules() {
  297.13  	./configure \
  297.14 @@ -27,5 +27,5 @@
  297.15  genpkg_rules() {
  297.16  	mkdir -p $fs/usr
  297.17  	cp -a $install/usr/bin $fs/usr
  297.18 -	DEPENDS="xorg-libX11 xorg-libXau xorg-libXpm xorg-libXdmcp"
  297.19 +	DEPENDS="libx11 libxau libxpm libxdmcp"
  297.20  }
   298.1 --- a/lxappearance-obconf/receipt	Fri Dec 21 04:44:58 2018 +0200
   298.2 +++ b/lxappearance-obconf/receipt	Sat Dec 22 04:52:35 2018 +0200
   298.3 @@ -12,7 +12,7 @@
   298.4  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   298.5  
   298.6  BUILD_DEPENDS="intltool openbox-dev gtk2-dev lxappearance-dev \
   298.7 -xorg-libXrandr-dev"
   298.8 +libxrandr-dev"
   298.9  
  298.10  compile_rules() {
  298.11  	./configure \
   299.1 --- a/lxappearance/receipt	Fri Dec 21 04:44:58 2018 +0200
   299.2 +++ b/lxappearance/receipt	Sat Dec 22 04:52:35 2018 +0200
   299.3 @@ -12,7 +12,7 @@
   299.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   299.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   299.6  
   299.7 -BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev dbus-dev dbus-glib-dev"
   299.8 +BUILD_DEPENDS="intltool libx11-dev gtk2-dev dbus-dev dbus-glib-dev"
   299.9  SPLIT="$PACKAGE-dev"
  299.10  
  299.11  compile_rules() {
  299.12 @@ -32,7 +32,7 @@
  299.13  		lxappearance)
  299.14  			copy @std
  299.15  			DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
  299.16 -			glib gtk2 pango xorg-libX11"
  299.17 +			glib gtk2 pango libx11"
  299.18  			;;
  299.19  		*-dev)
  299.20  			copy @dev
   300.1 --- a/lxde/receipt	Fri Dec 21 04:44:58 2018 +0200
   300.2 +++ b/lxde/receipt	Sat Dec 22 04:52:35 2018 +0200
   300.3 @@ -18,7 +18,7 @@
   300.4  
   300.5  	TAGS="LXDE window-manager desktop"
   300.6  	SUGGESTED="lxterminal lxdm lxshortcut xarchiver"
   300.7 -	DEPENDS="xorg-libX11 gtk2 lxpanel lxtask lxappearance lxsession pcmanfm \
   300.8 +	DEPENDS="libx11 gtk2 lxpanel lxtask lxappearance lxsession pcmanfm \
   300.9  	lxrandr lxinput openbox obconf gpicview leafpad slitaz-configs \
  300.10  	slitaz-tools-boxes"
  300.11  }
   301.1 --- a/lxdm/receipt	Fri Dec 21 04:44:58 2018 +0200
   301.2 +++ b/lxdm/receipt	Sat Dec 22 04:52:35 2018 +0200
   301.3 @@ -11,7 +11,7 @@
   301.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   301.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   301.6  
   301.7 -BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev   iso-codes" # + consolekit2-dev
   301.8 +BUILD_DEPENDS="intltool libx11-dev gtk2-dev   iso-codes" # + consolekit2-dev
   301.9  SPLIT="$PACKAGE-dev"
  301.10  
  301.11  compile_rules() {
  301.12 @@ -37,7 +37,7 @@
  301.13  		lxdm)
  301.14  			copy @std
  301.15  			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
  301.16 -			xorg-libX11 xorg-libxcb"
  301.17 +			libx11 libxcb"
  301.18  			SUGGESTED="iso-codes"
  301.19  			CONFIG_FILES="/etc/lxdm/LoginReady /etc/lxdm/PostLogin \
  301.20  			/etc/lxdm/PostLogout /etc/lxdm/PreLogin /etc/lxdm/PreReboot \
   302.1 --- a/lxhotkey/receipt	Fri Dec 21 04:44:58 2018 +0200
   302.2 +++ b/lxhotkey/receipt	Sat Dec 22 04:52:35 2018 +0200
   302.3 @@ -11,7 +11,7 @@
   302.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   302.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   302.6  
   302.7 -BUILD_DEPENDS="intltool libfm-dev xorg-libX11-dev"
   302.8 +BUILD_DEPENDS="intltool libfm-dev libx11-dev"
   302.9  SPLIT="$PACKAGE-dev"
  302.10  
  302.11  compile_rules() {
  302.12 @@ -25,7 +25,7 @@
  302.13  	case $PACKAGE in
  302.14  		lxhotkey)
  302.15  			copy @std
  302.16 -			DEPENDS="glib libfm libfm-extra libunistring xorg-libX11"
  302.17 +			DEPENDS="glib libfm libfm-extra libunistring libx11"
  302.18  			;;
  302.19  		*-dev)
  302.20  			copy @dev
   303.1 --- a/lximage-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
   303.2 +++ b/lximage-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
   303.3 @@ -29,6 +29,6 @@
   303.4  genpkg_rules() {
   303.5  	copy @std
   303.6  	DEPENDS="glib libexif libfm libfm-qt menu-cache qt5-base qt5-svg \
   303.7 -	qt5-x11extras xorg-libX11 xorg-libXext xorg-libXfixes xorg-libxcb"
   303.8 +	qt5-x11extras libx11 libxext libxfixes libxcb"
   303.9  	TAGS="LXQt"
  303.10  }
   304.1 --- a/lxinput/receipt	Fri Dec 21 04:44:58 2018 +0200
   304.2 +++ b/lxinput/receipt	Sat Dec 22 04:52:35 2018 +0200
   304.3 @@ -27,6 +27,6 @@
   304.4  	# skip icons (found in the icon theme)
   304.5  	copy bin/ *.ui
   304.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
   304.7 -	xorg-libX11   xorg-xset"
   304.8 +	libx11   xset"
   304.9  	TAGS="LXDE keyboard mouse"
  304.10  }
   305.1 --- a/lxlauncher/receipt	Fri Dec 21 04:44:58 2018 +0200
   305.2 +++ b/lxlauncher/receipt	Sat Dec 22 04:52:35 2018 +0200
   305.3 @@ -11,8 +11,8 @@
   305.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   305.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   305.6  
   305.7 -BUILD_DEPENDS="xorg-libX11-dev gtk2-dev gnome-menus gnome-menus-dev \
   305.8 -menu-cache-dev startup-notification-dev startup-notification xorg-libxcb-dev \
   305.9 +BUILD_DEPENDS="libx11-dev gtk2-dev gnome-menus gnome-menus-dev \
  305.10 +menu-cache-dev startup-notification-dev startup-notification libxcb-dev \
  305.11  intltool"
  305.12  
  305.13  compile_rules() {
  305.14 @@ -27,6 +27,6 @@
  305.15  genpkg_rules() {
  305.16  	copy @std
  305.17  	DEPENDS="cairo gdk-pixbuf glib gtk2 menu-cache startup-notification \
  305.18 -	xorg-libX11   gnome-menus"
  305.19 +	libx11   gnome-menus"
  305.20  	TAGS="LXDE netbook"
  305.21  }
   306.1 --- a/lxpanel/receipt	Fri Dec 21 04:44:58 2018 +0200
   306.2 +++ b/lxpanel/receipt	Sat Dec 22 04:52:35 2018 +0200
   306.3 @@ -40,13 +40,13 @@
   306.4  			stock_volume.png volume-*.png window-manager.png
   306.5  			CAT="x-window|extra files and plugins"
   306.6  			TAGS="LXDE"
   306.7 -			DEPENDS="glib gtk2 lxpanel xorg-libX11"
   306.8 +			DEPENDS="glib gtk2 lxpanel libx11"
   306.9  			;;
  306.10  		lxpanel)
  306.11  			copy @std @rm
  306.12  			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 libfm libfm-gtk \
  306.13  			keybinder libwnck2 libxml2 menu-cache pango wireless_tools \
  306.14 -			xorg-libX11    slitaz-menus"
  306.15 +			libx11    slitaz-menus"
  306.16  			#CONFIG_FILES="/etc/xdg/lxpanel/default/"
  306.17  			TAGS="LXDE gtk2 panel"
  306.18  			SUGGESTED="lxde lxsession slitaz-icon"
   307.1 --- a/lxqt-appswitcher/receipt	Fri Dec 21 04:44:58 2018 +0200
   307.2 +++ b/lxqt-appswitcher/receipt	Sat Dec 22 04:52:35 2018 +0200
   307.3 @@ -11,7 +11,7 @@
   307.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   307.5  WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
   307.6  
   307.7 -BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev liblxqt-dev \
   307.8 +BUILD_DEPENDS="cmake Qt4-dev qmake libx11-dev liblxqt-dev \
   307.9  lxqt-globalkeys-dev libqtxdg-dev "
  307.10  
  307.11  compile_rules() {
   308.1 --- a/lxqt-config-randr/receipt	Fri Dec 21 04:44:58 2018 +0200
   308.2 +++ b/lxqt-config-randr/receipt	Sat Dec 22 04:52:35 2018 +0200
   308.3 @@ -11,7 +11,7 @@
   308.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   308.5  WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
   308.6  
   308.7 -BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev xorg-libXrandr-dev \
   308.8 +BUILD_DEPENDS="cmake Qt4-dev qmake libx11-dev libxrandr-dev \
   308.9  libqtxdg-dev liblxqt-dev"
  308.10  
  308.11  compile_rules() {
  308.12 @@ -26,6 +26,6 @@
  308.13  
  308.14  genpkg_rules() {
  308.15  	cp -a $install/* $fs
  308.16 -	DEPENDS="libQtCore libQtGui xorg-libX11 xorg-libXext xorg-libXrandr"
  308.17 +	DEPENDS="libQtCore libQtGui libx11 libxext libxrandr"
  308.18  	TAGS="LXQt"
  308.19  }
   309.1 --- a/lxqt-config/receipt	Fri Dec 21 04:44:58 2018 +0200
   309.2 +++ b/lxqt-config/receipt	Sat Dec 22 04:52:35 2018 +0200
   309.3 @@ -13,7 +13,7 @@
   309.4  WGET_URL="https://github.com/lxde/lxqt-config/releases/download/$VERSION/$TARBALL"
   309.5  
   309.6  BUILD_DEPENDS="cmake qt5-dev mesa-dev liblxqt-dev kwindowsystem-dev \
   309.7 -lxqt-build-tools libkscreen-dev xorg-libXcursor-dev zlib-dev"
   309.8 +lxqt-build-tools libkscreen-dev libxcursor-dev zlib-dev"
   309.9  
  309.10  compile_rules() {
  309.11  	# temporary workaround due to cmake-3.8
  309.12 @@ -37,7 +37,7 @@
  309.13  genpkg_rules() {
  309.14  	copy @std lxqt-config # usually /usr/bin/*-config is dev, but not this time
  309.15  	DEPENDS="kwindowsystem libkscreen liblxqt libqtxdg qt5-base qt5-svg \
  309.16 -	qt5-x11extras xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
  309.17 -	xorg-libxcb zlib"
  309.18 +	qt5-x11extras libx11 libxcursor libxext libxfixes \
  309.19 +	libxcb zlib"
  309.20  	TAGS="LXQt"
  309.21  }
   310.1 --- a/lxqt-globalkeys/receipt	Fri Dec 21 04:44:58 2018 +0200
   310.2 +++ b/lxqt-globalkeys/receipt	Sat Dec 22 04:52:35 2018 +0200
   310.3 @@ -39,7 +39,7 @@
   310.4  		lxqt-globalkeys)
   310.5  			copy @std
   310.6  			DEPENDS="kwindowsystem liblxqt libqtxdg qt5-base qt5-svg \
   310.7 -			qt5-x11extras xorg-libX11 xorg-libXext"
   310.8 +			qt5-x11extras libx11 libxext"
   310.9  			;;
  310.10  		*-dev)
  310.11  			copy @dev
   311.1 --- a/lxqt-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
   311.2 +++ b/lxqt-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
   311.3 @@ -14,8 +14,8 @@
   311.4  
   311.5  BUILD_DEPENDS="cmake qt5-dev mesa-dev kwindowsystem-dev liblxqt-dev \
   311.6  lxqt-build-tools lxqt-globalkeys-dev libstatgrab-dev solid-dev menu-cache-dev \
   311.7 -lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev xorg-libXcomposite-dev \
   311.8 -xorg-libXrender-dev alsa-lib-dev libxkbcommon-dev xorg-xcb-util-dev \
   311.9 +lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev libxcomposite-dev \
  311.10 +libxrender-dev alsa-lib-dev libxkbcommon-dev xcb-util-dev \
  311.11  pulseaudio-dev"
  311.12  SPLIT="$PACKAGE-sensors $PACKAGE $PACKAGE-dev"
  311.13  
  311.14 @@ -51,9 +51,9 @@
  311.15  			DEPENDS="alsa-lib glib kwindowsystem libdbusmenu-qt liblxqt \
  311.16  			libqtxdg libstatgrab libsysstat libxkbcommon-x11 libxkbcommon \
  311.17  			lxqt-globalkeys menu-cache pulseaudio qt5-base qt5-svg \
  311.18 -			qt5-x11extras solid xorg-libICE xorg-libSM xorg-libX11 \
  311.19 -			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
  311.20 -			xorg-libXrender xorg-libxcb xorg-xcb-util"
  311.21 +			qt5-x11extras solid libice libsm libx11 \
  311.22 +			libxcomposite libxdamage libxext libxfixes \
  311.23 +			libxrender libxcb xcb-util"
  311.24  			SUGGESTED="qastools xscreensaver"
  311.25  			;;
  311.26  		*-dev)
   312.1 --- a/lxqt-session/receipt	Fri Dec 21 04:44:58 2018 +0200
   312.2 +++ b/lxqt-session/receipt	Sat Dec 22 04:52:35 2018 +0200
   312.3 @@ -12,7 +12,7 @@
   312.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   312.5  WGET_URL="https://github.com/lxde/lxqt-session/releases/download/$VERSION/$TARBALL"
   312.6  
   312.7 -BUILD_DEPENDS="cmake xorg-libX11-dev qt5-dev mesa-dev kwindowsystem-dev \
   312.8 +BUILD_DEPENDS="cmake libx11-dev qt5-dev mesa-dev kwindowsystem-dev \
   312.9  liblxqt-dev lxqt-build-tools xdg-user-dirs eudev-dev"
  312.10  
  312.11  compile_rules() {
  312.12 @@ -29,6 +29,6 @@
  312.13  genpkg_rules() {
  312.14  	copy @std
  312.15  	DEPENDS="eudev kwindowsystem liblxqt libqtxdg qt5-base qt5-svg \
  312.16 -	qt5-x11extras xorg-libX11 xorg-libXext"
  312.17 +	qt5-x11extras libx11 libxext"
  312.18  	TAGS="LXQt"
  312.19  }
   313.1 --- a/lxqt/receipt	Fri Dec 21 04:44:58 2018 +0200
   313.2 +++ b/lxqt/receipt	Sat Dec 22 04:52:35 2018 +0200
   313.3 @@ -14,7 +14,7 @@
   313.4  lxqt-openssh-askpass lxqt-panel lxqt-policykit lxqt-powermanagement \
   313.5  lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo lxqt-themes pavucontrol-qt \
   313.6  pcmanfm-qt qterminal qtermwidget lxmenu-data   \
   313.7 -gvfs gvfs-udisks2 openbox qlipper xorg-xprop xorg-xset"
   313.8 +gvfs gvfs-udisks2 openbox qlipper xprop xset"
   313.9  # still Qt4: obconf-qt lxqt-config-randr lxqt-appswitcher
  313.10  
  313.11  SUGGESTED="copyq juffed qps qupzilla oxygen-icons \
   314.1 --- a/lxsession/receipt	Fri Dec 21 04:44:58 2018 +0200
   314.2 +++ b/lxsession/receipt	Sat Dec 22 04:52:35 2018 +0200
   314.3 @@ -12,7 +12,7 @@
   314.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   314.5  WGET_URL="$SF_MIRROR/lxde/$TARBALL"
   314.6  
   314.7 -BUILD_DEPENDS="intltool xorg-libX11-dev polkit-dev vala libxslt docbook-xsl \
   314.8 +BUILD_DEPENDS="intltool libx11-dev polkit-dev vala libxslt docbook-xsl \
   314.9  automake gtk2-dev"
  314.10  
  314.11  compile_rules() {
  314.12 @@ -55,7 +55,7 @@
  314.13  genpkg_rules() {
  314.14  	copy @std
  314.15  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango polkit \
  314.16 -	xorg-libX11   dbus-glib lsb-release"
  314.17 +	libx11   dbus-glib lsb-release"
  314.18  	CONFIG_FILES="/etc/xdg/lxsession/LXDE/desktop.conf \
  314.19  	/etc/xdg/lxsession/LXDE/conffiles.conf"
  314.20  }
   315.1 --- a/lxterminal/receipt	Fri Dec 21 04:44:58 2018 +0200
   315.2 +++ b/lxterminal/receipt	Sat Dec 22 04:52:35 2018 +0200
   315.3 @@ -29,7 +29,7 @@
   315.4  			copy @std
   315.5  			rm -r $fs/usr/share/icons
   315.6  			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
   315.7 -			vte-gtk2 xorg-libX11 xorg-libXext"
   315.8 +			vte-gtk2 libx11 libxext"
   315.9  			SUGGESTED="lxterminal-locales"
  315.10  			TAGS="LXDE terminal"
  315.11  			;;
   316.1 --- a/lyx/receipt	Fri Dec 21 04:44:58 2018 +0200
   316.2 +++ b/lyx/receipt	Sat Dec 22 04:52:35 2018 +0200
   316.3 @@ -11,7 +11,7 @@
   316.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   316.5  WGET_URL="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$TARBALL"
   316.6  
   316.7 -BUILD_DEPENDS="python Qt4-dev bison aspell-dev xorg-libX11-dev aiksaurus-dev \
   316.8 +BUILD_DEPENDS="python Qt4-dev bison aspell-dev libx11-dev aiksaurus-dev \
   316.9  zlib-dev"
  316.10  SPLIT="$PACKAGE-doc $PACKAGE-examples $PACKAGE-locales $PACKAGE"
  316.11  
   317.1 --- a/magicpoint/receipt	Fri Dec 21 04:44:58 2018 +0200
   317.2 +++ b/magicpoint/receipt	Sat Dec 22 04:52:35 2018 +0200
   317.3 @@ -13,8 +13,8 @@
   317.4  # use Debian patches with Debian sources
   317.5  WGET_URL="http://http.debian.net/debian/pool/main/m/mgp/mgp_$VERSION.orig.tar.gz"
   317.6  
   317.7 -BUILD_DEPENDS="perl xorg-libX11-dev xorg-libXft-dev fontconfig-dev xorg-imake \
   317.8 -xorg-cf-files imlib2-dev xorg-libXmu-dev"
   317.9 +BUILD_DEPENDS="perl libx11-dev libxft-dev fontconfig-dev imake \
  317.10 +xorg-cf-files imlib2-dev libxmu-dev"
  317.11  
  317.12  compile_rules() {
  317.13  	./configure $CONFIGURE_ARGS &&
  317.14 @@ -28,6 +28,6 @@
  317.15  
  317.16  genpkg_rules() {
  317.17  	copy @std
  317.18 -	DEPENDS="giflib imlib2 libpng16 xorg-libSM xorg-libX11 xorg-libXext \
  317.19 -	xorg-libXft xorg-libXmu xorg-libXt"
  317.20 +	DEPENDS="giflib imlib2 libpng libsm libx11 libxext \
  317.21 +	libxft libxmu libxt"
  317.22  }
   318.1 --- a/magnifier/receipt	Fri Dec 21 04:44:58 2018 +0200
   318.2 +++ b/magnifier/receipt	Sat Dec 22 04:52:35 2018 +0200
   318.3 @@ -20,7 +20,7 @@
   318.4  	cp -a $install/usr/bin $fs/usr
   318.5  	cp -a $install/usr/share $fs/usr
   318.6  	cp $install/usr/share/magnifier/icon3.ico $fs/usr/share/pixmaps/icon3.png
   318.7 -	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
   318.8 -	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
   318.9 -	xorg-libXrandr xorg-libXrender xorg-libXdamage"
  318.10 +	DEPENDS="expat gtk2 libx11 libxau libxcomposite \
  318.11 +	libxcursor libxdmcp libxext libxfixes libxinerama \
  318.12 +	libxrandr libxrender libxdamage"
  318.13  }
   319.1 --- a/mana/receipt	Fri Dec 21 04:44:58 2018 +0200
   319.2 +++ b/mana/receipt	Sat Dec 22 04:52:35 2018 +0200
   319.3 @@ -12,7 +12,7 @@
   319.4  WGET_URL="http://manasource.org/files/$TARBALL"
   319.5  
   319.6  BUILD_DEPENDS="physfs-dev libxml2-dev libsdl-mixer-dev libsdl-image-dev \
   319.7 -libsdl-net-dev libsdl-ttf-dev libsdl-ttf curl-dev zlib-dev libpng16-dev guichan-dev \
   319.8 +libsdl-net-dev libsdl-ttf-dev libsdl-ttf curl-dev zlib-dev libpng-dev guichan-dev \
   319.9  libsdl-gfx-dev enet"
  319.10  
  319.11  compile_rules() {
  319.12 @@ -31,5 +31,5 @@
  319.13  	cp -a $install/usr/share/mana $fs/usr/share/
  319.14  	cp -a $install/usr/share/pixmaps $fs/usr/share/
  319.15  	DEPENDS="ttf-dejavu physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
  319.16 -	libsdl-ttf curl zlib libpng16 guichan libsdl-gfx"
  319.17 +	libsdl-ttf curl zlib libpng guichan libsdl-gfx"
  319.18  }
   320.1 --- a/manaplus/receipt	Fri Dec 21 04:44:58 2018 +0200
   320.2 +++ b/manaplus/receipt	Sat Dec 22 04:52:35 2018 +0200
   320.3 @@ -12,7 +12,7 @@
   320.4  WGET_URL="http://download.evolonline.org/manaplus/download/$VERSION/$TARBALL"
   320.5  
   320.6  BUILD_DEPENDS="curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev \
   320.7 -libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng16-dev zlib-dev"
   320.8 +libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng-dev zlib-dev"
   320.9  
  320.10  compile_rules() {
  320.11  	./configure \
  320.12 @@ -26,5 +26,5 @@
  320.13  genpkg_rules() {
  320.14  	copy @std
  320.15  	DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
  320.16 -	libsdl-ttf libpng16 libsdl-gfx ttf-dejavu zlib"
  320.17 +	libsdl-ttf libpng libsdl-gfx ttf-dejavu zlib"
  320.18  }
   321.1 --- a/mapserver/receipt	Fri Dec 21 04:44:58 2018 +0200
   321.2 +++ b/mapserver/receipt	Sat Dec 22 04:52:35 2018 +0200
   321.3 @@ -12,7 +12,7 @@
   321.4  WGET_URL="http://download.osgeo.org/mapserver/$TARBALL"
   321.5  
   321.6  BUILD_DEPENDS="giflib-dev gdal-dev libgd-dev proj-dev postgresql-dev curl-dev \
   321.7 -geos-dev apache-dev freetype-dev libpng16-dev jpeg-dev libgd-dev libgd \
   321.8 +geos-dev apache-dev freetype-dev libpng-dev jpeg-dev libgd-dev libgd \
   321.9  libxml2-dev fribidi-dev cairo-dev fcgi-dev cmake"
  321.10  
  321.11  compile_rules() {
   322.1 --- a/marco/receipt	Fri Dec 21 04:44:58 2018 +0200
   322.2 +++ b/marco/receipt	Sat Dec 22 04:52:35 2018 +0200
   322.3 @@ -12,8 +12,8 @@
   322.4  WGET_URL="https://github.com/mate-desktop/marco/archive/v$VERSION.tar.gz"
   322.5  
   322.6  BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev startup-notification-dev \
   322.7 -xorg-libXcursor-dev libgtop-dev libcanberra-dev zenity itstool \
   322.8 -xorg-xcb-util-dev"
   322.9 +libxcursor-dev libgtop-dev libcanberra-dev zenity itstool \
  322.10 +xcb-util-dev"
  322.11  SPLIT="$PACKAGE-dev"
  322.12  
  322.13  compile_rules() {
  322.14 @@ -29,9 +29,9 @@
  322.15  		marco)
  322.16  			copy @std
  322.17  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
  322.18 -			libcanberra-gtk3 libgtop pango startup-notification xorg-libX11 \
  322.19 -			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
  322.20 -			xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender"
  322.21 +			libcanberra-gtk3 libgtop pango startup-notification libx11 \
  322.22 +			libxcomposite libxcursor libxdamage libxext \
  322.23 +			libxfixes libxinerama libxrandr libxrender"
  322.24  			;;
  322.25  		*-dev)
  322.26  			copy @dev
   323.1 --- a/matchbox-desktop-2/receipt	Fri Dec 21 04:44:58 2018 +0200
   323.2 +++ b/matchbox-desktop-2/receipt	Sat Dec 22 04:52:35 2018 +0200
   323.3 @@ -13,7 +13,7 @@
   323.4  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-desktop-2/snapshot/$TARBALL"
   323.5  
   323.6  BUILD_DEPENDS="gtk2-dev dbus-dev dbus-glib-dev util-linux-uuid-dev"
   323.7 -BUILD_DEPENDS="automake glib-dev gtk3-dev xorg-libX11-dev"
   323.8 +BUILD_DEPENDS="automake glib-dev gtk3-dev libx11-dev"
   323.9  
  323.10  compile_rules() {
  323.11  	mkdir m4
  323.12 @@ -28,6 +28,6 @@
  323.13  
  323.14  genpkg_rules() {
  323.15  	copy @std
  323.16 -	DEPENDS="atk gdk-pixbuf glib gtk3 pango xorg-libX11"
  323.17 +	DEPENDS="atk gdk-pixbuf glib gtk3 pango libx11"
  323.18  	TAGS="matchbox"
  323.19  }
   324.1 --- a/matchbox-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   324.2 +++ b/matchbox-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   324.3 @@ -12,7 +12,7 @@
   324.4  WGET_URL="http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/${VERSION%.*}/$TARBALL"
   324.5  
   324.6  BUILD_DEPENDS="gfortran libmatchbox-dev startup-notification-dev \
   324.7 -xorg-xcb-util-dev"
   324.8 +xcb-util-dev"
   324.9  
  324.10  compile_rules() {
  324.11  	export LDFLAGS="$LDFLAGS -ldl"
  324.12 @@ -29,6 +29,6 @@
  324.13  
  324.14  genpkg_rules() {
  324.15  	copy @std
  324.16 -	DEPENDS="libmatchbox startup-notification xorg-libX11 zlib"
  324.17 +	DEPENDS="libmatchbox startup-notification libx11 zlib"
  324.18  	TAGS="matchbox"
  324.19  }
   325.1 --- a/matchbox-keyboard/receipt	Fri Dec 21 04:44:58 2018 +0200
   325.2 +++ b/matchbox-keyboard/receipt	Sat Dec 22 04:52:35 2018 +0200
   325.3 @@ -11,7 +11,7 @@
   325.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   325.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot/$TARBALL"
   325.6  
   325.7 -BUILD_DEPENDS="automake libtool libfakekey-dev xorg-libXft-dev expat-dev"
   325.8 +BUILD_DEPENDS="automake libtool libfakekey-dev libxft-dev expat-dev"
   325.9  
  325.10  compile_rules() {
  325.11  	./autogen.sh \
  325.12 @@ -22,6 +22,6 @@
  325.13  
  325.14  genpkg_rules() {
  325.15  	copy @std
  325.16 -	DEPENDS="expat libfakekey libpng16 xorg-libX11 xorg-libXft xorg-libXrender"
  325.17 +	DEPENDS="expat libfakekey libpng libx11 libxft libxrender"
  325.18  	TAGS="matchbox"
  325.19  }
   326.1 --- a/matchbox-panel-2/receipt	Fri Dec 21 04:44:58 2018 +0200
   326.2 +++ b/matchbox-panel-2/receipt	Sat Dec 22 04:52:35 2018 +0200
   326.3 @@ -12,7 +12,7 @@
   326.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   326.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-panel-2/snapshot/$TARBALL"
   326.6  
   326.7 -BUILD_DEPENDS="automake libtool gettext-dev xorg-libX11-dev gtk3-dev \
   326.8 +BUILD_DEPENDS="automake libtool gettext-dev libx11-dev gtk3-dev \
   326.9  dbus-glib-dev"
  326.10  
  326.11  compile_rules() {
  326.12 @@ -25,6 +25,6 @@
  326.13  
  326.14  genpkg_rules() {
  326.15  	copy @std
  326.16 -	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 xorg-libX11"
  326.17 +	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 libx11"
  326.18  	TAGS="matchbox"
  326.19  }
   327.1 --- a/matchbox-panel-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
   327.2 +++ b/matchbox-panel-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
   327.3 @@ -23,6 +23,6 @@
   327.4  
   327.5  genpkg_rules() {
   327.6  	copy @std
   327.7 -	DEPENDS="gdk-pixbuf glib gtk2 xorg-libX11"
   327.8 +	DEPENDS="gdk-pixbuf glib gtk2 libx11"
   327.9  	TAGS="matchbox"
  327.10  }
   328.1 --- a/matchbox-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
   328.2 +++ b/matchbox-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
   328.3 @@ -26,7 +26,7 @@
   328.4  
   328.5  genpkg_rules() {
   328.6  	copy @std
   328.7 -	DEPENDS="libmatchbox startup-notification wireless_tools xorg-libX11 \
   328.8 -	xorg-libXext"
   328.9 +	DEPENDS="libmatchbox startup-notification wireless_tools libx11 \
  328.10 +	libxext"
  328.11  	TAGS="matchbox"
  328.12  }
   329.1 --- a/matchbox-window-manager-2/receipt	Fri Dec 21 04:44:58 2018 +0200
   329.2 +++ b/matchbox-window-manager-2/receipt	Sat Dec 22 04:52:35 2018 +0200
   329.3 @@ -12,8 +12,8 @@
   329.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   329.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager-2/snapshot/matchbox-window-manager-2-$HASH.tar.bz2"
   329.6  
   329.7 -BUILD_DEPENDS="automake libtool xorg-libX11-dev pango-dev gtk2-dev \
   329.8 -libpng12-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXcursor-dev \
   329.9 +BUILD_DEPENDS="automake libtool libx11-dev pango-dev gtk2-dev \
  329.10 +libpng12-dev libxcomposite-dev libxdamage-dev libxcursor-dev \
  329.11  expat-dev"
  329.12  
  329.13  compile_rules() {
  329.14 @@ -41,6 +41,6 @@
  329.15  
  329.16  genpkg_rules() {
  329.17  	copy @std
  329.18 -	DEPENDS="expat glib gtk2 libpng16 pango xorg-libX11 xorg-libXcomposite \
  329.19 -	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXft xorg-libXrender"
  329.20 +	DEPENDS="expat glib gtk2 libpng pango libx11 libxcomposite \
  329.21 +	libxdamage libxext libxfixes libxft libxrender"
  329.22  }
   330.1 --- a/matchbox-window-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
   330.2 +++ b/matchbox-window-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
   330.3 @@ -11,8 +11,8 @@
   330.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   330.5  WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager/snapshot/$TARBALL"
   330.6  
   330.7 -BUILD_DEPENDS="automake gconf-dev libmatchbox-dev xorg-libXfixes-dev \
   330.8 -xorg-libXcursor-dev expat-dev startup-notification-dev xorg-libSM-dev"
   330.9 +BUILD_DEPENDS="automake gconf-dev libmatchbox-dev libxfixes-dev \
  330.10 +libxcursor-dev expat-dev startup-notification-dev libsm-dev"
  330.11  
  330.12  compile_rules() {
  330.13  	./autogen.sh \
  330.14 @@ -26,7 +26,7 @@
  330.15  
  330.16  genpkg_rules() {
  330.17  	copy @std
  330.18 -	DEPENDS="expat libmatchbox startup-notification xorg-libICE xorg-libSM \
  330.19 -	xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes"
  330.20 +	DEPENDS="expat libmatchbox startup-notification libice libsm \
  330.21 +	libx11 libxcursor libxext libxfixes"
  330.22  	TAGS="window-manager"
  330.23  }
   331.1 --- a/mate-applets/receipt	Fri Dec 21 04:44:58 2018 +0200
   331.2 +++ b/mate-applets/receipt	Sat Dec 22 04:52:35 2018 +0200
   331.3 @@ -11,7 +11,7 @@
   331.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   331.5  WGET_URL="https://github.com/mate-desktop/mate-applets/archive/v$VERSION.tar.gz"
   331.6  
   331.7 -BUILD_DEPENDS="mate-common yelp-tools-dev xorg-libX11-dev python-dev gtk3-dev \
   331.8 +BUILD_DEPENDS="mate-common yelp-tools-dev libx11-dev python-dev gtk3-dev \
   331.9  mate-panel-dev libgtop-dev libwnck3-dev libnotify-dev dbus-glib-dev \
  331.10  polkit-dev upower-dev gucharmap3-dev python-pygobject-dev itstool libmateweather-dev \
  331.11  gtksourceview3-dev wireless_tools-dev" # + cpufrequtils-dev + libcpupower(absent)
  331.12 @@ -32,15 +32,15 @@
  331.13  
  331.14  genpkg_rules() {
  331.15  	deps="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk3 libffi \
  331.16 -	libharfbuzz liblzma libpng16 libxml2 mate-panel pango pcre \
  331.17 -	util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 xorg-libXau \
  331.18 -	xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman zlib"
  331.19 +	libharfbuzz liblzma libpng libxml2 mate-panel pango pcre \
  331.20 +	util-linux-blkid util-linux-mount util-linux-uuid libx11 libxau \
  331.21 +	libxdmcp libxext libxrender libxcb pixman zlib"
  331.22  
  331.23  	case $PACKAGE in
  331.24  		*-accessx-status)
  331.25  			copy accessx-status* *AccessxStatus* *accessx-status*/mate-* \
  331.26  			apps/mate-ax-applet.png
  331.27 -			DEPENDS="$deps xorg-libICE xorg-libSM"
  331.28 +			DEPENDS="$deps libice libsm"
  331.29  			CAT="x-window|Keyboard Accessibility Monitor"
  331.30  			;;
  331.31  		*-battstat)
  331.32 @@ -86,7 +86,7 @@
  331.33  		*-stickynotes)
  331.34  			copy *stickynotes* *StickyNotes* mate-sticky-notes-*
  331.35  			DEPENDS="$deps gtksourceview3 libwnck3 startup-notification \
  331.36 -			xorg-xcb-util"
  331.37 +			xcb-util"
  331.38  			CAT="x-window|Sticky Notes"
  331.39  			;;
  331.40  		*-timer)
   332.1 --- a/mate-control-center/receipt	Fri Dec 21 04:44:58 2018 +0200
   332.2 +++ b/mate-control-center/receipt	Sat Dec 22 04:52:35 2018 +0200
   332.3 @@ -11,11 +11,11 @@
   332.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   332.5  WGET_URL="https://github.com/mate-desktop/mate-control-center/archive/v$VERSION.tar.gz"
   332.6  
   332.7 -BUILD_DEPENDS="mate-common yelp-tools itstool xorg-libX11-dev \
   332.8 -xorg-libXScrnSaver-dev xorg-libXext-dev libcanberra-dev xorg-libXxf86misc-dev \
   332.9 -xorg-xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
  332.10 +BUILD_DEPENDS="mate-common yelp-tools itstool libx11-dev \
  332.11 +libxscrnsaver-dev libxext-dev libcanberra-dev libxxf86misc-dev \
  332.12 +xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
  332.13  librsvg-dev mate-settings-daemon-dev libappindicator-gtk3-dev \
  332.14 -desktop-file-utils xorg-libXcursor-dev libmatekbd-dev libxklavier-dev"
  332.15 +desktop-file-utils libxcursor-dev libmatekbd-dev libxklavier-dev"
  332.16  SPLIT="$PACKAGE-dev"
  332.17  
  332.18  compile_rules() {
  332.19 @@ -35,8 +35,8 @@
  332.20  			DEPENDS="atk cairo dbus-glib dconf fontconfig freetype gdk-pixbuf \
  332.21  			glib gtk3 libappindicator-gtk3 libcanberra libcanberra-gtk3 \
  332.22  			libmatekbd librsvg libxklavier libxml2 marco mate-desktop \
  332.23 -			mate-menus pango xorg-libX11 xorg-libXScrnSaver xorg-libXcursor \
  332.24 -			xorg-libXi"
  332.25 +			mate-menus pango libx11 libxscrnsaver libxcursor \
  332.26 +			libxi"
  332.27  			;;
  332.28  		*-dev)
  332.29  			copy @dev
   333.1 --- a/mate-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   333.2 +++ b/mate-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   333.3 @@ -12,8 +12,8 @@
   333.4  WGET_URL="https://github.com/mate-desktop/mate-desktop/archive/v$VERSION.tar.gz"
   333.5  
   333.6  BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev dconf-dev \
   333.7 -startup-notification-dev xorg-libX11-dev xorg-libXrandr-dev gdk-pixbuf-dev \
   333.8 -gtk3-dev xorg-xcb-util-dev"
   333.9 +startup-notification-dev libx11-dev libxrandr-dev gdk-pixbuf-dev \
  333.10 +gtk3-dev xcb-util-dev"
  333.11  SPLIT="$PACKAGE-dev"
  333.12  
  333.13  compile_rules() {
  333.14 @@ -29,7 +29,7 @@
  333.15  		mate-desktop)
  333.16  			copy @std @ico # only 16 and 48 icons
  333.17  			DEPENDS="atk cairo dconf gdk-pixbuf glib gtk3 pango \
  333.18 -			startup-notification xorg-libX11 xorg-libXrandr"
  333.19 +			startup-notification libx11 libxrandr"
  333.20  			;;
  333.21  		*-dev)
  333.22  			copy @dev
   334.1 --- a/mate-indicator-applet/receipt	Fri Dec 21 04:44:58 2018 +0200
   334.2 +++ b/mate-indicator-applet/receipt	Sat Dec 22 04:52:35 2018 +0200
   334.3 @@ -11,7 +11,7 @@
   334.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   334.5  WGET_URL="https://github.com/mate-desktop/mate-indicator-applet/archive/v$VERSION.tar.gz"
   334.6  
   334.7 -BUILD_DEPENDS="mate-common gtk3-dev xorg-libX11-dev mate-panel-dev \
   334.8 +BUILD_DEPENDS="mate-common gtk3-dev libx11-dev mate-panel-dev \
   334.9  libindicator-gtk3-dev"
  334.10  
  334.11  compile_rules() {
  334.12 @@ -24,6 +24,6 @@
  334.13  
  334.14  genpkg_rules() {
  334.15  	copy @std
  334.16 -	DEPENDS="atk glib gtk3 libindicator-gtk3 mate-panel xorg-libX11"
  334.17 +	DEPENDS="atk glib gtk3 libindicator-gtk3 mate-panel libx11"
  334.18  	TAGS="MATE"
  334.19  }
   335.1 --- a/mate-netbook/receipt	Fri Dec 21 04:44:58 2018 +0200
   335.2 +++ b/mate-netbook/receipt	Sat Dec 22 04:52:35 2018 +0200
   335.3 @@ -11,7 +11,7 @@
   335.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   335.5  WGET_URL="https://github.com/mate-desktop/mate-netbook/archive/v$VERSION.tar.gz"
   335.6  
   335.7 -BUILD_DEPENDS="mate-common gtk3-dev libwnck3-dev xorg-libXtst-dev \
   335.8 +BUILD_DEPENDS="mate-common gtk3-dev libwnck3-dev libxtst-dev \
   335.9  libfakekey-dev mate-panel-dev"
  335.10  
  335.11  compile_rules() {
  335.12 @@ -25,6 +25,6 @@
  335.13  genpkg_rules() {
  335.14  	copy @std
  335.15  	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libfakekey libwnck3 mate-panel \
  335.16 -	pango xorg-libX11"
  335.17 +	pango libx11"
  335.18  	TAGS="MATE"
  335.19  }
   336.1 --- a/mate-notification-daemon-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   336.2 +++ b/mate-notification-daemon-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   336.3 @@ -32,7 +32,7 @@
   336.4  genpkg_rules() {
   336.5  	copy @std @ico # only 16 and 48 icons
   336.6  	DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libcanberra-gtk2 \
   336.7 -	libnotify libwnck2 xorg-libX11"
   336.8 +	libnotify libwnck2 libx11"
   336.9  	PROVIDE="notification-daemon"
  336.10  	TAGS="MATE"
  336.11  }
   337.1 --- a/mate-notification-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
   337.2 +++ b/mate-notification-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
   337.3 @@ -28,7 +28,7 @@
   337.4  		mate-notification-daemon)
   337.5  			copy @std @ico # only 16 and 48 icons
   337.6  			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk3 \
   337.7 -			libcanberra-gtk3 libnotify libwnck3 pango xorg-libX11"
   337.8 +			libcanberra-gtk3 libnotify libwnck3 pango libx11"
   337.9  			PROVIDE="gtk3:notification-daemon"
  337.10  			;;
  337.11  		*-dev)
   338.1 --- a/mate-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
   338.2 +++ b/mate-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
   338.3 @@ -12,7 +12,7 @@
   338.4  WGET_URL="https://github.com/mate-desktop/mate-panel/archive/v$VERSION.tar.gz"
   338.5  
   338.6  BUILD_DEPENDS="mate-common gtk-doc yelp-tools-dev gobject-introspection-dev \
   338.7 -xorg-libICE-dev xorg-libSM-dev gtk3-dev mate-desktop-dev mate-menus-dev \
   338.8 +libice-dev libsm-dev gtk3-dev mate-desktop-dev mate-menus-dev \
   338.9  dbus-glib-dev libwnck3-dev librsvg-dev libmateweather-dev itstool"
  338.10  SPLIT="$PACKAGE-dev"
  338.11  
  338.12 @@ -30,8 +30,8 @@
  338.13  		mate-panel)
  338.14  			copy @std
  338.15  			DEPENDS="atk cairo dbus-glib gdk-pixbuf glib gtk3 libmateweather \
  338.16 -			librsvg libwnck3 mate-desktop mate-menus pango xorg-libICE \
  338.17 -			xorg-libSM xorg-libX11 xorg-libXrandr"
  338.18 +			librsvg libwnck3 mate-desktop mate-menus pango libice \
  338.19 +			libsm libx11 libxrandr"
  338.20  			;;
  338.21  		*-dev)
  338.22  			copy @dev
   339.1 --- a/mate-power-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
   339.2 +++ b/mate-power-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
   339.3 @@ -26,6 +26,6 @@
   339.4  	copy @std
   339.5  	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libcanberra \
   339.6  	libcanberra-gtk3 libgnome-keyring3 libnotify mate-panel pango upower \
   339.7 -	xorg-libX11 xorg-libXext xorg-libXrandr"
   339.8 +	libx11 libxext libxrandr"
   339.9  	TAGS="MATE"
  339.10  }
   340.1 --- a/mate-screensaver/receipt	Fri Dec 21 04:44:58 2018 +0200
   340.2 +++ b/mate-screensaver/receipt	Sat Dec 22 04:52:35 2018 +0200
   340.3 @@ -11,9 +11,9 @@
   340.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   340.5  WGET_URL="https://github.com/mate-desktop/mate-screensaver/archive/v$VERSION.tar.gz"
   340.6  
   340.7 -BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk3-dev \
   340.8 -dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \
   340.9 -mesa-dev libmatekbd-dev libnotify-dev expat-dev xorg-libxshmfence-dev"
  340.10 +BUILD_DEPENDS="mate-common libx11-dev libxscrnsaver-dev gtk3-dev \
  340.11 +dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto libxext-dev \
  340.12 +mesa-dev libmatekbd-dev libnotify-dev expat-dev libxshmfence-dev"
  340.13  SPLIT="$PACKAGE-dev"
  340.14  
  340.15  compile_rules() {
  340.16 @@ -30,7 +30,7 @@
  340.17  			copy @std
  340.18  			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libmatekbd \
  340.19  			libnotify libxklavier mate-desktop mate-menus mesa pango \
  340.20 -			xorg-libX11 xorg-libXScrnSaver xorg-libXext xorg-libXxf86vm"
  340.21 +			libx11 libxscrnsaver libxext libxxf86vm"
  340.22  			;;
  340.23  		*-dev)
  340.24  			copy @dev
   341.1 --- a/mate-session-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
   341.2 +++ b/mate-session-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
   341.3 @@ -11,8 +11,8 @@
   341.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   341.5  WGET_URL="https://github.com/mate-desktop/mate-session-manager/archive/v$VERSION.tar.gz"
   341.6  
   341.7 -BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev xorg-libXtst-dev xmlto \
   341.8 -libxslt-dev libwrap-dev docbook-xsl xorg-libSM-dev xorg-xtrans"
   341.9 +BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev libxtst-dev xmlto \
  341.10 +libxslt-dev libwrap-dev docbook-xsl libsm-dev xtrans"
  341.11  
  341.12  compile_rules() {
  341.13  	./autogen.sh \
  341.14 @@ -24,7 +24,7 @@
  341.15  
  341.16  genpkg_rules() {
  341.17  	copy @std @ico # only 16 and 48 icons
  341.18 -	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 xorg-libICE xorg-libSM \
  341.19 -	xorg-libX11 xorg-libXau xorg-libXext xorg-libXrender xorg-libXtst"
  341.20 +	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libice libsm \
  341.21 +	libx11 libxau libxext libxrender libxtst"
  341.22  	TAGS="MATE"
  341.23  }
   342.1 --- a/mate-settings-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
   342.2 +++ b/mate-settings-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
   342.3 @@ -12,7 +12,7 @@
   342.4  WGET_URL="https://github.com/mate-desktop/mate-settings-daemon/archive/v$VERSION.tar.gz"
   342.5  
   342.6  BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev dconf-dev mate-desktop-dev \
   342.7 -libnotify-dev xorg-libXxf86misc-dev libmatekbd-dev libcanberra-dev \
   342.8 +libnotify-dev libxxf86misc-dev libmatekbd-dev libcanberra-dev \
   342.9  libmatemixer-dev nss-dev polkit-dev pulseaudio-dev"
  342.10  SPLIT="$PACKAGE-dev"
  342.11  
  342.12 @@ -31,8 +31,8 @@
  342.13  			copy @std
  342.14  			DEPENDS="cairo dbus dbus-glib dconf fontconfig gdk-pixbuf glib \
  342.15  			gtk3 libcanberra-gtk3 libmatekbd libmatemixer libnotify \
  342.16 -			libxklavier mate-desktop nspr nss polkit pulseaudio xorg-libX11 \
  342.17 -			xorg-libXi xorg-libXxf86misc"
  342.18 +			libxklavier mate-desktop nspr nss polkit pulseaudio libx11 \
  342.19 +			libxi libxxf86misc"
  342.20  			;;
  342.21  		*-dev)
  342.22  			copy @dev
   343.1 --- a/mate-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
   343.2 +++ b/mate-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
   343.3 @@ -12,7 +12,7 @@
   343.4  WGET_URL="https://github.com/mate-desktop/mate-terminal/archive/v$VERSION.tar.gz"
   343.5  
   343.6  BUILD_DEPENDS="mate-common yelp-tools-dev vte-dev gtk3-dev dconf-dev \
   343.7 -xorg-libX11-dev itstool xorg-libSM-dev"
   343.8 +libx11-dev itstool libsm-dev"
   343.9  
  343.10  compile_rules() {
  343.11  	./autogen.sh \
  343.12 @@ -24,7 +24,7 @@
  343.13  
  343.14  genpkg_rules() {
  343.15  	copy @std
  343.16 -	DEPENDS="atk dconf gdk-pixbuf glib gtk3 pango vte xorg-libICE xorg-libSM \
  343.17 -	xorg-libX11"
  343.18 +	DEPENDS="atk dconf gdk-pixbuf glib gtk3 pango vte libice libsm \
  343.19 +	libx11"
  343.20  	TAGS="MATE"
  343.21  }
   344.1 --- a/mate-user-share/receipt	Fri Dec 21 04:44:58 2018 +0200
   344.2 +++ b/mate-user-share/receipt	Sat Dec 22 04:52:35 2018 +0200
   344.3 @@ -11,7 +11,7 @@
   344.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   344.5  WGET_URL="https://github.com/mate-desktop/mate-user-share/archive/v$VERSION.tar.gz"
   344.6  
   344.7 -BUILD_DEPENDS="mate-common yelp-tools-dev itstool xorg-libX11-dev gtk3-dev \
   344.8 +BUILD_DEPENDS="mate-common yelp-tools-dev itstool libx11-dev gtk3-dev \
   344.9  dbus-glib-dev libnotify-dev libcanberra-dev caja-dev"
  344.10  
  344.11  compile_rules() {
  344.12 @@ -26,6 +26,6 @@
  344.13  
  344.14  genpkg_rules() {
  344.15  	copy @std
  344.16 -	DEPENDS="caja glib gtk3 pango xorg-libX11"
  344.17 +	DEPENDS="caja glib gtk3 pango libx11"
  344.18  	TAGS="MATE"
  344.19  }
   345.1 --- a/mate-utils/receipt	Fri Dec 21 04:44:58 2018 +0200
   345.2 +++ b/mate-utils/receipt	Sat Dec 22 04:52:35 2018 +0200
   345.3 @@ -12,7 +12,7 @@
   345.4  WGET_URL="https://github.com/mate-desktop/mate-utils/archive/v$VERSION.tar.gz"
   345.5  
   345.6  BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev mate-panel-dev \
   345.7 -libgtop-dev libcanberra-dev itstool xorg-libSM-dev"
   345.8 +libgtop-dev libcanberra-dev itstool libsm-dev"
   345.9  SPLIT="$PACKAGE-dev"
  345.10  
  345.11  compile_rules() {
  345.12 @@ -27,8 +27,8 @@
  345.13  		mate-utils)
  345.14  			copy @std @ico # only 16 and 48 icons
  345.15  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
  345.16 -			libcanberra-gtk3 libgtop mate-panel pango xorg-libICE xorg-libSM \
  345.17 -			xorg-libX11 xorg-libXext zlib"
  345.18 +			libcanberra-gtk3 libgtop mate-panel pango libice libsm \
  345.19 +			libx11 libxext zlib"
  345.20  			;;
  345.21  		*-dev)
  345.22  			copy @dev
   346.1 --- a/matplotlib/receipt	Fri Dec 21 04:44:58 2018 +0200
   346.2 +++ b/matplotlib/receipt	Sat Dec 22 04:52:35 2018 +0200
   346.3 @@ -11,7 +11,7 @@
   346.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   346.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   346.6  
   346.7 -BUILD_DEPENDS="python python-dev zlib-dev libpng16-dev freetype-dev python-numpy \
   346.8 +BUILD_DEPENDS="python python-dev zlib-dev libpng-dev freetype-dev python-numpy \
   346.9  python-pygtk-dev"
  346.10  
  346.11  compile_rules() {
  346.12 @@ -23,8 +23,8 @@
  346.13  
  346.14  genpkg_rules() {
  346.15  	cp -a $install/usr $fs
  346.16 -	DEPENDS="python zlib libpng16 freetype python-numpy gtk2 expat xorg-libXau \
  346.17 -	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
  346.18 -	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
  346.19 +	DEPENDS="python zlib libpng freetype python-numpy gtk2 expat libxau \
  346.20 +	libxcomposite libxcursor libxdmcp libxext \
  346.21 +	libxfixes libxinerama libxrandr libxrender \
  346.22  	python-pygtk gcc-lib-base"
  346.23  }
   347.1 --- a/mesa-demos/receipt	Fri Dec 21 04:44:58 2018 +0200
   347.2 +++ b/mesa-demos/receipt	Sat Dec 22 04:52:35 2018 +0200
   347.3 @@ -12,7 +12,7 @@
   347.4  WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$TARBALL"
   347.5  
   347.6  BUILD_DEPENDS="glew-dev mesa-dev talloc-dev mesa-libegl eudev-dev expat-dev \
   347.7 -xorg-libxshmfence-dev freeglut-dev xorg-libXi-dev"
   347.8 +libxshmfence-dev freeglut-dev libxi-dev"
   347.9  
  347.10  compile_rules() {
  347.11  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
   348.1 --- a/mesa12/receipt	Fri Dec 21 04:44:58 2018 +0200
   348.2 +++ b/mesa12/receipt	Sat Dec 22 04:52:35 2018 +0200
   348.3 @@ -13,10 +13,10 @@
   348.4  WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$TARBALL"
   348.5  
   348.6  BUILD_DEPENDS="autoconf automake libtool python libdrm-dev libgcrypt-dev \
   348.7 -eudev-dev xorg-xorgproto \
   348.8 -xorg-libxcb-dev xorg-libxshmfence-dev xorg-libX11-dev xorg-libXext-dev \
   348.9 -xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \
  348.10 -elfutils-dev llvm-dev xorg-libpciaccess-dev"
  348.11 +eudev-dev xorgproto \
  348.12 +libxcb-dev libxshmfence-dev libx11-dev libxext-dev \
  348.13 +libxdamage-dev libxfixes-dev libxxf86vm-dev expat-dev \
  348.14 +elfutils-dev llvm-dev libpciaccess-dev"
  348.15  SPLIT="$PACKAGE-dev $PACKAGE-dri $PACKAGE-libegl"
  348.16  
  348.17  compile_rules() {
  348.18 @@ -51,8 +51,8 @@
  348.19  		mesa12)
  348.20  			copy etc/ libGL.so* libGLESv1_CM.so* libGLESv2.so* \
  348.21  			libOSMesa.so* libgbm.so* libglapi.so* libxatracker.so*
  348.22 -			DEPENDS="expat libdrm xorg-libXdamage xorg-libXxf86vm \
  348.23 -			xorg-libXt udev xorg-libxshmfence"
  348.24 +			DEPENDS="expat libdrm libxdamage libxxf86vm \
  348.25 +			libxt udev libxshmfence"
  348.26  			SUGGESTED="nvidia"
  348.27  			PROVIDE="libgl"
  348.28  			CONFIG_FILES="/etc/drirc"
  348.29 @@ -60,15 +60,15 @@
  348.30  		mesa12-dev)
  348.31  			copy @dev
  348.32  			DEPENDS="mesa12 mesa12-dri mesa12-libegl libdrm-dev \
  348.33 -			xorg-libXdamage-dev  xorg-libXxf86vm-dev \
  348.34 -			xorg-libXt-dev xorg-xorgproto"
  348.35 +			libxdamage-dev libxxf86vm-dev \
  348.36 +			libxt-dev xorgproto"
  348.37  			;;
  348.38  		mesa12-dri)
  348.39  			copy *_dri.so 90-DRI.conf
  348.40  			CAT="x-window|DRI drivers"
  348.41  			DEPENDS="elfutils expat libdrm libdrm-intel libdrm-nouveau \
  348.42  			libdrm-radeon libgcrypt libgpg-error llvm-libs \
  348.43 -			xorg-libpciaccess zlib"
  348.44 +			libpciaccess zlib"
  348.45  			;;
  348.46  		mesa12-libegl)
  348.47  			copy libEGL*
   349.1 --- a/metacity/receipt	Fri Dec 21 04:44:58 2018 +0200
   349.2 +++ b/metacity/receipt	Sat Dec 22 04:52:35 2018 +0200
   349.3 @@ -12,8 +12,8 @@
   349.4  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   349.5  
   349.6  BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk2-dev \
   349.7 -xorg-libXcomposite-dev xorg-libXdamage-dev zenity-gtk2 xorg-libXinerama-dev \
   349.8 -xorg-libXrandr-dev xorg-libXcursor-dev libcanberra-dev libltdl libvorbis-dev \
   349.9 +libxcomposite-dev libxdamage-dev zenity-gtk2 libxinerama-dev \
  349.10 +libxrandr-dev libxcursor-dev libcanberra-dev libltdl libvorbis-dev \
  349.11  libogg-dev libtool gnome-doc-utils gconf-dev util-linux-uuid-dev intltool"
  349.12  
  349.13  compile_rules() {
  349.14 @@ -29,7 +29,7 @@
  349.15  
  349.16  genpkg_rules() {
  349.17  	copy @std
  349.18 -	DEPENDS="gsettings-desktop-schemas glib gtk2 xorg-libXcomposite \
  349.19 -	xorg-libXdamage zenity-gtk2 xorg-libXinerama xorg-libXrandr xorg-libXcursor \
  349.20 +	DEPENDS="gsettings-desktop-schemas glib gtk2 libxcomposite \
  349.21 +	libxdamage zenity-gtk2 libxinerama libxrandr libxcursor \
  349.22  	libcanberra libltdl libvorbis libogg gconf"
  349.23  }
   350.1 --- a/mhwaveedit/receipt	Fri Dec 21 04:44:58 2018 +0200
   350.2 +++ b/mhwaveedit/receipt	Sat Dec 22 04:52:35 2018 +0200
   350.3 @@ -11,7 +11,7 @@
   350.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   350.5  WGET_URL="http://download.gna.org/mhwaveedit/$TARBALL" # FIXME
   350.6  
   350.7 -BUILD_DEPENDS="alsa-lib-dev libxml2-dev xorg-libX11-dev gtk2-dev"
   350.8 +BUILD_DEPENDS="alsa-lib-dev libxml2-dev libx11-dev gtk2-dev"
   350.9  
  350.10  compile_rules() {
  350.11  	chmod +x install-sh
  350.12 @@ -32,8 +32,8 @@
  350.13  	cp -a $install/usr/bin $fs/usr
  350.14  	cp -a $stuff/skel $fs/etc
  350.15  	chown -R 0.0 $fs
  350.16 -	DEPENDS="alsa-lib libxml2 expat gtk2 xorg-libX11 xorg-libXau \
  350.17 -	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
  350.18 -	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
  350.19 -	xorg-libXdamage"
  350.20 +	DEPENDS="alsa-lib libxml2 expat gtk2 libx11 libxau \
  350.21 +	libxcomposite libxcursor libxdmcp libxext \
  350.22 +	libxfixes libxinerama libxrandr libxrender \
  350.23 +	libxdamage"
  350.24  }
   351.1 --- a/miam-player/receipt	Fri Dec 21 04:44:58 2018 +0200
   351.2 +++ b/miam-player/receipt	Sat Dec 22 04:52:35 2018 +0200
   351.3 @@ -11,7 +11,7 @@
   351.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   351.5  WGET_URL="https://github.com/MBach/Miam-Player/archive/v$VERSION.tar.gz"
   351.6  
   351.7 -BUILD_DEPENDS="qt5-dev xorg-libX11-dev mesa-dev taglib-dev qtav-dev \
   351.8 +BUILD_DEPENDS="qt5-dev libx11-dev mesa-dev taglib-dev qtav-dev \
   351.9  libsdl2-dev"
  351.10  
  351.11  compile_rules() {
   352.1 --- a/minetest/receipt	Fri Dec 21 04:44:58 2018 +0200
   352.2 +++ b/minetest/receipt	Sat Dec 22 04:52:35 2018 +0200
   352.3 @@ -18,9 +18,9 @@
   352.4  EXTRA_SOURCE_FILES="$WGET_URL2"
   352.5  
   352.6  BUILD_DEPENDS="cmake irrlicht-dev gmp-dev jsoncpp-dev luajit-dev curl-dev \
   352.7 -gettext-dev openal-dev libvorbis-dev xorg-libX11-dev xorg-libXext-dev \
   352.8 -xorg-libICE-dev xorg-libSM-dev freetype-dev ncurses-dev sqlite3-dev mesa-dev \
   352.9 -glu-dev libjpeg-turbo-dev bzip2-dev zlib-dev libpng16-dev doxygen graphviz"
  352.10 +gettext-dev openal-dev libvorbis-dev libx11-dev libxext-dev \
  352.11 +libice-dev libsm-dev freetype-dev ncurses-dev sqlite3-dev mesa-dev \
  352.12 +glu-dev libjpeg-turbo-dev bzip2-dev zlib-dev libpng-dev doxygen graphviz"
  352.13  SPLIT="$PACKAGE-data"
  352.14  
  352.15  compile_rules() {
  352.16 @@ -47,7 +47,7 @@
  352.17  		minetest)
  352.18  			copy bin/
  352.19  			DEPENDS="minetest-data freetype gmp irrlicht jsoncpp libcurl \
  352.20 -			libsqlite3 libvorbis luajit mesa ncurses openal xorg-libX11 zlib"
  352.21 +			libsqlite3 libvorbis luajit mesa ncurses openal libx11 zlib"
  352.22  			;;
  352.23  		*-data)
  352.24  			copy @std @rm
   353.1 --- a/mirage/receipt	Fri Dec 21 04:44:58 2018 +0200
   353.2 +++ b/mirage/receipt	Sat Dec 22 04:52:35 2018 +0200
   353.3 @@ -11,7 +11,7 @@
   353.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   353.5  WGET_URL="http://download.berlios.de/mirageiv/$TARBALL" # FIXME
   353.6  
   353.7 -BUILD_DEPENDS="python python-dev xorg-xorgproto xorg-libX11-dev gettext-dev"
   353.8 +BUILD_DEPENDS="python python-dev xorgproto libx11-dev gettext-dev"
   353.9  
  353.10  compile_rules() {
  353.11  	python -B setup.py install --root=$install
  353.12 @@ -19,5 +19,5 @@
  353.13  
  353.14  genpkg_rules() {
  353.15  	cp -a $install/usr $fs
  353.16 -	DEPENDS="python python-pygtk xorg-libX11 xorg-libXau xorg-libXdmcp libffi"
  353.17 +	DEPENDS="python python-pygtk libx11 libxau libxdmcp libffi"
  353.18  }
   354.1 --- a/mjpegtools/receipt	Fri Dec 21 04:44:58 2018 +0200
   354.2 +++ b/mjpegtools/receipt	Sat Dec 22 04:52:35 2018 +0200
   354.3 @@ -11,14 +11,14 @@
   354.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   354.5  WGET_URL="$SF_MIRROR/mjpeg/$TARBALL"
   354.6  
   354.7 -BUILD_DEPENDS="libdv expat gtk2 jpeg libsdl libsdl-gfx xorg-libX11 xorg-libXau \
   354.8 -xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes \
   354.9 -xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage gcc-lib-base \
  354.10 +BUILD_DEPENDS="libdv expat gtk2 jpeg libsdl libsdl-gfx libx11 libxau \
  354.11 +libxcomposite libxcursor libxdmcp libxext libxfixes \
  354.12 +libxinerama libxrandr libxrender libxdamage gcc-lib-base \
  354.13  libdv-dev libsdl-gfx-dev jpeg-dev"
  354.14  SPLIT="$PACKAGE-dev"
  354.15  
  354.16 -BUILD_DEPENDS="libjpeg-turbo-dev libpng16-dev libdv-dev xorg-libX11-dev \
  354.17 -xorg-libICE-dev xorg-libXxf86dga-dev gtk2-dev libsdl-dev"
  354.18 +BUILD_DEPENDS="libjpeg-turbo-dev libpng-dev libdv-dev libx11-dev \
  354.19 +libice-dev libxxf86dga-dev gtk2-dev libsdl-dev"
  354.20  
  354.21  compile_rules() {
  354.22  	./configure $CONFIGURE_ARGS &&
  354.23 @@ -31,7 +31,7 @@
  354.24  	case $PACKAGE in
  354.25  		mjpegtools)
  354.26  			copy @std
  354.27 -			DEPENDS="glib gtk2 libdv libjpeg-turbo libpng16 libsdl"
  354.28 +			DEPENDS="glib gtk2 libdv libjpeg-turbo libpng libsdl"
  354.29  			TAGS="mpeg mjpeg video"
  354.30  			;;
  354.31  		*-dev)
   355.1 --- a/mono/receipt	Fri Dec 21 04:44:58 2018 +0200
   355.2 +++ b/mono/receipt	Sat Dec 22 04:52:35 2018 +0200
   355.3 @@ -11,7 +11,7 @@
   355.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   355.5  WGET_URL="https://download.mono-project.com/sources/mono/$TARBALL"
   355.6  
   355.7 -BUILD_DEPENDS="zlib-dev gettext-dev libtool xorg-libX11-dev cmake libgdiplus-dev"
   355.8 +BUILD_DEPENDS="zlib-dev gettext-dev libtool libx11-dev cmake libgdiplus-dev"
   355.9  SPLIT="$PACKAGE-doc $PACKAGE $PACKAGE-dev"
  355.10  COOKOPTS="skip-log-errors"
  355.11  
   356.1 --- a/mozplugger/receipt	Fri Dec 21 04:44:58 2018 +0200
   356.2 +++ b/mozplugger/receipt	Sat Dec 22 04:52:35 2018 +0200
   356.3 @@ -11,7 +11,7 @@
   356.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   356.5  WGET_URL="$WEB_SITE/files/$TARBALL"
   356.6  
   356.7 -BUILD_DEPENDS="xorg-libX11-dev"
   356.8 +BUILD_DEPENDS="libx11-dev"
   356.9  
  356.10  compile_rules() {
  356.11  	./configure &&
  356.12 @@ -30,5 +30,5 @@
  356.13  
  356.14  genpkg_rules() {
  356.15  	copy @std
  356.16 -	DEPENDS="xorg-libX11"
  356.17 +	DEPENDS="libx11"
  356.18  }
   357.1 --- a/mplayer-cli/receipt	Fri Dec 21 04:44:58 2018 +0200
   357.2 +++ b/mplayer-cli/receipt	Sat Dec 22 04:52:35 2018 +0200
   357.3 @@ -12,8 +12,8 @@
   357.4  TARBALL="MPlayer-$VERSION.tar.xz"
   357.5  WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
   357.6  
   357.7 -BUILD_DEPENDS="ncurses-dev xorg-libXv-dev alsa-lib-dev xorg-libXdamage-dev \
   357.8 -giflib-dev xorg-libXxf86vm-dev xorg-xorgproto freetype-dev fontconfig-dev \
   357.9 +BUILD_DEPENDS="ncurses-dev libxv-dev alsa-lib-dev libxdamage-dev \
  357.10 +giflib-dev libxxf86vm-dev xorgproto freetype-dev fontconfig-dev \
  357.11  zlib-dev yasm libmad-dev libsdl-dev gnutls-dev"
  357.12  
  357.13  compile_rules() {
  357.14 @@ -61,7 +61,7 @@
  357.15  	cp $src/etc/*menu.conf $fs/etc/mplayer
  357.16  	# Font
  357.17  	cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
  357.18 -	DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng16 \
  357.19 -	libsdl ncurses xorg-libX11 xorg-libXext xorg-libXv xorg-libXxf86vm zlib"
  357.20 +	DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng \
  357.21 +	libsdl ncurses libx11 libxext libxv libxxf86vm zlib"
  357.22  	PROVIDE="mplayer"
  357.23  }
   358.1 --- a/mplayer-svn/receipt	Fri Dec 21 04:44:58 2018 +0200
   358.2 +++ b/mplayer-svn/receipt	Sat Dec 22 04:52:35 2018 +0200
   358.3 @@ -12,7 +12,7 @@
   358.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   358.5  WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk"
   358.6  
   358.7 -BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-dev libmad-dev xorg-libXv-dev \
   358.8 +BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-dev libmad-dev libxv-dev \
   358.9  libtheora-dev subversion yasm"
  358.10  
  358.11  # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg
  358.12 @@ -107,8 +107,8 @@
  358.13  	# Font
  358.14  	cd ..
  358.15  	ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
  358.16 -	DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora lame giflib \
  358.17 -	xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
  358.18 +	DEPENDS="gtk2 cdparanoia libmad libxv libtheora lame giflib \
  358.19 +	libxscrnsaver libxxf86vm alsa-lib bzlib x264 libass"
  358.20  	PROVIDE="mplayer"
  358.21  	SUGGESTED="v4l-utils"
  358.22  	TAGS="player movie audio video"
   359.1 --- a/mplayer/receipt	Fri Dec 21 04:44:58 2018 +0200
   359.2 +++ b/mplayer/receipt	Sat Dec 22 04:52:35 2018 +0200
   359.3 @@ -11,10 +11,10 @@
   359.4  TARBALL="MPlayer-$VERSION.tar.xz"
   359.5  WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
   359.6  
   359.7 -BUILD_DEPENDS="gtk2-dev libmad-dev xorg-libXv-dev libtheora-dev \
   359.8 -alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \
   359.9 -xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
  359.10 -xvidcore-dev zlib-dev xorg-xorgproto yasm cdparanoia-dev \
  359.11 +BUILD_DEPENDS="gtk2-dev libmad-dev libxv-dev libtheora-dev \
  359.12 +alsa-lib-dev ncurses-dev lame-dev libxdamage-dev giflib-dev \
  359.13 +libxxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
  359.14 +xvidcore-dev zlib-dev xorgproto yasm cdparanoia-dev \
  359.15  x264-dev enca-dev libmng-dev lirc-dev"
  359.16  SPLIT="mencoder"
  359.17  
  359.18 @@ -67,17 +67,17 @@
  359.19  			# Font
  359.20  			cd ..
  359.21  			ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
  359.22 -			DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora alsa-lib \
  359.23 -			ncurses lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm \
  359.24 +			DEPENDS="gtk2 cdparanoia libmad libxv libtheora alsa-lib \
  359.25 +			ncurses lame libxdamage giflib enca lirc libxxf86vm \
  359.26  			esound libmng audiofile libvorbis libogg zlib xvidcore x264 \
  359.27 -			xorg-libXScrnSaver"
  359.28 +			libxscrnsaver"
  359.29  			;;
  359.30  		mencoder)
  359.31  			copy /usr/bin/mencoder
  359.32  			CAT="multimedia|video and movie encoder"
  359.33  			DEPENDS="libtheora alsa-lib cdparanoia expat libogg libvorbis \
  359.34  			fontconfig freetype x264 xvidcore jpeg libmad ncurses zlib lame \
  359.35 -			libpng16 giflib enca lirc"
  359.36 +			libpng giflib enca lirc"
  359.37  			;;
  359.38  	esac
  359.39  }
   360.1 --- a/mplayerplug-in/receipt	Fri Dec 21 04:44:58 2018 +0200
   360.2 +++ b/mplayerplug-in/receipt	Sat Dec 22 04:52:35 2018 +0200
   360.3 @@ -11,7 +11,7 @@
   360.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   360.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   360.6  
   360.7 -BUILD_DEPENDS="mplayer gtk2-dev xorg-libXpm-dev firefox-dev libIDL gettext-dev \
   360.8 +BUILD_DEPENDS="mplayer gtk2-dev libxpm-dev firefox-dev libIDL gettext-dev \
   360.9  nspr-dev"
  360.10  
  360.11  compile_rules() {
  360.12 @@ -46,7 +46,7 @@
  360.13  	cp -a $install/usr/lib/mozilla $fs/usr/lib		
  360.14  	# change the default video output to xv,x11
  360.15  	sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf
  360.16 -	DEPENDS="mplayer xorg-libXpm gtk2 gcc-lib-base"
  360.17 +	DEPENDS="mplayer libxpm gtk2 gcc-lib-base"
  360.18  	TAGS="player audio video browser"
  360.19  }
  360.20  
   361.1 --- a/mpv/receipt	Fri Dec 21 04:44:58 2018 +0200
   361.2 +++ b/mpv/receipt	Sat Dec 22 04:52:35 2018 +0200
   361.3 @@ -12,7 +12,7 @@
   361.4  WGET_URL="https://github.com/mpv-player/mpv/archive/v$VERSION.tar.gz"
   361.5  EXTRA_SOURCE_FILES="$WAFTOOL"
   361.6  
   361.7 -BUILD_DEPENDS="xorg-dev xorg-libXv-dev xorg-libXScrnSaver-dev lua-dev \
   361.8 +BUILD_DEPENDS="xorg-dev libxv-dev libxscrnsaver-dev lua-dev \
   361.9  ffmpeg-dev enca-dev fribidi-dev libass-dev alsa-lib-dev"
  361.10  
  361.11  compile_rules() {
  361.12 @@ -33,6 +33,6 @@
  361.13  
  361.14  genpkg_rules() {
  361.15  	cp -a $install/* $fs
  361.16 -	DEPENDS="xorg-server xorg-libXv xorg-libXinerama xorg-libXScrnSaver \
  361.17 +	DEPENDS="xorg-server libxv libxinerama libxscrnsaver \
  361.18  	util-linux-uuid alsa-lib enca fribidi libass lua ffmpeg"
  361.19  }
   362.1 --- a/mrxvt-unicode/receipt	Fri Dec 21 04:44:58 2018 +0200
   362.2 +++ b/mrxvt-unicode/receipt	Sat Dec 22 04:52:35 2018 +0200
   362.3 @@ -11,7 +11,7 @@
   362.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   362.5  WGET_URL="$WEB_SITE/archive/${TARBALL/*-/}"
   362.6  
   362.7 -BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev xorg-libXft-dev \
   362.8 +BUILD_DEPENDS="xorg-dev libpng-dev jpeg-dev freetype-dev libxft-dev \
   362.9  libtool"
  362.10  
  362.11  compile_rules() {
  362.12 @@ -29,8 +29,8 @@
  362.13  
  362.14  genpkg_rules() {
  362.15  	cp -a $install/* $fs
  362.16 -	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
  362.17 -	zlib xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
  362.18 -	xorg-libXrender"
  362.19 +	DEPENDS="libpng jpeg freetype expat fontconfig libice libsm \
  362.20 +	zlib libx11 libxau libxdmcp libxft libxpm \
  362.21 +	libxrender"
  362.22  	TAGS="terminal"
  362.23  }
   363.1 --- a/mrxvt/receipt	Fri Dec 21 04:44:58 2018 +0200
   363.2 +++ b/mrxvt/receipt	Sat Dec 22 04:52:35 2018 +0200
   363.3 @@ -11,7 +11,7 @@
   363.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   363.5  WGET_URL="$SF_MIRROR/materm/$TARBALL"
   363.6  
   363.7 -BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev"
   363.8 +BUILD_DEPENDS="xorg-dev libpng-dev jpeg-dev freetype-dev"
   363.9  
  363.10  compile_rules() {
  363.11  	./bootstrap.sh
  363.12 @@ -29,8 +29,8 @@
  363.13  genpkg_rules() {
  363.14  	mkdir -p $fs/usr
  363.15  	cp -a $install/usr/bin $fs/usr
  363.16 -	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
  363.17 -	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
  363.18 -	xorg-libXrender zlib"
  363.19 +	DEPENDS="libpng jpeg freetype expat fontconfig libice libsm \
  363.20 +	libx11 libxau libxdmcp libxft libxpm \
  363.21 +	libxrender zlib"
  363.22  	TAGS="terminal"
  363.23  }
   364.1 --- a/mtools/receipt	Fri Dec 21 04:44:58 2018 +0200
   364.2 +++ b/mtools/receipt	Sat Dec 22 04:52:35 2018 +0200
   364.3 @@ -11,7 +11,7 @@
   364.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   364.5  WGET_URL="https://ftp.gnu.org/pub/gnu/mtools/$TARBALL"
   364.6  
   364.7 -BUILD_DEPENDS="texinfo xorg-libX11-dev xorg-libICE-dev"
   364.8 +BUILD_DEPENDS="texinfo libx11-dev libice-dev"
   364.9  SPLIT="$PACKAGE-floppyd $PACKAGE"
  364.10  
  364.11  compile_rules() {
  364.12 @@ -25,7 +25,7 @@
  364.13  		*-floppyd)
  364.14  			copy floppyd floppyd_installtest
  364.15  			CAT="system-tools|floppy daemon"
  364.16 -			DEPENDS="xorg-libX11 xorg-libXau"
  364.17 +			DEPENDS="libx11 libxau"
  364.18  			;;
  364.19  		mtools)
  364.20  			copy @std @rm
   365.1 --- a/mtpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
   365.2 +++ b/mtpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
   365.3 @@ -12,7 +12,7 @@
   365.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   365.5  WGET_URL="https://github.com/wjaguar/mtPaint/archive/$COMMIT.tar.gz"
   365.6  
   365.7 -BUILD_DEPENDS="gtk2-dev libpng16-dev lcms-dev zlib-dev gettext-dev \
   365.8 +BUILD_DEPENDS="gtk2-dev libpng-dev lcms-dev zlib-dev gettext-dev \
   365.9  libjpeg-turbo-dev tiff-dev"
  365.10  
  365.11  compile_rules() {
  365.12 @@ -39,5 +39,5 @@
  365.13  genpkg_rules() {
  365.14  	copy @std
  365.15  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 lcms \
  365.16 -	libjpeg-turbo libpng16 pango tiff xorg-libX11 zlib"
  365.17 +	libjpeg-turbo libpng pango tiff libx11 zlib"
  365.18  }
   366.1 --- a/mupdf/receipt	Fri Dec 21 04:44:58 2018 +0200
   366.2 +++ b/mupdf/receipt	Sat Dec 22 04:52:35 2018 +0200
   366.3 @@ -48,7 +48,7 @@
   366.4  			copy mupdf-x11-curl mupdf.desktop mupdf.png
   366.5  			ln -s mupdf-x11-curl $fs/usr/bin/mupdf
   366.6  			DEPENDS="freetype jbig2dec libcurl libharfbuzz libjpeg-turbo \
   366.7 -			openjpeg2 openssl xorg-libX11 xorg-libXext zlib"
   366.8 +			openjpeg2 openssl libx11 libxext zlib"
   366.9  			CAT="x-window|basic X11 version"
  366.10  			;;
  366.11  		mupdf-gl)
   367.1 --- a/mupen64plus/receipt	Fri Dec 21 04:44:58 2018 +0200
   367.2 +++ b/mupen64plus/receipt	Sat Dec 22 04:52:35 2018 +0200
   367.3 @@ -25,7 +25,7 @@
   367.4  
   367.5  genpkg_rules() {
   367.6  	copy @std
   367.7 -	DEPENDS="freetype glu boost-filesystem boost-system libpng16 \
   367.8 +	DEPENDS="freetype glu boost-filesystem boost-system libpng \
   367.9  	libsamplerate libsdl mesa speexdsp zlib"
  367.10  	TAGS="emulator nintendo64"
  367.11  }
   368.1 --- a/mygestures/receipt	Fri Dec 21 04:44:58 2018 +0200
   368.2 +++ b/mygestures/receipt	Sat Dec 22 04:52:35 2018 +0200
   368.3 @@ -11,8 +11,8 @@
   368.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   368.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   368.6  
   368.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst jansson-dev xorg-libXmu-dev \
   368.8 -xorg-libXrender-dev xorg-libXtst-dev libxml2-dev"
   368.9 +BUILD_DEPENDS="libx11-dev jansson-dev libxmu-dev \
  368.10 +libxrender-dev libxtst-dev libxml2-dev"
  368.11  
  368.12  compile_rules() {
  368.13  	./configure \
  368.14 @@ -24,5 +24,5 @@
  368.15  
  368.16  genpkg_rules() {
  368.17  	copy @std
  368.18 -	DEPENDS="xorg-libX11 xorg-libXtst jansson"
  368.19 +	DEPENDS="libx11 libxtst jansson"
  368.20  }
   369.1 --- a/nabi/receipt	Fri Dec 21 04:44:58 2018 +0200
   369.2 +++ b/nabi/receipt	Sat Dec 22 04:52:35 2018 +0200
   369.3 @@ -25,5 +25,5 @@
   369.4  
   369.5  genpkg_rules() {
   369.6  	copy @std
   369.7 -	DEPENDS="libhangul gtk2 cairo xorg-libSM xorg-libICE"
   369.8 +	DEPENDS="libhangul gtk2 cairo libsm libice"
   369.9  }
   370.1 --- a/nagios/receipt	Fri Dec 21 04:44:58 2018 +0200
   370.2 +++ b/nagios/receipt	Sat Dec 22 04:52:35 2018 +0200
   370.3 @@ -11,7 +11,7 @@
   370.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   370.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   370.6  
   370.7 -BUILD_DEPENDS="libgd-dev libpng16-dev libjpeg-turbo-dev libtool"
   370.8 +BUILD_DEPENDS="libgd-dev libpng-dev libjpeg-turbo-dev libtool"
   370.9  SPLIT="$PACKAGE-dev"
  370.10  
  370.11  compile_rules() {
  370.12 @@ -59,7 +59,7 @@
  370.13  			sed -i 's/Options None/Options FollowSymLinks/' \
  370.14  			$fs/etc/apache/conf.d/nagios.conf
  370.15  
  370.16 -			DEPENDS="libgd libltdl   apache nagios-plugins libpng16 \
  370.17 +			DEPENDS="libgd libltdl   apache nagios-plugins libpng \
  370.18  			libjpeg-turbo"
  370.19  			SUGGESTED="nagios-nrpe"
  370.20  			;;
   371.1 --- a/navit/receipt	Fri Dec 21 04:44:58 2018 +0200
   371.2 +++ b/navit/receipt	Sat Dec 22 04:52:35 2018 +0200
   371.3 @@ -12,9 +12,9 @@
   371.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   371.5  
   371.6  BUILD_DEPENDS="mesa-dev freeglut-dev quesoglc-dev freeimage-dev \
   371.7 -imagemagick-dev xorg-libXpm-dev xorg-libXmu-dev gtk2-dev libsdl-dev \
   371.8 +imagemagick-dev libxpm-dev libxmu-dev gtk2-dev libsdl-dev \
   371.9  libsdl-image-dev freetype-dev fribidi-dev imlib2-dev postgresql-dev \
  371.10 -xorg-libXi-dev openssl-dev"
  371.11 +libxi-dev openssl-dev"
  371.12  
  371.13  compile_rules() {
  371.14  	./configure $CONFIGURE_ARGS &&
   372.1 --- a/netsurf/receipt	Fri Dec 21 04:44:58 2018 +0200
   372.2 +++ b/netsurf/receipt	Sat Dec 22 04:52:35 2018 +0200
   372.3 @@ -12,7 +12,7 @@
   372.4  WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
   372.5  
   372.6  BUILD_DEPENDS="bison flex perl expat-dev gperf libjpeg-turbo-dev curl-dev \
   372.7 -openssl-dev libpng16-dev librsvg-dev gtk2-dev check-dev perl-html-parser"
   372.8 +openssl-dev libpng-dev librsvg-dev gtk2-dev check-dev perl-html-parser"
   372.9  # libharu-dev gstreamer0-dev
  372.10  
  372.11  compile_rules() {
  372.12 @@ -56,7 +56,7 @@
  372.13  	copy @std
  372.14  	# Remove files to save some space
  372.15  	rm -rf $fs/usr/share/netsurf/*.xpm
  372.16 -	DEPENDS="cairo expat gdk-pixbuf glib gtk2 libcurl libjpeg-turbo libpng16 \
  372.17 +	DEPENDS="cairo expat gdk-pixbuf glib gtk2 libcurl libjpeg-turbo libpng \
  372.18  	librsvg openssl pango zlib"
  372.19  	TAGS="web-browser"
  372.20  }
   373.1 --- a/nitrogen/receipt	Fri Dec 21 04:44:58 2018 +0200
   373.2 +++ b/nitrogen/receipt	Sat Dec 22 04:52:35 2018 +0200
   373.3 @@ -11,7 +11,7 @@
   373.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   373.5  WGET_URL="https://github.com/l3ib/nitrogen/releases/download/$VERSION/$TARBALL"
   373.6  
   373.7 -BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext-dev xorg-libXinerama-dev"
   373.8 +BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext-dev libxinerama-dev"
   373.9  
  373.10  compile_rules() {
  373.11  	./configure $CONFIGURE_ARGS &&
  373.12 @@ -22,6 +22,6 @@
  373.13  genpkg_rules() {
  373.14  	copy @std
  373.15  	DEPENDS="atkmm glib glibmm gtk2 gtkmm libgiomm libsigc++ pangomm \
  373.16 -	xorg-libX11 xorg-libXinerama"
  373.17 +	libx11 libxinerama"
  373.18  	TAGS="wallpaper"
  373.19  }
   374.1 --- a/notecase/receipt	Fri Dec 21 04:44:58 2018 +0200
   374.2 +++ b/notecase/receipt	Sat Dec 22 04:52:35 2018 +0200
   374.3 @@ -11,7 +11,7 @@
   374.4  TARBALL="$PACKAGE-${VERSION}_src.tar.gz"
   374.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   374.6  
   374.7 -BUILD_DEPENDS="gtk2-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \
   374.8 +BUILD_DEPENDS="gtk2-dev pixman-dev gtksourceview-dev gnome-vfs-dev \
   374.9  gconf-dev gettext libgcrypt-dev"
  374.10  
  374.11  compile_rules() {
   375.1 --- a/notes/receipt	Fri Dec 21 04:44:58 2018 +0200
   375.2 +++ b/notes/receipt	Sat Dec 22 04:52:35 2018 +0200
   375.3 @@ -11,7 +11,7 @@
   375.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   375.5  WGET_URL="https://github.com/nuttyartist/notes/archive/v$VERSION.tar.gz"
   375.6  
   375.7 -BUILD_DEPENDS="qt5-dev xorg-libxcb-dev xorg-libX11-dev mesa-dev"
   375.8 +BUILD_DEPENDS="qt5-dev libxcb-dev libx11-dev mesa-dev"
   375.9  
  375.10  compile_rules() {
  375.11  	mkdir build
  375.12 @@ -30,5 +30,5 @@
  375.13  
  375.14  genpkg_rules() {
  375.15  	copy @std @ico # only 16 and 48; svg is too huge
  375.16 -	DEPENDS="libatomic mesa qt5-base xorg-libX11"
  375.17 +	DEPENDS="libatomic mesa qt5-base libx11"
  375.18  }
   376.1 --- a/notification-daemon-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   376.2 +++ b/notification-daemon-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   376.3 @@ -29,7 +29,7 @@
   376.4  		notification-daemon-gtk2)
   376.5  			copy @std @ico # only 16 and 48 icons
   376.6  			DEPENDS="gconf atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
   376.7 -			libcanberra-gtk2 libnotify libwnck2 xorg-libX11"
   376.8 +			libcanberra-gtk2 libnotify libwnck2 libx11"
   376.9  			;;
  376.10  		*-dev)
  376.11  			copy @dev
   377.1 --- a/notification-daemon/receipt	Fri Dec 21 04:44:58 2018 +0200
   377.2 +++ b/notification-daemon/receipt	Sat Dec 22 04:52:35 2018 +0200
   377.3 @@ -11,7 +11,7 @@
   377.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   377.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   377.6  
   377.7 -BUILD_DEPENDS="gettext-dev gtk3-dev glib-dev xorg-libX11-dev"
   377.8 +BUILD_DEPENDS="gettext-dev gtk3-dev glib-dev libx11-dev"
   377.9  
  377.10  compile_rules() {
  377.11  	./configure $CONFIGURE_ARGS &&
  377.12 @@ -22,5 +22,5 @@
  377.13  
  377.14  genpkg_rules() {
  377.15  	copy @std
  377.16 -	DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango xorg-libX11"
  377.17 +	DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango libx11"
  377.18  }
   378.1 --- a/ntk/receipt	Fri Dec 21 04:44:58 2018 +0200
   378.2 +++ b/ntk/receipt	Sat Dec 22 04:52:35 2018 +0200
   378.3 @@ -12,7 +12,7 @@
   378.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   378.5  WGET_URL="http://git.tuxfamily.org/non/fltk/?p=non/fltk.git;a=snapshot;h=$GITHASH;sf=tgz"
   378.6  
   378.7 -BUILD_DEPENDS="xorg-libXft-dev cairo-dev jpeg-dev git python"
   378.8 +BUILD_DEPENDS="libxft-dev cairo-dev jpeg-dev git python"
   378.9  SPLIT="$PACKAGE-dev"
  378.10  
  378.11  compile_rules() {
  378.12 @@ -25,11 +25,11 @@
  378.13  	case $PACKAGE in
  378.14  		ntk)
  378.15  			copy @std
  378.16 -			DEPENDS="xorg-libXft cairo jpeg"
  378.17 +			DEPENDS="libxft cairo jpeg"
  378.18  			;;
  378.19  		*-dev)
  378.20  			copy @dev
  378.21 -			DEPENDS="ntk cairo-dev xorg-libX11-dev xorg-libXft-dev"
  378.22 +			DEPENDS="ntk cairo-dev libx11-dev libxft-dev"
  378.23  			;;
  378.24  	esac
  378.25  }
   379.1 --- a/ntop/receipt	Fri Dec 21 04:44:58 2018 +0200
   379.2 +++ b/ntop/receipt	Sat Dec 22 04:52:35 2018 +0200
   379.3 @@ -43,7 +43,7 @@
   379.4  			copy @std
   379.5  			chown -R www:www $fs/usr/share/ntop/
   379.6  			CONFIG_FILES="/etc/ntop/"
   379.7 -			DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng16 perl pcre libwrap
   379.8 +			DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng perl pcre libwrap
   379.9  			TAGS="network"
  379.10  			;;
  379.11  		ntop-dev)
   380.1 --- a/numlockx/receipt	Fri Dec 21 04:44:58 2018 +0200
   380.2 +++ b/numlockx/receipt	Sat Dec 22 04:52:35 2018 +0200
   380.3 @@ -11,7 +11,7 @@
   380.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   380.5  WGET_URL="http://pkgs.fedoraproject.org/repo/pkgs/$PACKAGE/$TARBALL/be9109370447eae23f6f3f8527bb1a67/$TARBALL"
   380.6  
   380.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev"
   380.8 +BUILD_DEPENDS="libx11-dev libxext-dev"
   380.9  
  380.10  compile_rules() {
  380.11  	./configure $CONFIGURE_ARGS &&
  380.12 @@ -21,5 +21,5 @@
  380.13  
  380.14  genpkg_rules() {
  380.15  	copy @std
  380.16 -	DEPENDS="xorg-libXtst"
  380.17 +	DEPENDS="libxtst"
  380.18  }
   381.1 --- a/nvclock/receipt	Fri Dec 21 04:44:58 2018 +0200
   381.2 +++ b/nvclock/receipt	Sat Dec 22 04:52:35 2018 +0200
   381.3 @@ -11,7 +11,7 @@
   381.4  TARBALL="$PACKAGE$VERSION.tar.gz"
   381.5  WGET_URL="$WEB_SITE/$TARBALL"
   381.6  
   381.7 -BUILD_DEPENDS="autoconf automake xorg-libX11-dev xorg-libXext-dev"
   381.8 +BUILD_DEPENDS="autoconf automake libx11-dev libxext-dev"
   381.9  
  381.10  compile_rules(){
  381.11  	[ -d $PACKAGE$VERSION ] && mv $PACKAGE$VERSION $PACKAGE-$VERSION
   382.1 --- a/nvidia-173xx/receipt	Fri Dec 21 04:44:58 2018 +0200
   382.2 +++ b/nvidia-173xx/receipt	Sat Dec 22 04:52:35 2018 +0200
   382.3 @@ -75,7 +75,7 @@
   382.4  	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1
   382.5  	ln -s libglx.so.$VERSION        $fs/usr/lib/X11/modules/extensions/libglx.so
   382.6  
   382.7 -	DEPENDS="linux xorg-server gtk2 cairo linux-agp xorg-libXv"
   382.8 +	DEPENDS="linux xorg-server gtk2 cairo linux-agp libxv"
   382.9  	PROVIDE="nvidia mesa"
  382.10  	TAGS="driver graphic video"
  382.11  }
   383.1 --- a/obconf-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
   383.2 +++ b/obconf-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
   383.3 @@ -12,7 +12,7 @@
   383.4  WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
   383.5  
   383.6  BUILD_DEPENDS="wget cacerts cmake Qt4-dev qmake openbox-dev glib-dev \
   383.7 -xorg-libXft-dev pango-dev"
   383.8 +libxft-dev pango-dev"
   383.9  
  383.10  compile_rules() {
  383.11  	mkdir build
  383.12 @@ -27,6 +27,6 @@
  383.13  genpkg_rules() {
  383.14  	cp -a $install/* $fs
  383.15  	DEPENDS="bzlib fontconfig freetype libQtCore libQtGui libffi libxml2 \
  383.16 -	openbox pango pcre xorg-libICE xorg-libSM xorg-libX11 xorg-libXft zlib"
  383.17 +	openbox pango pcre libice libsm libx11 libxft zlib"
  383.18  	TAGS="LXQt"
  383.19  }
   384.1 --- a/obconf/receipt	Fri Dec 21 04:44:58 2018 +0200
   384.2 +++ b/obconf/receipt	Sat Dec 22 04:52:35 2018 +0200
   384.3 @@ -12,7 +12,7 @@
   384.4  WGET_URL="http://openbox.org/dist/obconf/$TARBALL"
   384.5  
   384.6  BUILD_DEPENDS="gtk2-dev libglade-dev openbox-dev gdk-pixbuf-dev \
   384.7 -startup-notification-dev xorg-libXft-dev"
   384.8 +startup-notification-dev libxft-dev"
   384.9  
  384.10  compile_rules() {
  384.11  	msgfmt -o $src/po/ru.gmo $stuff/ru.po
  384.12 @@ -27,7 +27,7 @@
  384.13  
  384.14  genpkg_rules() {
  384.15  	copy @std
  384.16 -	DEPENDS="openbox gtk2 libglade shared-mime-info xorg-libXdamage \
  384.17 +	DEPENDS="openbox gtk2 libglade shared-mime-info libxdamage \
  384.18  	startup-notification slitaz-boot-scripts desktop-file-utils"
  384.19  	TAGS="openbox"
  384.20  }
   385.1 --- a/ocaml/receipt	Fri Dec 21 04:44:58 2018 +0200
   385.2 +++ b/ocaml/receipt	Sat Dec 22 04:52:35 2018 +0200
   385.3 @@ -11,7 +11,7 @@
   385.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   385.5  WGET_URL="https://github.com/ocaml/ocaml/archive/$VERSION.tar.gz"
   385.6  
   385.7 -BUILD_DEPENDS="xorg-libX11-dev"
   385.8 +BUILD_DEPENDS="libx11-dev"
   385.9  
  385.10  compile_rules() {
  385.11  	./configure \
  385.12 @@ -27,6 +27,6 @@
  385.13  
  385.14  genpkg_rules() {
  385.15  	copy @std @dev
  385.16 -	DEPENDS="libbfd ncurses xorg-libX11"
  385.17 +	DEPENDS="libbfd ncurses libx11"
  385.18  	TAGS="language programming"
  385.19  }
   386.1 --- a/octave/receipt	Fri Dec 21 04:44:58 2018 +0200
   386.2 +++ b/octave/receipt	Sat Dec 22 04:52:35 2018 +0200
   386.3 @@ -14,8 +14,8 @@
   386.4  BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev \
   386.5  fltk-dev perl texinfo lapack tar gawk pcre-dev mesa-dev curl-dev \
   386.6  libdrm-dev expat-dev libxml2-dev libgfortran zlib ncurses readline freetype \
   386.7 -gcc-lib-base expat mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm \
   386.8 -xorg-libXdamage xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl \
   386.9 +gcc-lib-base expat mesa glu libx11 libxext libxxf86vm \
  386.10 +libxdamage libxfixes libdrm libxau libxdmcp pcre libcurl \
  386.11  lapack bash gcc fltk gnuplot"
  386.12  
  386.13  compile_rules() {
  386.14 @@ -37,8 +37,8 @@
  386.15  genpkg_rules() {
  386.16  	cp -a $install/* $fs
  386.17  	DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base expat \
  386.18 -	mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \
  386.19 -	xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl lapack bash \
  386.20 +	mesa glu libx11 libxext libxxf86vm libxdamage \
  386.21 +	libxfixes libdrm libxau libxdmcp pcre libcurl lapack bash \
  386.22  	gcc fltk gnuplot"
  386.23  	TAGS="programming language"
  386.24  }
   387.1 --- a/openbox/receipt	Fri Dec 21 04:44:58 2018 +0200
   387.2 +++ b/openbox/receipt	Sat Dec 22 04:52:35 2018 +0200
   387.3 @@ -11,10 +11,10 @@
   387.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   387.5  WGET_URL="http://openbox.org/dist/openbox/$TARBALL"
   387.6  
   387.7 -BUILD_DEPENDS="glib-dev pango-dev gettext-dev xorg-libXcursor-dev \
   387.8 -xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev xorg-libXinerama-dev \
   387.9 -startup-notification-dev automake libtool docbook-utils xorg-libXi-dev \
  387.10 -xorg-xcb-util-dev imlib2-dev librsvg-dev"
  387.11 +BUILD_DEPENDS="glib-dev pango-dev gettext-dev libxcursor-dev \
  387.12 +libice-dev libsm-dev libxrandr-dev libxinerama-dev \
  387.13 +startup-notification-dev automake libtool docbook-utils libxi-dev \
  387.14 +xcb-util-dev imlib2-dev librsvg-dev"
  387.15  SPLIT="$PACKAGE-light:light $PACKAGE-themes $PACKAGE-python $PACKAGE-dev"
  387.16  
  387.17  compile_rules() {
  387.18 @@ -48,9 +48,9 @@
  387.19  			open-folder-menu.sh
  387.20  			# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
  387.21  			DEPENDS="cairo glib imlib2 librsvg libxml2 pango \
  387.22 -			startup-notification xorg-libICE xorg-libSM xorg-libX11 \
  387.23 -			xorg-libXcursor xorg-libXext xorg-libXft xorg-libXi \
  387.24 -			xorg-libXinerama xorg-libXrandr   slitaz-configs"
  387.25 +			startup-notification libice libsm libx11 \
  387.26 +			libxcursor libxext libxft libxi \
  387.27 +			libxinerama libxrandr   slitaz-configs"
  387.28  			SUGGESTED="obconf pcmanfm hsetroot"
  387.29  			TAGS="window-manager"
  387.30  			;;
  387.31 @@ -60,9 +60,9 @@
  387.32  			open-folder-menu.sh
  387.33  			# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
  387.34  			CAT="x-window|without imlib2 and SVG support"
  387.35 -			DEPENDS="glib libxml2 pango startup-notification xorg-libICE \
  387.36 -			xorg-libSM xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXft \
  387.37 -			xorg-libXi xorg-libXinerama xorg-libXrandr   slitaz-configs"
  387.38 +			DEPENDS="glib libxml2 pango startup-notification libice \
  387.39 +			libsm libx11 libxcursor libxext libxft \
  387.40 +			libxi libxinerama libxrandr   slitaz-configs"
  387.41  			PROVIDE="openbox"
  387.42  			SUGGESTED="obconf spacefm pcmanfm hsetroot wbar2 conky"
  387.43  			TAGS="window-manager"
  387.44 @@ -80,7 +80,7 @@
  387.45  			copy @dev
  387.46  			DEPENDS="openbox openbox-themes \
  387.47  			glib-dev imlib2-dev librsvg-dev libxml2-dev pango-dev \
  387.48 -			xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXft-dev"
  387.49 +			libice-dev libsm-dev libx11-dev libxft-dev"
  387.50  			;;
  387.51  	esac
  387.52  }
   388.1 --- a/opencv/receipt	Fri Dec 21 04:44:58 2018 +0200
   388.2 +++ b/opencv/receipt	Sat Dec 22 04:52:35 2018 +0200
   388.3 @@ -18,7 +18,7 @@
   388.4  opencv_contrib-$VERSION.tar.gz"
   388.5  
   388.6  BUILD_DEPENDS="cmake python-dev python-numpy zlib-dev \
   388.7 -libjpeg-turbo-dev tiff-dev libpng16-dev libwebp-dev jasper-dev openexr-dev \
   388.8 +libjpeg-turbo-dev tiff-dev libpng-dev libwebp-dev jasper-dev openexr-dev \
   388.9  ilmbase-dev gtk2-dev glib-dev gstreamer1-dev gst1-plugins-base-dev \
  388.10  libgphoto2-dev shared-mime-info xine-lib-dev protobuf-dev " # lapack-dev
  388.11  SPLIT="$PACKAGE-dev"
  388.12 @@ -70,7 +70,7 @@
  388.13  		opencv)
  388.14  			copy @std
  388.15  			DEPENDS="cairo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk2 \
  388.16 -			jasper libgphoto2 libjpeg-turbo libpng16 libwebp openexr tiff \
  388.17 +			jasper libgphoto2 libjpeg-turbo libpng libwebp openexr tiff \
  388.18  			xine-lib zlib"
  388.19  			;;
  388.20  		opencv-dev)
   389.1 --- a/openjpeg/receipt	Fri Dec 21 04:44:58 2018 +0200
   389.2 +++ b/openjpeg/receipt	Sat Dec 22 04:52:35 2018 +0200
   389.3 @@ -13,7 +13,7 @@
   389.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   389.5  WGET_URL="$SF_MIRROR/openjpeg.mirror/$TARBALL"
   389.6  
   389.7 -BUILD_DEPENDS="automake libtool libpng16-dev zlib-dev tiff-dev lcms2-dev"
   389.8 +BUILD_DEPENDS="automake libtool libpng-dev zlib-dev tiff-dev lcms2-dev"
   389.9  SPLIT="$PACKAGE-tools $PACKAGE-dev"
  389.10  
  389.11  compile_rules() {
  389.12 @@ -34,7 +34,7 @@
  389.13  		*-tools)
  389.14  			copy bin/
  389.15  			CAT="graphics|applications"
  389.16 -			DEPENDS="openjpeg lcms2 libpng16 tiff"
  389.17 +			DEPENDS="openjpeg lcms2 libpng tiff"
  389.18  			;;
  389.19  		*-dev)
  389.20  			copy @dev
   390.1 --- a/openjpeg2/receipt	Fri Dec 21 04:44:58 2018 +0200
   390.2 +++ b/openjpeg2/receipt	Sat Dec 22 04:52:35 2018 +0200
   390.3 @@ -13,7 +13,7 @@
   390.4  TARBALL="openjpeg-$VERSION.tar.gz"
   390.5  WGET_URL="https://github.com/uclouvain/openjpeg/archive/v$VERSION.tar.gz"
   390.6  
   390.7 -BUILD_DEPENDS="cmake zlib-dev libpng16-dev tiff-dev lcms2-dev"
   390.8 +BUILD_DEPENDS="cmake zlib-dev libpng-dev tiff-dev lcms2-dev"
   390.9  SPLIT="$PACKAGE-tools $PACKAGE-dev"
  390.10  
  390.11  compile_rules() {
  390.12 @@ -37,7 +37,7 @@
  390.13  		openjpeg2-tools)
  390.14  			copy bin/
  390.15  			CAT="graphics|applications"
  390.16 -			DEPENDS="openjpeg2 lcms2 libpng16 tiff"
  390.17 +			DEPENDS="openjpeg2 lcms2 libpng tiff"
  390.18  			;;
  390.19  		*-dev)
  390.20  			copy @dev
   391.1 --- a/openmotif/receipt	Fri Dec 21 04:44:58 2018 +0200
   391.2 +++ b/openmotif/receipt	Sat Dec 22 04:52:35 2018 +0200
   391.3 @@ -11,10 +11,10 @@
   391.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   391.5  WGET_URL="${WEB_SITE}files/public_downloads/$PACKAGE/${VERSION%.*}/$VERSION/$TARBALL"
   391.6  
   391.7 -BUILD_DEPENDS="xorg-dev-proto xorg-libXmu xorg-libXft-dev xorg-libXrender-dev \
   391.8 -xorg-xbitmaps fontconfig-dev freetype-dev jpeg-dev libpng16-dev xorg-libXt-dev \
   391.9 -xorg-libSM-dev xorg-libXmu-dev xorg-libX11-dev xorg-xorgproto \
  391.10 -bison flex xorg-libXp util-linux-uuid-dev expat-dev libxml2-dev"
  391.11 +BUILD_DEPENDS="xorg-dev-proto libxft-dev libxrender-dev \
  391.12 +xbitmaps fontconfig-dev freetype-dev jpeg-dev libpng-dev libxt-dev \
  391.13 +libsm-dev libxmu-dev libx11-dev xorgproto \
  391.14 +bison flex libxp util-linux-uuid-dev expat-dev libxml2-dev"
  391.15  SPLIT="$PACKAGE-demo $PACKAGE-dev $PACKAGE"
  391.16  
  391.17  compile_rules() {
  391.18 @@ -39,8 +39,8 @@
  391.19  			;;
  391.20  		openmotif)
  391.21  			copy @std @rm
  391.22 -			DEPENDS="xorg fontconfig expat freetype jpeg libpng16 xorg-libXp \
  391.23 -			xorg-libXft"
  391.24 +			DEPENDS="xorg fontconfig expat freetype jpeg libpng libxp \
  391.25 +			libxft"
  391.26  			;;
  391.27  	esac
  391.28  }
   392.1 --- a/openspades/receipt	Fri Dec 21 04:44:58 2018 +0200
   392.2 +++ b/openspades/receipt	Sat Dec 22 04:52:35 2018 +0200
   392.3 @@ -33,6 +33,6 @@
   392.4  genpkg_rules() {
   392.5  	cp -a $install/* $fs
   392.6  	DEPENDS="gcc49-lib-base glew glibc-base libcurl glu libsdl2 libsdl2-image \
   392.7 -	xorg-libxcb mesa util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \
   392.8 -	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
   392.9 +	libxcb mesa util-linux-uuid libice libsm libx11 \
  392.10 +	libxau libxdmcp libxext zlib"
  392.11  }
   393.1 --- a/openttd/receipt	Fri Dec 21 04:44:58 2018 +0200
   393.2 +++ b/openttd/receipt	Sat Dec 22 04:52:35 2018 +0200
   393.3 @@ -11,7 +11,7 @@
   393.4  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
   393.5  WGET_URL="http://us.binaries.openttd.org/binaries/releases/$VERSION/$TARBALL"
   393.6  
   393.7 -BUILD_DEPENDS="libsdl-dev lzo-dev zlib-dev libpng16-dev xz-dev icu-dev"
   393.8 +BUILD_DEPENDS="libsdl-dev lzo-dev zlib-dev libpng-dev xz-dev icu-dev"
   393.9  
  393.10  compile_rules() {
  393.11  	./configure \
  393.12 @@ -40,5 +40,5 @@
  393.13  
  393.14  genpkg_rules() {
  393.15  	copy @std
  393.16 -	DEPENDS="libsdl lzo zlib libpng16 icu"
  393.17 +	DEPENDS="libsdl lzo zlib libpng icu"
  393.18  }
   394.1 --- a/openvas-client/receipt	Fri Dec 21 04:44:58 2018 +0200
   394.2 +++ b/openvas-client/receipt	Sat Dec 22 04:52:35 2018 +0200
   394.3 @@ -11,7 +11,7 @@
   394.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   394.5  WGET_URL="http://wald.intevation.org/frs/download.php/757/$TARBALL"
   394.6  
   394.7 -BUILD_DEPENDS="libgd-dev libpng16-dev glib-dev openvas-libraries-dev \
   394.8 +BUILD_DEPENDS="libgd-dev libpng-dev glib-dev openvas-libraries-dev \
   394.9  gnutls-dev gtk2-dev"
  394.10  
  394.11  compile_rules() {
   395.1 --- a/optipng/receipt	Fri Dec 21 04:44:58 2018 +0200
   395.2 +++ b/optipng/receipt	Sat Dec 22 04:52:35 2018 +0200
   395.3 @@ -12,7 +12,7 @@
   395.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   395.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   395.6  
   395.7 -BUILD_DEPENDS="libpng16-dev zlib-dev"
   395.8 +BUILD_DEPENDS="libpng-dev zlib-dev"
   395.9  SPLIT="$PACKAGE-static:static"
  395.10  
  395.11  compile_rules() {
  395.12 @@ -40,7 +40,7 @@
  395.13  	case $PACKAGE in
  395.14  		optipng)
  395.15  			copy @std
  395.16 -			DEPENDS="libpng16 zlib"
  395.17 +			DEPENDS="libpng zlib"
  395.18  			;;
  395.19  		optipng-static)
  395.20  			copy @std
   396.1 --- a/orage/receipt	Fri Dec 21 04:44:58 2018 +0200
   396.2 +++ b/orage/receipt	Sat Dec 22 04:52:35 2018 +0200
   396.3 @@ -26,6 +26,6 @@
   396.4  genpkg_rules() {
   396.5  	copy @std
   396.6  	DEPENDS="dbus dbus-glib gdk-pixbuf glib gtk2 libical libnotify \
   396.7 -	libxfce4util pango popt xfce4-panel xorg-libX11"
   396.8 +	libxfce4util pango popt xfce4-panel libx11"
   396.9  	TAGS="Xfce office"
  396.10  }
   397.1 --- a/oxine/receipt	Fri Dec 21 04:44:58 2018 +0200
   397.2 +++ b/oxine/receipt	Sat Dec 22 04:52:35 2018 +0200
   397.3 @@ -12,7 +12,7 @@
   397.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   397.5  
   397.6  BUILD_DEPENDS="shared-mime-info libcdio-dev xine-lib-dev curl-dev \
   397.7 -xorg-libX11-dev xorg-libXtst-dev"
   397.8 +libx11-dev libxtst-dev"
   397.9  
  397.10  compile_rules() {
  397.11  	./configure $CONFIGURE_ARGS &&
   398.1 --- a/oxygen-gtk/receipt	Fri Dec 21 04:44:58 2018 +0200
   398.2 +++ b/oxygen-gtk/receipt	Sat Dec 22 04:52:35 2018 +0200
   398.3 @@ -12,7 +12,7 @@
   398.4  BRANCH="$VERSION"
   398.5  WGET_URL="git|git://anongit.kde.org/oxygen-gtk"
   398.6  
   398.7 -BUILD_DEPENDS="git cmake xorg-libX11-dev gtk2-dev"
   398.8 +BUILD_DEPENDS="git cmake libx11-dev gtk2-dev"
   398.9  
  398.10  compile_rules() {
  398.11  	mkdir build
  398.12 @@ -24,5 +24,5 @@
  398.13  
  398.14  genpkg_rules() {
  398.15  	copy @std
  398.16 -	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11"
  398.17 +	DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11"
  398.18  }
   399.1 --- a/oyranos/receipt	Fri Dec 21 04:44:58 2018 +0200
   399.2 +++ b/oyranos/receipt	Sat Dec 22 04:52:35 2018 +0200
   399.3 @@ -12,15 +12,15 @@
   399.4  WGET_URL="https://github.com/oyranos-cms/oyranos/archive/$VERSION.tar.gz"
   399.5  
   399.6  BUILD_DEPENDS="shared-mime-info cmake yajl-dev openicc-config-dev lcms2-dev \
   399.7 -cairo-dev libraw-dev exiv2-dev libpng16-dev xorg-libXfixes-dev \
   399.8 -xorg-libXrandr-dev xorg-libXinerama-dev xorg-libXxf86vm-dev xorg-libXmu-dev \
   399.9 +cairo-dev libraw-dev exiv2-dev libpng-dev libxfixes-dev \
  399.10 +libxrandr-dev libxinerama-dev libxxf86vm-dev libxmu-dev \
  399.11  libxcm-dev libjpeg-turbo-dev tiff-dev gettext"
  399.12  SPLIT="$PACKAGE-dev"
  399.13  COOKOPTS="skip-log-errors"
  399.14  
  399.15 -DEPENDS_std="cairo exiv2 libgomp libjpeg-turbo libpng16 libraw libxcm libxml2 \
  399.16 -openicc-config xorg-libX11 xorg-libXfixes xorg-libXinerama xorg-libXrandr \
  399.17 -xorg-libXxf86vm yajl"
  399.18 +DEPENDS_std="cairo exiv2 libgomp libjpeg-turbo libpng libraw libxcm libxml2 \
  399.19 +openicc-config libx11 libxfixes libxinerama libxrandr \
  399.20 +libxxf86vm yajl"
  399.21  
  399.22  compile_rules() {
  399.23  	# --libdir=/usr/lib : don't want to be /usr/lib64
   400.1 --- a/palemoon/receipt	Fri Dec 21 04:44:58 2018 +0200
   400.2 +++ b/palemoon/receipt	Sat Dec 22 04:52:35 2018 +0200
   400.3 @@ -12,10 +12,10 @@
   400.4  WGET_URL="https://github.com/MoonchildProductions/Pale-Moon/archive/${VERSION}_Release.tar.gz"
   400.5  
   400.6  BUILD_DEPENDS="autoconf213 gtk2-dev yasm zip unzip iw dbus-dev dbus-glib-dev \
   400.7 -iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \
   400.8 +iw libpng-dev gstreamer0-dev gst0-plugins-base-dev \
   400.9  libvpx-dev mesa-dev virtualenv zlib-dev bzip2-dev python-dev \
  400.10 -xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo-dev \
  400.11 -xorg-libXt-dev coreutils-file-special alsa-lib-dev spl spl-src"
  400.12 +pixman-dev libffi-dev libjpeg-turbo-dev \
  400.13 +libxt-dev coreutils-file-special alsa-lib-dev spl spl-src"
  400.14  # sqlite sqlite-dev libevent libevent-dev
  400.15  
  400.16  compile_rules() {
   401.1 --- a/pango/receipt	Fri Dec 21 04:44:58 2018 +0200
   401.2 +++ b/pango/receipt	Sat Dec 22 04:52:35 2018 +0200
   401.3 @@ -11,7 +11,7 @@
   401.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   401.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   401.6  
   401.7 -BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev \
   401.8 +BUILD_DEPENDS="harfbuzz-dev libxft-dev cairo-dev \
   401.9  gobject-introspection-dev meson ninja fribidi-dev"
  401.10  SPLIT="$PACKAGE-typelib $PACKAGE-dev"
  401.11  
  401.12 @@ -34,7 +34,7 @@
  401.13  		pango)
  401.14  			copy @std
  401.15  			DEPENDS="cairo fontconfig freetype fribidi glib libharfbuzz \
  401.16 -			xorg-libX11 xorg-libXft xorg-libXrender"
  401.17 +			libx11 libxft libxrender"
  401.18  			;;
  401.19  		pango-typelib)
  401.20  			copy *.typelib
  401.21 @@ -45,7 +45,7 @@
  401.22  			copy @dev @rm
  401.23  			DEPENDS="pango pango-typelib \
  401.24  			cairo-dev fontconfig-dev freetype-dev fribidi-dev glib-dev \
  401.25 -			harfbuzz-dev xorg-libXft-dev"
  401.26 +			harfbuzz-dev libxft-dev"
  401.27  			;;
  401.28  	esac
  401.29  }
   402.1 --- a/pangox-compat/receipt	Fri Dec 21 04:44:58 2018 +0200
   402.2 +++ b/pangox-compat/receipt	Sat Dec 22 04:52:35 2018 +0200
   402.3 @@ -11,7 +11,7 @@
   402.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   402.5  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   402.6  
   402.7 -BUILD_DEPENDS="pango-dev glib-dev xorg-libX11-dev"
   402.8 +BUILD_DEPENDS="pango-dev glib-dev libx11-dev"
   402.9  SPLIT="$PACKAGE-dev"
  402.10  
  402.11  compile_rules() {
  402.12 @@ -25,11 +25,11 @@
  402.13  	case $PACKAGE in
  402.14  		pangox-compat)
  402.15  			copy @std
  402.16 -			DEPENDS="glib pango xorg-libX11"
  402.17 +			DEPENDS="glib pango libx11"
  402.18  			;;
  402.19  		*-dev)
  402.20  			copy @dev
  402.21 -			DEPENDS="pangox-compat pango-dev xorg-libX11-dev"
  402.22 +			DEPENDS="pangox-compat pango-dev libx11-dev"
  402.23  			;;
  402.24  	esac
  402.25  }
   403.1 --- a/parcellite/receipt	Fri Dec 21 04:44:58 2018 +0200
   403.2 +++ b/parcellite/receipt	Sat Dec 22 04:52:35 2018 +0200
   403.3 @@ -11,7 +11,7 @@
   403.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   403.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   403.6  
   403.7 -BUILD_DEPENDS="xorg-libX11-dev gtk2-dev intltool"
   403.8 +BUILD_DEPENDS="libx11-dev gtk2-dev intltool"
   403.9  
  403.10  compile_rules() {
  403.11  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
  403.12 @@ -28,5 +28,5 @@
  403.13  	cp -a $install/usr/bin $fs/usr
  403.14  	cp -a $stuff/skel $fs/etc
  403.15  	chown -R 0.0 $fs
  403.16 -	DEPENDS="gtk2 xorg-libX11 xorg-libXdamage"
  403.17 +	DEPENDS="gtk2 libx11 libxdamage"
  403.18  }
   404.1 --- a/pari/receipt	Fri Dec 21 04:44:58 2018 +0200
   404.2 +++ b/pari/receipt	Sat Dec 22 04:52:35 2018 +0200
   404.3 @@ -11,7 +11,7 @@
   404.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   404.5  WGET_URL="http://pari.math.u-bordeaux.fr/pub/$PACKAGE/unix/$TARBALL"
   404.6  
   404.7 -BUILD_DEPENDS="gmp-dev readline-dev xorg-libX11-dev"
   404.8 +BUILD_DEPENDS="gmp-dev readline-dev libx11-dev"
   404.9  SPLIT="$PACKAGE-dev"
  404.10  
  404.11  compile_rules() {
  404.12 @@ -34,8 +34,8 @@
  404.13  	case $PACKAGE in
  404.14  		pari)
  404.15  			copy @std
  404.16 -			DEPENDS="glibc-base gmp xorg-libxcb ncurses readline xorg-libX11 \
  404.17 -			xorg-libXau xorg-libXdmcp"
  404.18 +			DEPENDS="glibc-base gmp libxcb ncurses readline libx11 \
  404.19 +			libxau libxdmcp"
  404.20  			;;
  404.21  		*-dev)
  404.22  			copy @dev
   405.1 --- a/parole/receipt	Fri Dec 21 04:44:58 2018 +0200
   405.2 +++ b/parole/receipt	Sat Dec 22 04:52:35 2018 +0200
   405.3 @@ -31,7 +31,7 @@
   405.4  			copy @std
   405.5  			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gst0-plugins-base \
   405.6  			gstreamer0 gtk2 libnotify libxfce4ui libxfce4util taglib xfconf \
   405.7 -			xorg-libX11"
   405.8 +			libx11"
   405.9  			;;
  405.10  		*-dev)
  405.11  			copy @dev
   406.1 --- a/pavucontrol/receipt	Fri Dec 21 04:44:58 2018 +0200
   406.2 +++ b/pavucontrol/receipt	Sat Dec 22 04:52:35 2018 +0200
   406.3 @@ -31,5 +31,5 @@
   406.4  	copy @std
   406.5  	DEPENDS="atk atkmm cairo cairomm fontconfig freetype gdk-pixbuf glib \
   406.6  	glibmm gtk2 gtkmm libcanberra libgiomm libsigc++ pango pangomm pulseaudio \
   406.7 -	pulseaudio-glib xorg-libX11"
   406.8 +	pulseaudio-glib libx11"
   406.9  }
   407.1 --- a/pce/receipt	Fri Dec 21 04:44:58 2018 +0200
   407.2 +++ b/pce/receipt	Sat Dec 22 04:52:35 2018 +0200
   407.3 @@ -21,7 +21,7 @@
   407.4  
   407.5  genpkg_rules() {
   407.6  	copy @std
   407.7 -	DEPENDS="readline ncurses libsdl xorg-libX11 xorg-libxcb xorg-libXau \
   407.8 -	xorg-libXdmcp"
   407.9 +	DEPENDS="readline ncurses libsdl libx11 libxcb libxau \
  407.10 +	libxdmcp"
  407.11  	TAGS="emulator atari macplus"
  407.12  }
   408.1 --- a/pcmanfm-legacy/receipt	Fri Dec 21 04:44:58 2018 +0200
   408.2 +++ b/pcmanfm-legacy/receipt	Sat Dec 22 04:52:35 2018 +0200
   408.3 @@ -12,8 +12,8 @@
   408.4  WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL"
   408.5  
   408.6  BUILD_DEPENDS="gtk2-dev gamin-dev gamin shared-mime-info intltool hal-dev \
   408.7 -dbus-glib-dev dbus-dev startup-notification-dev xorg-libxcb-dev xorg-xcb-util-dev \
   408.8 -xorg-xcb-util xorg-libX11-dev xorg-libXt-dev"
   408.9 +dbus-glib-dev dbus-dev startup-notification-dev libxcb-dev xcb-util-dev \
  408.10 +libx11-dev libxt-dev"
  408.11  
  408.12  compile_rules() {
  408.13  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
  408.14 @@ -35,6 +35,6 @@
  408.15  genpkg_rules() {
  408.16  	copy @std
  408.17  	DEPENDS="cairo dbus dbus-glib gamin gdk-pixbuf glib gtk2 hal pango \
  408.18 -	startup-notification xorg-libX11   hicolor-icon-theme shared-mime-info"
  408.19 +	startup-notification libx11   hicolor-icon-theme shared-mime-info"
  408.20  	TAGS="file-manager"
  408.21  }
   409.1 --- a/pcmanfm-qt/receipt	Fri Dec 21 04:44:58 2018 +0200
   409.2 +++ b/pcmanfm-qt/receipt	Sat Dec 22 04:52:35 2018 +0200
   409.3 @@ -29,7 +29,7 @@
   409.4  
   409.5  genpkg_rules() {
   409.6  	copy @std
   409.7 -	DEPENDS="glib libfm libfm-qt menu-cache qt5-base qt5-x11extras xorg-libxcb \
   409.8 +	DEPENDS="glib libfm libfm-qt menu-cache qt5-base qt5-x11extras libxcb \
   409.9  	   shared-mime-info"
  409.10  	TAGS="LXQt file-manager"
  409.11  }
   410.1 --- a/pcmanfm/receipt	Fri Dec 21 04:44:58 2018 +0200
   410.2 +++ b/pcmanfm/receipt	Sat Dec 22 04:52:35 2018 +0200
   410.3 @@ -13,7 +13,7 @@
   410.4  #WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" # SF download problems
   410.5  WGET_URL="http://git.lxde.org/gitweb/?p=lxde/pcmanfm.git;a=snapshot;h=$VERSION;sf=txz"
   410.6  
   410.7 -BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk2-dev automake"
   410.8 +BUILD_DEPENDS="intltool libx11-dev pango-dev libfm-dev gtk2-dev automake"
   410.9  
  410.10  compile_rules() {
  410.11  	# tarball from git.lxde.org requires this step
  410.12 @@ -39,7 +39,7 @@
  410.13  
  410.14  genpkg_rules() {
  410.15  	copy @std
  410.16 -	DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm libfm-gtk pango xorg-libX11"
  410.17 +	DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm libfm-gtk pango libx11"
  410.18  	SUGGESTED="gvfs"
  410.19  	TAGS="file-manager"
  410.20  }
   411.1 --- a/pcsxr-svn/receipt	Fri Dec 21 04:44:58 2018 +0200
   411.2 +++ b/pcsxr-svn/receipt	Sat Dec 22 04:52:35 2018 +0200
   411.3 @@ -13,10 +13,10 @@
   411.4  WGET_URL="subversion|https://pcsxr.svn.codeplex.com/svn/pcsxr"
   411.5  BRANCH="$VERSION"
   411.6  
   411.7 -BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk2-dev xorg-libXtst \
   411.8 -xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev zlib-dev libsdl libsdl-dev \
   411.9 +BUILD_DEPENDS="glib-dev libcdio-dev libglade-dev gtk2-dev \
  411.10 +libxtst-dev libxv-dev mesa-dev zlib-dev libsdl-dev \
  411.11  subversion nasm gettext-dev intltool sed lzma autoconf automake libtool \
  411.12 -expat-dev xorg-libxshmfence-dev"
  411.13 +expat-dev libxshmfence-dev"
  411.14  
  411.15  compile_rules() {
  411.16  	./autogen.sh \
  411.17 @@ -38,6 +38,6 @@
  411.18  	cp -a $install/usr/share/psemu $fs/usr/share
  411.19  	cp -a $install/usr/share/pcsx $fs/usr/share
  411.20  	find $fs/usr/lib -name "*.la" -delete
  411.21 -	DEPENDS="libcdio libglade xorg-libXtst xorg-libXv mesa libsdl"
  411.22 +	DEPENDS="libcdio libglade libxtst libxv mesa libsdl"
  411.23  	TAGS="emulator playstation"
  411.24  }
   412.1 --- a/peazip/receipt	Fri Dec 21 04:44:58 2018 +0200
   412.2 +++ b/peazip/receipt	Sat Dec 22 04:52:35 2018 +0200
   412.3 @@ -78,7 +78,7 @@
   412.4  			;;
   412.5  		peazip)
   412.6  			copy @std @rm
   412.7 -			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango xorg-libX11   \
   412.8 +			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango libx11   \
   412.9  			busybox desktop-file-utils gmp libcurl ncurses upx zpaq xdg-utils"
  412.10  			SUGGESTED="aescrypt gnupg"
  412.11  			TAGS="archiver bzip2 encryption gzip rar split tar unrar xz zip 7zip"
   413.1 --- a/pekwm/receipt	Fri Dec 21 04:44:58 2018 +0200
   413.2 +++ b/pekwm/receipt	Sat Dec 22 04:52:35 2018 +0200
   413.3 @@ -30,8 +30,8 @@
   413.4  
   413.5  genpkg_rules() {
   413.6  	copy @std
   413.7 -	DEPENDS="xorg-libX11 xorg-libXinerama xorg-libXft xorg-libXrandr xorg-libXpm"
   413.8 -	SUGGESTED="hsetroot tint2 lxpanel wbar xorg-xprop xorg-xev xdotool wmctrl"
   413.9 +	DEPENDS="libx11 libxinerama libxft libxrandr libxpm"
  413.10 +	SUGGESTED="hsetroot tint2 lxpanel wbar xprop xev xdotool wmctrl"
  413.11  	TAGS="window-manager"
  413.12  }
  413.13  
   414.1 --- a/perl-tk/receipt	Fri Dec 21 04:44:58 2018 +0200
   414.2 +++ b/perl-tk/receipt	Sat Dec 22 04:52:35 2018 +0200
   414.3 @@ -14,10 +14,10 @@
   414.4  TARBALL="$ORIGIN-$VERSION.tar.gz"
   414.5  WGET_URL="https://cpan.metacpan.org/authors/id/${AUTHOR:0:1}/${AUTHOR:0:2}/$AUTHOR/$TARBALL"
   414.6  
   414.7 -DEPENDS_std="perl fontconfig libjpeg-turbo libpng16 xorg-libX11 \
   414.8 -xorg-libXft zlib tk"
   414.9 -BUILD_DEPENDS="$DEPENDS_std perl-dev xorg-libX11-dev freetype-dev \
  414.10 -xorg-libXft-dev fontconfig-dev libpng16-dev zlib-dev libjpeg-turbo-dev tk-dev"
  414.11 +DEPENDS_std="perl fontconfig libjpeg-turbo libpng libx11 \
  414.12 +libxft zlib tk"
  414.13 +BUILD_DEPENDS="$DEPENDS_std perl-dev libx11-dev freetype-dev \
  414.14 +libxft-dev fontconfig-dev libpng-dev zlib-dev libjpeg-turbo-dev tk-dev"
  414.15  
  414.16  SPLIT="$PACKAGE-dev"
  414.17  
   415.1 --- a/pgadmin/receipt	Fri Dec 21 04:44:58 2018 +0200
   415.2 +++ b/pgadmin/receipt	Sat Dec 22 04:52:35 2018 +0200
   415.3 @@ -37,5 +37,5 @@
   415.4  	cp -a $stuff/applications $fs/usr/share
   415.5  	cp -a $stuff/icons $fs/usr/share
   415.6  	DEPENDS="postgresql wxWidgets28 gtk2 libxslt libcomerr3 libkrb5 \
   415.7 -	xorg-libXxf86vm"
   415.8 +	libxxf86vm"
   415.9  }
   416.1 --- a/php/receipt	Fri Dec 21 04:44:58 2018 +0200
   416.2 +++ b/php/receipt	Sat Dec 22 04:52:35 2018 +0200
   416.3 @@ -13,7 +13,7 @@
   416.4  
   416.5  BUILD_DEPENDS="sqlite3-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
   416.6  net-snmp-dev postgresql-dev gettext-dev openssl-dev apache-dev apr-util-dev \
   416.7 -c-client mhash-dev libpng16-dev libunixODBC unixODBC-dev openldap-dev \
   416.8 +c-client mhash-dev libpng-dev libunixODBC unixODBC-dev openldap-dev \
   416.9  libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl \
  416.10  jpeg-dev net-snmp-dev libvpx-dev apache coreutils-conditions sed re2c"
  416.11  SPLIT="\
  416.12 @@ -135,14 +135,14 @@
  416.13  			;;
  416.14  		php-dev)
  416.15  			copy @dev
  416.16 -			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng16 \
  416.17 +			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng \
  416.18  			libpostgresqlclient libunixODBC mhash openssl jpeg \
  416.19  			libmcrypt libtool libkrb5 libcomerr3 net-snmp"
  416.20  			;;
  416.21  		php-gd)
  416.22  			copy gd.so
  416.23  			CAT="development|gd module"
  416.24 -			DEPENDS="libpng16 php jpeg libvpx"
  416.25 +			DEPENDS="libpng php jpeg libvpx"
  416.26  			;;
  416.27  		php-imap)
  416.28  			copy imap.so
   417.1 --- a/pidgin/receipt	Fri Dec 21 04:44:58 2018 +0200
   417.2 +++ b/pidgin/receipt	Sat Dec 22 04:52:35 2018 +0200
   417.3 @@ -12,9 +12,9 @@
   417.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   417.5  
   417.6  BUILD_DEPENDS="gtk2-dev libgcrypt-dev gnutls-dev \
   417.7 -startup-notification-dev libgpg-error-dev libxml2-dev xorg-libxcb-dev \
   417.8 +startup-notification-dev libgpg-error-dev libxml2-dev libxcb-dev \
   417.9  libidn-dev libtasn1-dev intltool expat-dev nss-dev \
  417.10 -ncurses-dev xorg-xcb-util-dev gmp-dev"
  417.11 +ncurses-dev xcb-util-dev gmp-dev"
  417.12  SPLIT="libpurple libpurple-dev $PACKAGE $PACKAGE-dev"
  417.13  
  417.14  compile_rules() {
  417.15 @@ -60,8 +60,8 @@
  417.16  		pidgin)
  417.17  			copy @std @rm
  417.18  			DEPENDS="gtk2 gnutls libgcrypt libgpg-error libpurple \
  417.19 -			startup-notification gmp xorg-libXdamage libxml2 \
  417.20 -			xorg-libxcb xorg-xcb-util libidn ncurses libtasn1 nss"
  417.21 +			startup-notification gmp libxdamage libxml2 \
  417.22 +			libxcb xcb-util libidn ncurses libtasn1 nss"
  417.23  			PROVIDE="purple"
  417.24  			;;
  417.25  		pidgin-dev)
   418.1 --- a/pingus/receipt	Fri Dec 21 04:44:58 2018 +0200
   418.2 +++ b/pingus/receipt	Sat Dec 22 04:52:35 2018 +0200
   418.3 @@ -15,7 +15,7 @@
   418.4  WGET_URL="http://pingus.seul.org/files/$TARBALL"
   418.5  
   418.6  BUILD_DEPENDS="scons2 libsdl-dev libsdl-image-dev libsdl-mixer-dev boost-dev \
   418.7 -boost-signals libpng16-dev"
   418.8 +boost-signals libpng-dev"
   418.9  
  418.10  compile_rules() {
  418.11  	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/screenshot.cpp
   419.1 --- a/plotdrop/receipt	Fri Dec 21 04:44:58 2018 +0200
   419.2 +++ b/plotdrop/receipt	Sat Dec 22 04:52:35 2018 +0200
   419.3 @@ -23,5 +23,5 @@
   419.4  	cp -a $install/usr/bin $fs/usr
   419.5  	cp -a $install/usr/share $fs/usr
   419.6  	rm $fs/usr/share/$PACKAGE/*.png
   419.7 -	DEPENDS="gnuplot gtk2 libxml2 expat xorg-libX11 libglade"
   419.8 +	DEPENDS="gnuplot gtk2 libxml2 expat libx11 libglade"
   419.9  }
   420.1 --- a/ploticus/receipt	Fri Dec 21 04:44:58 2018 +0200
   420.2 +++ b/ploticus/receipt	Sat Dec 22 04:52:35 2018 +0200
   420.3 @@ -11,7 +11,7 @@
   420.4  TARBALL="ploticus${VERSION/./}_src.tar.gz"
   420.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   420.6  
   420.7 -BUILD_DEPENDS="zlib-dev xorg-dev libpng16-dev"
   420.8 +BUILD_DEPENDS="zlib-dev xorg-dev libpng-dev"
   420.9  
  420.10  compile_rules() {
  420.11  	cd $src/src
  420.12 @@ -21,5 +21,5 @@
  420.13  
  420.14  genpkg_rules() {
  420.15  	copy @std
  420.16 -	DEPENDS="zlib xorg libpng16"
  420.17 +	DEPENDS="zlib xorg libpng"
  420.18  }
   421.1 --- a/pluma/receipt	Fri Dec 21 04:44:58 2018 +0200
   421.2 +++ b/pluma/receipt	Sat Dec 22 04:52:35 2018 +0200
   421.3 @@ -13,7 +13,7 @@
   421.4  
   421.5  BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gobject-introspection-dev \
   421.6  enchant-dev iso-codes-dev gtk3-dev gtksourceview3-dev libpeas-dev itstool \
   421.7 -xorg-libSM-dev"
   421.8 +libsm-dev"
   421.9  SPLIT="$PACKAGE-dev $PACKAGE-plugins $PACKAGE"
  421.10  
  421.11  compile_rules() {
  421.12 @@ -41,8 +41,8 @@
  421.13  			copy @std @rm
  421.14  			rm -r $fs/usr/lib # -> plugins
  421.15  			DEPENDS="atk cairo gdk-pixbuf glib gobject-introspection gtk3 \
  421.16 -			gtksourceview3 libpeas libpeas-gtk pango xorg-libICE xorg-libSM \
  421.17 -			xorg-libX11"
  421.18 +			gtksourceview3 libpeas libpeas-gtk pango libice libsm \
  421.19 +			libx11"
  421.20  			;;
  421.21  	esac
  421.22  	TAGS="MATE"
   422.1 --- a/plymouth/receipt	Fri Dec 21 04:44:58 2018 +0200
   422.2 +++ b/plymouth/receipt	Sat Dec 22 04:52:35 2018 +0200
   422.3 @@ -11,7 +11,7 @@
   422.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   422.5  WGET_URL="http://www.freedesktop.org/software/plymouth/releases/$TARBALL"
   422.6  
   422.7 -BUILD_DEPENDS="libpng16-dev pango-dev gtk2-dev xorg-libpciaccess-dev libdrm-dev"
   422.8 +BUILD_DEPENDS="libpng-dev pango-dev gtk2-dev libpciaccess-dev libdrm-dev"
   422.9  
  422.10  compile_rules() {
  422.11  	./configure \
  422.12 @@ -28,5 +28,5 @@
  422.13  
  422.14  genpkg_rules() {
  422.15  	copy @std
  422.16 -	DEPENDS="libpng16 pango gtk2 xorg-libpciaccess libdrm"
  422.17 +	DEPENDS="libpng pango gtk2 libpciaccess libdrm"
  422.18  }
   423.1 --- a/pngquant/receipt	Fri Dec 21 04:44:58 2018 +0200
   423.2 +++ b/pngquant/receipt	Sat Dec 22 04:52:35 2018 +0200
   423.3 @@ -13,10 +13,10 @@
   423.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   423.5  WGET_URL="git|https://github.com/kornelski/pngquant.git"
   423.6  
   423.7 -BUILD_DEPENDS="git lcms2-dev libpng16-dev zlib-dev"
   423.8 +BUILD_DEPENDS="git lcms2-dev libpng-dev zlib-dev"
   423.9  SPLIT="$PACKAGE-static:static"
  423.10  
  423.11 -DEPENDS_std="lcms2 libpng16 zlib"
  423.12 +DEPENDS_std="lcms2 libpng zlib"
  423.13  DEPENDS_static=" "
  423.14  
  423.15  COPY_static="@std"
   424.1 --- a/pngrewrite/receipt	Fri Dec 21 04:44:58 2018 +0200
   424.2 +++ b/pngrewrite/receipt	Sat Dec 22 04:52:35 2018 +0200
   424.3 @@ -11,7 +11,7 @@
   424.4  TARBALL="$PACKAGE-$VERSION.zip"
   424.5  WGET_URL="${WEB_SITE}$TARBALL"
   424.6  
   424.7 -BUILD_DEPENDS="libpng16-dev zlib-dev"
   424.8 +BUILD_DEPENDS="libpng-dev zlib-dev"
   424.9  
  424.10  compile_rules() {
  424.11  	make &&
  424.12 @@ -20,5 +20,5 @@
  424.13  
  424.14  genpkg_rules() {
  424.15  	copy @std
  424.16 -	DEPENDS="libpng16"
  424.17 +	DEPENDS="libpng"
  424.18  }
   425.1 --- a/pnmixer/receipt	Fri Dec 21 04:44:58 2018 +0200
   425.2 +++ b/pnmixer/receipt	Sat Dec 22 04:52:35 2018 +0200
   425.3 @@ -11,7 +11,7 @@
   425.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   425.5  WGET_URL="http://cloud.github.com/downloads/nicklan/$PACKAGE/$TARBALL"
   425.6  
   425.7 -BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext-dev xorg-libX11-dev \
   425.8 +BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext-dev libx11-dev \
   425.9  gtk2-dev"
  425.10  
  425.11  compile_rules() {
  425.12 @@ -27,8 +27,8 @@
  425.13  genpkg_rules() {
  425.14  	cp -a $install/* $fs
  425.15  	DEPENDS="alsa-lib atk bzlib cairo expat fontconfig freetype gcc-lib-base \
  425.16 -	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
  425.17 -	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
  425.18 -	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
  425.19 -	xorg-libXrandr xorg-libXrender zlib"
  425.20 +	gdk-pixbuf glib glibc-base gtk2 libffi libpng libxcb pango \
  425.21 +	pixman libx11 libxau libxcomposite libxcursor \
  425.22 +	libxdamage libxdmcp libxext libxfixes libxinerama \
  425.23 +	libxrandr libxrender zlib"
  425.24  }
   426.1 --- a/podofo/receipt	Fri Dec 21 04:44:58 2018 +0200
   426.2 +++ b/podofo/receipt	Sat Dec 22 04:52:35 2018 +0200
   426.3 @@ -12,7 +12,7 @@
   426.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   426.5  
   426.6  BUILD_DEPENDS="cmake fontconfig-dev freetype-dev zlib-dev jpeg-dev tiff-dev \
   426.7 -libpng16-dev"
   426.8 +libpng-dev"
   426.9  SPLIT="$PACKAGE-dev"
  426.10  
  426.11  compile_rules() {
  426.12 @@ -35,7 +35,7 @@
  426.13  			mkdir -p $fs/usr/lib
  426.14  			cp -a $install/usr/bin $fs/usr
  426.15  			cp -a $install/usr/lib/*.so* $fs/usr/lib
  426.16 -			DEPENDS="fontconfig freetype zlib jpeg tiff gcc-lib-base libpng16"
  426.17 +			DEPENDS="fontconfig freetype zlib jpeg tiff gcc-lib-base libpng"
  426.18  			;;
  426.19  		*-dev)
  426.20  			mkdir -p $fs/usr/lib
   427.1 --- a/ponyprog/receipt	Fri Dec 21 04:44:58 2018 +0200
   427.2 +++ b/ponyprog/receipt	Sat Dec 22 04:52:35 2018 +0200
   427.3 @@ -17,5 +17,5 @@
   427.4  
   427.5  genpkg_rules() {
   427.6  	copy @std
   427.7 -	DEPENDS="xorg-libXaw"
   427.8 +	DEPENDS="libxaw"
   427.9  }
   428.1 --- a/poppler-qt4/receipt	Fri Dec 21 04:44:58 2018 +0200
   428.2 +++ b/poppler-qt4/receipt	Sat Dec 22 04:52:35 2018 +0200
   428.3 @@ -12,9 +12,9 @@
   428.4  TARBALL="poppler-$VERSION.tar.xz"
   428.5  WGET_URL="http://poppler.freedesktop.org/$TARBALL"
   428.6  
   428.7 -BUILD_DEPENDS="xorg-libXdamage expat-dev jpeg-dev tiff-dev \
   428.8 +BUILD_DEPENDS="libxdamage expat-dev jpeg-dev tiff-dev \
   428.9  freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev cairo-dev \
  428.10 -automake bzip2-dev libpng16-dev libtool Qt4-dev libxml2-dev"
  428.11 +automake bzip2-dev libpng-dev libtool Qt4-dev libxml2-dev"
  428.12  SPLIT="$PACKAGE-apps $PACKAGE-dev"
  428.13  
  428.14  # FIXME: after Qt will be available, to merge this receipt with the poppler receipt.
  428.15 @@ -43,7 +43,7 @@
  428.16  				rm -rf $fs/usr/bin/poppler-glib-demo
  428.17  			fi
  428.18  			CAT="office|utilities to manipulate PDF file"
  428.19 -			DEPENDS="fontconfig poppler-qt4 cairo zlib libpng16 gcc-lib-base \
  428.20 +			DEPENDS="fontconfig poppler-qt4 cairo zlib libpng gcc-lib-base \
  428.21  			libQtCore libQtXml libQtGui"
  428.22  			PROVIDE="poppler-apps"
  428.23  			;;
   429.1 --- a/poppler/receipt	Fri Dec 21 04:44:58 2018 +0200
   429.2 +++ b/poppler/receipt	Sat Dec 22 04:52:35 2018 +0200
   429.3 @@ -13,7 +13,7 @@
   429.4  WGET_URL="https://poppler.freedesktop.org/$TARBALL"
   429.5  
   429.6  BUILD_DEPENDS="cmake freetype-dev fontconfig-dev libjpeg-turbo-dev zlib-dev \
   429.7 -libpng16-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
   429.8 +libpng-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
   429.9  gdk-pixbuf-dev openjpeg2-dev lcms2-dev curl-dev poppler-data"
  429.10  SPLIT="$PACKAGE-apps $PACKAGE-dev"
  429.11  
  429.12 @@ -40,7 +40,7 @@
  429.13  		poppler)
  429.14  			copy *.so*
  429.15  			DEPENDS="cairo fontconfig freetype glib lcms2 libcurl \
  429.16 -			libjpeg-turbo libpng16 nspr nss openjpeg2 tiff zlib"
  429.17 +			libjpeg-turbo libpng nspr nss openjpeg2 tiff zlib"
  429.18  			;;
  429.19  		*-apps)
  429.20  			copy bin/
   430.1 --- a/powermanga/receipt	Fri Dec 21 04:44:58 2018 +0200
   430.2 +++ b/powermanga/receipt	Sat Dec 22 04:52:35 2018 +0200
   430.3 @@ -11,7 +11,7 @@
   430.4  TARBALL="$PACKAGE-$VERSION.tgz"
   430.5  WGET_URL="http://linux.tlk.fr/games/Powermanga/download/$TARBALL"
   430.6  
   430.7 -BUILD_DEPENDS="libsdl-dev zlib-dev libsdl-mixer-dev xorg-libXext"
   430.8 +BUILD_DEPENDS="libsdl-dev zlib-dev libsdl-mixer-dev libxext"
   430.9  
  430.10  # Packaging for SliTaz by Rene Rivero.
  430.11  
   431.1 --- a/prboom/receipt	Fri Dec 21 04:44:58 2018 +0200
   431.2 +++ b/prboom/receipt	Sat Dec 22 04:52:35 2018 +0200
   431.3 @@ -12,7 +12,7 @@
   431.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   431.5  
   431.6  BUILD_DEPENDS="libsdl-dev libsdl-mixer-dev libsdl-net-dev mesa-dev glu \
   431.7 -libpng16-dev glu-dev"
   431.8 +libpng-dev glu-dev"
   431.9  
  431.10  compile_rules() {
  431.11  	sed -i 's|png_error_ptr_||;s|png_infopp_||' src/SDL/i_sshot.c
  431.12 @@ -37,6 +37,6 @@
  431.13  	echo "Copying package files"
  431.14  	cp -a $install/usr/games $fs/usr
  431.15  	cp -a $install/usr/share/games $fs/usr/share
  431.16 -	DEPENDS="libsdl libsdl-mixer libsdl-net libpng16 mesa glu freedoom"
  431.17 +	DEPENDS="libsdl libsdl-mixer libsdl-net libpng mesa glu freedoom"
  431.18  	SUGGESTED="nvidia"
  431.19  }
   432.1 --- a/pulseaudio/receipt	Fri Dec 21 04:44:58 2018 +0200
   432.2 +++ b/pulseaudio/receipt	Sat Dec 22 04:52:35 2018 +0200
   432.3 @@ -12,8 +12,8 @@
   432.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   432.5  WGET_URL="https://www.freedesktop.org/software/pulseaudio/releases/$TARBALL"
   432.6  
   432.7 -BUILD_DEPENDS="intltool libtool xorg-libxcb-dev xorg-libICE-dev xorg-libSM-dev \
   432.8 -xorg-libXtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
   432.9 +BUILD_DEPENDS="intltool libtool libxcb-dev libice-dev libsm-dev \
  432.10 +libxtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
  432.11  dbus-dev eudev-dev openssl-dev speexdsp-dev"
  432.12  SPLIT="$PACKAGE-alsa $PACKAGE-cli $PACKAGE-esound $PACKAGE-glib $PACKAGE-http \
  432.13  $PACKAGE-native $PACKAGE-rtp $PACKAGE-simple $PACKAGE $PACKAGE-dev"
  432.14 @@ -72,7 +72,7 @@
  432.15  			module-x11-publish.so module-stream-restore.so \
  432.16  			module-device-manager.so module-device-restore.so
  432.17  			CAT="multimedia|native protocol support"
  432.18 -			DEPENDS="dbus pulseaudio xorg-libxcb"
  432.19 +			DEPENDS="dbus pulseaudio libxcb"
  432.20  			;;
  432.21  		*-rtp)
  432.22  			copy librtp.so module-rtp-recv.so module-rtp-send.so libraop.so \
  432.23 @@ -90,7 +90,7 @@
  432.24  			copy @std @rm
  432.25  			CAT="multimedia|main part"
  432.26  			DEPENDS="dbus eudev libcap libltdl libsndfile speexdsp \
  432.27 -			xorg-libICE xorg-libSM xorg-libX11 xorg-libXtst xorg-libxcb"
  432.28 +			libice libsm libx11 libxtst libxcb"
  432.29  			SUGGESTED="consolekit2"
  432.30  			;;
  432.31  		*-dev)
   433.1 --- a/putty/receipt	Fri Dec 21 04:44:58 2018 +0200
   433.2 +++ b/putty/receipt	Sat Dec 22 04:52:35 2018 +0200
   433.3 @@ -34,12 +34,12 @@
   433.4  	case $PACKAGE in
   433.5  		putty)
   433.6  			copy @std
   433.7 -			DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11   krb5"
   433.8 +			DEPENDS="cairo gdk-pixbuf glib gtk2 pango libx11   krb5"
   433.9  			CAT="utilities|using GTK+2"
  433.10  			;;
  433.11  		putty-gtk3)
  433.12  			copy @std
  433.13 -			DEPENDS="cairo gdk-pixbuf glib gtk3 pango xorg-libX11   krb5"
  433.14 +			DEPENDS="cairo gdk-pixbuf glib gtk3 pango libx11   krb5"
  433.15  			CAT="utilities|using GTK+3"
  433.16  			;;
  433.17  	esac
   434.1 --- a/puzzles/receipt	Fri Dec 21 04:44:58 2018 +0200
   434.2 +++ b/puzzles/receipt	Sat Dec 22 04:52:35 2018 +0200
   434.3 @@ -31,5 +31,5 @@
   434.4  		cp $img $fs/usr/share/pixmaps/$(basename $img -16d24.png).png
   434.5  	done
   434.6  	cp -a $stuff/*.desktop $fs/usr/share/applications
   434.7 -	DEPENDS="gtk2 cairo xorg-libxcb xorg-libXrandr"
   434.8 +	DEPENDS="gtk2 cairo libxcb libxrandr"
   434.9  }
   435.1 --- a/pwsafe/receipt	Fri Dec 21 04:44:58 2018 +0200
   435.2 +++ b/pwsafe/receipt	Sat Dec 22 04:52:35 2018 +0200
   435.3 @@ -21,8 +21,8 @@
   435.4  
   435.5  genpkg_rules() {
   435.6  	copy @std
   435.7 -	DEPENDS="readline ncurses xorg-libSM xorg-libICE xorg-libXmu xorg-libX11 \
   435.8 -	openssl gcc-lib-base xorg-libXt xorg-libXext xorg-libXau xorg-libXdmcp"
   435.9 +	DEPENDS="readline ncurses libsm libice libxmu libx11 \
  435.10 +	openssl gcc-lib-base libxt libxext libxau libxdmcp"
  435.11  }
  435.12  
  435.13  post_install() {
   436.1 --- a/python-pygame/receipt	Fri Dec 21 04:44:58 2018 +0200
   436.2 +++ b/python-pygame/receipt	Sat Dec 22 04:52:35 2018 +0200
   436.3 @@ -18,8 +18,8 @@
   436.4  WGET_URL="https://github.com/pygame/pygame/archive/$VERSION.tar.gz"
   436.5  
   436.6  BUILD_DEPENDS="python-dev python3-dev \
   436.7 -libsdl-dev libsdl-ttf-dev libsdl-image-dev libsdl-mixer-dev libpng16-dev \
   436.8 -libjpeg-turbo-dev xorg-libX11-dev portmidi-dev freetype-dev"
   436.9 +libsdl-dev libsdl-ttf-dev libsdl-image-dev libsdl-mixer-dev libpng-dev \
  436.10 +libjpeg-turbo-dev libx11-dev portmidi-dev freetype-dev"
  436.11  SPLIT="$PACKAGE-dev $PACKAGE \
  436.12  ${PACKAGE/python/python3}-dev:3 ${PACKAGE/python/python3}:3"
  436.13  
  436.14 @@ -39,8 +39,8 @@
  436.15  			;;
  436.16  		*)
  436.17  			copy @std @rm
  436.18 -			DEPENDS="$py freetype libjpeg-turbo libpng16 libsdl libsdl-image \
  436.19 -			libsdl-mixer libsdl-ttf portmidi xorg-libX11"
  436.20 +			DEPENDS="$py freetype libjpeg-turbo libpng libsdl libsdl-image \
  436.21 +			libsdl-mixer libsdl-ttf portmidi libx11"
  436.22  			;;
  436.23  	esac
  436.24  }
   437.1 --- a/python-wxpython/receipt	Fri Dec 21 04:44:58 2018 +0200
   437.2 +++ b/python-wxpython/receipt	Sat Dec 22 04:52:35 2018 +0200
   437.3 @@ -9,12 +9,12 @@
   437.4  WEB_SITE="https://www.wxpython.org/"
   437.5  REPOLOGY="python:wxpython"
   437.6  
   437.7 -BUILD_DEPENDS="python python-six python-pypubsub zlib-dev libpng16-dev \
   437.8 -libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
   437.9 -xorg-libSM-dev mesa-dev glu-dev libsdl-dev webkit2gtk-dev gstreamer1-dev"
  437.10 -BUILD_DEPENDS_x86_64="python python-six python-pypubsub zlib-dev libpng16-dev \
  437.11 -libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
  437.12 -xorg-libSM-dev mesa-dev glu-dev libsdl-dev gstreamer1-dev \
  437.13 +BUILD_DEPENDS="python python-six python-pypubsub zlib-dev libpng-dev \
  437.14 +libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev libxxf86vm-dev \
  437.15 +libsm-dev mesa-dev glu-dev libsdl-dev webkit2gtk-dev gstreamer1-dev"
  437.16 +BUILD_DEPENDS_x86_64="python python-six python-pypubsub zlib-dev libpng-dev \
  437.17 +libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev libxxf86vm-dev \
  437.18 +libsm-dev mesa-dev glu-dev libsdl-dev gstreamer1-dev \
  437.19  gst1-plugins-base-dev libnotify-dev cppunit-dev"
  437.20  SPLIT="$PACKAGE-dev"
  437.21  
   438.1 --- a/python/receipt	Fri Dec 21 04:44:58 2018 +0200
   438.2 +++ b/python/receipt	Sat Dec 22 04:52:35 2018 +0200
   438.3 @@ -55,7 +55,7 @@
   438.4  		*-tcltk)
   438.5  			copy _tkinter.so lib-tk/ @rm
   438.6  			CAT="development|Tcl/Tk files"
   438.7 -			DEPENDS="python tcl tk xorg-libX11"
   438.8 +			DEPENDS="python tcl tk libx11"
   438.9  			;;
  438.10  		python)
  438.11  			# Now pyconfig.h is required for Mercurial.
   439.1 --- a/python3/receipt	Fri Dec 21 04:44:58 2018 +0200
   439.2 +++ b/python3/receipt	Sat Dec 22 04:52:35 2018 +0200
   439.3 @@ -21,7 +21,7 @@
   439.4  COPY_dev="@dev @rm"
   439.5  
   439.6  DEPENDS_std="python3-setuptools python3-pip bzlib expat gdbm libffi liblzma \
   439.7 -libsqlite3 ncurses ncurses-libpanel openssl readline zlib" # tcl tk xorg-libX11
   439.8 +libsqlite3 ncurses ncurses-libpanel openssl readline zlib" # tcl tk libx11
   439.9  
  439.10  PROVIDE_std="py3k"
  439.11  PROVIDE_dev="py3k-dev"
   440.1 --- a/pywebkitgtk/receipt	Fri Dec 21 04:44:58 2018 +0200
   440.2 +++ b/pywebkitgtk/receipt	Sat Dec 22 04:52:35 2018 +0200
   440.3 @@ -29,11 +29,11 @@
   440.4  			DEPENDS="atk bzlib cairo enchant fontconfig freetype gdk-pixbuf \
   440.5  			glib gst1-plugins-base gstreamer1 gtk2 icu libatomic libffi \
   440.6  			libgcrypt libgpg-error libharfbuzz libharfbuzz-icu libicu \
   440.7 -			libjpeg-turbo liblzma libpng16 libsecret libsoup libsqlite3 \
   440.8 +			libjpeg-turbo liblzma libpng libsecret libsoup libsqlite3 \
   440.9  			libwebp libxml2 libxslt orc pango pcre python util-linux-blkid \
  440.10 -			util-linux-mount util-linux-uuid webkitgtk xorg-libICE xorg-libSM \
  440.11 -			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender \
  440.12 -			xorg-libXt xorg-libxcb xorg-pixman zlib"
  440.13 +			util-linux-mount util-linux-uuid webkitgtk libice libsm \
  440.14 +			libx11 libxau libxdmcp libxext libxrender \
  440.15 +			libxt libxcb pixman zlib"
  440.16  			;;
  440.17  		*-dev)
  440.18  			copy @dev
  440.19 @@ -41,12 +41,12 @@
  440.20  			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev \
  440.21  			gst1-plugins-base-dev gstreamer1-dev gtk2-dev harfbuzz-dev \
  440.22  			harfbuzz-icu-dev icu-dev libjpeg-turbo-dev libffi-dev \
  440.23 -			libgcrypt-dev libgpg-error-dev libpng16-dev libsecret-dev \
  440.24 +			libgcrypt-dev libgpg-error-dev libpng-dev libsecret-dev \
  440.25  			libsoup-dev libwebp-dev libxml2-dev libxslt-dev orc-dev pango-dev \
  440.26  			pcre-dev sqlite3-dev util-linux-blkid-dev util-linux-mount-dev \
  440.27 -			util-linux-uuid-dev webkitgtk-dev xorg-libICE-dev xorg-libSM-dev \
  440.28 -			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
  440.29 -			xorg-libXrender-dev xorg-libXt-dev xorg-libxcb-dev xorg-pixman-dev \
  440.30 +			util-linux-uuid-dev webkitgtk-dev libice-dev libsm-dev \
  440.31 +			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
  440.32 +			libxrender-dev libxt-dev libxcb-dev pixman-dev \
  440.33  			xz-dev zlib-dev"
  440.34  			;;
  440.35  	esac
   441.1 --- a/qarma/receipt	Fri Dec 21 04:44:58 2018 +0200
   441.2 +++ b/qarma/receipt	Sat Dec 22 04:52:35 2018 +0200
   441.3 @@ -12,7 +12,7 @@
   441.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   441.5  WGET_URL="https://github.com/luebking/qarma/archive/$COMMIT.tar.gz"
   441.6  
   441.7 -BUILD_DEPENDS="qt5-dev xorg-libX11-dev"
   441.8 +BUILD_DEPENDS="qt5-dev libx11-dev"
   441.9  
  441.10  compile_rules() {
  441.11  	qmake &&
  441.12 @@ -24,7 +24,7 @@
  441.13  
  441.14  genpkg_rules() {
  441.15  	copy @std
  441.16 -	DEPENDS="libatomic mesa qt5-base qt5-x11extras xorg-libX11"
  441.17 +	DEPENDS="libatomic mesa qt5-base qt5-x11extras libx11"
  441.18  }
  441.19  
  441.20  post_install() {
   442.1 --- a/qca-ossl/receipt	Fri Dec 21 04:44:58 2018 +0200
   442.2 +++ b/qca-ossl/receipt	Sat Dec 22 04:52:35 2018 +0200
   442.3 @@ -11,7 +11,7 @@
   442.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   442.5  WGET_URL="http://delta.affinix.com/download/qca/2.0/plugins/$TARBALL"
   442.6  
   442.7 -BUILD_DEPENDS="qmake xorg-libX11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
   442.8 +BUILD_DEPENDS="qmake libx11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
   442.9  
  442.10  compile_rules() {
  442.11  	chmod +x configure
   443.1 --- a/qedit/receipt	Fri Dec 21 04:44:58 2018 +0200
   443.2 +++ b/qedit/receipt	Sat Dec 22 04:52:35 2018 +0200
   443.3 @@ -11,7 +11,7 @@
   443.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   443.5  WGET_URL="${WEB_SITE}tgz/$TARBALL"
   443.6  
   443.7 -BUILD_DEPENDS="qt5-dev cmake xorg-xcb-util-keysyms-dev xorg-dev zlib-dev \
   443.8 +BUILD_DEPENDS="qt5-dev cmake xcb-util-keysyms-dev xorg-dev zlib-dev \
   443.9  mesa-dev"
  443.10  
  443.11  compile_rules() {
  443.12 @@ -27,6 +27,6 @@
  443.13  
  443.14  genpkg_rules() {
  443.15  	cp -a $install/* $fs
  443.16 -	DEPENDS="qt5-base xorg-xcb-util-keysyms"
  443.17 +	DEPENDS="qt5-base xcb-util-keysyms"
  443.18  	TAGS="text-editor"
  443.19  }
   444.1 --- a/qemacs/receipt	Fri Dec 21 04:44:58 2018 +0200
   444.2 +++ b/qemacs/receipt	Sat Dec 22 04:52:35 2018 +0200
   444.3 @@ -11,7 +11,7 @@
   444.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   444.5  WGET_URL="${WEB_SITE}$TARBALL"
   444.6  
   444.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev"
   444.8 +BUILD_DEPENDS="libx11-dev libxext-dev libxv-dev"
   444.9  SPLIT="$PACKAGE-tiny $PACKAGE-x11 $PACKAGE-dev"
  444.10  
  444.11  compile_rules() {
  444.12 @@ -67,8 +67,8 @@
  444.13  			install -m 755 -s $src/html2png $fs/usr/bin
  444.14  			install $src/kmaps $src/ligatures $fs/usr/share/qe
  444.15  			CAT="editors|Light emacs clone with X11 support."
  444.16 -			DEPENDS="xorg-libX11 xorg-libXext xorg-libXv xorg-libxcb \
  444.17 -			xorg-libXau xorg-libXdmcp"
  444.18 +			DEPENDS="libx11 libxext libxv libxcb \
  444.19 +			libxau libxdmcp"
  444.20  			PROVIDE="qemacs"
  444.21  			TAGS="editor"
  444.22  			;;
   445.1 --- a/qiv/receipt	Fri Dec 21 04:44:58 2018 +0200
   445.2 +++ b/qiv/receipt	Sat Dec 22 04:52:35 2018 +0200
   445.3 @@ -11,7 +11,7 @@
   445.4  TARBALL="$PACKAGE-$VERSION.tgz"
   445.5  WGET_URL="$WEB_SITE/download/$TARBALL"
   445.6  
   445.7 -BUILD_DEPENDS="gtk2-dev imlib2-dev xorg-libXinerama-dev"
   445.8 +BUILD_DEPENDS="gtk2-dev imlib2-dev libxinerama-dev"
   445.9  
  445.10  compile_rules() {
  445.11  	sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile
   446.1 --- a/qiviewer/receipt	Fri Dec 21 04:44:58 2018 +0200
   446.2 +++ b/qiviewer/receipt	Sat Dec 22 04:52:35 2018 +0200
   446.3 @@ -24,5 +24,5 @@
   446.4  genpkg_rules() {
   446.5  	mkdir -p $fs/usr/share/applications
   446.6  	cp -a $install/usr/bin $fs/usr
   446.7 -	DEPENDS="xorg-libX11 libQtCore libQtGui"
   446.8 +	DEPENDS="libx11 libQtCore libQtGui"
   446.9  }
   447.1 --- a/qjackctl/receipt	Fri Dec 21 04:44:58 2018 +0200
   447.2 +++ b/qjackctl/receipt	Sat Dec 22 04:52:35 2018 +0200
   447.3 @@ -11,7 +11,7 @@
   447.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   447.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   447.6  
   447.7 -BUILD_DEPENDS="qmake Qt4-dev jack-dev xorg-xorgproto xorg-libX11-dev"
   447.8 +BUILD_DEPENDS="qmake Qt4-dev jack-dev xorgproto libx11-dev"
   447.9  
  447.10  compile_rules() {
  447.11  	#sed -i 's|^LIBS.*|& -Wl,--copy-dt-needed-entries -lX11|' qjackctl.pro.in
  447.12 @@ -24,8 +24,8 @@
  447.13  	cp -a $install/usr $fs
  447.14  	#rm -rf $fs/usr/share/man
  447.15  	DEPENDS="alsa-lib bzlib expat fontconfig freetype gcc-lib-base glib \
  447.16 -	glibc-base jack libffi libpng16 libQtCore libQtDBus \
  447.17 -	libQtGui libQtXml xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \
  447.18 -	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
  447.19 +	glibc-base jack libffi libpng libQtCore libQtDBus \
  447.20 +	libQtGui libQtXml libxcb util-linux-uuid libice libsm \
  447.21 +	libx11 libxau libxdmcp libxext libxrender zlib"
  447.22  	TAGS="audio sound"
  447.23  }
   448.1 --- a/qlipper/receipt	Fri Dec 21 04:44:58 2018 +0200
   448.2 +++ b/qlipper/receipt	Sat Dec 22 04:52:35 2018 +0200
   448.3 @@ -25,5 +25,5 @@
   448.4  
   448.5  genpkg_rules() {
   448.6  	copy @std
   448.7 -	DEPENDS="qt5-base xorg-libX11"
   448.8 +	DEPENDS="qt5-base libx11"
   448.9  }
   449.1 --- a/qoauth/receipt	Fri Dec 21 04:44:58 2018 +0200
   449.2 +++ b/qoauth/receipt	Sat Dec 22 04:52:35 2018 +0200
   449.3 @@ -11,7 +11,7 @@
   449.4  TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
   449.5  WGET_URL="http://files.ayoy.net/$PACKAGE/release/$VERSION/src/$TARBALL"
   449.6  
   449.7 -BUILD_DEPENDS="qmake qca-dev xorg-libX11-dev dbus-dev Qt4-dev slitaz-toolchain"
   449.8 +BUILD_DEPENDS="qmake qca-dev libx11-dev dbus-dev Qt4-dev slitaz-toolchain"
   449.9  
  449.10  compile_rules() {
  449.11  #	echo -n "Linking..."
   450.1 --- a/qps/receipt	Fri Dec 21 04:44:58 2018 +0200
   450.2 +++ b/qps/receipt	Sat Dec 22 04:52:35 2018 +0200
   450.3 @@ -11,7 +11,7 @@
   450.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   450.5  WGET_URL="$WEB_SITE/releases/download/$VERSION/$TARBALL"
   450.6  
   450.7 -BUILD_DEPENDS="cmake qt5-dev mesa-dev xorg-libXrender-dev"
   450.8 +BUILD_DEPENDS="cmake qt5-dev mesa-dev libxrender-dev"
   450.9  
  450.10  compile_rules() {
  450.11  	mkdir build; cd build
   451.1 --- a/qrencode/receipt	Fri Dec 21 04:44:58 2018 +0200
   451.2 +++ b/qrencode/receipt	Sat Dec 22 04:52:35 2018 +0200
   451.3 @@ -11,7 +11,7 @@
   451.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   451.5  WGET_URL="https://fukuchi.org/works/qrencode/$TARBALL"
   451.6  
   451.7 -BUILD_DEPENDS="libpng16-dev"
   451.8 +BUILD_DEPENDS="libpng-dev"
   451.9  SPLIT="$PACKAGE-dev"
  451.10  
  451.11  compile_rules() {
  451.12 @@ -25,7 +25,7 @@
  451.13  	case $PACKAGE in
  451.14  		qrencode)
  451.15  			copy @std
  451.16 -			DEPENDS="libpng16"
  451.17 +			DEPENDS="libpng"
  451.18  			;;
  451.19  		qrencode-dev)
  451.20  			copy @dev
   452.1 --- a/qt4-base/receipt	Fri Dec 21 04:44:58 2018 +0200
   452.2 +++ b/qt4-base/receipt	Sat Dec 22 04:52:35 2018 +0200
   452.3 @@ -13,12 +13,12 @@
   452.4  TARBALL="$SOURCE-$VERSION.tar.gz"
   452.5  WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
   452.6  
   452.7 -BUILD_DEPENDS="xorg-libX11-dev dbus-dev libmng-dev cups-dev mysql-dev \
   452.8 +BUILD_DEPENDS="libx11-dev dbus-dev libmng-dev cups-dev mysql-dev \
   452.9  unixODBC-dev mesa-dev fontconfig-dev postgresql-dev atk-dev autoconf automake \
  452.10  bash binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
  452.11 -freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
  452.12 +freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng-dev \
  452.13  libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
  452.14 -pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
  452.15 +pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple pixman-dev \
  452.16  tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev sqlite3-dev \
  452.17  libQtClucene wayland-dev"
  452.18  SPLIT="qt-base libQtWebkit qtconfig"
  452.19 @@ -75,7 +75,7 @@
  452.20  	libQtWebkit)
  452.21  		copy libQtWebKit.so*
  452.22  		CAT="network|Web browser engine for Qt"
  452.23 -		DEPENDS="libQtCore libQtGui libQtNetwork libpng16"
  452.24 +		DEPENDS="libQtCore libQtGui libQtNetwork libpng"
  452.25  		;;
  452.26  	qtconfig)
  452.27  		CAT="x-window|Qtconfig is a tool that allows users to customize the default settings for Qt applications"
   453.1 --- a/qt4/receipt	Fri Dec 21 04:44:58 2018 +0200
   453.2 +++ b/qt4/receipt	Sat Dec 22 04:52:35 2018 +0200
   453.3 @@ -12,13 +12,13 @@
   453.4  TARBALL="$SOURCE-$VERSION.tar.gz"
   453.5  WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
   453.6  
   453.7 -BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer0-dev gst0-python-dev \
   453.8 +BUILD_DEPENDS="libx11-dev dbus-dev gstreamer0-dev gst0-python-dev \
   453.9  libmng-dev cups-dev mysql-dev unixODBC-dev mesa-dev fontconfig-dev mesa-libegl \
  453.10  glu glw postgresql-dev gst0-plugins-base-dev atk-dev autoconf automake bash \
  453.11  binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
  453.12 -freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
  453.13 +freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng-dev \
  453.14  libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
  453.15 -pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
  453.16 +pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple pixman-dev \
  453.17  tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
  453.18  sqlite3-dev glu-dev glw-dev wayland-dev"
  453.19  SPLIT="libQt3Support libQtClucene libQtCore libQtDBus libQtDeclarative \
  453.20 @@ -149,10 +149,10 @@
  453.21  			;;
  453.22  		libQtGui)
  453.23  			CAT="development|Qt Gui Library"
  453.24 -			DEPENDS="libQtCore expat fontconfig freetype xorg-libICE \
  453.25 -			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
  453.26 -			xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender \
  453.27 -			libpng16"
  453.28 +			DEPENDS="libQtCore expat fontconfig freetype libice \
  453.29 +			libsm libx11 libxau libxdmcp \
  453.30 +			libxext libxi libxrandr libxrender \
  453.31 +			libpng"
  453.32  			mkdir -p $fs/usr/lib
  453.33  			cp -a $install/usr/lib/libQtGui.so* $fs/usr/lib
  453.34  
  453.35 @@ -183,7 +183,7 @@
  453.36  			;;
  453.37  		libQtOpenGL)
  453.38  			CAT="development|Qt OpenGL Library"
  453.39 -			DEPENDS="libQtGui mesa glu xorg-libXxf86vm xorg-libXdamage libdrm"
  453.40 +			DEPENDS="libQtGui mesa glu libxxf86vm libxdamage libdrm"
  453.41  			mkdir -p $fs/usr/lib
  453.42  			cp -a $install/usr/lib/libQtOpenGL.so* $fs/usr/lib
  453.43  			;;
  453.44 @@ -222,7 +222,7 @@
  453.45  			;;
  453.46  		libQtSvg)
  453.47  			CAT="development|Qt Svg Library"
  453.48 -			DEPENDS="libQtCore libQtGui libQtXml libpng16"
  453.49 +			DEPENDS="libQtCore libQtGui libQtXml libpng"
  453.50  			mkdir -p $fs/usr/lib/qt/plugins/imageformats $fs/usr/lib/qt/plugins/iconengines
  453.51  			cp -a $install/usr/lib/libQtSvg.so*	$fs/usr/lib
  453.52  			cp -a $install/usr/lib/qt/plugins/imageformats/libqsvg.so	$fs/*/*/*/*/imageformats
  453.53 @@ -236,7 +236,7 @@
  453.54  			;;
  453.55  		libQtWebkit-video)
  453.56  			CAT="multimedia|Web browser engine for Qt (with gstreamer HTML5 audio video support)"
  453.57 -			DEPENDS="libQtCore libQtGui libQtNetwork libpng16 \
  453.58 +			DEPENDS="libQtCore libQtGui libQtNetwork libpng \
  453.59  			gst0-plugins-base gst0-plugins-good gst0-ffmpeg"
  453.60  			SUGGESTED="gst0-plugins-bad gst0-plugins-ugly"
  453.61  			mkdir -p $fs/usr/lib
  453.62 @@ -261,9 +261,9 @@
  453.63  		Qt4-dev)
  453.64  			CAT="development|qt x11 toolkit"
  453.65  			SUGGESTED="libmng nvidia"
  453.66 -			DEPENDS="QtDesigner jpeg tiff libpng16 mesa glu \
  453.67 +			DEPENDS="QtDesigner jpeg tiff libpng mesa glu \
  453.68  			freetds libmysqlclient libpostgresqlclient libunixODBC \
  453.69 -			xorg-xcb-util libQt3Support libQtClucene libQtPlugins \
  453.70 +			xcb-util libQt3Support libQtClucene libQtPlugins \
  453.71  			libQtDBus libQtHelp libQtOpenGL libQtScript libQtSql \
  453.72  			libQtScriptTools libQtWebkit libQtTest qtconfig \
  453.73  			gcc-lib-base"
  453.74 @@ -314,9 +314,9 @@
  453.75  			TAGS="qt"
  453.76  			DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
  453.77  			libQtDesigner libQtScript expat fontconfig freetype \
  453.78 -			glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
  453.79 -			xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr \
  453.80 -			xorg-libXrender zlib libpng16 gcc-lib-base"
  453.81 +			glib libice libsm libx11 libxau \
  453.82 +			libxdmcp libxext libxi libxrandr \
  453.83 +			libxrender zlib libpng gcc-lib-base"
  453.84  			mkdir -p $fs/usr/bin \
  453.85  				$fs/usr/share/pixmaps \
  453.86  				$fs/usr/share/applications
   454.1 --- a/qt5/receipt	Fri Dec 21 04:44:58 2018 +0200
   454.2 +++ b/qt5/receipt	Sat Dec 22 04:52:35 2018 +0200
   454.3 @@ -16,10 +16,10 @@
   454.4  PATCH_URL="https://anonscm.debian.org/cgit/pkg-kde/qt/qtdeclarative.git/plain/debian/patches/"
   454.5  
   454.6  BUILD_DEPENDS="dbus-dev eudev-dev zlib-dev glib-dev icu-dev pcre-dev \
   454.7 -openssl-dev sqlite3-dev xorg-libxcb-dev mesa-dev freetype-dev fontconfig-dev \
   454.8 -libinput-dev harfbuzz-dev libjpeg-turbo-dev libpng16-dev tslib-dev \
   454.9 -xorg-libX11-dev libxkbcommon-dev xorg-libXrender-dev cups-dev \
  454.10 -xorg-libXcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
  454.11 +openssl-dev sqlite3-dev libxcb-dev mesa-dev freetype-dev fontconfig-dev \
  454.12 +libinput-dev harfbuzz-dev libjpeg-turbo-dev libpng-dev tslib-dev \
  454.13 +libx11-dev libxkbcommon-dev libxrender-dev cups-dev \
  454.14 +libxcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
  454.15  # Name split packages according to sources structure, for example:
  454.16  # $src/qtgamepad/ -> qt5-gamepad
  454.17  SPLIT="\
  454.18 @@ -190,7 +190,7 @@
  454.19  			copy libqgtk3.so
  454.20  			CAT="development|GTK+3 theme support"
  454.21  			DEPENDS="qt5-base atk cairo gdk-pixbuf glib gtk3 mesa pango \
  454.22 -			xorg-libX11 xorg-libXext";;
  454.23 +			libx11 libxext";;
  454.24  		qt5-base-egl)
  454.25  			copy libQt5Egl*so*
  454.26  			CAT="development|EGL libs"
  454.27 @@ -239,10 +239,10 @@
  454.28  
  454.29  			CAT="development|Base module"
  454.30  			DEPENDS="dbus eudev fontconfig freetype glib icu openssl libcups \
  454.31 -			libdrm libharfbuzz libicu libinput libjpeg-turbo libpng16 \
  454.32 +			libdrm libharfbuzz libicu libinput libjpeg-turbo libpng \
  454.33  			libsqlite3 libxkbcommon libxkbcommon-x11 mesa \
  454.34 -			mtdev tslib xorg-libICE xorg-libSM xorg-libX11 xorg-libXext \
  454.35 -			xorg-libXi xorg-libxcb zlib libatomic";;
  454.36 +			mtdev tslib libice libsm libx11 libxext \
  454.37 +			libxi libxcb zlib libatomic";;
  454.38  		qt5-canvas3d)
  454.39  			CAT="development|Canvas3D module"
  454.40  			DEPENDS="qt5-base qt5-declarative mesa";;
  454.41 @@ -319,12 +319,12 @@
  454.42  			DEPENDS="qt5-base qt5-declarative mesa";;
  454.43  		qt5-virtualkeyboard)
  454.44  			CAT="development|VirtualKeyboard module"
  454.45 -			DEPENDS="qt5-base qt5-declarative qt5-svg mesa xorg-libxcb";;
  454.46 +			DEPENDS="qt5-base qt5-declarative qt5-svg mesa libxcb";;
  454.47  		qt5-wayland)
  454.48  			CAT="development|Wayland module"
  454.49  			DEPENDS="qt5-base qt5-declarative fontconfig freetype glib \
  454.50  			libxkbcommon mesa mesa-libegl mesa-libwayland-egl wayland \
  454.51 -			xorg-libX11 xorg-libXcomposite xorg-libXext";;
  454.52 +			libx11 libxcomposite libxext";;
  454.53  		qt5-webchannel)
  454.54  			CAT="development|WebChannel module"
  454.55  			DEPENDS="qt5-base qt5-declarative mesa";;
   455.1 --- a/qtav/receipt	Fri Dec 21 04:44:58 2018 +0200
   455.2 +++ b/qtav/receipt	Sat Dec 22 04:52:35 2018 +0200
   455.3 @@ -11,7 +11,7 @@
   455.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   455.5  WGET_URL="https://github.com/wang-bin/QtAV/archive/v$VERSION.tar.gz"
   455.6  
   455.7 -BUILD_DEPENDS="qt5-dev ffmpeg-dev openal-dev pulseaudio-dev xorg-libXv-dev \
   455.8 +BUILD_DEPENDS="qt5-dev ffmpeg-dev openal-dev pulseaudio-dev libxv-dev \
   455.9  libva-dev mesa-dev libsdl2-dev"
  455.10  SPLIT="$PACKAGE-dev $PACKAGE-player $PACKAGE-qmlplayer $PACKAGE"
  455.11  
  455.12 @@ -44,7 +44,7 @@
  455.13  		qtav)
  455.14  			copy @std @rm
  455.15  			DEPENDS="ffmpeg libass libatomic libva mesa openal pulseaudio \
  455.16 -			qt5-base xorg-libX11 xorg-libXext xorg-libXv"
  455.17 +			qt5-base libx11 libxext libxv"
  455.18  			;;
  455.19  	esac
  455.20  }
   456.1 --- a/qterminal/receipt	Fri Dec 21 04:44:58 2018 +0200
   456.2 +++ b/qterminal/receipt	Sat Dec 22 04:52:35 2018 +0200
   456.3 @@ -28,6 +28,6 @@
   456.4  genpkg_rules() {
   456.5  	copy @std
   456.6  	sed -i '/^Actions=/d' $fs/usr/share/applications/qterminal.desktop
   456.7 -	DEPENDS="qt5-base qt5-x11extras qtermwidget xorg-libX11"
   456.8 +	DEPENDS="qt5-base qt5-x11extras qtermwidget libx11"
   456.9  	TAGS="terminal LXQt"
  456.10  }
   457.1 --- a/qtpanel/receipt	Fri Dec 21 04:44:58 2018 +0200
   457.2 +++ b/qtpanel/receipt	Sat Dec 22 04:52:35 2018 +0200
   457.3 @@ -11,8 +11,8 @@
   457.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   457.5  WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
   457.6  
   457.7 -BUILD_DEPENDS="Qt4-dev qmake cmake xorg-libX11-dev xorg-libXcomposite-dev \
   457.8 -xorg-libXdamage-dev"
   457.9 +BUILD_DEPENDS="Qt4-dev qmake cmake libx11-dev libxcomposite-dev \
  457.10 +libxdamage-dev"
  457.11  
  457.12  compile_rules() {
  457.13  	#sed -i 's|ddd ddMMM hh:mm||' clockapplet.cpp
  457.14 @@ -31,5 +31,5 @@
  457.15  	cp -a $install/* $fs
  457.16  	mkdir -p $fs/etc/xdg
  457.17  	cp -a $stuff/autostart $fs/etc/xdg
  457.18 -	DEPENDS="libQtGui xorg-libXdamage xorg-libXcomposite"
  457.19 +	DEPENDS="libQtGui libxdamage libxcomposite"
  457.20  }
   458.1 --- a/qtractor/receipt	Fri Dec 21 04:44:58 2018 +0200
   458.2 +++ b/qtractor/receipt	Sat Dec 22 04:52:35 2018 +0200
   458.3 @@ -13,7 +13,7 @@
   458.4  
   458.5  BUILD_DEPENDS="qmake Qt4-dev jack-dev alsa-lib-dev \
   458.6  libsndfile-dev ladspa-dev libvorbis-dev libmad-dev libsamplerate-dev \
   458.7 -xorg-libX11-dev zlib-dev liblo-dev lilv lv2 "
   458.8 +libx11-dev zlib-dev liblo-dev lilv lv2 "
   458.9  
  458.10  #extras:
  458.11  # librubberband : http://breakfastquay.com/rubberband/
   459.1 --- a/qtstyleplugins/receipt	Fri Dec 21 04:44:58 2018 +0200
   459.2 +++ b/qtstyleplugins/receipt	Sat Dec 22 04:52:35 2018 +0200
   459.3 @@ -12,7 +12,7 @@
   459.4  WGET_URL="${WEB_SITE}archive/${TARBALL/*-}"
   459.5  
   459.6  BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
   459.7 -freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
   459.8 +freetype-dev fontconfig-dev sqlite3-dev libpng-dev libjpeg-turbo-dev icu-dev \
   459.9  glib-dev zlib-dev libxslt-python libxslt-dev gtk2-dev"
  459.10  
  459.11  compile_rules() {
   460.1 --- a/qtwebkit/receipt	Fri Dec 21 04:44:58 2018 +0200
   460.2 +++ b/qtwebkit/receipt	Sat Dec 22 04:52:35 2018 +0200
   460.3 @@ -13,7 +13,7 @@
   460.4  WGET_URL="${WEB_SITE_2}releases/download/${TARBALL/.tar*/}/$TARBALL"
   460.5  
   460.6  BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
   460.7 -freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
   460.8 +freetype-dev fontconfig-dev sqlite3-dev libpng-dev libjpeg-turbo-dev icu-dev \
   460.9  glib-dev zlib-dev libxslt-python libxslt-dev gstreamer1-dev \
  460.10  gst1-plugins-base-dev hyphen-dev "
  460.11  
   461.1 --- a/quarry/receipt	Fri Dec 21 04:44:58 2018 +0200
   461.2 +++ b/quarry/receipt	Sat Dec 22 04:52:35 2018 +0200
   461.3 @@ -29,6 +29,6 @@
   461.4  
   461.5  genpkg_rules() {
   461.6  	copy @std
   461.7 -	DEPENDS="gtk2 librsvg libgsf xorg-xcb-util"
   461.8 +	DEPENDS="gtk2 librsvg libgsf xcb-util"
   461.9  	SUGGESTED="gnugo"
  461.10  }
   462.1 --- a/quesoglc/receipt	Fri Dec 21 04:44:58 2018 +0200
   462.2 +++ b/quesoglc/receipt	Sat Dec 22 04:52:35 2018 +0200
   462.3 @@ -12,8 +12,8 @@
   462.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   462.5  
   462.6  BUILD_DEPENDS="freetype-dev fontconfig-dev freeglut-dev fribidi-dev \
   462.7 -mesa-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \
   462.8 -libxml2-dev xorg-libxshmfence-dev glu-dev"
   462.9 +mesa-dev expat-dev libxxf86vm-dev util-linux-uuid-dev libxcb-dev \
  462.10 +libxml2-dev libxshmfence-dev glu-dev"
  462.11  SPLIT="$PACKAGE-dev"
  462.12  
  462.13  compile_rules() {
  462.14 @@ -28,7 +28,7 @@
  462.15  		quesoglc)
  462.16  			copy @std
  462.17  			DEPENDS="freetype fontconfig freeglut fribidi mesa glu \
  462.18 -			expat xorg-libXxf86vm xorg-libxcb"
  462.19 +			expat libxxf86vm libxcb"
  462.20  			;;
  462.21  		quesoglc-dev)
  462.22  			copy @dev
   463.1 --- a/qupzilla/receipt	Fri Dec 21 04:44:58 2018 +0200
   463.2 +++ b/qupzilla/receipt	Sat Dec 22 04:52:35 2018 +0200
   463.3 @@ -11,7 +11,7 @@
   463.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   463.5  WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
   463.6  
   463.7 -BUILD_DEPENDS="Qt4-dev qmake openssl-dev xorg-libX11-dev"
   463.8 +BUILD_DEPENDS="Qt4-dev qmake openssl-dev libx11-dev"
   463.9  SPLIT="$PACKAGE-locales"
  463.10  
  463.11  COOKOPTS="!pixmaps"
  463.12 @@ -33,7 +33,7 @@
  463.13  			rm -rf $fs/usr/share/pixmaps
  463.14  			rm -rf $fs/usr/share/qupzilla/locale
  463.15  			DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtScript \
  463.16 -			libQtSql libQtXml openssl xorg-libX11 zlib cacerts xdg-utils \
  463.17 +			libQtSql libQtXml openssl libx11 zlib cacerts xdg-utils \
  463.18  			libQtWebkit"
  463.19  			SUGGESTED="libQtWebkit-video qupzilla-locales"
  463.20  			TAGS="web-browser"
   464.1 --- a/qutim/receipt	Fri Dec 21 04:44:58 2018 +0200
   464.2 +++ b/qutim/receipt	Sat Dec 22 04:52:35 2018 +0200
   464.3 @@ -11,7 +11,7 @@
   464.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   464.5  WGET_URL="${WEB_SITE}dwnl/40/$TARBALL"
   464.6  
   464.7 -BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev xorg-libXScrnSaver-dev dbus-dev \
   464.8 +BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev libxscrnsaver-dev dbus-dev \
   464.9  libjreen-dev mesa-dev"
  464.10  
  464.11  compile_rules() {
  464.12 @@ -35,5 +35,5 @@
  464.13  	cp -a $install/usr/bin $fs/usr
  464.14  	cp -a $install/usr/lib $fs/usr
  464.15  	cp -a $install/usr/share $fs/usr
  464.16 -	DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen qca-ossl"
  464.17 +	DEPENDS="qt4 qca qt4-phonon libxscrnsaver libjreen qca-ossl"
  464.18  }
   465.1 --- a/qxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
   465.2 +++ b/qxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
   465.3 @@ -11,7 +11,7 @@
   465.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   465.5  WGET_URL="http://qxkb.googlecode.com/files/$TARBALL"
   465.6  
   465.7 -BUILD_DEPENDS="cmake Qt4-dev xorg-libxkbfile-dev qmake"
   465.8 +BUILD_DEPENDS="cmake Qt4-dev libxkbfile-dev qmake"
   465.9  
  465.10  compile_rules() {
  465.11  	mkdir build
  465.12 @@ -25,5 +25,5 @@
  465.13  
  465.14  genpkg_rules() {
  465.15  	cp -a $install/* $fs
  465.16 -	DEPENDS="glibc-base libQtSvg xorg-libxkbfile"
  465.17 +	DEPENDS="glibc-base libQtSvg libxkbfile"
  465.18  }
   466.1 --- a/radeontool/receipt	Fri Dec 21 04:44:58 2018 +0200
   466.2 +++ b/radeontool/receipt	Sat Dec 22 04:52:35 2018 +0200
   466.3 @@ -11,7 +11,7 @@
   466.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   466.5  WGET_URL="http://people.freedesktop.org/~airlied/$PACKAGE/$TARBALL"
   466.6  
   466.7 -BUILD_DEPENDS="xorg-libpciaccess-dev"
   466.8 +BUILD_DEPENDS="libpciaccess-dev"
   466.9  
  466.10  compile_rules() {
  466.11  	./configure $CONFIGURE_ARGS &&
  466.12 @@ -22,5 +22,5 @@
  466.13  
  466.14  genpkg_rules() {
  466.15  	copy @std
  466.16 -	DEPENDS="xorg-libpciaccess"
  466.17 +	DEPENDS="libpciaccess"
  466.18  }
   467.1 --- a/rainbow-cm/receipt	Fri Dec 21 04:44:58 2018 +0200
   467.2 +++ b/rainbow-cm/receipt	Sat Dec 22 04:52:35 2018 +0200
   467.3 @@ -23,5 +23,5 @@
   467.4  
   467.5  genpkg_rules() {
   467.6  	copy @std
   467.7 -	DEPENDS="glib gtk2 pango xorg-libX11"
   467.8 +	DEPENDS="glib gtk2 pango libx11"
   467.9  }
   468.1 --- a/raine/receipt	Fri Dec 21 04:44:58 2018 +0200
   468.2 +++ b/raine/receipt	Sat Dec 22 04:52:35 2018 +0200
   468.3 @@ -12,7 +12,7 @@
   468.4  WGET_URL="$WEB_SITE/cgi-bin/gitweb.cgi?p=raine;a=snapshot;h=02988ce197bc5b9f1a9eae66251e883d649cc03b;sf=tgz"
   468.5  EXTRA_SOURCE_FILES="raines-0.51.9.tar.bz2"
   468.6  
   468.7 -BUILD_DEPENDS="libsdl-dev zlib-dev libpng16-dev nasm libsdl-image-dev xz-dev \
   468.8 +BUILD_DEPENDS="libsdl-dev zlib-dev libpng-dev nasm libsdl-image-dev xz-dev \
   468.9  libsdl-ttf-dev muparser-dev mesa-dev glu-dev"
  468.10  
  468.11  compile_rules() {
  468.12 @@ -33,5 +33,5 @@
  468.13  	mkdir -p $fs/usr/
  468.14  	cp -a $install/usr/games $fs/usr/
  468.15  	cp -a $install/usr/share $fs/usr/
  468.16 -	DEPENDS="libsdl zlib libpng16 libsdl-image liblzma libsdl-ttf muparser mesa"
  468.17 +	DEPENDS="libsdl zlib libpng libsdl-image liblzma libsdl-ttf muparser mesa"
  468.18  }
   469.1 --- a/rapidsvn/receipt	Fri Dec 21 04:44:58 2018 +0200
   469.2 +++ b/rapidsvn/receipt	Sat Dec 22 04:52:35 2018 +0200
   469.3 @@ -11,7 +11,7 @@
   469.4  WGET_URL="http://www.rapidsvn.org/download/release/$VERSION/$TARBALL"
   469.5  TAGS="subversion svn version-control versioning"
   469.6  
   469.7 -BUILD_DEPENDS="xorg-libXxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \
   469.8 +BUILD_DEPENDS="libxxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \
   469.9  apr-util-dev cyrus-sasl-dev neon-dev libproxy-dev sqlite3-dev expat-dev python \
  469.10  util-linux-uuid-dev"
  469.11  
  469.12 @@ -35,6 +35,6 @@
  469.13  	mkdir -p $fs/usr/lib
  469.14  	cp -a $install/usr/lib/*.so* $fs/usr/lib
  469.15  	cp -a $install/usr/bin $fs/usr
  469.16 -	DEPENDS="wxWidgets28 libsvn apr libltdl xorg-libXxf86vm libproxy libsqlite3 \
  469.17 +	DEPENDS="wxWidgets28 libsvn apr libltdl libxxf86vm libproxy libsqlite3 \
  469.18  	libsasl apr-util"
  469.19  }
   470.1 --- a/ratmenu/receipt	Fri Dec 21 04:44:58 2018 +0200
   470.2 +++ b/ratmenu/receipt	Sat Dec 22 04:52:35 2018 +0200
   470.3 @@ -11,7 +11,7 @@
   470.4  TARBALL="${PACKAGE}_$VERSION.tar.gz"
   470.5  WGET_URL="http://ftp.de.debian.org/debian/pool/main/r/ratmenu/$TARBALL"
   470.6  
   470.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
   470.8 +BUILD_DEPENDS="libx11-dev xorgproto"
   470.9  
  470.10  compile_rules() {
  470.11  	make PREFIX=/usr &&
  470.12 @@ -24,5 +24,5 @@
  470.13  genpkg_rules() {
  470.14  	mkdir -p $fs/usr
  470.15  	cp -a $install/usr/bin $fs/usr
  470.16 -	DEPENDS="xorg-libX11"
  470.17 +	DEPENDS="libx11"
  470.18  }
   471.1 --- a/ratpoison/receipt	Fri Dec 21 04:44:58 2018 +0200
   471.2 +++ b/ratpoison/receipt	Sat Dec 22 04:52:35 2018 +0200
   471.3 @@ -11,7 +11,7 @@
   471.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   471.5  WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
   471.6  
   471.7 -BUILD_DEPENDS="xorg-libXtst-dev xorg-libXinerama-dev"
   471.8 +BUILD_DEPENDS="libxtst-dev libxinerama-dev"
   471.9  
  471.10  compile_rules() {
  471.11  	./configure &&
  471.12 @@ -23,6 +23,6 @@
  471.13  	mkdir -p $fs/usr/share
  471.14  	cp -a $install/usr/bin $fs/usr
  471.15  	cp -a $install/usr/share/ratpoison $fs/usr/share
  471.16 -	DEPENDS="microperl xorg-libXtst xorg-libXinerama"
  471.17 +	DEPENDS="microperl libxtst libxinerama"
  471.18  	TAGS="window-manager"
  471.19  }
   472.1 --- a/razorqt/receipt	Fri Dec 21 04:44:58 2018 +0200
   472.2 +++ b/razorqt/receipt	Sat Dec 22 04:52:35 2018 +0200
   472.3 @@ -41,7 +41,7 @@
   472.4  	case $PACKAGE in
   472.5  		razorqt)
   472.6  			DEPENDS="libQtDBus libQtGui libmagic libstatgrab \
   472.7 -			xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
   472.8 +			libxcomposite libxcursor libxdamage \
   472.9  			lightdm-qt"
  472.10  			SUGGESTED="razorqt-themes razorqt-appswitcher razorqt-power \
  472.11  			razorqt-runner razorqt-autosuspend"
   473.1 --- a/rdesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   473.2 +++ b/rdesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   473.3 @@ -30,7 +30,7 @@
   473.4  		cp -a $install/usr/share/rdesktop/keymaps/$i* \
   473.5  			$fs/usr/share/rdesktop/keymaps
   473.6  	done
   473.7 -	DEPENDS="openssl xorg-libX11 glibc-base xorg-libXau xorg-libXdmcp \
   473.8 +	DEPENDS="openssl libx11 glibc-base libxau libxdmcp \
   473.9  	alsa-lib libsamplerate libao pcsc-lite"
  473.10  	TAGS="rdp remote-desktop"
  473.11  }
   474.1 --- a/rdpdesk/receipt	Fri Dec 21 04:44:58 2018 +0200
   474.2 +++ b/rdpdesk/receipt	Sat Dec 22 04:52:35 2018 +0200
   474.3 @@ -11,8 +11,8 @@
   474.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   474.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   474.6  
   474.7 -BUILD_DEPENDS="wxWidgets28-dev xorg-imake jpeg-dev zlib-dev gettext \
   474.8 -openssl-dev xorg-libXp autoconf xorg-libXt-dev xorg-libXp-dev xorg-libXaw-dev"
   474.9 +BUILD_DEPENDS="wxWidgets28-dev imake jpeg-dev zlib-dev gettext \
  474.10 +openssl-dev autoconf libxt-dev libxp-dev libxaw-dev"
  474.11  
  474.12  compile_rules() {
  474.13  	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
  474.14 @@ -28,6 +28,6 @@
  474.15  
  474.16  genpkg_rules() {
  474.17  	cp -a $install/usr $fs
  474.18 -	DEPENDS="wxWidgets28 xorg-libXp xorg-libXaw openssl"
  474.19 +	DEPENDS="wxWidgets28 libxp libxaw openssl"
  474.20  	SUGGESTED="wfica rdesktop"
  474.21  }
   475.1 --- a/realvnc-viewer/receipt	Fri Dec 21 04:44:58 2018 +0200
   475.2 +++ b/realvnc-viewer/receipt	Sat Dec 22 04:52:35 2018 +0200
   475.3 @@ -12,8 +12,8 @@
   475.4  TARBALL="vnc4_$VERSION+X4.3.0.orig.tar.gz"
   475.5  WGET_URL="http://ftp.de.debian.org/debian/pool/main/v/vnc4/$TARBALL"
   475.6  
   475.7 -BUILD_DEPENDS="xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev \
   475.8 -xorg-libXdmcp-dev xorg-libXmu-dev xorg-xorgproto xorg-libXtst-dev"
   475.9 +BUILD_DEPENDS="libxaw-dev libxt-dev libxau-dev \
  475.10 +libxdmcp-dev libxmu-dev xorgproto libxtst-dev"
  475.11  
  475.12  compile_rules() {
  475.13  	mv vnc4* $src 2> /dev/null
  475.14 @@ -38,8 +38,8 @@
  475.15  
  475.16  	cp -a $src/unix/vncviewer/vncviewer $fs/usr/bin
  475.17  	cp -a $stuff/* $fs/usr/share
  475.18 -	DEPENDS="gcc-lib-base xorg-libXdmcp xorg-libXau xorg-libX11 xorg-libXext \
  475.19 -	xorg-libICE xorg-libSM util-linux-uuid"
  475.20 +	DEPENDS="gcc-lib-base libxdmcp libxau libx11 libxext \
  475.21 +	libice libsm util-linux-uuid"
  475.22  	PROVIDE="vncviewer"
  475.23  	TAGS="remote-desktop vnc"
  475.24  }
   476.1 --- a/recordmydesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   476.2 +++ b/recordmydesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   476.3 @@ -11,10 +11,10 @@
   476.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   476.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   476.6  
   476.7 -BUILD_DEPENDS="alsa-lib-dev xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
   476.8 -xorg-libXext-dev xorg-libXdamage-dev xorg-libXfixes-dev libogg libogg-dev \
   476.9 -libvorbis libvorbis-dev libtheora-dev zlib-dev xorg-libXfixes-dev \
  476.10 -xorg-xorgproto"
  476.11 +BUILD_DEPENDS="alsa-lib-dev libx11-dev libice-dev libsm-dev \
  476.12 +libxext-dev libxdamage-dev libxfixes-dev libogg libogg-dev \
  476.13 +libvorbis libvorbis-dev libtheora-dev zlib-dev \
  476.14 +xorgproto"
  476.15  
  476.16  compile_rules() {
  476.17  	sed -i 's|shmstr.h|shmproto.h|g' src/*.h
  476.18 @@ -32,7 +32,7 @@
  476.19  genpkg_rules() {
  476.20  	mkdir -p $fs/usr
  476.21  	cp -a $install/usr/bin $fs/usr
  476.22 -	DEPENDS="libtheora alsa-lib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
  476.23 -	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes zlib"
  476.24 +	DEPENDS="libtheora alsa-lib libice libsm libx11 libxau \
  476.25 +	libxdamage libxdmcp libxext libxfixes zlib"
  476.26  	TAGS="desktop"
  476.27  }
   477.1 --- a/redshift/receipt	Fri Dec 21 04:44:58 2018 +0200
   477.2 +++ b/redshift/receipt	Sat Dec 22 04:52:35 2018 +0200
   477.3 @@ -11,7 +11,7 @@
   477.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   477.5  WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
   477.6  
   477.7 -BUILD_DEPENDS="python xorg-libXrandr-dev"
   477.8 +BUILD_DEPENDS="python libxrandr-dev"
   477.9  
  477.10  compile_rules() {
  477.11  	./configure \
   478.1 --- a/remind/receipt	Fri Dec 21 04:44:58 2018 +0200
   478.2 +++ b/remind/receipt	Sat Dec 22 04:52:35 2018 +0200
   478.3 @@ -25,7 +25,7 @@
   478.4  	mkdir -p $fs/usr $fs/etc/skel
   478.5  	touch $fs/etc/skel/.reminders
   478.6  	cp -a $install/usr/bin $fs/usr
   478.7 -	DEPENDS="tk tcl tcllib xorg-libXScrnSaver"
   478.8 +	DEPENDS="tk tcl tcllib libxscrnsaver"
   478.9  	TAGS="office calendar"
  478.10  }
  478.11  
   479.1 --- a/remmina/receipt	Fri Dec 21 04:44:58 2018 +0200
   479.2 +++ b/remmina/receipt	Sat Dec 22 04:52:35 2018 +0200
   479.3 @@ -13,7 +13,7 @@
   479.4  
   479.5  BUILD_DEPENDS="gtk2-dev intltool cmake libgcrypt-dev libssh-dev vte-dev \
   479.6  freerdp-dev libvncserver-dev libgnome-keyring-dev gettext-dev \
   479.7 -telepathy-glib-dev libappindicator-gtk3-dev xorg-libxkbfile-dev"
   479.8 +telepathy-glib-dev libappindicator-gtk3-dev libxkbfile-dev"
   479.9  SPLIT="$PACKAGE-dev"
  479.10  
  479.11  compile_rules() {
   480.1 --- a/rhythmcat2/receipt	Fri Dec 21 04:44:58 2018 +0200
   480.2 +++ b/rhythmcat2/receipt	Sat Dec 22 04:52:35 2018 +0200
   480.3 @@ -30,5 +30,5 @@
   480.4  
   480.5  genpkg_rules() {
   480.6  	copy RhythmCat2 *.so* *.PNG *.desktop *.mo
   480.7 -	DEPENDS="gst0-plugins-base gtk3 xorg-libXdamage"
   480.8 +	DEPENDS="gst0-plugins-base gtk3 libxdamage"
   480.9  }
   481.1 --- a/ristretto/receipt	Fri Dec 21 04:44:58 2018 +0200
   481.2 +++ b/ristretto/receipt	Sat Dec 22 04:52:35 2018 +0200
   481.3 @@ -25,6 +25,6 @@
   481.4  genpkg_rules() {
   481.5  	copy @std
   481.6  	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libexif libmagic libxfce4ui \
   481.7 -	libxfce4util pango xfconf xorg-libX11"
   481.8 +	libxfce4util pango xfconf libx11"
   481.9  	TAGS="Xfce"
  481.10  }
   482.1 --- a/rosegarden/receipt	Fri Dec 21 04:44:58 2018 +0200
   482.2 +++ b/rosegarden/receipt	Sat Dec 22 04:52:35 2018 +0200
   482.3 @@ -11,9 +11,9 @@
   482.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   482.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   482.6  
   482.7 -BUILD_DEPENDS="Qt4-dev ladspa-dev dssi-dev alsa-lib-dev xorg-libSM-dev \
   482.8 -liblo-dev liblrdf-dev fftw-dev libsndfile-dev libsamplerate-dev xorg-imake \
   482.9 -xorg-makedepend jack-dev xorg-libX11-dev lirc-dev"
  482.10 +BUILD_DEPENDS="Qt4-dev ladspa-dev dssi-dev alsa-lib-dev libsm-dev \
  482.11 +liblo-dev liblrdf-dev fftw-dev libsndfile-dev libsamplerate-dev imake \
  482.12 +makedepend jack-dev libx11-dev lirc-dev"
  482.13  
  482.14  compile_rules() {
  482.15  	touch -d 197001010101 dependencies
  482.16 @@ -32,7 +32,7 @@
  482.17  	cp -a $install/usr/bin $fs/usr
  482.18  	cp -a $install/usr/share/icons $fs/usr/share
  482.19  	DEPENDS="libQtGui libQtXml libQtNetwork libQtCore jack libsndfile liblrdf \
  482.20 -	fftw libsamplerate alsa-lib xorg-libX11 zlib gcc-lib-base xorg-libxcb \
  482.21 -	xorg-libXau xorg-libXdmcp lirc liblo"
  482.22 +	fftw libsamplerate alsa-lib libx11 zlib gcc-lib-base libxcb \
  482.23 +	libxau libxdmcp lirc liblo"
  482.24  	TAGS="midi"
  482.25  }
   483.1 --- a/rox-filer/receipt	Fri Dec 21 04:44:58 2018 +0200
   483.2 +++ b/rox-filer/receipt	Sat Dec 22 04:52:35 2018 +0200
   483.3 @@ -12,7 +12,7 @@
   483.4  WGET_URL="$SF_MIRROR/rox/$TARBALL"
   483.5  
   483.6  BUILD_DEPENDS="libglade-dev libxml2-dev gtk2-dev shared-mime-info-dev \
   483.7 -xorg-libSM-dev symlinks"
   483.8 +libsm-dev symlinks"
   483.9  SPLIT="$PACKAGE-default-icons $PACKAGE-locales $PACKAGE"
  483.10  
  483.11  compile_rules() {
  483.12 @@ -72,8 +72,8 @@
  483.13  			;;
  483.14  		*)
  483.15  			copy @std @rm
  483.16 -			DEPENDS="gdk-pixbuf glib gtk2 libglade libxml2 pango xorg-libICE \
  483.17 -			xorg-libSM xorg-libX11   shared-mime-info"
  483.18 +			DEPENDS="gdk-pixbuf glib gtk2 libglade libxml2 pango libice \
  483.19 +			libsm libx11   shared-mime-info"
  483.20  			SUGGESTED="rox-filer-default-icons rox-filer-locales"
  483.21  			TAGS="file-manager"
  483.22  			;;
   484.1 --- a/rrdtool/receipt	Fri Dec 21 04:44:58 2018 +0200
   484.2 +++ b/rrdtool/receipt	Sat Dec 22 04:52:35 2018 +0200
   484.3 @@ -11,8 +11,8 @@
   484.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   484.5  WGET_URL="https://oss.oetiker.ch/rrdtool/pub/$TARBALL"
   484.6  
   484.7 -BUILD_DEPENDS="perl-dev zlib-dev freetype-dev libpng16-dev libxml2-dev \
   484.8 -fontconfig-dev xorg-pixman-dev cairo-dev glib-dev pango-dev python-dev perl \
   484.9 +BUILD_DEPENDS="perl-dev zlib-dev freetype-dev libpng-dev libxml2-dev \
  484.10 +fontconfig-dev pixman-dev cairo-dev glib-dev pango-dev python-dev perl \
  484.11  groff tcl-dev lua5.1-dev ruby-dev gettext-dev libwrap-dev glib-dev"
  484.12  SPLIT="$PACKAGE-lua $PACKAGE-perl $PACKAGE-python $PACKAGE-ruby $PACKAGE-tcl \
  484.13  $PACKAGE-dev $PACKAGE $PACKAGE-lite:lite"
  484.14 @@ -36,7 +36,7 @@
  484.15  DEPENDS_ruby="ruby rrdtool"
  484.16  DEPENDS_tcl="tcl rrdtool"
  484.17  DEPENDS_dev="rrdtool"
  484.18 -DEPENDS_std="cairo glib libpng16 libwrap libxml2 pango"
  484.19 +DEPENDS_std="cairo glib libpng libwrap libxml2 pango"
  484.20  DEPENDS_lite="glib libxml2"
  484.21  
  484.22  TAGS_std="logs"
   485.1 --- a/rubix/receipt	Fri Dec 21 04:44:58 2018 +0200
   485.2 +++ b/rubix/receipt	Sat Dec 22 04:52:35 2018 +0200
   485.3 @@ -23,5 +23,5 @@
   485.4  
   485.5  genpkg_rules() {
   485.6  	copy @std
   485.7 -	DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
   485.8 +	DEPENDS="libx11 libxcb libxau libxdmcp"
   485.9  }
   486.1 --- a/ruby-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   486.2 +++ b/ruby-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   486.3 @@ -35,7 +35,7 @@
   486.4  		*)
   486.5  			copy @ruby
   486.6  			DEPENDS="ruby ruby-atk ruby-gdk_pixbuf2 ruby-pango cairo \
   486.7 -			gdk-pixbuf glib gtk2 pango xorg-libX11"
   486.8 +			gdk-pixbuf glib gtk2 pango libx11"
   486.9  			TAGS="ruby programming gtk development"
  486.10  			;;
  486.11  	esac
   487.1 --- a/sakura-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   487.2 +++ b/sakura-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   487.3 @@ -33,6 +33,6 @@
   487.4  	copy @std
   487.5  	TAGS="terminal"
   487.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango vte-gtk2 \
   487.7 -	xorg-libX11 xorg-libXext"
   487.8 +	libx11 libxext"
   487.9  	PROVIDE="sakura"
  487.10  }
   488.1 --- a/sbxkb/receipt	Fri Dec 21 04:44:58 2018 +0200
   488.2 +++ b/sbxkb/receipt	Sat Dec 22 04:52:35 2018 +0200
   488.3 @@ -24,8 +24,8 @@
   488.4  genpkg_rules() {
   488.5  	cp -a $install/* $fs
   488.6  	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base \
   488.7 -	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
   488.8 -	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
   488.9 -	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
  488.10 -	xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
  488.11 +	gdk-pixbuf glib glibc-base gtk2 libffi libpng libxcb pango \
  488.12 +	pixman libx11 libxau libxcomposite libxcursor \
  488.13 +	libxdamage libxdmcp libxext libxfixes \
  488.14 +	libxinerama libxrandr libxrender zlib"
  488.15  }
   489.1 --- a/scim-pinyin/receipt	Fri Dec 21 04:44:58 2018 +0200
   489.2 +++ b/scim-pinyin/receipt	Sat Dec 22 04:52:35 2018 +0200
   489.3 @@ -29,18 +29,18 @@
   489.4  		scim-pinyin)
   489.5  			copy @std
   489.6  			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
   489.7 -			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
   489.8 -			pcre xorg-pixman scim xorg-libX11 xorg-libXau xorg-libXdmcp \
   489.9 -			xorg-libXext xorg-libXrender zlib"
  489.10 +			harfbuzz libffi libltdl liblzma libpng libxcb libxml2 pango \
  489.11 +			pcre pixman scim libx11 libxau libxdmcp \
  489.12 +			libxext libxrender zlib"
  489.13  			;;
  489.14  		*-dev)
  489.15  			copy @dev
  489.16  			DEPENDS="atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
  489.17  			gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev harfbuzz-dev libffi-dev \
  489.18 -			xz-dev libpng16-dev libtool xorg-libxcb-dev libxml2-dev \
  489.19 -			pango-dev pcre-dev xorg-pixman-dev scim-dev xorg-libX11-dev \
  489.20 -			xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
  489.21 -			xorg-libXrender-dev zlib-dev"
  489.22 +			xz-dev libpng-dev libtool libxcb-dev libxml2-dev \
  489.23 +			pango-dev pcre-dev pixman-dev scim-dev libx11-dev \
  489.24 +			libxau-dev libxdmcp-dev libxext-dev \
  489.25 +			libxrender-dev zlib-dev"
  489.26  			;;
  489.27  	esac
  489.28  }
   490.1 --- a/scim/receipt	Fri Dec 21 04:44:58 2018 +0200
   490.2 +++ b/scim/receipt	Sat Dec 22 04:52:35 2018 +0200
   490.3 @@ -12,7 +12,7 @@
   490.4  WGET_URL="https://github.com/scim-im/scim/archive/$TARBALL"
   490.5  
   490.6  BUILD_DEPENDS="gettext-dev automake intltool libtool doxygen coreutils-path \
   490.7 -libxslt docbook-xsl gtk2-dev xorg-libX11-dev"
   490.8 +libxslt docbook-xsl gtk2-dev libx11-dev"
   490.9  SPLIT="$PACKAGE-dev"
  490.10  
  490.11  compile_rules() {
  490.12 @@ -31,19 +31,19 @@
  490.13  		scim)
  490.14  			copy @std
  490.15  			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
  490.16 -			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
  490.17 -			pcre xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
  490.18 -			xorg-libXrender zlib"
  490.19 +			harfbuzz libffi libltdl liblzma libpng libxcb libxml2 pango \
  490.20 +			pcre pixman libx11 libxau libxdmcp libxext \
  490.21 +			libxrender zlib"
  490.22  			CONFIG_FILES="/etc/scim/config /etc/scim/global"
  490.23  			;;
  490.24  		*-dev)
  490.25  			copy @dev
  490.26  			DEPENDS="scim atk-dev bzip2-dev cairo-dev fontconfig-dev \
  490.27  			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev \
  490.28 -			harfbuzz-dev libffi-dev xz-dev libpng16-dev libtool \
  490.29 -			xorg-libxcb-dev libxml2-dev pango-dev pcre-dev xorg-pixman-dev \
  490.30 -			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
  490.31 -			xorg-libXrender-dev zlib-dev"
  490.32 +			harfbuzz-dev libffi-dev xz-dev libpng-dev libtool \
  490.33 +			libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev \
  490.34 +			libx11-dev libxau-dev libxdmcp-dev libxext-dev \
  490.35 +			libxrender-dev zlib-dev"
  490.36  			;;
  490.37  	esac
  490.38  }
   491.1 --- a/scite/receipt	Fri Dec 21 04:44:58 2018 +0200
   491.2 +++ b/scite/receipt	Sat Dec 22 04:52:35 2018 +0200
   491.3 @@ -35,6 +35,6 @@
   491.4  	# Save space ~100kb
   491.5  	rm $fs/usr/share/scite/*.html
   491.6  	rm $fs/usr/share/scite/*.png
   491.7 -	DEPENDS="gtk2 xorg-libXdamage gcc-lib-base"
   491.8 +	DEPENDS="gtk2 libxdamage gcc-lib-base"
   491.9  	TAGS="text-editor"
  491.10  }
   492.1 --- a/screenfetch/receipt	Fri Dec 21 04:44:58 2018 +0200
   492.2 +++ b/screenfetch/receipt	Sat Dec 22 04:52:35 2018 +0200
   492.3 @@ -19,5 +19,5 @@
   492.4  
   492.5  genpkg_rules() {
   492.6  	copy @std
   492.7 -	DEPENDS="bash procps xorg-xdpyinfo"
   492.8 +	DEPENDS="bash procps xdpyinfo"
   492.9  }
   493.1 --- a/screengrab/receipt	Fri Dec 21 04:44:58 2018 +0200
   493.2 +++ b/screengrab/receipt	Sat Dec 22 04:52:35 2018 +0200
   493.3 @@ -25,6 +25,6 @@
   493.4  
   493.5  genpkg_rules() {
   493.6  	copy @std
   493.7 -	DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras xorg-libX11 \
   493.8 -	xorg-libXext xorg-libxcb"
   493.9 +	DEPENDS="kwindowsystem libqtxdg qt5-base qt5-svg qt5-x11extras libx11 \
  493.10 +	libxext libxcb"
  493.11  }
   494.1 --- a/scribus/receipt	Fri Dec 21 04:44:58 2018 +0200
   494.2 +++ b/scribus/receipt	Sat Dec 22 04:52:35 2018 +0200
   494.3 @@ -11,11 +11,11 @@
   494.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   494.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   494.6  
   494.7 -BUILD_DEPENDS="cmake qmake Qt4-dev freetype freetype-dev \
   494.8 -cairo cairo-dev tiff tiff-dev lcms lcms-dev jpeg jpeg-dev libpng16 libpng16-dev \
   494.9 -cups cups-dev fontconfig fontconfig-dev libxml2 libxml2-dev podofo-dev \
  494.10 -ghostscript python python-dev python-pil aspell aspell-dev \
  494.11 -boost-dev openssl openssl-dev zlib tk"
  494.12 +BUILD_DEPENDS="cmake qmake Qt4-dev freetype-dev \
  494.13 +cairo-dev tiff-dev lcms-dev jpeg-dev libpng-dev \
  494.14 +cups-dev fontconfig-dev libxml2-dev podofo-dev \
  494.15 +ghostscript python-dev python-pil aspell-dev \
  494.16 +boost-dev openssl-dev zlib tk"
  494.17  
  494.18  compile_rules() {
  494.19  	cmake \
   495.1 --- a/scrot/receipt	Fri Dec 21 04:44:58 2018 +0200
   495.2 +++ b/scrot/receipt	Sat Dec 22 04:52:35 2018 +0200
   495.3 @@ -11,7 +11,7 @@
   495.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   495.5  WGET_URL="http://www.linuxbrit.co.uk/downloads/$TARBALL"
   495.6  
   495.7 -BUILD_DEPENDS="patch giblib-dev imlib2-dev xorg-libX11-dev"
   495.8 +BUILD_DEPENDS="patch giblib-dev imlib2-dev libx11-dev"
   495.9  
  495.10  compile_rules() {
  495.11  	sed -i 's|prefix)/doc|prefix)/share/doc|' *
  495.12 @@ -23,6 +23,6 @@
  495.13  
  495.14  genpkg_rules() {
  495.15  	copy @std
  495.16 -	DEPENDS="bzlib freetype giblib glibc-base imlib2 xorg-libxcb xorg-libX11 \
  495.17 -	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
  495.18 +	DEPENDS="bzlib freetype giblib glibc-base imlib2 libxcb libx11 \
  495.19 +	libxau libxdmcp libxext zlib"
  495.20  }
   496.1 --- a/sddm/receipt	Fri Dec 21 04:44:58 2018 +0200
   496.2 +++ b/sddm/receipt	Sat Dec 22 04:52:35 2018 +0200
   496.3 @@ -12,7 +12,7 @@
   496.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   496.5  WGET_URL="https://github.com/sddm/sddm/releases/download/v$VERSION/$TARBALL"
   496.6  
   496.7 -BUILD_DEPENDS="cmake extra-cmake-modules xorg-libxcb-dev qt5-dev mesa-dev \
   496.8 +BUILD_DEPENDS="cmake extra-cmake-modules libxcb-dev qt5-dev mesa-dev \
   496.9  python-docutils"
  496.10  SPLIT="$PACKAGE-theme-elarun $PACKAGE-theme-maldives $PACKAGE-theme-maya $PACKAGE"
  496.11  
  496.12 @@ -66,7 +66,7 @@
  496.13  		sddm)
  496.14  			copy @std @rm
  496.15  			rm -r $fs/etc/pam.d # PAM disabled, but installed anyway
  496.16 -			DEPENDS="sddm-theme-maya qt5-base qt5-declarative xorg-libxcb"
  496.17 +			DEPENDS="sddm-theme-maya qt5-base qt5-declarative libxcb"
  496.18  			;;
  496.19  	esac
  496.20  }
   497.1 --- a/seamonkey/receipt	Fri Dec 21 04:44:58 2018 +0200
   497.2 +++ b/seamonkey/receipt	Sat Dec 22 04:52:35 2018 +0200
   497.3 @@ -11,7 +11,7 @@
   497.4  TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
   497.5  WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$VERSION/source/$TARBALL"
   497.6  
   497.7 -BUILD_DEPENDS="gtk2-dev zip libIDL coreutils xorg-libXft-dev libevent-dev \
   497.8 +BUILD_DEPENDS="gtk2-dev zip libIDL coreutils libxft-dev libevent-dev \
   497.9  libvpx-dev perl alsa-lib alsa-lib-dev findutils python python-dev \
  497.10  wireless_tools-dev mesa-dev yasm libnotify-dev curl-dev hunspell-dev"
  497.11  
  497.12 @@ -51,7 +51,7 @@
  497.13  
  497.14  	# Create default user preference file
  497.15  	cp $stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js
  497.16 -	DEPENDS="gtk2 glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl \
  497.17 +	DEPENDS="gtk2 glib jpeg libx11 libIDL alsa-lib libxt curl \
  497.18  	libnotify libevent libvpx"
  497.19  	TAGS="web-browser"
  497.20  }
   498.1 --- a/searchmonkey/receipt	Fri Dec 21 04:44:58 2018 +0200
   498.2 +++ b/searchmonkey/receipt	Sat Dec 22 04:52:35 2018 +0200
   498.3 @@ -11,7 +11,7 @@
   498.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   498.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   498.6  
   498.7 -BUILD_DEPENDS="gtk2-dev libglade-dev xorg-libXdamage-dev"
   498.8 +BUILD_DEPENDS="gtk2-dev libglade-dev libxdamage-dev"
   498.9  
  498.10  compile_rules() {
  498.11  	./configure &&
  498.12 @@ -21,5 +21,5 @@
  498.13  
  498.14  genpkg_rules() {
  498.15  	copy @std
  498.16 -	DEPENDS="gtk2 libglade xorg-libXdamage"
  498.17 +	DEPENDS="gtk2 libglade libxdamage"
  498.18  }
   499.1 --- a/seed/receipt	Fri Dec 21 04:44:58 2018 +0200
   499.2 +++ b/seed/receipt	Sat Dec 22 04:52:35 2018 +0200
   499.3 @@ -38,11 +38,11 @@
   499.4  			DEPENDS="seed atk-dev bzip2-dev cairo-dev dbus-dev dbus-glib-dev \
   499.5  			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev gmp-dev \
   499.6  			gobject-introspection-dev gtk2-dev harfbuzz-dev icu-dev libffi-dev \
   499.7 -			libpng16-dev webkitgtk-dev libxml2-dev mpfr-dev pango-dev pcre-dev \
   499.8 +			libpng-dev webkitgtk-dev libxml2-dev mpfr-dev pango-dev pcre-dev \
   499.9  			readline-dev sqlite3-dev util-linux-blkid-dev util-linux-mount-dev \
  499.10 -			util-linux-uuid-dev xorg-libX11-dev xorg-libXau-dev \
  499.11 -			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
  499.12 -			xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
  499.13 +			util-linux-uuid-dev libx11-dev libxau-dev \
  499.14 +			libxdmcp-dev libxext-dev libxrender-dev \
  499.15 +			libxcb-dev pixman-dev xz-dev zlib-dev"
  499.16  			;;
  499.17  	esac
  499.18  }
   500.1 --- a/slang/receipt	Fri Dec 21 04:44:58 2018 +0200
   500.2 +++ b/slang/receipt	Sat Dec 22 04:52:35 2018 +0200
   500.3 @@ -12,7 +12,7 @@
   500.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   500.5  WGET_URL="http://www.jedsoft.org/releases/slang/$TARBALL"
   500.6  
   500.7 -BUILD_DEPENDS="pcre-dev oniguruma-dev libpng16-dev zlib-dev readline-dev"
   500.8 +BUILD_DEPENDS="pcre-dev oniguruma-dev libpng-dev zlib-dev readline-dev"
   500.9  SPLIT="$PACKAGE-dev"
  500.10  
  500.11  compile_rules() {
  500.12 @@ -34,7 +34,7 @@
  500.13  	case $PACKAGE in
  500.14  		slang)
  500.15  			copy @std
  500.16 -			DEPENDS="libpcre libpng16 oniguruma readline zlib"
  500.17 +			DEPENDS="libpcre libpng oniguruma readline zlib"
  500.18  			CONFIG_FILES="/etc/slsh.rc"
  500.19  			;;
  500.20  		*-dev) copy @dev;;
   501.1 --- a/slim/receipt	Fri Dec 21 04:44:58 2018 +0200
   501.2 +++ b/slim/receipt	Sat Dec 22 04:52:35 2018 +0200
   501.3 @@ -12,9 +12,9 @@
   501.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   501.5  WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL"
   501.6  
   501.7 -BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
   501.8 -libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev \
   501.9 -pam-dev   libunistring xorg-libXrandr-dev consolekit2-dev"
  501.10 +BUILD_DEPENDS="cmake libx11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
  501.11 +libpng-dev fontconfig-dev libxft-dev libxrender-dev libxmu-dev \
  501.12 +pam-dev   libunistring libxrandr-dev consolekit2-dev"
  501.13  SPLIT="$PACKAGE-theme-default $PACKAGE" # $PACKAGE-pam:pam"
  501.14  
  501.15  compile_rules() {
  501.16 @@ -59,16 +59,16 @@
  501.17  			;;
  501.18  		slim)
  501.19  			copy @std @rm
  501.20 -			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
  501.21 -			xorg-libXft xorg-libXmu xorg-libXrender zlib"
  501.22 +			DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
  501.23 +			libxft libxmu libxrender zlib"
  501.24  			CONFIG_FILES="/etc/slim.conf"
  501.25  			SUGGESTED="slim-theme-default slitaz-configs"
  501.26  			;;
  501.27  		slim-pam)
  501.28  			copy @std
  501.29  			rm -rf $fs/usr/share/slim/themes/default
  501.30 -			DEPENDS="fontconfig freetype libjpeg-turbo libpng16 xorg-libX11 \
  501.31 -			xorg-libXft xorg-libXmu xorg-libXrender zlib pam"
  501.32 +			DEPENDS="fontconfig freetype libjpeg-turbo libpng libx11 \
  501.33 +			libxft libxmu libxrender zlib pam"
  501.34  			CONFIG_FILES="/etc/slim.conf"
  501.35  			SUGGESTED="slim-theme-default slitaz-configs"
  501.36  			PROVIDE="slim:pam"
   502.1 --- a/slitaz-configs/receipt	Fri Dec 21 04:44:58 2018 +0200
   502.2 +++ b/slitaz-configs/receipt	Sat Dec 22 04:52:35 2018 +0200
   502.3 @@ -93,8 +93,8 @@
   502.4  				/usr/share/templates/ \
   502.5  				/usr/share/webhome/ \
   502.6  				/root/
   502.7 -			DEPENDS="slitaz-configs-base xorg-libXcomposite \
   502.8 -			xorg-libXdamage transset-df ttf-dejavu slim compton"
   502.9 +			DEPENDS="slitaz-configs-base libxcomposite \
  502.10 +			libxdamage transset-df ttf-dejavu slim compton"
  502.11  			CAT="base-system|for GUI systems"
  502.12  			;;
  502.13  		slitaz-themes)
   503.1 --- a/slitaz-dev-pkgs/receipt	Fri Dec 21 04:44:58 2018 +0200
   503.2 +++ b/slitaz-dev-pkgs/receipt	Sat Dec 22 04:52:35 2018 +0200
   503.3 @@ -12,6 +12,6 @@
   503.4  DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash bison \
   503.5  flex libtool gettext-dev m4 perl perl-xml-parser perl-xml-simple ncurses-dev \
   503.6  pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config fontconfig-dev freetype-dev \
   503.7 -glibc-dev libpng16-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
   503.8 +glibc-dev libpng-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
   503.9  pango-dev atk-dev cairo-dev expat-dev glib-dev gtk2-dev libIDL zip poppler-dev \
  503.10 -python patch openssl mercurial rsync wget xorg-pixman-dev autoconf automake"
  503.11 +python patch openssl mercurial rsync wget pixman-dev autoconf automake"
   504.1 --- a/slitaz-polar-cursors/receipt	Fri Dec 21 04:44:58 2018 +0200
   504.2 +++ b/slitaz-polar-cursors/receipt	Sat Dec 22 04:52:35 2018 +0200
   504.3 @@ -12,7 +12,7 @@
   504.4  TARBALL=$PACKAGE-$VERSION.tar.gz
   504.5  WGET_URL="ftp://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL"
   504.6  
   504.7 -BUILD_DEPENDS="xorg-xcursorgen"
   504.8 +BUILD_DEPENDS="xcursorgen"
   504.9  
  504.10  compile_rules() {
  504.11  	cd $src/Source
   505.1 --- a/slock/receipt	Fri Dec 21 04:44:58 2018 +0200
   505.2 +++ b/slock/receipt	Sat Dec 22 04:52:35 2018 +0200
   505.3 @@ -11,7 +11,7 @@
   505.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   505.5  WGET_URL="http://dl.suckless.org/tools/$TARBALL"
   505.6  
   505.7 -BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev xorg-libXext-dev"
   505.8 +BUILD_DEPENDS="xorgproto libx11-dev libxext-dev"
   505.9  
  505.10  compile_rules() {
  505.11  	mv config.mk config.mk.original
  505.12 @@ -23,5 +23,5 @@
  505.13  
  505.14  genpkg_rules() {
  505.15  	copy @std
  505.16 -	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext"
  505.17 +	DEPENDS="libx11 libxau libxdmcp libxext"
  505.18  }
   506.1 --- a/smx/receipt	Fri Dec 21 04:44:58 2018 +0200
   506.2 +++ b/smx/receipt	Sat Dec 22 04:52:35 2018 +0200
   506.3 @@ -39,18 +39,18 @@
   506.4  		smx)
   506.5  			copy @std @rm
   506.6  			DEPENDS="bzlib fontconfig freetype glib openssl libgd \
   506.7 -			libharfbuzz libjpeg-turbo liblzma libpng16 libsqlite3 libtdb \
   506.8 -			libunixODBC libwebp libxml2 pcre perl-core tiff xorg-libX11 \
   506.9 -			xorg-libXau xorg-libXdmcp xorg-libXpm xorg-libxcb zlib"
  506.10 +			libharfbuzz libjpeg-turbo liblzma libpng libsqlite3 libtdb \
  506.11 +			libunixODBC libwebp libxml2 pcre perl-core tiff libx11 \
  506.12 +			libxau libxdmcp libxpm libxcb zlib"
  506.13  			;;
  506.14  		*-dev)
  506.15  			copy @dev
  506.16  			DEPENDS="smx smx-fcgi \
  506.17  			bzip2-dev fontconfig-dev freetype-dev glib-dev harfbuzz-dev \
  506.18 -			libjpeg-turbo-dev libgd-dev libpng16-dev libtdb-dev libwebp-dev \
  506.19 +			libjpeg-turbo-dev libgd-dev libpng-dev libtdb-dev libwebp-dev \
  506.20  			libxml2-dev openssl-dev pcre-dev perl-dev sqlite3-dev tiff-dev \
  506.21 -			unixODBC-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
  506.22 -			xorg-libXpm-dev xorg-libxcb-dev xz-dev zlib-dev"
  506.23 +			unixODBC-dev libx11-dev libxau-dev libxdmcp-dev \
  506.24 +			libxpm-dev libxcb-dev xz-dev zlib-dev"
  506.25  			;;
  506.26  	esac
  506.27  }
   507.1 --- a/sox/receipt	Fri Dec 21 04:44:58 2018 +0200
   507.2 +++ b/sox/receipt	Sat Dec 22 04:52:35 2018 +0200
   507.3 @@ -12,7 +12,7 @@
   507.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   507.5  
   507.6  BUILD_DEPENDS="ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev \
   507.7 -libvorbis-dev libpng16-dev lame-dev libsamplerate-dev alsa-lib-dev \
   507.8 +libvorbis-dev libpng-dev lame-dev libsamplerate-dev alsa-lib-dev \
   507.9  libao-dev libogg-dev libmagic-dev flac-dev"
  507.10  SPLIT="$PACKAGE-dev"
  507.11  
  507.12 @@ -30,7 +30,7 @@
  507.13  		sox)
  507.14  			copy @std
  507.15  			DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad \
  507.16 -			libvorbis libpng16 lame libmagic libgomp libao ffmpeg \
  507.17 +			libvorbis libpng lame libmagic libgomp libao ffmpeg \
  507.18  			libsndfile flac"
  507.19  			;;
  507.20  		*-dev)
   508.1 --- a/spacefm/receipt	Fri Dec 21 04:44:58 2018 +0200
   508.2 +++ b/spacefm/receipt	Sat Dec 22 04:52:35 2018 +0200
   508.3 @@ -51,14 +51,14 @@
   508.4  			copy @std @ico
   508.5  			CAT="system-tools|with GTK+2 interface"
   508.6  			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk2 pango \
   508.7 -			startup-notification xorg-libX11   bash"
   508.8 +			startup-notification libx11   bash"
   508.9  			TAGS="file-manager"
  508.10  			;;
  508.11  		spacefm-gtk3)
  508.12  			copy @std @ico
  508.13  			CAT="system-tools|with GTK+3 interface"
  508.14  			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk3 pango \
  508.15 -			startup-notification xorg-libX11   bash"
  508.16 +			startup-notification libx11   bash"
  508.17  			TAGS="file-manager"
  508.18  			;;
  508.19  	esac
   509.1 --- a/spectrwm/receipt	Fri Dec 21 04:44:58 2018 +0200
   509.2 +++ b/spectrwm/receipt	Sat Dec 22 04:52:35 2018 +0200
   509.3 @@ -11,9 +11,9 @@
   509.4  TARBALL="$PACKAGE-$VERSION.tgz"
   509.5  WGET_URL="https://opensource.conformal.com/snapshots/spectrwm/$TARBALL"
   509.6  
   509.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev \
   509.8 -xorg-libXcursor-dev xorg-libXft-dev xorg-xcb-util-dev xorg-xcb-util-wm-dev \
   509.9 -xorg-xcb-util-keysyms-dev xorg-libXt-dev"
  509.10 +BUILD_DEPENDS="libx11-dev libxrandr-dev \
  509.11 +libxcursor-dev libxft-dev xcb-util-dev xcb-util-wm-dev \
  509.12 +xcb-util-keysyms-dev libxt-dev"
  509.13  
  509.14  compile_rules() {
  509.15  	cd linux
  509.16 @@ -29,7 +29,7 @@
  509.17  	# "switch on" keyboard mapping
  509.18  	sed -i 's|# keyboard_mapping.*|keyboard_mapping = /etc/spectrwm_us.conf|' \
  509.19  		$fs/etc/spectrwm.conf
  509.20 -	DEPENDS="xorg-xcb-util xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libXcursor xorg-libXft"
  509.21 +	DEPENDS="xcb-util xcb-util-keysyms xcb-util-wm libxcursor libxft"
  509.22  	CONFIG_FILES="/etc/spectrwm.conf"
  509.23  	TAGS="tile window-manager"
  509.24  }
   510.1 --- a/speedcrunch/receipt	Fri Dec 21 04:44:58 2018 +0200
   510.2 +++ b/speedcrunch/receipt	Sat Dec 22 04:52:35 2018 +0200
   510.3 @@ -12,7 +12,7 @@
   510.4  TARBALL="$PACKAGE-$VERSION.zip"
   510.5  WGET_URL="https://github.com/speedcrunch/SpeedCrunch/archive/$GITHASH.zip"
   510.6  
   510.7 -BUILD_DEPENDS="cmake Qt4-dev qmake xorg-xorgproto xorg-libX11-dev"
   510.8 +BUILD_DEPENDS="cmake Qt4-dev qmake xorgproto libx11-dev"
   510.9  
  510.10  compile_rules() {
  510.11  	mkdir build
   511.1 --- a/splashutils/receipt	Fri Dec 21 04:44:58 2018 +0200
   511.2 +++ b/splashutils/receipt	Sat Dec 22 04:52:35 2018 +0200
   511.3 @@ -11,7 +11,7 @@
   511.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   511.5  WGET_URL="$SF_MIRROR/fbsplash.berlios/$TARBALL"
   511.6  
   511.7 -BUILD_DEPENDS="autoconf automake libtool jpeg-dev gpm-dev libpng16-dev \
   511.8 +BUILD_DEPENDS="autoconf automake libtool jpeg-dev gpm-dev libpng-dev \
   511.9  freetype-dev"
  511.10  
  511.11  compile_rules() {
   512.1 --- a/squeak-vm/receipt	Fri Dec 21 04:44:58 2018 +0200
   512.2 +++ b/squeak-vm/receipt	Sat Dec 22 04:52:35 2018 +0200
   512.3 @@ -11,7 +11,7 @@
   512.4  TARBALL="Squeak-$VERSION-src.tar.gz"
   512.5  WGET_URL="http://squeakvm.org/unix/release/$TARBALL"
   512.6  
   512.7 -BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev cmake"
   512.8 +BUILD_DEPENDS="alsa-lib-dev dbus-dev libxrender-dev cmake"
   512.9  
  512.10  compile_rules() {
  512.11  	./unix/cmake/configure \
  512.12 @@ -26,6 +26,6 @@
  512.13  
  512.14  genpkg_rules() {
  512.15  	copy @std
  512.16 -	DEPENDS="alsa-lib dbus xorg-libXrender"
  512.17 +	DEPENDS="alsa-lib dbus libxrender"
  512.18  	SUGGESTED="scratch"
  512.19  }
   513.1 --- a/st/receipt	Fri Dec 21 04:44:58 2018 +0200
   513.2 +++ b/st/receipt	Sat Dec 22 04:52:35 2018 +0200
   513.3 @@ -11,8 +11,8 @@
   513.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   513.5  WGET_URL="http://dl.suckless.org/st/$TARBALL"
   513.6  
   513.7 -BUILD_DEPENDS="fontconfig-dev freetype-dev xorg-xorgproto xorg-libX11-dev \
   513.8 -xorg-libXft-dev"
   513.9 +BUILD_DEPENDS="fontconfig-dev freetype-dev xorgproto libx11-dev \
  513.10 +libxft-dev"
  513.11  
  513.12  compile_rules() {
  513.13  	# fix PREFIX
  513.14 @@ -26,5 +26,5 @@
  513.15  
  513.16  genpkg_rules() {
  513.17  	copy @std
  513.18 -	DEPENDS="fontconfig freetype xorg-libX11 xorg-libXft"
  513.19 +	DEPENDS="fontconfig freetype libx11 libxft"
  513.20  }
   514.1 --- a/stardict/receipt	Fri Dec 21 04:44:58 2018 +0200
   514.2 +++ b/stardict/receipt	Sat Dec 22 04:52:35 2018 +0200
   514.3 @@ -12,7 +12,7 @@
   514.4  WGET_URL="http://stardict-3.googlecode.com/files/$TARBALL"
   514.5  
   514.6  BUILD_DEPENDS="bzip2 enchant-dev tar intltool popt libsigc++-dev gtk2-dev \
   514.7 -xorg-libSM-dev zlib-dev util-linux-uuid-dev libffi"
   514.8 +libsm-dev zlib-dev util-linux-uuid-dev libffi"
   514.9  
  514.10  compile_rules() {
  514.11  	sed -i 's/<vector>/&\n#include <stdio.h>/' stardict-plugins/stardict-wordnet-plugin/scene.hpp
  514.12 @@ -35,5 +35,5 @@
  514.13  
  514.14  genpkg_rules() {
  514.15  	copy @std
  514.16 -	DEPENDS="enchant libsigc++ gtk2 xorg-libSM"
  514.17 +	DEPENDS="enchant libsigc++ gtk2 libsm"
  514.18  }
   515.1 --- a/startup-notification/receipt	Fri Dec 21 04:44:58 2018 +0200
   515.2 +++ b/startup-notification/receipt	Sat Dec 22 04:52:35 2018 +0200
   515.3 @@ -11,8 +11,8 @@
   515.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   515.5  WGET_URL="http://www.freedesktop.org/software/startup-notification/releases/$TARBALL"
   515.6  
   515.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libxcb-dev \
   515.8 -xorg-xcb-util-dev"
   515.9 +BUILD_DEPENDS="libx11-dev libice-dev libxcb-dev \
  515.10 +xcb-util-dev"
  515.11  SPLIT="$PACKAGE-dev"
  515.12  
  515.13  compile_rules() {
  515.14 @@ -30,7 +30,7 @@
  515.15  	case $PACKAGE in
  515.16  		startup-notification)
  515.17  			copy @std
  515.18 -			DEPENDS="xorg-libX11 xorg-libxcb xorg-xcb-util"
  515.19 +			DEPENDS="libx11 libxcb xcb-util"
  515.20  			;;
  515.21  		*-dev)
  515.22  			copy @dev
   516.1 --- a/stella/receipt	Fri Dec 21 04:44:58 2018 +0200
   516.2 +++ b/stella/receipt	Sat Dec 22 04:52:35 2018 +0200
   516.3 @@ -11,7 +11,7 @@
   516.4  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
   516.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   516.6  
   516.7 -BUILD_DEPENDS="libsdl-dev libpng16-dev zlib-dev"
   516.8 +BUILD_DEPENDS="libsdl-dev libpng-dev zlib-dev"
   516.9  
  516.10  compile_rules() {
  516.11  	./configure \
  516.12 @@ -24,6 +24,6 @@
  516.13  
  516.14  genpkg_rules() {
  516.15  	copy @std
  516.16 -	DEPENDS="gcc-lib-base libsdl libpng16"
  516.17 +	DEPENDS="gcc-lib-base libsdl libpng"
  516.18  	TAGS="emulator atari"
  516.19  }
   517.1 --- a/stellarium/receipt	Fri Dec 21 04:44:58 2018 +0200
   517.2 +++ b/stellarium/receipt	Sat Dec 22 04:52:35 2018 +0200
   517.3 @@ -12,7 +12,7 @@
   517.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   517.5  
   517.6  BUILD_DEPENDS="gettext-dev perl cmake boost-dev boost-thread mesa-dev \
   517.7 -qt4 Qt4-dev qmake zlib-dev xorg-libX11-dev libdrm glu-dev"
   517.8 +qt4 Qt4-dev qmake zlib-dev libx11-dev libdrm glu-dev"
   517.9  
  517.10  compile_rules() {
  517.11  	sed -i 's/Ch.*reau/Chereau/' doc/stellarium*
  517.12 @@ -29,6 +29,6 @@
  517.13  	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
  517.14  	cp -a $install/usr/bin $fs/usr
  517.15  	cp -a $install/usr/share/stellarium $fs/usr/share
  517.16 -	DEPENDS="libpng16 mesa glib freetype openssl libQtScript libQtOpenGL \
  517.17 +	DEPENDS="libpng mesa glib freetype openssl libQtScript libQtOpenGL \
  517.18  	libQtSql libQtNetwork libQtGui zlib"
  517.19  }
   518.1 --- a/stjerm-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
   518.2 +++ b/stjerm-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
   518.3 @@ -12,7 +12,7 @@
   518.4  TARBALL="stjerm-$VERSION.tar.gz"
   518.5  WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
   518.6  
   518.7 -BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake xorg-libXinerama-dev"
   518.8 +BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake libxinerama-dev"
   518.9  
  518.10  compile_rules() {
  518.11  	./autogen.sh
   519.1 --- a/strigi/receipt	Fri Dec 21 04:44:58 2018 +0200
   519.2 +++ b/strigi/receipt	Sat Dec 22 04:52:35 2018 +0200
   519.3 @@ -12,7 +12,7 @@
   519.4  WGET_URL="http://www.vandenoever.info/software/strigi/$TARBALL"
   519.5  
   519.6  BUILD_DEPENDS="libQtXml libxml2-dev cmake Qt4-dev bzlib expat-dev sqlite3-dev \
   519.7 -dbus-dev libQtCore libQtDBus qmake bzip2-dev xorg-libX11-dev"
   519.8 +dbus-dev libQtCore libQtDBus qmake bzip2-dev libx11-dev"
   519.9  SPLIT="$PACKAGE-client $PACKAGE $PACKAGE-dev"
  519.10  
  519.11  compile_rules() {
   520.1 --- a/stuurman-desktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   520.2 +++ b/stuurman-desktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   520.3 @@ -12,7 +12,7 @@
   520.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   520.5  WGET_URL="https://github.com/sde-gui/stuurman-desktop/archive/$COMMIT.tar.gz"
   520.6  
   520.7 -BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
   520.8 +BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool libx11-dev \
   520.9  libsde-utils-x11-dev pango-dev shared-mime-info libsmfm-core-dev gtk2-dev \
  520.10  libsmfm-gtk-dev"
  520.11  
  520.12 @@ -29,5 +29,5 @@
  520.13  genpkg_rules() {
  520.14  	copy @std
  520.15  	DEPENDS="cairo gdk-pixbuf glib gtk2 libsde-utils-x11 libsmfm-core \
  520.16 -	libsmfm-gtk pango xorg-libX11"
  520.17 +	libsmfm-gtk pango libx11"
  520.18  }
   521.1 --- a/stuurman/receipt	Fri Dec 21 04:44:58 2018 +0200
   521.2 +++ b/stuurman/receipt	Sat Dec 22 04:52:35 2018 +0200
   521.3 @@ -12,7 +12,7 @@
   521.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   521.5  WGET_URL="https://github.com/sde-gui/stuurman/archive/$COMMIT.tar.gz"
   521.6  
   521.7 -BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
   521.8 +BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool libx11-dev \
   521.9  pango-dev shared-mime-info libsmfm-core-dev gtk2-dev libsmfm-gtk-dev"
  521.10  
  521.11  compile_rules() {
   522.1 --- a/sudoku-savant/receipt	Fri Dec 21 04:44:58 2018 +0200
   522.2 +++ b/sudoku-savant/receipt	Sat Dec 22 04:52:35 2018 +0200
   522.3 @@ -33,7 +33,7 @@
   522.4  	cp -a $install/usr/games $fs/usr
   522.5  	cp $src/$PACKAGE.png $fs/usr/share/pixmaps
   522.6  	cp $src/$PACKAGE.desktop $fs/usr/share/applications
   522.7 -	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
   522.8 -	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXrandr \
   522.9 -	xorg-libXrender xorg-libXinerama xorg-libXdamage gcc-lib-base"
  522.10 +	DEPENDS="expat gtk2 libx11 libxau libxcomposite \
  522.11 +	libxcursor libxdmcp libxext libxfixes libxrandr \
  522.12 +	libxrender libxinerama libxdamage gcc-lib-base"
  522.13  }
   523.1 --- a/superswitcher/receipt	Fri Dec 21 04:44:58 2018 +0200
   523.2 +++ b/superswitcher/receipt	Sat Dec 22 04:52:35 2018 +0200
   523.3 @@ -12,7 +12,7 @@
   523.4  WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
   523.5  
   523.6  BUILD_DEPENDS="perl-xml-parser intltool glib-dev gtk2-dev libwnck2-dev \
   523.7 -xorg-libXcomposite-dev xorg-libXrender-dev autoconf automake"
   523.8 +libxcomposite-dev libxrender-dev autoconf automake"
   523.9  
  523.10  compile_rules() {
  523.11  	find . -name '*.[ch]*' | xargs sed -i 's|<glib/.*h|<glib.h|'
   524.1 --- a/surf/receipt	Fri Dec 21 04:44:58 2018 +0200
   524.2 +++ b/surf/receipt	Sat Dec 22 04:52:35 2018 +0200
   524.3 @@ -26,7 +26,7 @@
   524.4  genpkg_rules() {
   524.5  	copy @std
   524.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libsoup pango \
   524.7 -	webkitgtk xorg-libX11"
   524.8 +	webkitgtk libx11"
   524.9  	SUGGESTED="dmenu"
  524.10  	TAGS="web-browser"
  524.11  }
   525.1 --- a/surf2/receipt	Fri Dec 21 04:44:58 2018 +0200
   525.2 +++ b/surf2/receipt	Sat Dec 22 04:52:35 2018 +0200
   525.3 @@ -26,7 +26,7 @@
   525.4  genpkg_rules() {
   525.5  	copy @std
   525.6  	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsoup pango webkit2gtk \
   525.7 -	xorg-libX11"
   525.8 +	libx11"
   525.9  	SUGGESTED="dmenu"
  525.10  	PROVIDE="webkit2gtk:surf"
  525.11  	TAGS="web-browser"
   526.1 --- a/svkbd/receipt	Fri Dec 21 04:44:58 2018 +0200
   526.2 +++ b/svkbd/receipt	Sat Dec 22 04:52:35 2018 +0200
   526.3 @@ -14,7 +14,7 @@
   526.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   526.5  WGET_URL="http://git.suckless.org/svkbd/snapshot/svkbd-$GITHASH.tar.bz2"
   526.6  
   526.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev"
   526.8 +BUILD_DEPENDS="libx11-dev libxtst-dev"
   526.9  SPLIT="$PACKAGE-de $PACKAGE-fr $PACKAGE-ru"
  526.10  
  526.11  compile_rules() {
  526.12 @@ -34,5 +34,5 @@
  526.13  		svkbd-fr) copy svkbd-fr*; CAT="x-window|FR Layout";;
  526.14  		svkbd-ru) copy svkbd-ru*; CAT="x-window|RU Layout";;
  526.15  	esac
  526.16 -	DEPENDS="xorg-libX11 xorg-libXtst"
  526.17 +	DEPENDS="libx11 libxtst"
  526.18  }
   527.1 --- a/sylpheed/receipt	Fri Dec 21 04:44:58 2018 +0200
   527.2 +++ b/sylpheed/receipt	Sat Dec 22 04:52:35 2018 +0200
   527.3 @@ -39,7 +39,7 @@
   527.4  			;;
   527.5  		*-dev)
   527.6  			copy @dev
   527.7 -			DEPENDS="gtk2 openssl gpgme gnupg xorg-libXdamage"
   527.8 +			DEPENDS="gtk2 openssl gpgme gnupg libxdamage"
   527.9  			;;
  527.10  	esac
  527.11  }
   528.1 --- a/synergy/receipt	Fri Dec 21 04:44:58 2018 +0200
   528.2 +++ b/synergy/receipt	Sat Dec 22 04:52:35 2018 +0200
   528.3 @@ -11,7 +11,7 @@
   528.4  TARBALL="$PACKAGE-$VERSION-Source.tar.gz"
   528.5  WGET_URL="http://synergy.googlecode.com/files/$TARBALL"
   528.6  
   528.7 -BUILD_DEPENDS="xorg-dev-proto xorg-libXt-dev xorg-libXtst-dev cmake"
   528.8 +BUILD_DEPENDS="xorg-dev-proto libxt-dev libxtst-dev cmake"
   528.9  
  528.10  compile_rules() {
  528.11  	cmake \
  528.12 @@ -26,5 +26,5 @@
  528.13  
  528.14  genpkg_rules() {
  528.15  	copy @std
  528.16 -	DEPENDS="xorg-libX11 xorg-libXtst xorg-libSM xorg-libICE xorg-libXinerama"
  528.17 +	DEPENDS="libx11 libxtst libsm libice libxinerama"
  528.18  }
   529.1 --- a/tabbed/receipt	Fri Dec 21 04:44:58 2018 +0200
   529.2 +++ b/tabbed/receipt	Sat Dec 22 04:52:35 2018 +0200
   529.3 @@ -11,7 +11,7 @@
   529.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   529.5  WGET_URL="http://dl.suckless.org/tools/$TARBALL"
   529.6  
   529.7 -BUILD_DEPENDS="xorg-libX11-dev"
   529.8 +BUILD_DEPENDS="libx11-dev"
   529.9  
  529.10  compile_rules() {
  529.11  	make CC=$HOST_SYSTEM-gcc &&
  529.12 @@ -20,5 +20,5 @@
  529.13  
  529.14  genpkg_rules() {
  529.15  	copy @std
  529.16 -	DEPENDS="xorg-libX11 xorg-xwininfo"
  529.17 +	DEPENDS="libx11 xwininfo"
  529.18  }
   530.1 --- a/tea/receipt	Fri Dec 21 04:44:58 2018 +0200
   530.2 +++ b/tea/receipt	Sat Dec 22 04:52:35 2018 +0200
   530.3 @@ -27,6 +27,6 @@
   530.4  	cp -a $src/bin/tea $fs/usr/bin
   530.5  	cp -a $src/icons/tea_icon_v2.png \
   530.6  		$fs/usr/share/pixmaps/tea.png
   530.7 -	DEPENDS="xorg-libX11 qt5-base qt5-declarative"
   530.8 +	DEPENDS="libx11 qt5-base qt5-declarative"
   530.9  	TAGS="text-editor"
  530.10  }
   531.1 --- a/terminus-font/receipt	Fri Dec 21 04:44:58 2018 +0200
   531.2 +++ b/terminus-font/receipt	Sat Dec 22 04:52:35 2018 +0200
   531.3 @@ -13,7 +13,7 @@
   531.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   531.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   531.6  
   531.7 -BUILD_DEPENDS="python3 xorg-bdftopcf patch"
   531.8 +BUILD_DEPENDS="python3 bdftopcf patch"
   531.9  SPLIT="$PACKAGE-x11 $PACKAGE-base $PACKAGE"
  531.10  
  531.11  compile_rules() {
   532.1 --- a/tesseract/receipt	Fri Dec 21 04:44:58 2018 +0200
   532.2 +++ b/tesseract/receipt	Sat Dec 22 04:52:35 2018 +0200
   532.3 @@ -12,7 +12,7 @@
   532.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   532.5  WGET_URL="https://github.com/tesseract-ocr/tesseract/archive/$VERSION.tar.gz"
   532.6  
   532.7 -BUILD_DEPENDS="libtool autoconf automake libpng16-dev libjpeg-turbo-dev \
   532.8 +BUILD_DEPENDS="libtool autoconf automake libpng-dev libjpeg-turbo-dev \
   532.9  tiff-dev giflib-dev zlib-dev icu-dev pango-dev cairo-dev leptonica-dev"
  532.10  SPLIT="$PACKAGE-dev"
  532.11  
  532.12 @@ -28,7 +28,7 @@
  532.13  	case $PACKAGE in
  532.14  		tesseract)
  532.15  			copy @std
  532.16 -			DEPENDS="leptonica libpng16 libjpeg-turbo tiff giflib"
  532.17 +			DEPENDS="leptonica libpng libjpeg-turbo tiff giflib"
  532.18  			;;
  532.19  		*-dev)
  532.20  			copy @dev
   533.1 --- a/texmacs/receipt	Fri Dec 21 04:44:58 2018 +0200
   533.2 +++ b/texmacs/receipt	Sat Dec 22 04:52:35 2018 +0200
   533.3 @@ -11,7 +11,7 @@
   533.4  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
   533.5  WGET_URL="ftp://ftp.texmacs.org/pub/$PACKAGE/targz/$TARBALL"
   533.6  
   533.7 -BUILD_DEPENDS="xorg-libX11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
   533.8 +BUILD_DEPENDS="libx11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
   533.9  
  533.10  compile_rules() {
  533.11  	./configure \
   534.1 --- a/thunar-vfs/receipt	Fri Dec 21 04:44:58 2018 +0200
   534.2 +++ b/thunar-vfs/receipt	Sat Dec 22 04:52:35 2018 +0200
   534.3 @@ -11,9 +11,9 @@
   534.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   534.5  WGET_URL="http://archive.xfce.org/xfce/4.8/src/$TARBALL"
   534.6  
   534.7 -BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev libxfce4util-dev dbus-dev \
   534.8 +BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev libxfce4util-dev dbus-dev \
   534.9  startup-notification-dev xfce4-panel-dev zlib-dev intltool exo-dev \
  534.10 -dbus-glib-dev util-linux-uuid-dev hal-dev xorg-xcb-util-dev"
  534.11 +dbus-glib-dev util-linux-uuid-dev hal-dev xcb-util-dev"
  534.12  SPLIT="$PACKAGE-dev"
  534.13  
  534.14  compile_rules() {
  534.15 @@ -33,8 +33,8 @@
  534.16  		thunar-vfs)
  534.17  			copy @std
  534.18  			DEPENDS="dbus dbus-glib exo freetype gdk-pixbuf glib gtk2 hal \
  534.19 -			libjpeg-turbo libpng16 libxfce4util startup-notification \
  534.20 -			xorg-libX11"
  534.21 +			libjpeg-turbo libpng libxfce4util startup-notification \
  534.22 +			libx11"
  534.23  			;;
  534.24  		*-dev)
  534.25  			copy @dev
   535.1 --- a/thunar-volman/receipt	Fri Dec 21 04:44:58 2018 +0200
   535.2 +++ b/thunar-volman/receipt	Sat Dec 22 04:52:35 2018 +0200
   535.3 @@ -12,7 +12,7 @@
   535.4  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   535.5  
   535.6  BUILD_DEPENDS="intltool exo-dev libgudev-dev libxfce4ui-dev libnotify-dev \
   535.7 -eudev-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   535.8 +eudev-dev libsm-dev startup-notification-dev xcb-util-dev"
   535.9  
  535.10  compile_rules() {
  535.11  	./configure \
   536.1 --- a/thunar/receipt	Fri Dec 21 04:44:58 2018 +0200
   536.2 +++ b/thunar/receipt	Sat Dec 22 04:52:35 2018 +0200
   536.3 @@ -11,9 +11,9 @@
   536.4  TARBALL="Thunar-$VERSION.tar.bz2"
   536.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   536.6  
   536.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev exo-dev libxfce4ui-dev \
   536.8 +BUILD_DEPENDS="intltool libx11-dev libice-dev exo-dev libxfce4ui-dev \
   536.9  libgudev-dev libnotify-dev libexif-dev xfce4-panel-dev eudev-dev \
  536.10 -xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
  536.11 +libsm-dev startup-notification-dev xcb-util-dev"
  536.12  SPLIT="$PACKAGE-dev"
  536.13  
  536.14  compile_rules() {
  536.15 @@ -32,7 +32,7 @@
  536.16  			copy @std
  536.17  			DEPENDS="atk cairo dbus dbus-glib exo gdk-pixbuf glib gtk2 libexif \
  536.18  			libgudev libnotify libpcre libxfce4ui libxfce4util pango \
  536.19 -			xfce4-panel xfconf xorg-libICE xorg-libSM xorg-libX11"
  536.20 +			xfce4-panel xfconf libice libsm libx11"
  536.21  			TAGS="Xfce file-manager"
  536.22  			;;
  536.23  		*-dev)
   537.1 --- a/tightvnc/receipt	Fri Dec 21 04:44:58 2018 +0200
   537.2 +++ b/tightvnc/receipt	Sat Dec 22 04:52:35 2018 +0200
   537.3 @@ -10,10 +10,10 @@
   537.4  WEB_SITE="http://www.tightvnc.com/"
   537.5  WGET_URL="$SF_MIRROR/vnc-tight/$TARBALL"
   537.6  
   537.7 -BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-cf-files xorg-libXp \
   537.8 -xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev xorg-libXdmcp-dev \
   537.9 -xorg-libXmu-dev xorg-xorgproto \
  537.10 -xorg-xauth jpeg-dev zlib-dev xorg-libXrandr-dev"
  537.11 +BUILD_DEPENDS="imake gccmakedep xorg-cf-files libxp \
  537.12 +libxaw-dev libxt-dev libxau-dev libxdmcp-dev \
  537.13 +libxmu-dev xorgproto \
  537.14 +xauth jpeg-dev zlib-dev libxrandr-dev"
  537.15  SPLIT="$PACKAGE-extra $PACKAGE-java $PACKAGE-viewer"
  537.16  
  537.17  compile_rules() {
  537.18 @@ -39,7 +39,7 @@
  537.19  	case $PACKAGE in
  537.20  		tightvnc)
  537.21  			TAGS="remote-desktop vnc"
  537.22 -			DEPENDS="xorg-base-fonts jpeg zlib"
  537.23 +			DEPENDS="font-misc-misc-base jpeg zlib"
  537.24  			mkdir -p $fs/usr/bin
  537.25  			cp -a $install/usr/bin/Xvnc $fs/usr/bin
  537.26  			cp $src/vncpasswd/vncpasswd $fs/usr/bin
  537.27 @@ -65,8 +65,8 @@
  537.28  		tightvnc-extra)
  537.29  			CAT="x-window|extra tools"
  537.30  			TAGS="vnc"
  537.31 -			DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
  537.32 -			xorg-libXext"
  537.33 +			DEPENDS="perl jpeg zlib libxdmcp libxau libx11 \
  537.34 +			libxext"
  537.35  			mkdir -p $fs/usr/bin $fs/etc
  537.36  			cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
  537.37  			cp $src/tightvncserver.conf $fs/etc
  537.38 @@ -84,9 +84,9 @@
  537.39  		tightvnc-viewer)
  537.40  			CAT="x-window|X client"
  537.41  			TAGS="vnc remote-desktop"
  537.42 -			DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
  537.43 -			xorg-libXext xorg-libXp xorg-libXpm xorg-libICE \
  537.44 -			xorg-libSM xorg-libXt xorg-libXmu xorg-libXaw"
  537.45 +			DEPENDS="jpeg zlib libxdmcp libxau libx11 \
  537.46 +			libxext libxp libxpm libice \
  537.47 +			libsm libxt libxmu libxaw"
  537.48  			mkdir -p $fs/usr/bin
  537.49  			cp -a $install/usr/bin/vncviewer $fs/usr/bin
  537.50  			;;
   538.1 --- a/tilda/receipt	Fri Dec 21 04:44:58 2018 +0200
   538.2 +++ b/tilda/receipt	Sat Dec 22 04:52:35 2018 +0200
   538.3 @@ -23,6 +23,6 @@
   538.4  
   538.5  genpkg_rules() {
   538.6  	copy @std
   538.7 -	DEPENDS="gdk-pixbuf glib gtk3 pango vte xorg-libX11"
   538.8 +	DEPENDS="gdk-pixbuf glib gtk3 pango vte libx11"
   538.9  	TAGS="terminal"
  538.10  }
   539.1 --- a/timidity++/receipt	Fri Dec 21 04:44:58 2018 +0200
   539.2 +++ b/timidity++/receipt	Sat Dec 22 04:52:35 2018 +0200
   539.3 @@ -12,7 +12,7 @@
   539.4  WGET_URL="$SF_MIRROR/timidity/$TARBALL"
   539.5  
   539.6  BUILD_DEPENDS="alsa-lib-dev portaudio-dev jack-dev libao-dev libvorbis-dev \
   539.7 -libogg-dev flac-dev speex-dev gtk2-dev xorg-libXaw-dev"
   539.8 +libogg-dev flac-dev speex-dev gtk2-dev libxaw-dev"
   539.9  
  539.10  compile_rules() {
  539.11  	./configure \
  539.12 @@ -30,5 +30,5 @@
  539.13  genpkg_rules() {
  539.14  	copy @std
  539.15  	DEPENDS="alsa-lib portaudio jack libao libvorbis libogg \
  539.16 -	flac gtk2 xorg-libXaw"
  539.17 +	flac gtk2 libxaw"
  539.18  }
   540.1 --- a/tint2/receipt	Fri Dec 21 04:44:58 2018 +0200
   540.2 +++ b/tint2/receipt	Sat Dec 22 04:52:35 2018 +0200
   540.3 @@ -11,9 +11,9 @@
   540.4  TARBALL="$PACKAGE-v$VERSION.tar.bz2"
   540.5  WGET_URL="https://gitlab.com/o9000/tint2/-/archive/v$VERSION/$TARBALL"
   540.6  
   540.7 -BUILD_DEPENDS="cmake xorg-libX11-dev xorg-libXcomposite-dev \
   540.8 -xorg-libXdamage-dev xorg-libXinerama-dev xorg-libXext-dev xorg-libXrender-dev \
   540.9 -xorg-libXrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
  540.10 +BUILD_DEPENDS="cmake libx11-dev libxcomposite-dev \
  540.11 +libxdamage-dev libxinerama-dev libxext-dev libxrender-dev \
  540.12 +libxrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
  540.13  gtk2-dev gettext-dev"
  540.14  
  540.15  compile_rules() {
  540.16 @@ -39,8 +39,8 @@
  540.17  genpkg_rules() {
  540.18  	copy @std
  540.19  	DEPENDS="cairo gdk-pixbuf glib gtk2 imlib2 librsvg pango \
  540.20 -	startup-notification xorg-libX11 xorg-libXcomposite xorg-libXdamage \
  540.21 -	xorg-libXext xorg-libXinerama xorg-libXrandr xorg-libXrender"
  540.22 +	startup-notification libx11 libxcomposite libxdamage \
  540.23 +	libxext libxinerama libxrandr libxrender"
  540.24  	CONFIG_FILES="/etc/xdg/tint2/tint2rc"
  540.25  	TAGS="desktop panel taskbar"
  540.26  }
   541.1 --- a/tix/receipt	Fri Dec 21 04:44:58 2018 +0200
   541.2 +++ b/tix/receipt	Sat Dec 22 04:52:35 2018 +0200
   541.3 @@ -29,5 +29,5 @@
   541.4  
   541.5  genpkg_rules() {
   541.6  	cp -a $install/usr $fs
   541.7 -	DEPENDS="tcl xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
   541.8 +	DEPENDS="tcl libx11 libxau libxdmcp libxcb"
   541.9  }
   542.1 --- a/transset-df/receipt	Fri Dec 21 04:44:58 2018 +0200
   542.2 +++ b/transset-df/receipt	Sat Dec 22 04:52:35 2018 +0200
   542.3 @@ -11,7 +11,7 @@
   542.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   542.5  WGET_URL="http://www.forchheimer.se/transset-df/$TARBALL"
   542.6  
   542.7 -BUILD_DEPENDS="xorg-libXdamage-dev xorg-libXcomposite-dev xorg-libXrender-dev"
   542.8 +BUILD_DEPENDS="libxdamage-dev libxcomposite-dev libxrender-dev"
   542.9  
  542.10  compile_rules() {
  542.11  	make &&
  542.12 @@ -20,6 +20,6 @@
  542.13  
  542.14  genpkg_rules() {
  542.15  	copy @std
  542.16 -	DEPENDS="xorg-libXdamage xorg-libXcomposite xorg-xcompmgr xorg-libXrender \
  542.17 -	xorg-libXext"
  542.18 +	DEPENDS="libxdamage libxcomposite xcompmgr libxrender \
  542.19 +	libxext"
  542.20  }
   543.1 --- a/truecrypt/receipt	Fri Dec 21 04:44:58 2018 +0200
   543.2 +++ b/truecrypt/receipt	Sat Dec 22 04:52:35 2018 +0200
   543.3 @@ -12,7 +12,7 @@
   543.4  WGET_URL="https://sources.archlinux.org/other/tc/$TARBALL"
   543.5  TARBALL_SHA512="b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a"
   543.6  
   543.7 -BUILD_DEPENDS="pkcs nasm fuse2-dev wxWidgets28-dev xorg-libSM-dev"
   543.8 +BUILD_DEPENDS="pkcs nasm fuse2-dev wxWidgets28-dev libsm-dev"
   543.9  
  543.10  compile_rules() {
  543.11  	make \
  543.12 @@ -35,5 +35,5 @@
  543.13  
  543.14  genpkg_rules() {
  543.15  	copy @std
  543.16 -	DEPENDS="fuse2 wxWidgets28 xorg-libSM dmsetup linux-md"
  543.17 +	DEPENDS="fuse2 wxWidgets28 libsm dmsetup linux-md"
  543.18  }
   544.1 --- a/tsclient/receipt	Fri Dec 21 04:44:58 2018 +0200
   544.2 +++ b/tsclient/receipt	Sat Dec 22 04:52:35 2018 +0200
   544.3 @@ -32,6 +32,6 @@
   544.4  	cp -a $install/usr/share/pixmaps $fs/usr/share
   544.5  	cp -a $install/usr/share/applications $fs/usr/share
   544.6  	strip -s $fs/usr/lib/$PACKAGE/*
   544.7 -	DEPENDS="gtk2 rdesktop xorg-libXdamage"
   544.8 +	DEPENDS="gtk2 rdesktop libxdamage"
   544.9  	TAGS="remote-desktop"
  544.10  }
   545.1 --- a/tumbler/receipt	Fri Dec 21 04:44:58 2018 +0200
   545.2 +++ b/tumbler/receipt	Sat Dec 22 04:52:35 2018 +0200
   545.3 @@ -77,7 +77,7 @@
   545.4  			;;
   545.5  		tumbler)
   545.6  			copy @std @rm
   545.7 -			DEPENDS="dbus dbus-glib gdk-pixbuf glib libpng16"
   545.8 +			DEPENDS="dbus dbus-glib gdk-pixbuf glib libpng"
   545.9  			CAT="graphics|main package"
  545.10  			CONFIG_FILES="/etc/xdg/tumbler/tumbler.rc"
  545.11  			;;
   546.1 --- a/tuxpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
   546.2 +++ b/tuxpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
   546.3 @@ -11,7 +11,7 @@
   546.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   546.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   546.6  
   546.7 -BUILD_DEPENDS="libpng16-dev fribidi-dev librsvg-dev cairo-dev libsdl-dev \
   546.8 +BUILD_DEPENDS="libpng-dev fribidi-dev librsvg-dev cairo-dev libsdl-dev \
   546.9  libsdl-mixer-dev libsdl-pango-dev libsdl-image-dev libsdl-ttf-dev \
  546.10  libpaper-dev python-dev gettext-dev gperf"
  546.11  SPLIT="$PACKAGE-data"
  546.12 @@ -19,7 +19,7 @@
  546.13  COPY_std="etc/tuxpaint/ usr/bin/ usr/lib/"
  546.14  COPY_data="share/applications/ share/pixmaps/ share/tuxpaint/"
  546.15  
  546.16 -DEPENDS_std="tuxpaint-data cairo fribidi glib libpaper libpng16 librsvg libsdl \
  546.17 +DEPENDS_std="tuxpaint-data cairo fribidi glib libpaper libpng librsvg libsdl \
  546.18  libsdl-image libsdl-mixer libsdl-pango libsdl-ttf zlib"
  546.19  DEPENDS_data="python"
  546.20  
   547.1 --- a/unclutter/receipt	Fri Dec 21 04:44:58 2018 +0200
   547.2 +++ b/unclutter/receipt	Sat Dec 22 04:52:35 2018 +0200
   547.3 @@ -14,7 +14,7 @@
   547.4  PATCH="$(basename $PATCH_URL)"
   547.5  EXTRA_SOURCE_FILES="$PATCH"
   547.6  
   547.7 -BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev"
   547.8 +BUILD_DEPENDS="xorgproto libx11-dev"
   547.9  
  547.10  compile_rules() {
  547.11  	if [ ! -f "$SRC/$PATCH)" ]; then
  547.12 @@ -37,5 +37,5 @@
  547.13  
  547.14  genpkg_rules() {
  547.15  	cp -a $install/* $fs
  547.16 -	DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
  547.17 +	DEPENDS="libx11 libxcb libxau libxdmcp"
  547.18  }
   548.1 --- a/urxvt/receipt	Fri Dec 21 04:44:58 2018 +0200
   548.2 +++ b/urxvt/receipt	Sat Dec 22 04:52:35 2018 +0200
   548.3 @@ -11,8 +11,8 @@
   548.4  TARBALL="rxvt-unicode-$VERSION.tar.bz2"
   548.5  WGET_URL="http://dist.schmorp.de/rxvt-unicode/$TARBALL"
   548.6  
   548.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev gdk-pixbuf-dev \
   548.8 -startup-notification-dev xorg-libXmu-dev xorg-libXft-dev perl-dev ncurses-extra"
   548.9 +BUILD_DEPENDS="libx11-dev libice-dev gdk-pixbuf-dev \
  548.10 +startup-notification-dev libxmu-dev libxft-dev perl-dev ncurses-extra"
  548.11  SPLIT="$PACKAGE-full:full"
  548.12  
  548.13  compile_rules() {
  548.14 @@ -44,14 +44,14 @@
  548.15  	case $PACKAGE in
  548.16  		urxvt)
  548.17  			copy @std
  548.18 -			DEPENDS="xorg-libX11"
  548.19 +			DEPENDS="libx11"
  548.20  			;;
  548.21  		urxvt-full)
  548.22  			copy @std
  548.23  			CAT="utilities|everything enabled"
  548.24  			DEPENDS="fontconfig freetype gdk-pixbuf glib perl perl-core \
  548.25 -			startup-notification xorg-libX11 xorg-libXft xorg-libXmu \
  548.26 -			xorg-libXrender xorg-libXt"
  548.27 +			startup-notification libx11 libxft libxmu \
  548.28 +			libxrender libxt"
  548.29  			PROVIDE="urxvt"
  548.30  			;;
  548.31  	esac
   549.1 --- a/utox/receipt	Fri Dec 21 04:44:58 2018 +0200
   549.2 +++ b/utox/receipt	Sat Dec 22 04:52:35 2018 +0200
   549.3 @@ -13,5 +13,5 @@
   549.4  
   549.5  genpkg_rules() {
   549.6  	install -D $src/$TARBALL $fs/usr/bin/utox
   549.7 -	DEPENDS="dbus bzlib xorg-libX11 gtk2"
   549.8 +	DEPENDS="dbus bzlib libx11 gtk2"
   549.9  }
   550.1 --- a/vice/receipt	Fri Dec 21 04:44:58 2018 +0200
   550.2 +++ b/vice/receipt	Sat Dec 22 04:52:35 2018 +0200
   550.3 @@ -12,10 +12,10 @@
   550.4  WGET_URL="$SF_MIRROR/vice-emu/$TARBALL"
   550.5  
   550.6  BUILD_DEPENDS="automake xa gettext-dev ffmpeg-dev alsa-lib-dev lame-dev \
   550.7 -libvorbis-dev flac-dev pciutils-dev readline-dev libpng16-dev giflib-dev \
   550.8 -libjpeg-turbo-dev portaudio-dev mpg123-dev xorg-libICE-dev gtk2-dev \
   550.9 -vte-gtk2-dev gtkglext-dev mesa-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
  550.10 -xorg-bdftopcf xorg-mkfontdir" # pulseaudio-dev
  550.11 +libvorbis-dev flac-dev pciutils-dev readline-dev libpng-dev giflib-dev \
  550.12 +libjpeg-turbo-dev portaudio-dev mpg123-dev libice-dev gtk2-dev \
  550.13 +vte-gtk2-dev gtkglext-dev mesa-dev libxxf86vm-dev libxrandr-dev \
  550.14 +bdftopcf mkfontdir" # pulseaudio-dev
  550.15  
  550.16  compile_rules() {
  550.17  	rm -r src/lib/liblame src/lib/libx264 src/lib/libffmpeg
  550.18 @@ -42,6 +42,6 @@
  550.19  genpkg_rules() {
  550.20  	copy @std
  550.21  	DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk2 gtkglext \
  550.22 -	libjpeg-turbo libogg libpng16 libvorbis mesa mpg123 pango pciutils \
  550.23 -	portaudio readline vte-gtk2 xorg-libX11 xorg-libXrandr xorg-libXxf86vm zlib"
  550.24 +	libjpeg-turbo libogg libpng libvorbis mesa mpg123 pango pciutils \
  550.25 +	portaudio readline vte-gtk2 libx11 libxrandr libxxf86vm zlib"
  550.26  }
   551.1 --- a/vifm/receipt	Fri Dec 21 04:44:58 2018 +0200
   551.2 +++ b/vifm/receipt	Sat Dec 22 04:52:35 2018 +0200
   551.3 @@ -11,7 +11,7 @@
   551.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   551.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   551.6  
   551.7 -BUILD_DEPENDS="ncurses-dev libmagic-dev xorg-libX11-dev util-linux-whereis vim \
   551.8 +BUILD_DEPENDS="ncurses-dev libmagic-dev libx11-dev util-linux-whereis vim \
   551.9  file mandoc util-linux-column perl"
  551.10  
  551.11  compile_rules() {
   552.1 --- a/virtualbox-ose/receipt	Fri Dec 21 04:44:58 2018 +0200
   552.2 +++ b/virtualbox-ose/receipt	Sat Dec 22 04:52:35 2018 +0200
   552.3 @@ -13,11 +13,11 @@
   552.4  WGET_URL="http://download.virtualbox.org/virtualbox/$VERSION/$TARBALL"
   552.5  
   552.6  BUILD_DEPENDS="bin86 dev86 iasl libIDL libsdl-dev mesa-dev libxslt-dev \
   552.7 -glu-dev Qt4-dev libsdl-ttf-dev alsa-lib-dev hal-dev xorg-libXtst-dev \
   552.8 -xorg-libXrandr-dev python python-dev xalan-c curl-dev xalan-c-dev \
   552.9 +glu-dev Qt4-dev libsdl-ttf-dev alsa-lib-dev hal-dev libxtst-dev \
  552.10 +libxrandr-dev python python-dev xalan-c curl-dev xalan-c-dev \
  552.11  xerces-c-dev openssl-dev zlib-dev libcap-dev glib-dev libvncserver-dev \
  552.12  pam pam-dev bzip2 linux-module-headers tar vde2-dev \
  552.13 -libpng16-dev gsoap-dev libdevmapper-dev makeself cdrkit flex"
  552.14 +libpng-dev gsoap-dev libdevmapper-dev makeself cdrkit flex"
  552.15  SPLIT="$PACKAGE-guestutils"
  552.16  
  552.17  compile_rules() {
  552.18 @@ -115,8 +115,8 @@
  552.19  			install -D -m644 vboxdrv.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxdrv.ko"
  552.20  			install -D -m644 vboxnetflt.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxnetflt.ko"
  552.21  			install -D -m644 vboxnetadp.ko "$fs/lib/modules/$KERNEL_VERSION-slitaz/misc/vboxnetadp.ko"
  552.22 -			DEPENDS="libxml2 xorg-libXcursor libIDL xorg-libXinerama libsdl \
  552.23 -			xorg-libXmu curl libvncserver libpng16 jpeg mesa glu vde2 \
  552.24 +			DEPENDS="libxml2 libxcursor libIDL libxinerama libsdl \
  552.25 +			libxmu curl libvncserver libpng jpeg mesa glu vde2 \
  552.26  			python libQtCore libQtGui libQtNetwork libQtOpenGL"
  552.27  			TAGS="virtualization"
  552.28  			PROVIDE="virtualbox"
  552.29 @@ -168,7 +168,7 @@
  552.30  			install -D -m 0755 "$stuff/VBoxService" \
  552.31  				"$fs/etc/init.d/VBoxService"
  552.32  			CAT="misc|VirtualBox Guest userspace utilities, useful for running Slitaz inside a virtual machine"
  552.33 -			DEPENDS="xorg-libXfixes xorg-libXmu xorg-xrandr"
  552.34 +			DEPENDS="libxfixes libxmu xrandr"
  552.35  			TAGS="virtualization"
  552.36  			;;
  552.37  	esac
   553.1 --- a/vivaldi/receipt	Fri Dec 21 04:44:58 2018 +0200
   553.2 +++ b/vivaldi/receipt	Sat Dec 22 04:52:35 2018 +0200
   553.3 @@ -38,9 +38,9 @@
   553.4  genpkg_rules() {
   553.5  	copy opt/ usr/
   553.6  	DEPENDS="gconf alsa-lib atk cairo dbus expat fontconfig gdk-pixbuf glib \
   553.7 -	gtk3 libcups nspr nss pango xorg-libX11 xorg-libXScrnSaver \
   553.8 -	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
   553.9 -	xorg-libXfixes xorg-libXi xorg-libXrandr xorg-libXrender xorg-libXtst \
  553.10 -	xorg-libxcb   bash mesa"
  553.11 +	gtk3 libcups nspr nss pango libx11 libxscrnsaver \
  553.12 +	libxcomposite libxcursor libxdamage libxext \
  553.13 +	libxfixes libxi libxrandr libxrender libxtst \
  553.14 +	libxcb   bash mesa"
  553.15  	TAGS="web-browser"
  553.16  }
   554.1 --- a/vkeybd/receipt	Fri Dec 21 04:44:58 2018 +0200
   554.2 +++ b/vkeybd/receipt	Sat Dec 22 04:52:35 2018 +0200
   554.3 @@ -11,7 +11,7 @@
   554.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   554.5  WGET_URL="http://ftp.riken.jp/Linux/suse/people/tiwai/vkeybd/$TARBALL"
   554.6  
   554.7 -BUILD_DEPENDS="tk-dev tcl-dev alsa-lib-dev xorg-libX11-dev"
   554.8 +BUILD_DEPENDS="tk-dev tcl-dev alsa-lib-dev libx11-dev"
   554.9  
  554.10  compile_rules() {
  554.11  	# Hack makefile
  554.12 @@ -32,5 +32,5 @@
  554.13  	cp -a $src/vkeybd.desktop $fs/usr/share/applications
  554.14  	cp -a $src/pixmaps/vkeybd_48x48.png $fs/usr/share/pixmaps
  554.15  	chown -R root.root $fs
  554.16 -	DEPENDS="tk tcl alsa-lib xorg-libX11"
  554.17 +	DEPENDS="tk tcl alsa-lib libx11"
  554.18  }
   555.1 --- a/vlc/receipt	Fri Dec 21 04:44:58 2018 +0200
   555.2 +++ b/vlc/receipt	Sat Dec 22 04:52:35 2018 +0200
   555.3 @@ -11,7 +11,7 @@
   555.4  WGET_URL="http://download.videolan.org/pub/videolan/$PACKAGE/$VERSION/$TARBALL"
   555.5  
   555.6  BUILD_DEPENDS="Qt4-dev alsa-lib-dev dbus-dev ffmpeg-dev gettext-dev \
   555.7 -libmad-dev lua5.1-dev tar xorg-xcb-util-dev yasm expat-dev libxml2-dev \
   555.8 +libmad-dev lua5.1-dev tar xcb-util-dev yasm expat-dev libxml2-dev \
   555.9  util-linux-uuid-dev x264-dev flac-dev taglib-dev gnutls-dev libupnp-dev \
  555.10  libsamplerate-dev fribidi-dev zvbi-dev opus-dev gmp-dev ncurses-dev x265-dev"
  555.11  SPLIT="libvlc-dev libvlc $PACKAGE-locale"
  555.12 @@ -71,7 +71,7 @@
  555.13  			# Remove libtool archives
  555.14  			rm $fs/usr/lib/vlc/plugins/*/*.la
  555.15  			DEPENDS="alsa-lib dbus ffmpeg libmad lua5.1 tar x264 x265 \
  555.16 -			xorg-xcb-util zvbi nettle"
  555.17 +			xcb-util zvbi nettle"
  555.18  			CAT="multimedia|MPEG, VCD/DVD, and DivX library"
  555.19  			;;
  555.20  		vlc-locale)
   556.1 --- a/vnc2swf/receipt	Fri Dec 21 04:44:58 2018 +0200
   556.2 +++ b/vnc2swf/receipt	Sat Dec 22 04:52:35 2018 +0200
   556.3 @@ -11,9 +11,9 @@
   556.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   556.5  WGET_URL="$WEB_SITE/$TARBALL"
   556.6  
   556.7 -BUILD_DEPENDS="xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
   556.8 -xorg-libXaw-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXmu-dev \
   556.9 -xorg-libXpm-dev xorg-libXt-dev zlib-dev"
  556.10 +BUILD_DEPENDS="libice-dev libsm-dev libx11-dev libxau-dev \
  556.11 +libxaw-dev libxdmcp-dev libxext-dev libxmu-dev \
  556.12 +libxpm-dev libxt-dev zlib-dev"
  556.13  
  556.14  compile_rules() {
  556.15  	./configure \
  556.16 @@ -26,9 +26,9 @@
  556.17  genpkg_rules() {
  556.18  	mkdir -p $fs/usr/
  556.19  	cp -a $install/usr/X11R6/bin/ $fs/usr/
  556.20 -	DEPENDS="gcc-lib-base glibc-base xorg-libICE xorg-libSM xorg-libX11 \
  556.21 -	xorg-libXau xorg-libXaw xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm \
  556.22 -	xorg-libXt zlib"
  556.23 +	DEPENDS="gcc-lib-base glibc-base libice libsm libx11 \
  556.24 +	libxau libxaw libxdmcp libxext libxmu libxpm \
  556.25 +	libxt zlib"
  556.26  	SUGGESTED="x11vnc"
  556.27  	TAGS="vnc"
  556.28  }
   557.1 --- a/vte-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   557.2 +++ b/vte-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   557.3 @@ -44,12 +44,12 @@
   557.4  			;;
   557.5  		vte-gtk2)
   557.6  			copy @std @rm
   557.7 -			DEPENDS="atk cairo gdk-pixbuf glib gtk2 ncurses pango xorg-libX11"
   557.8 +			DEPENDS="atk cairo gdk-pixbuf glib gtk2 ncurses pango libx11"
   557.9  			;;
  557.10  		*-dev)
  557.11  			copy @dev
  557.12  			DEPENDS="vte-gtk2 vte-gtk2-terminal vte-gtk2-python \
  557.13 -			cairo-dev glib-dev gtk2-dev pango-dev xorg-libX11-dev"
  557.14 +			cairo-dev glib-dev gtk2-dev pango-dev libx11-dev"
  557.15  			;;
  557.16  	esac
  557.17  }
   558.1 --- a/warzone2100/receipt	Fri Dec 21 04:44:58 2018 +0200
   558.2 +++ b/warzone2100/receipt	Sat Dec 22 04:52:35 2018 +0200
   558.3 @@ -11,9 +11,9 @@
   558.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   558.5  WGET_URL="$SF_MIRROR/warzone2100/$TARBALL"
   558.6  
   558.7 -BUILD_DEPENDS="automake perl zip unzip gettext-dev qt5-dev xorg-libX11-dev \
   558.8 -libsdl2-dev libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
   558.9 -mesa-dev openssl-dev physfs-dev xorg-libXrandr-dev fribidi-dev \
  558.10 +BUILD_DEPENDS="automake perl zip unzip gettext-dev qt5-dev libx11-dev \
  558.11 +libsdl2-dev libpng-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
  558.12 +mesa-dev openssl-dev physfs-dev libxrandr-dev fribidi-dev \
  558.13  freetype-dev fontconfig-dev openssl-dev git"
  558.14  
  558.15  compile_rules() {
  558.16 @@ -34,6 +34,6 @@
  558.17  genpkg_rules() {
  558.18  	copy @std hicolor/ *.mo
  558.19  	DEPENDS="fontconfig freetype fribidi glew glib openssl glu \
  558.20 -	libharfbuzz libogg libpng16 libsdl2 libtheora libvorbis mesa openal \
  558.21 -	physfs qt5-base qt5-script xorg-libX11 xorg-libXrandr zlib   libsdl2-net"
  558.22 +	libharfbuzz libogg libpng libsdl2 libtheora libvorbis mesa openal \
  558.23 +	physfs qt5-base qt5-script libx11 libxrandr zlib   libsdl2-net"
  558.24  }
   559.1 --- a/waterline/receipt	Fri Dec 21 04:44:58 2018 +0200
   559.2 +++ b/waterline/receipt	Sat Dec 22 04:52:35 2018 +0200
   559.3 @@ -15,7 +15,7 @@
   559.4  
   559.5  BUILD_DEPENDS="automake gettext-dev intltool libtool gtk2-dev glib-dev \
   559.6  jansson-dev libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev \
   559.7 -libsde-utils-gtk-dev xorg-libXcomposite-dev menu-cache-dev alsa-lib-dev"
   559.8 +libsde-utils-gtk-dev libxcomposite-dev menu-cache-dev alsa-lib-dev"
   559.9  SPLIT="$PACKAGE-dev"
  559.10  
  559.11  COOKOPTS="!menus"
  559.12 @@ -38,7 +38,7 @@
  559.13  			copy @std
  559.14  			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 jansson libsde-utils \
  559.15  			libsde-utils-gtk libsde-utils-jansson libsde-utils-x11 menu-cache \
  559.16 -			pango xorg-libX11 xorg-libXcomposite"
  559.17 +			pango libx11 libxcomposite"
  559.18  			TAGS="desktop panel taskbar"
  559.19  			;;
  559.20  		*-dev)
   560.1 --- a/wbar/receipt	Fri Dec 21 04:44:58 2018 +0200
   560.2 +++ b/wbar/receipt	Sat Dec 22 04:52:35 2018 +0200
   560.3 @@ -11,7 +11,7 @@
   560.4  TARBALL="$PACKAGE-$VERSION.tbz2"
   560.5  WGET_URL="http://www.tecapli.com.ar/warlock/$TARBALL"
   560.6  
   560.7 -BUILD_DEPENDS="imlib2-dev xorg-libX11-dev"
   560.8 +BUILD_DEPENDS="imlib2-dev libx11-dev"
   560.9  
  560.10  compile_rules() {
  560.11  	sed -i 's|^LDFLAGS.*|& -lX11|' Makefile
   561.1 --- a/wbar2/receipt	Fri Dec 21 04:44:58 2018 +0200
   561.2 +++ b/wbar2/receipt	Sat Dec 22 04:52:35 2018 +0200
   561.3 @@ -12,7 +12,7 @@
   561.4  TARBALL="wbar-$VERSION.tgz"
   561.5  WGET_URL="http://wbar.googlecode.com/files/$TARBALL"
   561.6  
   561.7 -BUILD_DEPENDS="imlib2-dev gtk2-dev libglade-dev xorg-libX11-dev intltool file"
   561.8 +BUILD_DEPENDS="imlib2-dev gtk2-dev libglade-dev libx11-dev intltool file"
   561.9  
  561.10  compile_rules() {
  561.11  	./configure \
   562.1 --- a/webkit2gtk/receipt	Fri Dec 21 04:44:58 2018 +0200
   562.2 +++ b/webkit2gtk/receipt	Sat Dec 22 04:52:35 2018 +0200
   562.3 @@ -16,7 +16,7 @@
   562.4  BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
   562.5  harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
   562.6  libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
   562.7 -libnotify-dev gettext-dev sqlite3-dev xorg-libXt-dev"
   562.8 +libnotify-dev gettext-dev sqlite3-dev libxt-dev"
   562.9  SPLIT="$PACKAGE-dev"
  562.10  
  562.11  CFLAGS="${CFLAGS/-Os/-O2}"
  562.12 @@ -61,10 +61,10 @@
  562.13  			copy @std
  562.14  			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
  562.15  			gst1-plugins-base gstreamer1 gtk2 gtk3 icu libgcrypt libharfbuzz \
  562.16 -			libharfbuzz-icu libicu libjpeg-turbo libnotify libpng16 libsecret \
  562.17 +			libharfbuzz-icu libicu libjpeg-turbo libnotify libpng libsecret \
  562.18  			libsoup libsqlite3 libwebp libxml2 libxslt mesa mesa-libegl pango \
  562.19 -			xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXrender \
  562.20 -			xorg-libXt zlib"
  562.21 +			libx11 libxcomposite libxdamage libxrender \
  562.22 +			libxt zlib"
  562.23  			;;
  562.24  		*-dev)
  562.25  			copy @dev
   563.1 --- a/webkitgtk/receipt	Fri Dec 21 04:44:58 2018 +0200
   563.2 +++ b/webkitgtk/receipt	Sat Dec 22 04:52:35 2018 +0200
   563.3 @@ -18,9 +18,9 @@
   563.4  libnotify-dev gettext-dev"
   563.5  SPLIT="$PACKAGE-dev"
   563.6  
   563.7 -BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng16-dev \
   563.8 +BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng-dev \
   563.9  libwebp-dev glib-dev icu-dev libxml2-dev pango-dev enchant-dev gtk2-dev \
  563.10 -xorg-libXt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
  563.11 +libxt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
  563.12  harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext-dev \
  563.13  autoconf automake libtool"
  563.14  
  563.15 @@ -52,8 +52,8 @@
  563.16  			copy @std
  563.17  			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
  563.18  			gst1-plugins-base gstreamer1 gtk2 icu libharfbuzz libharfbuzz-icu \
  563.19 -			libicu libjpeg-turbo libpng16 libsecret libsoup libsqlite3 libwebp \
  563.20 -			libxml2 libxslt pango xorg-libX11 xorg-libXrender xorg-libXt zlib"
  563.21 +			libicu libjpeg-turbo libpng libsecret libsoup libsqlite3 libwebp \
  563.22 +			libxml2 libxslt pango libx11 libxrender libxt zlib"
  563.23  			;;
  563.24  		*-dev)
  563.25  			copy @dev
   564.1 --- a/wesnoth/receipt	Fri Dec 21 04:44:58 2018 +0200
   564.2 +++ b/wesnoth/receipt	Sat Dec 22 04:52:35 2018 +0200
   564.3 @@ -13,7 +13,7 @@
   564.4  
   564.5  BUILD_DEPENDS="cairo-dev pango-dev boost-dev boost-regex \
   564.6  boost-iostreams libsdl-dev libsdl-mixer-dev libsdl-ttf-dev libsdl-ttf \
   564.7 -libsdl-image-dev libsdl-net-dev libpng16-dev freetype-dev fontconfig-dev \
   564.8 +libsdl-image-dev libsdl-net-dev libpng-dev freetype-dev fontconfig-dev \
   564.9  findutils lua-dev boost-serialization autoconf automake fribidi-dev \
  564.10  boost-system boost-program-options boost-filesystem boost-locale \
  564.11  libvorbis-dev cmake gettext"
  564.12 @@ -32,8 +32,8 @@
  564.13  		wesnoth)
  564.14  			DEPENDS="libsdl libsdl-mixer libsdl-ttf libsdl-net \
  564.15  			libsdl-image zlib pango cairo fontconfig \
  564.16 -			boost-regex boost-iostreams libpng16 fribidi \
  564.17 -			gcc-lib-base xorg-xcb-util boost-system \
  564.18 +			boost-regex boost-iostreams libpng fribidi \
  564.19 +			gcc-lib-base xcb-util boost-system \
  564.20  			boost-program-options"
  564.21  			# programs
  564.22  			mkdir -p $fs/usr/bin
   565.1 --- a/weston/receipt	Fri Dec 21 04:44:58 2018 +0200
   565.2 +++ b/weston/receipt	Sat Dec 22 04:52:35 2018 +0200
   565.3 @@ -12,9 +12,9 @@
   565.4  WGET_URL="http://wayland.freedesktop.org/releases/$TARBALL"
   565.5  
   565.6  BUILD_DEPENDS="wayland-dev mesa-dev cairo-gl-dev libxkbcommon-dev \
   565.7 -libunwind-dev mtdev-dev xorg-libXcursor-dev pam-dev xz-dev \
   565.8 -gegl-dev libdrm-dev xorg-libXxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \
   565.9 -xorg-libxshmfence-dev"
  565.10 +libunwind-dev mtdev-dev libxcursor-dev pam-dev xz-dev \
  565.11 +gegl-dev libdrm-dev libxxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \
  565.12 +libxshmfence-dev"
  565.13  SPLIT="$PACKAGE-dev"
  565.14  
  565.15  compile_rules() {
  565.16 @@ -35,10 +35,10 @@
  565.17  	case $PACKAGE in
  565.18  		weston)
  565.19  			copy @std
  565.20 -			DEPENDS="cairo-gl eudev libdrm libjpeg-turbo libpng16 libunwind \
  565.21 +			DEPENDS="cairo-gl eudev libdrm libjpeg-turbo libpng libunwind \
  565.22  			libxkbcommon-wayland mesa mesa-libegl mesa-libgbm \
  565.23 -			mesa-libwayland-egl mtdev pam wayland xorg-libX11 xorg-libXcursor \
  565.24 -			xorg-libxcb xorg-pixman"
  565.25 +			mesa-libwayland-egl mtdev pam wayland libx11 libxcursor \
  565.26 +			libxcb pixman"
  565.27  			;;
  565.28  		*-dev)
  565.29  			copy @dev
   566.1 --- a/wine-rt/receipt	Fri Dec 21 04:44:58 2018 +0200
   566.2 +++ b/wine-rt/receipt	Sat Dec 22 04:52:35 2018 +0200
   566.3 @@ -13,7 +13,7 @@
   566.4  WGET_URL="$SF_MIRROR/wine/$TARBALL"
   566.5  
   566.6  BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev glu-dev freetype-dev \
   566.7 -libtool libxml2-dev libxslt-dev lcms-dev jpeg-dev libpng16-dev tiff-dev prelink"
   566.8 +libtool libxml2-dev libxslt-dev lcms-dev jpeg-dev libpng-dev tiff-dev prelink"
   566.9  SPLIT="$PACKAGE-dev"
  566.10  
  566.11  compile_rules() {
  566.12 @@ -54,7 +54,7 @@
  566.13  			cp -a $install/usr/lib/lib* $fs/usr/lib
  566.14  			cp -a $install/usr/lib/wine/*.so $fs/usr/lib/wine
  566.15  			DEPENDS="alsa-lib libxml2 libxslt mesa glu xorg-dev lcms \
  566.16 -			freetype jpeg libpng16 tiff"
  566.17 +			freetype jpeg libpng tiff"
  566.18  			PROVIDE="wine"
  566.19  			TAGS="windows"
  566.20  			;;
   567.1 --- a/wine/receipt	Fri Dec 21 04:44:58 2018 +0200
   567.2 +++ b/wine/receipt	Sat Dec 22 04:52:35 2018 +0200
   567.3 @@ -13,7 +13,7 @@
   567.4  
   567.5  BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev freetype-dev libtool \
   567.6  glu-dev libxml2-dev libxslt-dev lcms-dev prelink cups-dev dbus-dev \
   567.7 -jpeg-dev libpng16-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
   567.8 +jpeg-dev libpng-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
   567.9  SPLIT="$PACKAGE-dev"
  567.10  
  567.11  compile_rules() {
   568.1 --- a/winetricks/receipt	Fri Dec 21 04:44:58 2018 +0200
   568.2 +++ b/winetricks/receipt	Sat Dec 22 04:52:35 2018 +0200
   568.3 @@ -15,6 +15,6 @@
   568.4  	mkdir -p $fs/usr/bin
   568.5  	cp -a $src/$PACKAGE-$VERSION $fs/usr/bin/$PACKAGE
   568.6  	chmod a+x $fs/usr/bin/$PACKAGE
   568.7 -	DEPENDS="wine cabextract xorg-xmessage unzip wget"
   568.8 +	DEPENDS="wine cabextract xmessage unzip wget"
   568.9  	SUGGESTED="zenity-gtk2"
  568.10  }
   569.1 --- a/wireshark/receipt	Fri Dec 21 04:44:58 2018 +0200
   569.2 +++ b/wireshark/receipt	Sat Dec 22 04:52:35 2018 +0200
   569.3 @@ -29,7 +29,7 @@
   569.4  genpkg_rules() {
   569.5  	copy @std
   569.6  	DEPENDS="cairo gdk-pixbuf glib gtk2 libcap libgcrypt libgnutls libpcap \
   569.7 -	libxml2 pango zlib   libgpg-error xorg-libXdamage libcomerr3 attr \
   569.8 +	libxml2 pango zlib   libgpg-error libxdamage libcomerr3 attr \
   569.9  	portaudio libkrb5"
  569.10  	TAGS="network analysis"
  569.11  }
   570.1 --- a/wordwarvi/receipt	Fri Dec 21 04:44:58 2018 +0200
   570.2 +++ b/wordwarvi/receipt	Sat Dec 22 04:52:35 2018 +0200
   570.3 @@ -12,7 +12,7 @@
   570.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   570.5  
   570.6  BUILD_DEPENDS="libvorbis-dev libogg-dev portaudio portaudio-dev gtk2-dev \
   570.7 -xorg-libXrender-dev xorg-xorgproto xorg-pixman-dev \
   570.8 +libxrender-dev xorgproto pixman-dev \
   570.9  glib-dev"
  570.10  
  570.11  compile_rules() {
  570.12 @@ -24,9 +24,9 @@
  570.13  
  570.14  genpkg_rules() {
  570.15  	copy @std
  570.16 -	DEPENDS="portaudio expat gtk2 libvorbis xorg-libX11 xorg-libXau \
  570.17 -	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
  570.18 -	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
  570.19 -	xorg-libXdamage"
  570.20 +	DEPENDS="portaudio expat gtk2 libvorbis libx11 libxau \
  570.21 +	libxcomposite libxcursor libxdmcp libxext \
  570.22 +	libxfixes libxinerama libxrandr libxrender \
  570.23 +	libxdamage"
  570.24  	TAGS="shooting"
  570.25  }
   571.1 --- a/workerfm/receipt	Fri Dec 21 04:44:58 2018 +0200
   571.2 +++ b/workerfm/receipt	Sat Dec 22 04:52:35 2018 +0200
   571.3 @@ -12,7 +12,7 @@
   571.4  WGET_URL="$WEB_SITE/downloads/$TARBALL"
   571.5  
   571.6  BUILD_DEPENDS="avfs-dev dbus-glib-dev freetype-dev hal-dev libmagic-dev \
   571.7 -xorg-libX11-dev xorg-libXft-dev xorg-libXinerama-dev"
   571.8 +libx11-dev libxft-dev libxinerama-dev"
   571.9  
  571.10  compile_rules() {
  571.11  	./configure \
  571.12 @@ -24,6 +24,6 @@
  571.13  
  571.14  genpkg_rules() {
  571.15  	copy @std
  571.16 -	DEPENDS="avfs dbus hal libmagic xorg-libX11 xorg-libXinerama \
  571.17 -	   xorg-xmessage"
  571.18 +	DEPENDS="avfs dbus hal libmagic libx11 libxinerama \
  571.19 +	   xmessage"
  571.20  }
   572.1 --- a/wv/receipt	Fri Dec 21 04:44:58 2018 +0200
   572.2 +++ b/wv/receipt	Sat Dec 22 04:52:35 2018 +0200
   572.3 @@ -12,7 +12,7 @@
   572.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   572.5  WGET_URL="http://www.abisource.com/downloads/wv/$VERSION/$TARBALL"
   572.6  
   572.7 -BUILD_DEPENDS="libgsf-dev glib-dev libxml2-dev libpng16-dev"
   572.8 +BUILD_DEPENDS="libgsf-dev glib-dev libxml2-dev libpng-dev"
   572.9  SPLIT="$PACKAGE-dev"
  572.10  
  572.11  compile_rules() {
   573.1 --- a/wxWidgets/receipt	Fri Dec 21 04:44:58 2018 +0200
   573.2 +++ b/wxWidgets/receipt	Sat Dec 22 04:52:35 2018 +0200
   573.3 @@ -13,8 +13,8 @@
   573.4  WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
   573.5  
   573.6  BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
   573.7 -xorg-dev xorg-xorgproto glu mesa-dev libpng16-dev tiff-dev \
   573.8 -jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
   573.9 +xorg-dev xorgproto glu mesa-dev libpng-dev tiff-dev \
  573.10 +jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
  573.11  SPLIT="$PACKAGE-dev"
  573.12  
  573.13  compile_rules() {
  573.14 @@ -44,11 +44,11 @@
  573.15  			# Remove devel files.
  573.16  			rm -rf $fs/usr/lib/wx/include
  573.17  			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
  573.18 -			gtk2 cairo fontconfig freetype jpeg libpng16 tiff pango \
  573.19 -			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
  573.20 -			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
  573.21 -			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
  573.22 -			xorg-libXinerama xorg-libXrender xorg-libXxf86vm mesa"
  573.23 +			gtk2 cairo fontconfig freetype jpeg libpng tiff pango \
  573.24 +			pixman util-linux-uuid libsm libice libx11 \
  573.25 +			libxau libxcomposite libxcursor libxdamage \
  573.26 +			libxdmcp libxext glu libxfixes \
  573.27 +			libxinerama libxrender libxxf86vm mesa"
  573.28  			;;
  573.29  		*-dev)
  573.30  			mkdir -p $fs/usr/lib/wx
  573.31 @@ -59,8 +59,8 @@
  573.32  
  573.33  			cp -a $install/usr/share $fs/usr
  573.34  			rm -r $fs/usr/share/locale
  573.35 -			DEPENDS="wxWidgets gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
  573.36 -			xorg-libICE-dev expat zlib"
  573.37 +			DEPENDS="wxWidgets gtk2-dev libxinerama-dev libsm-dev \
  573.38 +			libice-dev expat zlib"
  573.39  			;;
  573.40  	esac
  573.41  }
   574.1 --- a/wxWidgets28/receipt	Fri Dec 21 04:44:58 2018 +0200
   574.2 +++ b/wxWidgets28/receipt	Sat Dec 22 04:52:35 2018 +0200
   574.3 @@ -13,8 +13,8 @@
   574.4  WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
   574.5  
   574.6  BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
   574.7 -xorg-dev xorg-xorgproto glu mesa-dev libpng12-dev tiff-dev \
   574.8 -jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
   574.9 +xorg-dev xorgproto glu mesa-dev libpng12-dev tiff-dev \
  574.10 +jpeg-dev libxpm-dev patch libxshmfence-dev glu-dev"
  574.11  SPLIT="$PACKAGE-dev"
  574.12  
  574.13  compile_rules() {
  574.14 @@ -50,10 +50,10 @@
  574.15  			rm -rf $fs/usr/lib/wx/include
  574.16  			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
  574.17  			gtk2 cairo fontconfig freetype jpeg libpng12 tiff pango \
  574.18 -			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
  574.19 -			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
  574.20 -			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
  574.21 -			xorg-libXinerama xorg-libXrender xorg-libXxf86vm mesa"
  574.22 +			pixman util-linux-uuid libsm libice libx11 \
  574.23 +			libxau libxcomposite libxcursor libxdamage \
  574.24 +			libxdmcp libxext glu libxfixes \
  574.25 +			libxinerama libxrender libxxf86vm mesa"
  574.26  			;;
  574.27  		*-dev)
  574.28  			mkdir -p $fs/usr/lib/wx
  574.29 @@ -64,8 +64,8 @@
  574.30  
  574.31  			cp -a $install/usr/share $fs/usr
  574.32  			rm -r $fs/usr/share/locale
  574.33 -			DEPENDS="wxWidgets28 gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
  574.34 -			xorg-libICE-dev expat zlib"
  574.35 +			DEPENDS="wxWidgets28 gtk2-dev libxinerama-dev libsm-dev \
  574.36 +			libice-dev expat zlib"
  574.37  			;;
  574.38  	esac
  574.39  }
   575.1 --- a/wxdfast/receipt	Fri Dec 21 04:44:58 2018 +0200
   575.2 +++ b/wxdfast/receipt	Sat Dec 22 04:52:35 2018 +0200
   575.3 @@ -22,5 +22,5 @@
   575.4  
   575.5  genpkg_rules() {
   575.6  	copy @std
   575.7 -	DEPENDS="wxWidgets28 xorg-libXdamage xorg-libXxf86vm"
   575.8 +	DEPENDS="wxWidgets28 libxdamage libxxf86vm"
   575.9  }
   576.1 --- a/x11rec/receipt	Fri Dec 21 04:44:58 2018 +0200
   576.2 +++ b/x11rec/receipt	Sat Dec 22 04:52:35 2018 +0200
   576.3 @@ -15,5 +15,5 @@
   576.4  genpkg_rules() {
   576.5  	mkdir -p $fs/usr/bin
   576.6  	cp -a $src/x11rec $fs/usr/bin
   576.7 -	DEPENDS="ruby imagemagick xorg-xwininfo gifsicle"
   576.8 +	DEPENDS="ruby imagemagick xwininfo gifsicle"
   576.9  }
   577.1 --- a/x11vnc/receipt	Fri Dec 21 04:44:58 2018 +0200
   577.2 +++ b/x11vnc/receipt	Sat Dec 22 04:52:35 2018 +0200
   577.3 @@ -11,7 +11,7 @@
   577.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   577.5  WGET_URL="$SF_MIRROR/libvncserver/$TARBALL"
   577.6  
   577.7 -BUILD_DEPENDS="openssl-dev jpeg-dev xorg-libX11-dev zlib-dev xorg-libXext-dev"
   577.8 +BUILD_DEPENDS="openssl-dev jpeg-dev libx11-dev zlib-dev libxext-dev"
   577.9  SPLIT="$PACKAGE-extra"
  577.10  
  577.11  compile_rules() {
  577.12 @@ -27,7 +27,7 @@
  577.13  	case $PACKAGE in
  577.14  		x11vnc)
  577.15  			copy x11vnc
  577.16 -			DEPENDS="xorg-libXtst openssl jpeg xorg-libXdamage zlib"
  577.17 +			DEPENDS="libxtst openssl jpeg libxdamage zlib"
  577.18  			TAGS="vnc server"
  577.19  			;;
  577.20  		x11vnc-extra)
   578.1 --- a/xaos/receipt	Fri Dec 21 04:44:58 2018 +0200
   578.2 +++ b/xaos/receipt	Sat Dec 22 04:52:35 2018 +0200
   578.3 @@ -11,8 +11,8 @@
   578.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   578.5  WGET_URL="$SF_MIRROR/xaos/$TARBALL"
   578.6  
   578.7 -BUILD_DEPENDS="gettext-dev xorg-libX11-dev xorg-libICE-dev libpng16-dev \
   578.8 -xorg-libXext-dev gsl-dev nasm"
   578.9 +BUILD_DEPENDS="gettext-dev libx11-dev libice-dev libpng-dev \
  578.10 +libxext-dev gsl-dev nasm"
  578.11  
  578.12  compile_rules() {
  578.13  	./configure $CONFIGURE_ARGS &&
  578.14 @@ -22,5 +22,5 @@
  578.15  
  578.16  genpkg_rules() {
  578.17  	copy bin/ XaoS/ locale/
  578.18 -	DEPENDS="gsl libpng16 xorg-libX11 xorg-libXext zlib"
  578.19 +	DEPENDS="gsl libpng libx11 libxext zlib"
  578.20  }
   579.1 --- a/xarchive/receipt	Fri Dec 21 04:44:58 2018 +0200
   579.2 +++ b/xarchive/receipt	Sat Dec 22 04:52:35 2018 +0200
   579.3 @@ -28,7 +28,7 @@
   579.4  	cp -a $install/usr/bin $fs/usr
   579.5  	sed -i 's|#!\s*/bin/bash|#!/bin/sh|' $install/usr/lib/xarchive/wrappers/*
   579.6  	cp $stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers
   579.7 -	DEPENDS="gtk2 xorg-libXdamage"
   579.8 +	DEPENDS="gtk2 libxdamage"
   579.9  	SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs \
  579.10  	cabextract xz lrzip"
  579.11  }
   580.1 --- a/xautomation/receipt	Fri Dec 21 04:44:58 2018 +0200
   580.2 +++ b/xautomation/receipt	Sat Dec 22 04:52:35 2018 +0200
   580.3 @@ -11,7 +11,7 @@
   580.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   580.5  WGET_URL="http://hoopajoo.net/static/projects/$TARBALL"
   580.6  
   580.7 -BUILD_DEPENDS="xorg-libX11-dev libpng16-dev xorg-libXtst-dev"
   580.8 +BUILD_DEPENDS="libx11-dev libpng-dev libxtst-dev"
   580.9  
  580.10  compile_rules() {
  580.11  	./configure $CONFIGURE_ARGS &&
  580.12 @@ -22,5 +22,5 @@
  580.13  genpkg_rules() {
  580.14  	mkdir -p $fs/usr
  580.15  	cp -a $install/usr/bin $fs/usr
  580.16 -	DEPENDS="xorg-libX11 libpng16"
  580.17 +	DEPENDS="libx11 libpng"
  580.18  }
   581.1 --- a/xbattle/receipt	Fri Dec 21 04:44:58 2018 +0200
   581.2 +++ b/xbattle/receipt	Sat Dec 22 04:52:35 2018 +0200
   581.3 @@ -11,7 +11,7 @@
   581.4  TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
   581.5  WGET_URL="$WEB_SITE/downloads/$VERSION/$TARBALL"
   581.6  
   581.7 -BUILD_DEPENDS="xorg-imake xorg-dev"
   581.8 +BUILD_DEPENDS="imake xorg-dev"
   581.9  
  581.10  compile_rules() {
  581.11  	xmkmf
  581.12 @@ -22,5 +22,5 @@
  581.13  genpkg_rules() {
  581.14  	copy @std
  581.15  	DEPENDS="xorg"
  581.16 -	SUGGESTED="xorg-xhost"
  581.17 +	SUGGESTED="xhost"
  581.18  }
   582.1 --- a/xbill/receipt	Fri Dec 21 04:44:58 2018 +0200
   582.2 +++ b/xbill/receipt	Sat Dec 22 04:52:35 2018 +0200
   582.3 @@ -11,7 +11,7 @@
   582.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   582.5  WGET_URL="$WEB_SITE/download/$TARBALL"
   582.6  
   582.7 -BUILD_DEPENDS="gtk2-dev xorg-libXaw-dev lesstif-dev"
   582.8 +BUILD_DEPENDS="gtk2-dev libxaw-dev lesstif-dev"
   582.9  
  582.10  compile_rules() {
  582.11  	./configure \
  582.12 @@ -29,5 +29,5 @@
  582.13  	mkdir -p $fs/usr/share
  582.14  	cp -a $install/usr/bin $fs/usr
  582.15  	cp -a $install/usr/share/xbill $fs/usr/share
  582.16 -	DEPENDS="gtk2 xorg-libXaw lesstif"
  582.17 +	DEPENDS="gtk2 libxaw lesstif"
  582.18  }
   583.1 --- a/xbindkeys/receipt	Fri Dec 21 04:44:58 2018 +0200
   583.2 +++ b/xbindkeys/receipt	Sat Dec 22 04:52:35 2018 +0200
   583.3 @@ -11,7 +11,7 @@
   583.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   583.5  WGET_URL="$WEB_SITE$TARBALL"
   583.6  
   583.7 -BUILD_DEPENDS="xorg-libX11-dev"
   583.8 +BUILD_DEPENDS="libx11-dev"
   583.9  
  583.10  compile_rules() {
  583.11  	./configure \
  583.12 @@ -24,6 +24,6 @@
  583.13  
  583.14  genpkg_rules() {
  583.15  	copy @std
  583.16 -	DEPENDS="xorg-libX11"
  583.17 +	DEPENDS="libx11"
  583.18  	TAGS="keyboard"
  583.19  }
   584.1 --- a/xcb-util-xrm/receipt	Fri Dec 21 04:44:58 2018 +0200
   584.2 +++ b/xcb-util-xrm/receipt	Sat Dec 22 04:52:35 2018 +0200
   584.3 @@ -11,7 +11,7 @@
   584.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   584.5  WGET_URL="https://github.com/Airblader/xcb-util-xrm/releases/download/v$VERSION/$TARBALL"
   584.6  
   584.7 -BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-libX11-dev"
   584.8 +BUILD_DEPENDS="libxcb-dev xorg-xcb-util-dev libx11-dev"
   584.9  SPLIT="$PACKAGE-dev"
  584.10  
  584.11  compile_rules() {
  584.12 @@ -25,11 +25,11 @@
  584.13  	case $PACKAGE in
  584.14  		xcb-util-xrm)
  584.15  			copy @std
  584.16 -			DEPENDS="xorg-libxcb xorg-xcb-util"
  584.17 +			DEPENDS="libxcb xorg-xcb-util"
  584.18  			;;
  584.19  		*-dev)
  584.20  			copy @dev
  584.21 -			DEPENDS="xcb-util-xrm xorg-libxcb-dev xorg-xcb-util-dev"
  584.22 +			DEPENDS="xcb-util-xrm libxcb-dev xorg-xcb-util-dev"
  584.23  			;;
  584.24  	esac
  584.25  }
   585.1 --- a/xchat/receipt	Fri Dec 21 04:44:58 2018 +0200
   585.2 +++ b/xchat/receipt	Sat Dec 22 04:52:35 2018 +0200
   585.3 @@ -46,11 +46,11 @@
   585.4  	case $PACKAGE in
   585.5  		xchat)
   585.6  			copy @std
   585.7 -			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
   585.8 +			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core libx11"
   585.9  			;;
  585.10  		xchat-plugin)
  585.11  			copy @std
  585.12 -			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
  585.13 +			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core libx11"
  585.14  			PROVIDE="xchat"
  585.15  			CAT="network|with plugins support"
  585.16  			;;
   586.1 --- a/xchm/receipt	Fri Dec 21 04:44:58 2018 +0200
   586.2 +++ b/xchm/receipt	Sat Dec 22 04:52:35 2018 +0200
   586.3 @@ -24,5 +24,5 @@
   586.4  	cp -a $install/usr/bin $fs/usr
   586.5  	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
   586.6  	cp -a $install/usr/share/pixmaps $fs/usr/share
   586.7 -	DEPENDS="wxWidgets28 chmlib xorg-libXdamage xorg-libXxf86vm"
   586.8 +	DEPENDS="wxWidgets28 chmlib libxdamage libxxf86vm"
   586.9  }
   587.1 --- a/xcircuit/receipt	Fri Dec 21 04:44:58 2018 +0200
   587.2 +++ b/xcircuit/receipt	Sat Dec 22 04:52:35 2018 +0200
   587.3 @@ -11,7 +11,7 @@
   587.4  TARBALL="$PACKAGE-$VERSION.tgz"
   587.5  WGET_URL="http://opencircuitdesign.com/xcircuit/archive/$TARBALL"
   587.6  
   587.7 -BUILD_DEPENDS="tk-dev tcl-dev xorg-libXpm-dev xorg-libXt-dev zlib-dev automake"
   587.8 +BUILD_DEPENDS="tk-dev tcl-dev libxpm-dev libxt-dev zlib-dev automake"
   587.9  
  587.10  compile_rules() {
  587.11  	cd $src/$PACKAGE-$VERSION
  587.12 @@ -28,5 +28,5 @@
  587.13  	mkdir -p $fs/usr/lib
  587.14  	cp -a $install/usr/bin $fs/usr
  587.15  	cp -a $install/usr/lib/$PACKAGE-${VERSION%.*} $fs/usr/lib
  587.16 -	DEPENDS="tcl tk xorg-libXpm zlib"
  587.17 +	DEPENDS="tcl tk libxpm zlib"
  587.18  }
   588.1 --- a/xcursor-aero/receipt	Fri Dec 21 04:44:58 2018 +0200
   588.2 +++ b/xcursor-aero/receipt	Sat Dec 22 04:52:35 2018 +0200
   588.3 @@ -19,6 +19,6 @@
   588.4  
   588.5  genpkg_rules() {
   588.6  	copy @std
   588.7 -	DEPENDS="xorg-libXcursor"
   588.8 +	DEPENDS="libxcursor"
   588.9  	TAGS="cursor-theme"
  588.10  }
   589.1 --- a/xcursor-comix/receipt	Fri Dec 21 04:44:58 2018 +0200
   589.2 +++ b/xcursor-comix/receipt	Sat Dec 22 04:52:35 2018 +0200
   589.3 @@ -12,7 +12,7 @@
   589.4  TARBALL="ComixCursors-$VERSION.tar.bz2"
   589.5  WGET_URL="https://gitlab.com/limitland/comixcursors/repository/${COMMIT:-$VERSION}/archive.tar.bz2"
   589.6  
   589.7 -BUILD_DEPENDS="bc rsvg-convert coreutils-numeric xorg-xcursorgen symlinks"
   589.8 +BUILD_DEPENDS="bc rsvg-convert coreutils-numeric xcursorgen symlinks"
   589.9  SPLIT="$PACKAGE-opaque-white $PACKAGE"
  589.10  
  589.11  compile_rules() {
  589.12 @@ -32,6 +32,6 @@
  589.13  			copy @std @rm
  589.14  			;;
  589.15  	esac
  589.16 -	DEPENDS="xorg-libXcursor"
  589.17 +	DEPENDS="libxcursor"
  589.18  	TAGS="cursor-theme"
  589.19  }
   590.1 --- a/xcursor-human/receipt	Fri Dec 21 04:44:58 2018 +0200
   590.2 +++ b/xcursor-human/receipt	Sat Dec 22 04:52:35 2018 +0200
   590.3 @@ -23,6 +23,6 @@
   590.4  
   590.5  genpkg_rules() {
   590.6  	copy @std
   590.7 -	DEPENDS="xorg-libXcursor"
   590.8 +	DEPENDS="libxcursor"
   590.9  	TAGS="cursor-theme"
  590.10  }
   591.1 --- a/xcursor-obsidian/receipt	Fri Dec 21 04:44:58 2018 +0200
   591.2 +++ b/xcursor-obsidian/receipt	Sat Dec 22 04:52:35 2018 +0200
   591.3 @@ -23,6 +23,6 @@
   591.4  
   591.5  genpkg_rules() {
   591.6  	copy @std
   591.7 -	DEPENDS="xorg-libXcursor"
   591.8 +	DEPENDS="libxcursor"
   591.9  	TAGS="cursor-theme"
  591.10  }
   592.1 --- a/xdigger/receipt	Fri Dec 21 04:44:58 2018 +0200
   592.2 +++ b/xdigger/receipt	Sat Dec 22 04:52:35 2018 +0200
   592.3 @@ -11,7 +11,7 @@
   592.4  TARBALL="$PACKAGE-$VERSION.tgz"
   592.5  WGET_URL="$(dirname $WEB_SITE)/$TARBALL"
   592.6  
   592.7 -BUILD_DEPENDS="xorg-imake xorg-dev"
   592.8 +BUILD_DEPENDS="imake xorg-dev"
   592.9  
  592.10  compile_rules() {
  592.11  	sed -i 's| inpause) step = Tr.*|&\nwait_count = 0;|;s| && cheat||' runlevels.c
   593.1 --- a/xdotool/receipt	Fri Dec 21 04:44:58 2018 +0200
   593.2 +++ b/xdotool/receipt	Sat Dec 22 04:52:35 2018 +0200
   593.3 @@ -11,7 +11,7 @@
   593.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   593.5  WGET_URL="http://semicomplete.googlecode.com/files/$TARBALL" # FIXME
   593.6  
   593.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev xorg-libXtst xorg-dev perl"
   593.8 +BUILD_DEPENDS="libx11-dev libxtst-dev xorg-dev perl"
   593.9  
  593.10  compile_rules() {
  593.11  	make &&
  593.12 @@ -25,5 +25,5 @@
  593.13  genpkg_rules() {
  593.14  	mkdir -p $fs/usr
  593.15  	cp -a $install/usr/bin $install/usr/lib $fs/usr
  593.16 -	DEPENDS="xorg-libX11 xorg-libXtst"
  593.17 +	DEPENDS="libx11 libxtst"
  593.18  }
   594.1 --- a/xfce4-battery-plugin/receipt	Fri Dec 21 04:44:58 2018 +0200
   594.2 +++ b/xfce4-battery-plugin/receipt	Sat Dec 22 04:52:35 2018 +0200
   594.3 @@ -12,7 +12,7 @@
   594.4  WGET_URL="http://archive.xfce.org/src/panel-plugins/$PACKAGE/${VERSION%.*}/$TARBALL"
   594.5  
   594.6  BUILD_DEPENDS="intltool gtk2-dev libxfce4util-dev libxfce4ui-dev \
   594.7 -xfce4-panel-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   594.8 +xfce4-panel-dev libsm-dev startup-notification-dev xcb-util-dev"
   594.9  
  594.10  compile_rules() {
  594.11  	./configure \
   595.1 --- a/xfce4-dict/receipt	Fri Dec 21 04:44:58 2018 +0200
   595.2 +++ b/xfce4-dict/receipt	Sat Dec 22 04:52:35 2018 +0200
   595.3 @@ -11,8 +11,8 @@
   595.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   595.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   595.6  
   595.7 -BUILD_DEPENDS="intltool gtk2-dev libxfce4ui-dev xfce4-panel-dev xorg-libSM-dev \
   595.8 -startup-notification-dev xorg-xcb-util-dev"
   595.9 +BUILD_DEPENDS="intltool gtk2-dev libxfce4ui-dev xfce4-panel-dev libsm-dev \
  595.10 +startup-notification-dev xcb-util-dev"
  595.11  
  595.12  compile_rules() {
  595.13  	./configure \
  595.14 @@ -26,6 +26,6 @@
  595.15  genpkg_rules() {
  595.16  	copy @std
  595.17  	DEPENDS="gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango xfce4-panel \
  595.18 -	xorg-libX11"
  595.19 +	libx11"
  595.20  	TAGS="Xfce"
  595.21  }
   596.1 --- a/xfce4-mixer/receipt	Fri Dec 21 04:44:58 2018 +0200
   596.2 +++ b/xfce4-mixer/receipt	Sat Dec 22 04:52:35 2018 +0200
   596.3 @@ -13,7 +13,7 @@
   596.4  
   596.5  BUILD_DEPENDS="intltool dbus-glib-dev gst0-plugins-base-dev gtk2-dev \
   596.6  libunique-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev keybinder-dev \
   596.7 -startup-notification-dev xorg-xcb-util-dev"
   596.8 +startup-notification-dev xcb-util-dev"
   596.9  
  596.10  compile_rules() {
  596.11  	./configure \
   597.1 --- a/xfce4-notifyd/receipt	Fri Dec 21 04:44:58 2018 +0200
   597.2 +++ b/xfce4-notifyd/receipt	Sat Dec 22 04:52:35 2018 +0200
   597.3 @@ -11,7 +11,7 @@
   597.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   597.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   597.6  
   597.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev libxfce4util-dev \
   597.8 +BUILD_DEPENDS="intltool libx11-dev libice-dev libxfce4util-dev \
   597.9  libxfce4ui-dev libnotify-dev"
  597.10  
  597.11  compile_rules() {
  597.12 @@ -27,6 +27,6 @@
  597.13  	# */bin/*-config usually a dev file, but not in this case
  597.14  	copy @std xfce4-notifyd-config
  597.15  	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
  597.16 -	libxfce4util xfconf xorg-libX11"
  597.17 +	libxfce4util xfconf libx11"
  597.18  	TAGS="Xfce"
  597.19  }
   598.1 --- a/xfce4-panel/receipt	Fri Dec 21 04:44:58 2018 +0200
   598.2 +++ b/xfce4-panel/receipt	Sat Dec 22 04:52:35 2018 +0200
   598.3 @@ -11,8 +11,8 @@
   598.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   598.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   598.6  
   598.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev libxfce4util-dev \
   598.8 -garcon-dev exo-dev libwnck2-dev xorg-libSM-dev"
   598.9 +BUILD_DEPENDS="intltool libx11-dev libice-dev libxfce4util-dev \
  598.10 +garcon-dev exo-dev libwnck2-dev libsm-dev"
  598.11  SPLIT="$PACKAGE-dev"
  598.12  
  598.13  compile_rules() {
  598.14 @@ -30,8 +30,8 @@
  598.15  		xfce4-panel)
  598.16  			copy @std
  598.17  			DEPENDS="atk cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
  598.18 -			libwnck2 libxfce4ui libxfce4util pango xfconf xorg-libX11 \
  598.19 -			xorg-libXext"
  598.20 +			libwnck2 libxfce4ui libxfce4util pango xfconf libx11 \
  598.21 +			libxext"
  598.22  			;;
  598.23  		*-dev)
  598.24  			copy @dev
   599.1 --- a/xfce4-power-manager/receipt	Fri Dec 21 04:44:58 2018 +0200
   599.2 +++ b/xfce4-power-manager/receipt	Sat Dec 22 04:52:35 2018 +0200
   599.3 @@ -12,8 +12,8 @@
   599.4  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   599.5  
   599.6  BUILD_DEPENDS="intltool gtk2-dev dbus-dev dbus-glib-dev xfconf-dev \
   599.7 -libxfce4ui-dev libnotify-dev upower-dev xorg-libXrandr-dev xfce4-panel-dev \
   599.8 -xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   599.9 +libxfce4ui-dev libnotify-dev upower-dev libxrandr-dev xfce4-panel-dev \
  599.10 +libsm-dev startup-notification-dev xcb-util-dev"
  599.11  
  599.12  compile_rules() {
  599.13  	./configure \
  599.14 @@ -27,7 +27,7 @@
  599.15  genpkg_rules() {
  599.16  	copy @std
  599.17  	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
  599.18 -	libxfce4util pango upower xfce4-panel xfconf xorg-libX11 xorg-libXext \
  599.19 -	xorg-libXrandr"
  599.20 +	libxfce4util pango upower xfce4-panel xfconf libx11 libxext \
  599.21 +	libxrandr"
  599.22  	TAGS="Xfce"
  599.23  }
   600.1 --- a/xfce4-screenshooter/receipt	Fri Dec 21 04:44:58 2018 +0200
   600.2 +++ b/xfce4-screenshooter/receipt	Sat Dec 22 04:52:35 2018 +0200
   600.3 @@ -11,9 +11,9 @@
   600.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   600.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   600.6  
   600.7 -BUILD_DEPENDS="intltool xfce4-panel-dev libsoup-dev xorg-libXfixes-dev \
   600.8 -libxfce4ui-dev exo-dev xorg-libSM-dev startup-notification-dev \
   600.9 -xorg-xcb-util-dev"
  600.10 +BUILD_DEPENDS="intltool xfce4-panel-dev libsoup-dev libxfixes-dev \
  600.11 +libxfce4ui-dev exo-dev libsm-dev startup-notification-dev \
  600.12 +xcb-util-dev"
  600.13  
  600.14  compile_rules() {
  600.15  	./configure \
  600.16 @@ -27,6 +27,6 @@
  600.17  genpkg_rules() {
  600.18  	copy @std
  600.19  	DEPENDS="cairo exo gdk-pixbuf glib gtk2 libsoup libxfce4ui libxfce4util \
  600.20 -	libxml2 xfce4-panel xorg-libX11 xorg-libXext xorg-libXfixes"
  600.21 +	libxml2 xfce4-panel libx11 libxext libxfixes"
  600.22  	TAGS="Xfce"
  600.23  }
   601.1 --- a/xfce4-session/receipt	Fri Dec 21 04:44:58 2018 +0200
   601.2 +++ b/xfce4-session/receipt	Sat Dec 22 04:52:35 2018 +0200
   601.3 @@ -11,8 +11,8 @@
   601.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   601.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   601.6  
   601.7 -BUILD_DEPENDS="intltool xorg-libX11-dev libxfce4util-dev libxfce4ui-dev \
   601.8 -libwnck2-dev polkit-dev upower-dev xorg-iceauth xorg-libSM-dev"
   601.9 +BUILD_DEPENDS="intltool libx11-dev libxfce4util-dev libxfce4ui-dev \
  601.10 +libwnck2-dev polkit-dev upower-dev iceauth libsm-dev"
  601.11  SPLIT="$PACKAGE-dev"
  601.12  
  601.13  compile_rules() {
  601.14 @@ -34,8 +34,8 @@
  601.15  		xfce4-session)
  601.16  			copy @std
  601.17  			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libwnck2 \
  601.18 -			libxfce4ui libxfce4util pango polkit xfconf xorg-libICE xorg-libSM \
  601.19 -			xorg-libX11   xorg-iceauth"
  601.20 +			libxfce4ui libxfce4util pango polkit xfconf libice libsm \
  601.21 +			libx11   iceauth"
  601.22  			;;
  601.23  		*-dev)
  601.24  			copy @dev
   602.1 --- a/xfce4-settings/receipt	Fri Dec 21 04:44:58 2018 +0200
   602.2 +++ b/xfce4-settings/receipt	Sat Dec 22 04:52:35 2018 +0200
   602.3 @@ -11,8 +11,8 @@
   602.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   602.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   602.6  
   602.7 -BUILD_DEPENDS="intltool exo-dev garcon-dev xorg-libXi-dev xorg-libXrandr-dev \
   602.8 -upower-dev libnotify-dev xorg-libXcursor-dev xorg-xf86-input-libinput-dev \
   602.9 +BUILD_DEPENDS="intltool exo-dev garcon-dev libxi-dev libxrandr-dev \
  602.10 +upower-dev libnotify-dev libxcursor-dev xf86-input-libinput-dev \
  602.11  libxklavier-dev"
  602.12  
  602.13  compile_rules() {
  602.14 @@ -30,6 +30,6 @@
  602.15  	copy @std hicolor/ # only 128 icons here
  602.16  	DEPENDS="cairo dbus dbus-glib exo fontconfig garcon gdk-pixbuf glib gtk2 \
  602.17  	libnotify libxfce4ui libxfce4util libxklavier pango upower xfconf \
  602.18 -	xorg-libX11 xorg-libXcursor xorg-libXi xorg-libXrandr"
  602.19 +	libx11 libxcursor libxi libxrandr"
  602.20  	TAGS="Xfce"
  602.21  }
   603.1 --- a/xfce4-terminal/receipt	Fri Dec 21 04:44:58 2018 +0200
   603.2 +++ b/xfce4-terminal/receipt	Sat Dec 22 04:52:35 2018 +0200
   603.3 @@ -11,8 +11,8 @@
   603.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   603.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   603.6  
   603.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev vte-gtk2-dev \
   603.8 -libxfce4ui-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
   603.9 +BUILD_DEPENDS="intltool libx11-dev libice-dev gtk2-dev vte-gtk2-dev \
  603.10 +libxfce4ui-dev libsm-dev startup-notification-dev xcb-util-dev"
  603.11  
  603.12  compile_rules(){
  603.13  	# warning: internationalized messages should not contain the '\r' escape sequence
  603.14 @@ -29,6 +29,6 @@
  603.15  genpkg_rules() {
  603.16  	copy @std
  603.17  	DEPENDS="atk gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango vte-gtk2 \
  603.18 -	xorg-libX11"
  603.19 +	libx11"
  603.20  	TAGS="Xfce terminal"
  603.21  }
   604.1 --- a/xfdesktop/receipt	Fri Dec 21 04:44:58 2018 +0200
   604.2 +++ b/xfdesktop/receipt	Sat Dec 22 04:52:35 2018 +0200
   604.3 @@ -11,7 +11,7 @@
   604.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   604.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   604.6  
   604.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
   604.8 +BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
   604.9  dbus-glib-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev exo-dev \
  604.10  thunar-dev garcon-dev libnotify-dev"
  604.11  SPLIT="$PACKAGE-extras $PACKAGE"
  604.12 @@ -35,7 +35,7 @@
  604.13  			copy @std @rm
  604.14  			DEPENDS="cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
  604.15  			libnotify libwnck2 libxfce4ui libxfce4util pango thunar xfconf \
  604.16 -			xorg-libX11"
  604.17 +			libx11"
  604.18  			;;
  604.19  	esac
  604.20  	TAGS="Xfce"
   605.1 --- a/xfe/receipt	Fri Dec 21 04:44:58 2018 +0200
   605.2 +++ b/xfe/receipt	Sat Dec 22 04:52:35 2018 +0200
   605.3 @@ -11,8 +11,8 @@
   605.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   605.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   605.6  
   605.7 -BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev xorg-libXft-dev fox-dev \
   605.8 -automake intltool gettext-dev xorg-libXrandr-dev xorg-libXi"
   605.9 +BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev tiff-dev libxft-dev fox-dev \
  605.10 +automake intltool gettext-dev libxrandr-dev libxi"
  605.11  SPLIT="$PACKAGE-extra-icons $PACKAGE xfi xfw xfp"
  605.12  
  605.13  compile_rules() {
  605.14 @@ -27,7 +27,7 @@
  605.15  
  605.16  genpkg_rules() {
  605.17  	COOKOPTS="!pixmaps !menus"
  605.18 -	DEPENDS="fox xorg-libX11 xorg-libXft xorg-libXrandr" # the same depends
  605.19 +	DEPENDS="fox libx11 libxft libxrandr" # the same depends
  605.20  	case $PACKAGE in
  605.21  		xfe-extra-icons)
  605.22  			copy kde-theme/ windows-theme/ xfe-theme/
   606.1 --- a/xfig/receipt	Fri Dec 21 04:44:58 2018 +0200
   606.2 +++ b/xfig/receipt	Sat Dec 22 04:52:35 2018 +0200
   606.3 @@ -11,9 +11,9 @@
   606.4  TARBALL="$PACKAGE-full-$VERSION.tar.xz"
   606.5  WGET_URL="$SF_MIRROR/mcj/$TARBALL"
   606.6  
   606.7 -BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep jpeg-dev \
   606.8 -libpng16-dev xorg-libXp xorg-libX11-dev xorg-libXt-dev xorg-libXpm-dev \
   606.9 -xorg-libXmu-dev xorg-libXaw-dev xorg-libXaw3d-dev xorg-libXt-dev"
  606.10 +BUILD_DEPENDS="imake xorg-cf-files gccmakedep jpeg-dev \
  606.11 +libpng-dev libxp libx11-dev libxt-dev libxpm-dev \
  606.12 +libxmu-dev libxaw-dev libxaw3d-dev"
  606.13  SPLIT="transfig"
  606.14  
  606.15  compile_rules() {
  606.16 @@ -39,12 +39,12 @@
  606.17  		xfig)
  606.18  			cp -a $install/xfig/* $fs
  606.19  			SUGGESTED="transfig"
  606.20 -			DEPENDS="jpeg libpng16 xorg xorg-libXp"
  606.21 +			DEPENDS="jpeg libpng xorg libxp"
  606.22  			;;
  606.23  		transfig)
  606.24  			cp -a $install/transfig/* $fs
  606.25  			SHORT_DESC="Utilities for converting XFig figure files"
  606.26 -			DEPENDS="xorg xorg-libXpm libpng16 zlib"
  606.27 +			DEPENDS="xorg libxpm libpng zlib"
  606.28  			;;
  606.29  	esac
  606.30  }
   607.1 --- a/xfmedia/receipt	Fri Dec 21 04:44:58 2018 +0200
   607.2 +++ b/xfmedia/receipt	Sat Dec 22 04:52:35 2018 +0200
   607.3 @@ -12,8 +12,8 @@
   607.4  WGET_URL="http://spuriousinterrupt.org/files/xfmedia/$TARBALL"
   607.5  
   607.6  BUILD_DEPENDS="shared-mime-info exo-dev util-linux-uuid-dev xine-lib-dev \
   607.7 -intltool libxfcegui4-dev startup-notification-dev xorg-libxcb-dev \
   607.8 -xorg-libX11-dev xorg-libXt-dev xorg-libXtst-dev xorg-xcb-util-dev"
   607.9 +intltool libxfcegui4-dev startup-notification-dev libxcb-dev \
  607.10 +libx11-dev libxt-dev libxtst-dev xcb-util-dev"
  607.11  
  607.12  compile_rules() {
  607.13  	export LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0"
  607.14 @@ -33,6 +33,6 @@
  607.15  	copy @std
  607.16  	rm -r $fs/usr/share/xfmedia/doc/
  607.17  	DEPENDS="exo gdk-pixbuf glib gtk2 libxfce4util libxfcegui4 pango xine-lib \
  607.18 -	xorg-libX11 xorg-libXext xorg-libXtst"
  607.19 +	libx11 libxext libxtst"
  607.20  	TAGS="Xfce"
  607.21  }
   608.1 --- a/xfmpc/receipt	Fri Dec 21 04:44:58 2018 +0200
   608.2 +++ b/xfmpc/receipt	Sat Dec 22 04:52:35 2018 +0200
   608.3 @@ -11,9 +11,9 @@
   608.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   608.5  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   608.6  
   608.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev \
   608.8 -libxfce4ui-dev libmpd-dev xorg-libSM-dev startup-notification-dev \
   608.9 -xorg-xcb-util-dev"
  608.10 +BUILD_DEPENDS="intltool libx11-dev libice-dev gtk2-dev \
  608.11 +libxfce4ui-dev libmpd-dev libsm-dev startup-notification-dev \
  608.12 +xcb-util-dev"
  608.13  
  608.14  compile_rules() {
  608.15  	sed -i 's|\\r||' po/es.po # tiny patch
   609.1 --- a/xfprint/receipt	Fri Dec 21 04:44:58 2018 +0200
   609.2 +++ b/xfprint/receipt	Sat Dec 22 04:52:35 2018 +0200
   609.3 @@ -13,7 +13,7 @@
   609.4  
   609.5  BUILD_DEPENDS="libxfcegui4-dev libxfce4util-dev cups-dev intltool xfconf-dev \
   609.6  dbus-glib-dev startup-notification-dev util-linux-uuid-dev gtk2-dev \
   609.7 -xorg-xcb-util-dev"
   609.8 +xcb-util-dev"
   609.9  SPLIT="$PACKAGE-dev"
  609.10  
  609.11  compile_rules() {
  609.12 @@ -34,7 +34,7 @@
  609.13  			# Remove SVG icons
  609.14  			rm -rf $fs/usr/share/icons/hicolor/scalable
  609.15  			DEPENDS="gdk-pixbuf glib gtk2 libcups libxfce4util libxfcegui4 \
  609.16 -			xfconf xorg-libX11"
  609.17 +			xfconf libx11"
  609.18  			;;
  609.19  		*-dev)
  609.20  			copy @dev
   610.1 --- a/xfwm4/receipt	Fri Dec 21 04:44:58 2018 +0200
   610.2 +++ b/xfwm4/receipt	Sat Dec 22 04:52:35 2018 +0200
   610.3 @@ -11,10 +11,10 @@
   610.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   610.5  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
   610.6  
   610.7 -BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
   610.8 -xorg-libXext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
   610.9 -libdrm-dev xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXfixes-dev \
  610.10 -xorg-libXdamage-dev"
  610.11 +BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \
  610.12 +libxext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
  610.13 +libdrm-dev libxrandr-dev libxcomposite-dev libxfixes-dev \
  610.14 +libxdamage-dev"
  610.15  SPLIT="$PACKAGE-themes $PACKAGE"
  610.16  
  610.17  compile_rules() {
  610.18 @@ -35,9 +35,9 @@
  610.19  		xfwm4)
  610.20  			copy @std @rm
  610.21  			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libwnck2 libxfce4ui \
  610.22 -			libxfce4util pango startup-notification xfconf xorg-libX11 \
  610.23 -			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
  610.24 -			xorg-libXrandr xorg-libXrender"
  610.25 +			libxfce4util pango startup-notification xfconf libx11 \
  610.26 +			libxcomposite libxdamage libxext libxfixes \
  610.27 +			libxrandr libxrender"
  610.28  			TAGS="Xfce window-manager"
  610.29  			;;
  610.30  	esac
   611.1 --- a/xgalaga++/receipt	Fri Dec 21 04:44:58 2018 +0200
   611.2 +++ b/xgalaga++/receipt	Sat Dec 22 04:52:35 2018 +0200
   611.3 @@ -11,7 +11,7 @@
   611.4  TARBALL="${PACKAGE}_$VERSION.tar.gz"
   611.5  WGET_URL="http://marc.mongenet.ch/OSS/XGalaga/$TARBALL"
   611.6  
   611.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXpm-dev"
   611.8 +BUILD_DEPENDS="libx11-dev libxpm-dev"
   611.9  
  611.10  compile_rules() {
  611.11  	make xgalaga++ &&
  611.12 @@ -20,5 +20,5 @@
  611.13  
  611.14  genpkg_rules() {
  611.15  	copy @std
  611.16 -	DEPENDS="xorg-libX11 xorg-libXpm"
  611.17 +	DEPENDS="libx11 libxpm"
  611.18  }
   612.1 --- a/xgalaga/receipt	Fri Dec 21 04:44:58 2018 +0200
   612.2 +++ b/xgalaga/receipt	Sat Dec 22 04:52:35 2018 +0200
   612.3 @@ -37,6 +37,6 @@
   612.4  	cp -a $install/usr/share/xgalaga $fs/usr/share
   612.5  	cp -a $install/usr/bin $fs/usr
   612.6  	cp $stuff/*.desktop $fs/usr/share/applications
   612.7 -	DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm \
   612.8 -	xorg-libxcb xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
   612.9 +	DEPENDS="libx11 libxmu libxt libxext libxpm \
  612.10 +	libxcb libxau libxdmcp libsm libice util-linux-uuid"
  612.11  }
   613.1 --- a/xine-lib/receipt	Fri Dec 21 04:44:58 2018 +0200
   613.2 +++ b/xine-lib/receipt	Sat Dec 22 04:52:35 2018 +0200
   613.3 @@ -11,10 +11,10 @@
   613.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
   613.5  WGET_URL="$SF_MIRROR/xine/$TARBALL"
   613.6  
   613.7 -BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xorgproto \
   613.8 +BUILD_DEPENDS="libxvmc-dev libxv-dev xorgproto \
   613.9  alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
  613.10 -util-linux-uuid-dev xorg-libxcb-dev libcaca-dev ffmpeg-dev file \
  613.11 -libmodplug-dev xorg-libXinerama-dev speex-dev gettext"
  613.12 +util-linux-uuid-dev libxcb-dev libcaca-dev ffmpeg-dev file \
  613.13 +libmodplug-dev libxinerama-dev speex-dev gettext"
  613.14  SPLIT="xine-fonts $PACKAGE $PACKAGE-dev"
  613.15  
  613.16  compile_rules() {
  613.17 @@ -50,9 +50,9 @@
  613.18  			;;
  613.19  		xine-lib)
  613.20  			copy @std @rm
  613.21 -			DEPENDS="zlib xorg-libX11 xorg-libXv xorg-libXvMC alsa-lib \
  613.22 -			libogg libvorbis libtheora xorg-libXvMC xorg-libXv \
  613.23 -			xorg-libxcb ffmpeg libmodplug"
  613.24 +			DEPENDS="zlib libx11 libxv libxvmc alsa-lib \
  613.25 +			libogg libvorbis libtheora \
  613.26 +			libxcb ffmpeg libmodplug"
  613.27  			SUGGESTED="xine-fonts faad2"
  613.28  			;;
  613.29  		*-dev)
   614.1 --- a/xine-ui/receipt	Fri Dec 21 04:44:58 2018 +0200
   614.2 +++ b/xine-ui/receipt	Sat Dec 22 04:52:35 2018 +0200
   614.3 @@ -12,8 +12,8 @@
   614.4  WGET_URL="$SF_MIRROR/xine/$TARBALL"
   614.5  
   614.6  # Keep Xine small for Live system, we have MPlayer or VLC has big video player.
   614.7 -BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-dev xorg-libXv-dev \
   614.8 -xorg-libXxf86vm-dev libpng16-dev libjpeg-turbo-dev xorg-libXScrnSaver-dev"
   614.9 +BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-dev libxv-dev \
  614.10 +libxxf86vm-dev libpng-dev libjpeg-turbo-dev libxscrnsaver-dev"
  614.11  
  614.12  COOKOPTS="!menus" # Use a custom .desktop file
  614.13  
  614.14 @@ -29,6 +29,6 @@
  614.15  genpkg_rules() {
  614.16  	copy @std
  614.17  	rm $fs/usr/share/xine/visuals/*.mpv # remove the sample
  614.18 -	DEPENDS="xine-lib libvorbis xorg-libXtst xorg-libXv xorg-libXi libpng16 \
  614.19 -	xorg-libXft xorg-libXxf86vm xorg-libXScrnSaver"
  614.20 +	DEPENDS="xine-lib libvorbis libxtst libxv libxi libpng \
  614.21 +	libxft libxxf86vm libxscrnsaver"
  614.22  }
   615.1 --- a/xinit/receipt	Fri Dec 21 04:44:58 2018 +0200
   615.2 +++ b/xinit/receipt	Sat Dec 22 04:52:35 2018 +0200
   615.3 @@ -14,7 +14,7 @@
   615.4  TARBALL_SHA1="fcdca692b09a45f546016fff78718d1cf7e7852f"
   615.5  
   615.6  BUILD_DEPENDS="util-macros libxmu-dev"
   615.7 -DEPENDS="libx11   openssl xorg-xauth"
   615.8 +DEPENDS="libx11   openssl xauth"
   615.9  
  615.10  compile_rules() {
  615.11  	sed -i '/$serverargs $vtarg/ s/serverargs/: #&/' startx.cpp
   616.1 --- a/xinput-calibrator/receipt	Fri Dec 21 04:44:58 2018 +0200
   616.2 +++ b/xinput-calibrator/receipt	Sat Dec 22 04:52:35 2018 +0200
   616.3 @@ -11,7 +11,7 @@
   616.4  TARBALL="xinput_calibrator-$VERSION.tar.gz"
   616.5  WGET_URL="http://cloud.github.com/downloads/tias/xinput_calibrator/$TARBALL"
   616.6  
   616.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev xorg-xorgproto"
   616.8 +BUILD_DEPENDS="libx11-dev libxext-dev libxi-dev xorgproto"
   616.9  
  616.10  compile_rules() {
  616.11  	./configure $CONFIGURE_ARGS &&
  616.12 @@ -22,5 +22,5 @@
  616.13  
  616.14  genpkg_rules() {
  616.15  	copy @std
  616.16 -	DEPENDS="xorg-libX11"
  616.17 +	DEPENDS="libx11"
  616.18  }
   617.1 --- a/xlockmore/receipt	Fri Dec 21 04:44:58 2018 +0200
   617.2 +++ b/xlockmore/receipt	Sat Dec 22 04:52:35 2018 +0200
   617.3 @@ -11,8 +11,8 @@
   617.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   617.5  WGET_URL="https://www.tux.org/~bagleyd/xlock/$PACKAGE-$VERSION/$TARBALL" # FIXME
   617.6  
   617.7 -BUILD_DEPENDS="xorg-libXdmcp-dev xorg-libXpm-dev xorg-libX11-dev \
   617.8 -xorg-libXt-dev xorg-libXext-dev"
   617.9 +BUILD_DEPENDS="libxdmcp-dev libxpm-dev libx11-dev \
  617.10 +libxt-dev libxext-dev"
  617.11  
  617.12  compile_rules() {
  617.13  	./configure \
  617.14 @@ -30,7 +30,7 @@
  617.15  
  617.16  genpkg_rules() {
  617.17  	copy @std
  617.18 -	DEPENDS="xorg-libX11 freetype freetype1"
  617.19 +	DEPENDS="libx11 freetype freetype1"
  617.20  }
  617.21  
  617.22  post_install() {
   618.1 --- a/xlunch/receipt	Fri Dec 21 04:44:58 2018 +0200
   618.2 +++ b/xlunch/receipt	Sat Dec 22 04:52:35 2018 +0200
   618.3 @@ -11,7 +11,7 @@
   618.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   618.5  WGET_URL="https://github.com/Tomas-M/xlunch/archive/v$VERSION.tar.gz"
   618.6  
   618.7 -BUILD_DEPENDS="xorg-libX11-dev findutils imlib2-dev"
   618.8 +BUILD_DEPENDS="libx11-dev findutils imlib2-dev"
   618.9  
  618.10  compile_rules() {
  618.11  	make &&
  618.12 @@ -20,7 +20,7 @@
  618.13  
  618.14  genpkg_rules() {
  618.15  	copy @std
  618.16 -	DEPENDS="imlib2 xorg-libX11   bash"
  618.17 +	DEPENDS="imlib2 libx11   bash"
  618.18  	CONFIG_FILES="/etc/xlunch/entries.dsv"
  618.19  }
  618.20  
   619.1 --- a/xmahjongg/receipt	Fri Dec 21 04:44:58 2018 +0200
   619.2 +++ b/xmahjongg/receipt	Sat Dec 22 04:52:35 2018 +0200
   619.3 @@ -11,7 +11,7 @@
   619.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   619.5  WGET_URL="http://www.lcdf.org/xmahjongg/$TARBALL"
   619.6  
   619.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev"
   619.8 +BUILD_DEPENDS="libx11-dev libxt-dev"
   619.9  
  619.10  compile_rules() {
  619.11  	./configure $CONFIGURE_ARGS &&
  619.12 @@ -21,5 +21,5 @@
  619.13  
  619.14  genpkg_rules() {
  619.15  	copy @std
  619.16 -	DEPENDS="xorg-libX11"
  619.17 +	DEPENDS="libx11"
  619.18  }
   620.1 --- a/xmgrace/receipt	Fri Dec 21 04:44:58 2018 +0200
   620.2 +++ b/xmgrace/receipt	Sat Dec 22 04:52:35 2018 +0200
   620.3 @@ -11,8 +11,8 @@
   620.4  TARBALL="grace-$VERSION.tar.gz"
   620.5  WGET_URL="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/$TARBALL"
   620.6  
   620.7 -BUILD_DEPENDS="jpeg-dev libpng16-dev fftw-dev lesstif-dev xorg-xorgproto bison \
   620.8 -xorg-libXt-dev"
   620.9 +BUILD_DEPENDS="jpeg-dev libpng-dev fftw-dev lesstif-dev xorgproto bison \
  620.10 +libxt-dev"
  620.11  
  620.12  compile_rules() {
  620.13  	sed -i 's|/man/|/share&|' doc/Makefile*
  620.14 @@ -45,5 +45,5 @@
  620.15  		$fs/usr/share/grace/doc/*.pdf \
  620.16  		$fs/usr/share/grace/doc/*.1 \
  620.17  		$fs/usr/man
  620.18 -	DEPENDS="libjpeg libpng16 fftw lesstif"
  620.19 +	DEPENDS="libjpeg libpng fftw lesstif"
  620.20  }
   621.1 --- a/xmountains/receipt	Fri Dec 21 04:44:58 2018 +0200
   621.2 +++ b/xmountains/receipt	Sat Dec 22 04:52:35 2018 +0200
   621.3 @@ -16,7 +16,7 @@
   621.4  # original version 2.9 available here:
   621.5  # http://archive.ubuntu.com/ubuntu/pool/universe/x/xmountains/xmountains_2.9.orig.tar.gz
   621.6  
   621.7 -BUILD_DEPENDS="xorg-imake xorg-xorgproto xorg-libX11-dev xorg-xbitmaps"
   621.8 +BUILD_DEPENDS="imake xorgproto libx11-dev xbitmaps"
   621.9  
  621.10  compile_rules() {
  621.11  	xmkmf &&
  621.12 @@ -33,5 +33,5 @@
  621.13  
  621.14  genpkg_rules() {
  621.15  	copy @std
  621.16 -	DEPENDS="xorg-libX11"
  621.17 +	DEPENDS="libx11"
  621.18  }
   622.1 --- a/xombrero/receipt	Fri Dec 21 04:44:58 2018 +0200
   622.2 +++ b/xombrero/receipt	Sat Dec 22 04:52:35 2018 +0200
   622.3 @@ -42,6 +42,6 @@
   622.4  	copy @std
   622.5  	CONFIG_FILES="/etc/xombrero.conf"
   622.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libbsd \
   622.7 -	libgnutls libsoup pango webkitgtk xorg-libX11"
   622.8 +	libgnutls libsoup pango webkitgtk libx11"
   622.9  	TAGS="web-browser"
  622.10  }
   623.1 --- a/xorg/receipt	Fri Dec 21 04:44:58 2018 +0200
   623.2 +++ b/xorg/receipt	Sat Dec 22 04:52:35 2018 +0200
   623.3 @@ -17,7 +17,7 @@
   623.4  libxi libxinerama libxkbfile libxmu libxpm libxrandr libxrender libxscrnsaver \
   623.5  libxt libxtst libxxf86vm xkbcomp xkeyboard-config"
   623.6  DEPENDS_dev="libxdmcp-dev libxau-dev libx11-dev libxext-dev libxrender-dev \
   623.7 -libxrandr-dev libxfixes-dev libfontenc-dev xorg-libxfont-dev libxft-dev \
   623.8 +libxrandr-dev libxfixes-dev libfontenc-dev libxfont-dev libxft-dev \
   623.9  libxcomposite-dev libxkbfile-dev libice-dev libsm-dev libxt-dev \
  623.10  libxinerama-dev libxmu-dev libxpm-dev libxaw-dev libxtst-dev libxcursor-dev \
  623.11  libxdamage-dev libxi-dev"
   624.1 --- a/xosd/receipt	Fri Dec 21 04:44:58 2018 +0200
   624.2 +++ b/xosd/receipt	Sat Dec 22 04:52:35 2018 +0200
   624.3 @@ -22,5 +22,5 @@
   624.4  
   624.5  genpkg_rules() {
   624.6  	copy @std
   624.7 -	DEPENDS="xorg-libX11"
   624.8 +	DEPENDS="libx11"
   624.9  }
   625.1 --- a/xournal/receipt	Fri Dec 21 04:44:58 2018 +0200
   625.2 +++ b/xournal/receipt	Sat Dec 22 04:52:35 2018 +0200
   625.3 @@ -27,6 +27,6 @@
   625.4  	copy @std
   625.5  	rm -r $fs/usr/share/mimelnk/
   625.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libart_lgpl \
   625.7 -	libgnomecanvas pango poppler xorg-libX11 zlib" # poppler-apps?
   625.8 +	libgnomecanvas pango poppler libx11 zlib" # poppler-apps?
   625.9  	SUGGESTED="ghostscript"
  625.10  }
   626.1 --- a/xpad/receipt	Fri Dec 21 04:44:58 2018 +0200
   626.2 +++ b/xpad/receipt	Sat Dec 22 04:52:35 2018 +0200
   626.3 @@ -11,7 +11,7 @@
   626.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   626.5  WGET_URL="https://launchpad.net/xpad/trunk/$VERSION/+download/$TARBALL"
   626.6  
   626.7 -BUILD_DEPENDS="gtk2-dev xorg-libSM-dev intltool"
   626.8 +BUILD_DEPENDS="gtk2-dev libsm-dev intltool"
   626.9  COOKOPTS="!pixmaps"
  626.10  
  626.11  HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
  626.12 @@ -28,5 +28,5 @@
  626.13  	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps/
  626.14  	cp -a $install/usr/bin $fs/usr
  626.15  	cp -a $stuff/xpad.png $fs/usr/share/icons/hicolor/48x48/apps/
  626.16 -	DEPENDS="gtk2 util-linux-uuid xorg-libICE xorg-libSM"
  626.17 +	DEPENDS="gtk2 util-linux-uuid libice libsm"
  626.18  }
   627.1 --- a/xpaint/receipt	Fri Dec 21 04:44:58 2018 +0200
   627.2 +++ b/xpaint/receipt	Sat Dec 22 04:52:35 2018 +0200
   627.3 @@ -11,8 +11,8 @@
   627.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   627.5  WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
   627.6  
   627.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev freetype-dev libXaw3dXft-dev \
   627.8 -libjpeg-turbo-dev tiff-dev libtool xorg-libXpm-dev"
   627.9 +BUILD_DEPENDS="libx11-dev libxft-dev freetype-dev libXaw3dXft-dev \
  627.10 +libjpeg-turbo-dev tiff-dev libtool libxpm-dev"
  627.11  SPLIT="$PACKAGE-dev"
  627.12  
  627.13  compile_rules() {
  627.14 @@ -28,9 +28,9 @@
  627.15  	case $PACKAGE in
  627.16  		xpaint)
  627.17  			copy @std
  627.18 -			DEPENDS="fontconfig libXaw3dXft libjpeg-turbo libpng16 tiff \
  627.19 -			xorg-libX11 xorg-libXext xorg-libXft xorg-libXmu xorg-libXpm \
  627.20 -			xorg-libXt"
  627.21 +			DEPENDS="fontconfig libXaw3dXft libjpeg-turbo libpng tiff \
  627.22 +			libx11 libxext libxft libxmu libxpm \
  627.23 +			libxt"
  627.24  			;;
  627.25  		*-dev)
  627.26  			copy @dev
   628.1 --- a/xpat2/receipt	Fri Dec 21 04:44:58 2018 +0200
   628.2 +++ b/xpat2/receipt	Sat Dec 22 04:52:35 2018 +0200
   628.3 @@ -11,7 +11,7 @@
   628.4  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
   628.5  WGET_URL="http://www.ibiblio.org/pub/Linux/games/solitaires/$TARBALL"
   628.6  
   628.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXaw-dev"
   628.8 +BUILD_DEPENDS="libx11-dev libxt-dev libxaw-dev"
   628.9  
  628.10  compile_rules() {
  628.11  	cd src
  628.12 @@ -28,5 +28,5 @@
  628.13  	cp -a $stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat
  628.14  	touch $fs/var/games/xpat2/xpat.log
  628.15  	chmod 666 $fs/var/games/xpat2/xpat.log
  628.16 -	DEPENDS="xorg-libX11 xorg-libXt xorg-libXaw"
  628.17 +	DEPENDS="libx11 libxt libxaw"
  628.18  }
   629.1 --- a/xpenguins/receipt	Fri Dec 21 04:44:58 2018 +0200
   629.2 +++ b/xpenguins/receipt	Sat Dec 22 04:52:35 2018 +0200
   629.3 @@ -11,8 +11,8 @@
   629.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   629.5  WGET_URL="${WEB_SITE}$TARBALL"
   629.6  
   629.7 -BUILD_DEPENDS="xorg-libXpm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev"
   629.8 -DEPENDS_std="xorg-libXpm xorg-libX11 xorg-libXext"
   629.9 +BUILD_DEPENDS="libxpm-dev libx11-dev libxext-dev libxt-dev"
  629.10 +DEPENDS_std="libxpm libx11 libxext"
  629.11  
  629.12  compile_rules() {
  629.13  	./configure \
   630.1 --- a/xplanet/receipt	Fri Dec 21 04:44:58 2018 +0200
   630.2 +++ b/xplanet/receipt	Sat Dec 22 04:52:35 2018 +0200
   630.3 @@ -11,9 +11,9 @@
   630.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   630.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   630.6  
   630.7 -BUILD_DEPENDS="patch xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
   630.8 -xorg-libXScrnSaver-dev freetype-dev pango-dev giflib-dev libjpeg-turbo-dev \
   630.9 -libpng16-dev tiff-dev"
  630.10 +BUILD_DEPENDS="patch libx11-dev libice-dev libxext-dev \
  630.11 +libxscrnsaver-dev freetype-dev pango-dev giflib-dev libjpeg-turbo-dev \
  630.12 +libpng-dev tiff-dev"
  630.13  
  630.14  compile_rules() {
  630.15  	./configure \
  630.16 @@ -25,7 +25,7 @@
  630.17  
  630.18  genpkg_rules() {
  630.19  	copy @std
  630.20 -	DEPENDS="perl jpeg libpng16 zlib tiff xorg-libX11 freetype pango fontconfig \
  630.21 -glib xorg-libXau xorg-libXdmcp expat giflib xorg-libXScrnSaver gcc-lib-base \
  630.22 +	DEPENDS="perl jpeg libpng zlib tiff libx11 freetype pango fontconfig \
  630.23 +glib libxau libxdmcp expat giflib libxscrnsaver gcc-lib-base \
  630.24   util-linux-uuid"
  630.25  }
   631.1 --- a/xpra/receipt	Fri Dec 21 04:44:58 2018 +0200
   631.2 +++ b/xpra/receipt	Sat Dec 22 04:52:35 2018 +0200
   631.3 @@ -13,9 +13,9 @@
   631.4  # integrity check: http://xpra.org/src/
   631.5  TARBALL_SHA1="5bcd554bff69a4077b7090f6871e939b5b3b47b2"
   631.6  
   631.7 -BUILD_DEPENDS="python python-cython libvpx-dev xorg-libX11-dev x264-dev \
   631.8 -x265-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
   631.9 -xorg-libXfixes-dev xorg-libxkbfile-dev xorg-libXrandr-dev xorg-libXtst-dev \
  631.10 +BUILD_DEPENDS="python python-cython libvpx-dev libx11-dev x264-dev \
  631.11 +x265-dev libxcomposite-dev libxdamage-dev libxext-dev \
  631.12 +libxfixes-dev libxkbfile-dev libxrandr-dev libxtst-dev \
  631.13  python-pygobject2-dev python-pygtk-dev python-dev"
  631.14  
  631.15  compile_rules() {
  631.16 @@ -28,7 +28,7 @@
  631.17  genpkg_rules() {
  631.18  	copy @std
  631.19  
  631.20 -	DEPENDS="glib gtk2 libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \
  631.21 -	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi xorg-libXrandr \
  631.22 -	xorg-libXtst xorg-libxkbfile   python-pygtk python-pygobject2" # maybe some other python-* too
  631.23 +	DEPENDS="glib gtk2 libvpx python x264 x265 libx11 libxcomposite \
  631.24 +	libxdamage libxext libxfixes libxi libxrandr \
  631.25 +	libxtst libxkbfile   python-pygtk python-pygobject2" # maybe some other python-* too
  631.26  }
   632.1 --- a/xrdp/receipt	Fri Dec 21 04:44:58 2018 +0200
   632.2 +++ b/xrdp/receipt	Sat Dec 22 04:52:35 2018 +0200
   632.3 @@ -35,7 +35,7 @@
   632.4  	case $PACKAGE in
   632.5  		xrdp)
   632.6  			copy @std
   632.7 -			DEPENDS="openssl pam xorg-libX11 xorg-libXfixes xorg-libXrandr   \
   632.8 +			DEPENDS="openssl pam libx11 libxfixes libxrandr   \
   632.9  			tightvnc"
  632.10  			;;
  632.11  		*-dev)
   633.1 --- a/xrestop/receipt	Fri Dec 21 04:44:58 2018 +0200
   633.2 +++ b/xrestop/receipt	Sat Dec 22 04:52:35 2018 +0200
   633.3 @@ -11,7 +11,7 @@
   633.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   633.5  WGET_URL="http://downloads.yoctoproject.org/releases/xrestop/$TARBALL"
   633.6  
   633.7 -BUILD_DEPENDS="ncurses-dev xorg-libXres-dev"
   633.8 +BUILD_DEPENDS="ncurses-dev libxres-dev"
   633.9  
  633.10  compile_rules() {
  633.11  	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
  633.12 @@ -24,5 +24,5 @@
  633.13  genpkg_rules() {
  633.14  	mkdir -p $fs/usr
  633.15  	cp -a $install/usr/bin $fs/usr
  633.16 -	DEPENDS="ncurses xorg-libXres"
  633.17 +	DEPENDS="ncurses libxres"
  633.18  }
   634.1 --- a/xruskb/receipt	Fri Dec 21 04:44:58 2018 +0200
   634.2 +++ b/xruskb/receipt	Sat Dec 22 04:52:35 2018 +0200
   634.3 @@ -11,7 +11,7 @@
   634.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   634.5  WGET_URL="http://ftp.yars.free.net/pub/source/xruskb/$TARBALL"
   634.6  
   634.7 -BUILD_DEPENDS="xorg-libXp-dev xorg-libXmu-dev lesstif-dev"
   634.8 +BUILD_DEPENDS="libxp-dev libxmu-dev lesstif-dev"
   634.9  
  634.10  compile_rules() {
  634.11  	./configure \
  634.12 @@ -24,5 +24,5 @@
  634.13  
  634.14  genpkg_rules() {
  634.15  	copy @std
  634.16 -	DEPENDS="lesstif freetype xorg-libXp xorg-libXmu"
  634.17 +	DEPENDS="lesstif freetype libxp libxmu"
  634.18  }
   635.1 --- a/xsane/receipt	Fri Dec 21 04:44:58 2018 +0200
   635.2 +++ b/xsane/receipt	Sat Dec 22 04:52:35 2018 +0200
   635.3 @@ -31,5 +31,5 @@
   635.4  	cp -a $install/usr/bin $fs/usr
   635.5  	cp -a $install/usr/share/sane $fs/usr/share
   635.6  	rm -rf $fs/usr/share/sane/xsane/doc
   635.7 -	DEPENDS="sane-backends gtk2 tiff xorg-libXdamage lcms v4l-utils libltdl"
   635.8 +	DEPENDS="sane-backends gtk2 tiff libxdamage lcms v4l-utils libltdl"
   635.9  }
   636.1 --- a/xscavenger/receipt	Fri Dec 21 04:44:58 2018 +0200
   636.2 +++ b/xscavenger/receipt	Sat Dec 22 04:52:35 2018 +0200
   636.3 @@ -11,8 +11,8 @@
   636.4  TARBALL="$PACKAGE-$VERSION.tgz"
   636.5  WGET_URL="https://www.linuxmotors.com/scavenger/downloads/$TARBALL"
   636.6  
   636.7 -BUILD_DEPENDS="xorg-imake xorg-xorgproto xorg-libX11-dev alsa-lib-dev \
   636.8 -xorg-libXext-dev"
   636.9 +BUILD_DEPENDS="imake xorgproto libx11-dev alsa-lib-dev \
  636.10 +libxext-dev"
  636.11  
  636.12  compile_rules() {
  636.13  	cd $src/src
  636.14 @@ -25,5 +25,5 @@
  636.15  
  636.16  genpkg_rules() {
  636.17  	copy @std
  636.18 -	DEPENDS="alsa-lib xorg-libX11 xorg-libXext"
  636.19 +	DEPENDS="alsa-lib libx11 libxext"
  636.20  }
   637.1 --- a/xscreensaver/receipt	Fri Dec 21 04:44:58 2018 +0200
   637.2 +++ b/xscreensaver/receipt	Sat Dec 22 04:52:35 2018 +0200
   637.3 @@ -11,10 +11,10 @@
   637.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   637.5  WGET_URL="$WEB_SITE/$TARBALL"
   637.6  
   637.7 -BUILD_DEPENDS="bc xorg-libX11-dev xorg-libXmu-dev xorg-libXext-dev \
   637.8 -xorg-libXinerama-dev xorg-libXi-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
   637.9 -gtk2-dev libxml2-dev mesa-dev gdk-pixbuf-dev xorg-libXpm-dev jpeg-dev \
  637.10 -xorg-libXt-dev libglade-dev intltool"
  637.11 +BUILD_DEPENDS="bc libx11-dev libxmu-dev libxext-dev \
  637.12 +libxinerama-dev libxi-dev libxxf86vm-dev libxrandr-dev \
  637.13 +gtk2-dev libxml2-dev mesa-dev gdk-pixbuf-dev libxpm-dev jpeg-dev \
  637.14 +libxt-dev libglade-dev intltool"
  637.15  
  637.16  compile_rules() {
  637.17  	export LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0 gdk-pixbuf-xlib-2.0 gl)"
   638.1 --- a/xsnow/receipt	Fri Dec 21 04:44:58 2018 +0200
   638.2 +++ b/xsnow/receipt	Sat Dec 22 04:52:35 2018 +0200
   638.3 @@ -11,8 +11,8 @@
   638.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   638.5  WGET_URL="$WEB_SITE/$TARBALL"
   638.6  
   638.7 -BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-libX11-dev xorg-libXpm-dev \
   638.8 -xorg-libXext-dev xorg-libXt-dev"
   638.9 +BUILD_DEPENDS="imake gccmakedep libx11-dev libxpm-dev \
  638.10 +libxext-dev libxt-dev"
  638.11  
  638.12  compile_rules() {
  638.13  	xmkmf &&
  638.14 @@ -26,5 +26,5 @@
  638.15  
  638.16  genpkg_rules() {
  638.17  	copy @std
  638.18 -	DEPENDS="xorg-libXpm xorg-libXext"
  638.19 +	DEPENDS="libxpm libxext"
  638.20  }
   639.1 --- a/xstroke/receipt	Fri Dec 21 04:44:58 2018 +0200
   639.2 +++ b/xstroke/receipt	Sat Dec 22 04:52:35 2018 +0200
   639.3 @@ -13,8 +13,8 @@
   639.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   639.5  WGET_URL="http://davesource.com/Projects/xstroke/xstroke.tar.gz"
   639.6  
   639.7 -BUILD_DEPENDS="xorg-libX11-dev"
   639.8 -DEPENDS_std="xorg-libX11"
   639.9 +BUILD_DEPENDS="libx11-dev"
  639.10 +DEPENDS_std="libx11"
  639.11  
  639.12  compile_rules() {
  639.13  	sed \
   640.1 --- a/xtel/receipt	Fri Dec 21 04:44:58 2018 +0200
   640.2 +++ b/xtel/receipt	Sat Dec 22 04:52:35 2018 +0200
   640.3 @@ -11,9 +11,9 @@
   640.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   640.5  WGET_URL="${WEB_SITE}download/$TARBALL"
   640.6  
   640.7 -BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep xorg-xbitmaps \
   640.8 -xorg-libXp xorg-bdftopcf xorg-mkfontdir xorg-mkfontscale jpeg-dev \
   640.9 -xorg-libXt-dev xorg-libXpm-dev xorg-libXaw-dev xorg-libXmu-dev"
  640.10 +BUILD_DEPENDS="imake xorg-cf-files gccmakedep xbitmaps \
  640.11 +libxp bdftopcf mkfontdir mkfontscale jpeg-dev \
  640.12 +libxt-dev libxpm-dev libxaw-dev libxmu-dev"
  640.13  
  640.14  compile_rules() {
  640.15  	sed -i 's/sys_errlist.errno./strerror(errno)/' procedure.c teleinfo.c \
  640.16 @@ -38,7 +38,7 @@
  640.17  	sed -i 's/`host/`nslookup/;s|/bin/bash|/bin/sh|' $fs/etc/ppp/ip*.iminitel
  640.18  	sed -i 's|X11R6/||' $fs/usr/bin/make_xtel_lignes
  640.19  	mv $fs/fonts $fs/usr/share/fonts/X11
  640.20 -	DEPENDS="ncurses-extra jpeg xorg-libXp xorg"
  640.21 +	DEPENDS="ncurses-extra jpeg libxp xorg"
  640.22  	CONFIG_FILES="/etc/xtel"
  640.23  	TAGS="emulator minitel"
  640.24  }
   641.1 --- a/xtrkcad/receipt	Fri Dec 21 04:44:58 2018 +0200
   641.2 +++ b/xtrkcad/receipt	Sat Dec 22 04:52:35 2018 +0200
   641.3 @@ -13,8 +13,8 @@
   641.4  WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
   641.5  
   641.6  BUILD_DEPENDS="cmake gettext-dev zlib-dev gtk2-dev libxml2-dev libgtkhtml-dev \
   641.7 -libgtkhtml doxygen xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
   641.8 -xorg-libXdmcp-dev"
   641.9 +libgtkhtml doxygen libx11-dev xorgproto libxau-dev \
  641.10 +libxdmcp-dev"
  641.11  SPLIT="$PACKAGE-doc $PACKAGE"
  641.12  
  641.13  compile_rules() {
  641.14 @@ -51,10 +51,10 @@
  641.15  		xtrkcad)
  641.16  			copy @std @rm
  641.17  			DEPENDS="menu-railroad glibc-base glib zlib expat libxml2 gtk2 \
  641.18 -			libgtkhtml fontconfig freetype atk cairo libpng16 pango \
  641.19 -			xorg-pixman xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
  641.20 -			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
  641.21 -			xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender"
  641.22 +			libgtkhtml fontconfig freetype atk cairo libpng pango \
  641.23 +			pixman libxcb xcb-util libx11 libxau \
  641.24 +			libxcomposite libxcursor libxdamage libxdmcp \
  641.25 +			libxext libxfixes libxinerama libxrender"
  641.26  			;;
  641.27  	esac
  641.28  }
   642.1 --- a/xtron/receipt	Fri Dec 21 04:44:58 2018 +0200
   642.2 +++ b/xtron/receipt	Sat Dec 22 04:52:35 2018 +0200
   642.3 @@ -32,5 +32,5 @@
   642.4  
   642.5  genpkg_rules() {
   642.6  	copy @std
   642.7 -	DEPENDS="xorg-libXpm xorg-libXau xorg-libxcb"
   642.8 +	DEPENDS="libxpm libxau libxcb"
   642.9  }
   643.1 --- a/xvkbd/receipt	Fri Dec 21 04:44:58 2018 +0200
   643.2 +++ b/xvkbd/receipt	Sat Dec 22 04:52:35 2018 +0200
   643.3 @@ -11,8 +11,8 @@
   643.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   643.5  WGET_URL="${WEB_SITE}$TARBALL"
   643.6  
   643.7 -BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \
   643.8 -xorg-libXaw3d-dev xorg-xorgproto"
   643.9 +BUILD_DEPENDS="imake libxaw-dev libxp-dev libxtst-dev \
  643.10 +libxaw3d-dev xorgproto"
  643.11  
  643.12  compile_rules() {
  643.13  	# delete Xaw3d
  643.14 @@ -33,7 +33,7 @@
  643.15  
  643.16  genpkg_rules() {
  643.17  	cp -a $install/* $fs
  643.18 -	DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d"
  643.19 +	DEPENDS="libxp libxtst libxaw3d"
  643.20  }
  643.21  
  643.22  post_install() {
   644.1 --- a/yarock/receipt	Fri Dec 21 04:44:58 2018 +0200
   644.2 +++ b/yarock/receipt	Sat Dec 22 04:52:35 2018 +0200
   644.3 @@ -12,7 +12,7 @@
   644.4  WGET_URL="https://launchpad.net/yarock/trunk/$VERSION/+download/$TARBALL"
   644.5  
   644.6  BUILD_DEPENDS="cmake Qt4-dev qmake qt4-phonon taglib-dev qjson-dev \
   644.7 -xorg-libX11 xorg-libXext xorg-libX11-dev wget"
   644.8 +libxext libx11-dev wget"
   644.9  
  644.10  compile_rules() {
  644.11  	sed -i 's/TAGLIB_VERSION STRLESS/TAGLIB_VERSION VERSION_LESS/' \
   645.1 --- a/yeahconsole/receipt	Fri Dec 21 04:44:58 2018 +0200
   645.2 +++ b/yeahconsole/receipt	Sat Dec 22 04:52:35 2018 +0200
   645.3 @@ -11,7 +11,7 @@
   645.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
   645.5  WGET_URL="http://phrat.de/$TARBALL"
   645.6  
   645.7 -BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
   645.8 +BUILD_DEPENDS="libx11-dev xorgproto"
   645.9  
  645.10  compile_rules() {
  645.11  	make &&
   646.1 --- a/zbar/receipt	Fri Dec 21 04:44:58 2018 +0200
   646.2 +++ b/zbar/receipt	Sat Dec 22 04:52:35 2018 +0200
   646.3 @@ -11,7 +11,7 @@
   646.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   646.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   646.6  
   646.7 -BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \
   646.8 +BUILD_DEPENDS="xmlto libx11-dev libxext-dev libxv-dev \
   646.9  libjpeg-turbo-dev imagemagick6-dev gtk2-dev"
  646.10  SPLIT="$PACKAGE-dev"
  646.11  
  646.12 @@ -33,7 +33,7 @@
  646.13  		zbar)
  646.14  			copy @std
  646.15  			DEPENDS="gdk-pixbuf glib gtk2 imagemagick6 libjpeg-turbo \
  646.16 -			xorg-libX11 xorg-libXv"
  646.17 +			libx11 libxv"
  646.18  			;;
  646.19  		*-dev)
  646.20  			copy @dev
   647.1 --- a/zenity+webkit2/receipt	Fri Dec 21 04:44:58 2018 +0200
   647.2 +++ b/zenity+webkit2/receipt	Sat Dec 22 04:52:35 2018 +0200
   647.3 @@ -32,7 +32,7 @@
   647.4  		zenity+webkit2)
   647.5  			copy @std @rm
   647.6  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify libsoup \
   647.7 -			pango webkit2gtk xorg-libX11"
   647.8 +			pango webkit2gtk libx11"
   647.9  			PROVIDE="webkit2gtk:zenity"
  647.10  			TAGS="dialogs"
  647.11  			;;
   648.1 --- a/zenity-gtk2/receipt	Fri Dec 21 04:44:58 2018 +0200
   648.2 +++ b/zenity-gtk2/receipt	Sat Dec 22 04:52:35 2018 +0200
   648.3 @@ -26,6 +26,6 @@
   648.4  	copy @std
   648.5  	rm -r $fs/usr/share/gnome/ $fs/usr/share/omf/ # GNOME stuff. Just remove it
   648.6  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
   648.7 -	xorg-libX11"
   648.8 +	libx11"
   648.9  	TAGS="dialogs gui"
  648.10  }
   649.1 --- a/zenity/receipt	Fri Dec 21 04:44:58 2018 +0200
   649.2 +++ b/zenity/receipt	Sat Dec 22 04:52:35 2018 +0200
   649.3 @@ -32,7 +32,7 @@
   649.4  		zenity)
   649.5  			copy @std @rm
   649.6  			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify pango \
   649.7 -			xorg-libX11"
   649.8 +			libx11"
   649.9  			TAGS="dialogs"
  649.10  			;;
  649.11  	esac
   650.1 --- a/ziproxy/receipt	Fri Dec 21 04:44:58 2018 +0200
   650.2 +++ b/ziproxy/receipt	Sat Dec 22 04:52:35 2018 +0200
   650.3 @@ -11,7 +11,7 @@
   650.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   650.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   650.6  
   650.7 -BUILD_DEPENDS="giflib-dev jasper-dev jpeg-dev cyrus-sasl-dev zlib-dev libpng16-dev"
   650.8 +BUILD_DEPENDS="giflib-dev jasper-dev jpeg-dev cyrus-sasl-dev zlib-dev libpng-dev"
   650.9  
  650.10  compile_rules() {
  650.11  	sed -i 's/DGifCloseFile(GifFile/&,NULL/;s/input))/input,NULL))/' src/image.c
  650.12 @@ -31,6 +31,6 @@
  650.13  	cp -a $src/etc $fs
  650.14  	cp -a $src/var $fs
  650.15  	chown -R root.root $fs
  650.16 -	DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng16"
  650.17 +	DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng"
  650.18  	CONFIG_FILES="/etc/ziproxy"
  650.19  }
   651.1 --- a/zsnes/receipt	Fri Dec 21 04:44:58 2018 +0200
   651.2 +++ b/zsnes/receipt	Sat Dec 22 04:52:35 2018 +0200
   651.3 @@ -12,7 +12,7 @@
   651.4  TARBALL="$PACKAGE${VERSION//./}src.tar.bz2"
   651.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   651.6  
   651.7 -BUILD_DEPENDS="nasm libsdl-dev libpng16-dev ncurses-dev mesa-dev \
   651.8 +BUILD_DEPENDS="nasm libsdl-dev libpng-dev ncurses-dev mesa-dev \
   651.9  automake autoconf zlib-dev patch"
  651.10  
  651.11  compile_rules() {
  651.12 @@ -38,6 +38,6 @@
  651.13  	copy @std
  651.14  #	mkdir -p $fs/usr/bin
  651.15  #	cp -a $src/src/zsnes $fs/usr/bin
  651.16 -	DEPENDS="gcc-lib-base libsdl libpng16 ncurses mesa zlib"
  651.17 +	DEPENDS="gcc-lib-base libsdl libpng ncurses mesa zlib"
  651.18  	TAGS="emulator nintendo snes"
  651.19  }
   652.1 --- a/zvbi/receipt	Fri Dec 21 04:44:58 2018 +0200
   652.2 +++ b/zvbi/receipt	Sat Dec 22 04:52:35 2018 +0200
   652.3 @@ -11,7 +11,7 @@
   652.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   652.5  WGET_URL="$SF_MIRROR/zapping/$TARBALL"
   652.6  
   652.7 -BUILD_DEPENDS="libpng16-dev xorg-libX11-dev gettext-dev doxygen"
   652.8 +BUILD_DEPENDS="libpng-dev libx11-dev gettext-dev doxygen"
   652.9  SPLIT="$PACKAGE-dev"
  652.10  
  652.11  compile_rules() {
  652.12 @@ -27,11 +27,11 @@
  652.13  	case $PACKAGE in
  652.14  		zvbi)
  652.15  			copy @std
  652.16 -			DEPENDS="libpng16 xorg-libX11 zlib"
  652.17 +			DEPENDS="libpng libx11 zlib"
  652.18  			;;
  652.19  		*-dev)
  652.20  			copy @dev
  652.21 -			DEPENDS="zvbi libpng16-dev zlib-dev"
  652.22 +			DEPENDS="zvbi libpng-dev zlib-dev"
  652.23  			;;
  652.24  	esac
  652.25  }