various: make pkgconf an explicit dependency

Closes #216
2020-08-20 11:32:35 +03:00 · 2020-08-20 11:32:35 +03:00 · 16ff18810e
commit 16ff18810e
parent 3b3e749bb5
74 changed files with 103 additions and 29 deletions
--- a/extra/atk/depends
+++ b/extra/atk/depends
@ -1,3 +1,4 @@
 glib
 libffi
-meson make
+meson   make
 pkgconf make
--- a/extra/cairo/depends
+++ b/extra/cairo/depends
@ -6,4 +6,5 @@ libXext
 libXrender
 mesa
 pixman
 pkgconf make
 zlib
--- a/extra/efibootmgr/depends
+++ b/extra/efibootmgr/depends
@ -1,2 +1,3 @@
 efivar
 linux-headers make
 pkgconf make
--- a/extra/ffmpeg/depends
+++ b/extra/ffmpeg/depends
@ -9,6 +9,7 @@ libwebp
 linux-headers make
 nasm          make
 opus
 pkgconf make
 x264
 x265
 xvidcore
--- a/extra/firefox-esr/depends
+++ b/extra/firefox-esr/depends
@ -44,6 +44,7 @@ nodejs        make
 pango
 perl          make
 pixman
 pkgconf       make
 python        make
 python2       make
 rust          make
--- a/extra/firefox/depends
+++ b/extra/firefox/depends
@ -44,6 +44,7 @@ nodejs        make
 pango
 perl          make
 pixman
 pkgconf       make
 python        make
 python2       make
 rust          make
--- a/extra/fontconfig/depends
+++ b/extra/fontconfig/depends
@ -1,3 +1,4 @@
 expat
 freetype-harfbuzz
-gperf    make
+gperf   make
 pkgconf make
--- a/extra/freetype-harfbuzz/depends
+++ b/extra/freetype-harfbuzz/depends
@ -13,6 +13,7 @@ libpng
 libxcb
 libxshmfence
 mesa
-meson make
+meson   make
 pixman
 pkgconf make
 zlib
--- a/extra/gdk-pixbuf/depends
+++ b/extra/gdk-pixbuf/depends
@ -1,4 +1,5 @@
 glib
 libX11
 libpng
-meson  make
+meson   make
 pkgconf make
--- a/extra/glib/depends
+++ b/extra/glib/depends
@ -1,3 +1,4 @@
 libffi
-meson make
+meson   make
 pkgconf make
 zlib
--- a/extra/gtk+2/depends
+++ b/extra/gtk+2/depends
@ -6,4 +6,5 @@ libXi
 libXinerama
 libepoxy
 pango
-python make
+pkgconf make
 python  make
--- a/extra/gtk+3/depends
+++ b/extra/gtk+3/depends
@ -10,4 +10,5 @@ libXinerama
 libXrandr
 libepoxy
 pango
-python make
+pkgconf make
 python  make
--- a/extra/intel-vaapi-driver/depends
+++ b/extra/intel-vaapi-driver/depends
@ -3,3 +3,4 @@ libpciaccess
 libva
 linux-headers make
 meson         make
 pkgconf       make
--- a/extra/libass/depends
+++ b/extra/libass/depends
@ -1,4 +1,5 @@
 expat
 fontconfig
 freetype-harfbuzz
-nasm make
+nasm    make
 pkgconf make
--- a/extra/libdrm/depends
+++ b/extra/libdrm/depends
@ -1,3 +1,4 @@
 libpciaccess
 linux-headers make
 meson         make
 pkgconf       make
--- a/extra/libinput/depends
+++ b/extra/libinput/depends
@ -1,4 +1,5 @@
 libevdev
 linux-headers make
 meson         make
 pkgconf       make
 mtdev
--- a/extra/libva-utils/depends
+++ b/extra/libva-utils/depends
@ -1,2 +1,3 @@
 libva
-mesa make
+mesa    make
 pkgconf make
--- a/extra/libva/depends
+++ b/extra/libva/depends
@ -3,4 +3,5 @@ libXext
 libXfixes
 libdrm
 linux-headers make
 pkgconf       make
 mesa
--- a/extra/mesa/depends
+++ b/extra/mesa/depends
@ -15,6 +15,7 @@ linux-headers make
 llvm
 m4            make
 meson         make
 pkgconf       make
 python        make
 xorgproto
 zlib
--- a/extra/mpv/depends
+++ b/extra/mpv/depends
@ -6,4 +6,5 @@ libXScrnSaver
 libXinerama
 libXrandr
 mesa
-python            make
+pkgconf make
 python  make
--- a/extra/pango/depends
+++ b/extra/pango/depends
@ -5,4 +5,5 @@ fribidi
 glib
 libXft
 libXrender
-meson      make
+meson   make
 pkgconf make
--- a/extra/rust/depends
+++ b/extra/rust/depends
@ -2,6 +2,7 @@ cmake  make
 curl   make
 libressl
 llvm
-python make
+pkgconf make
 python  make
 xz
 zlib
--- a/xorg/libICE/depends
+++ b/xorg/libICE/depends
@ -1,2 +1,3 @@
 pkgconf   make
 xorgproto make
 xtrans    make
--- a/xorg/libSM/depends
+++ b/xorg/libSM/depends
@ -1,2 +1,3 @@
 pkgconf make
 libICE
-xtrans make
+xtrans  make
--- a/xorg/libX11/depends
+++ b/xorg/libX11/depends
@ -1,4 +1,5 @@
 libXau
 libxcb
 pkgconf make
 xorgproto
-xtrans    make
+xtrans  make
--- a/xorg/libXScrnSaver/depends
+++ b/xorg/libXScrnSaver/depends
@ -1,3 +1,4 @@
 libX11    make
 libXext   make
 pkgconf   make
 xorgproto make
--- a/xorg/libXau/depends
+++ b/xorg/libXau/depends
@ -1 +1,2 @@
 pkgconf   make
 xorgproto make
--- a/xorg/libXcomposite/depends
+++ b/xorg/libXcomposite/depends
@ -1,2 +1,3 @@
 xorgproto make
 libXfixes
 pkgconf   make
 xorgproto make
--- a/xorg/libXcursor/depends
+++ b/xorg/libXcursor/depends
@ -1,3 +1,4 @@
 xorgproto  make
 libXrender
 libXfixes
 libXrender
 pkgconf   make
 xorgproto make
--- a/xorg/libXdamage/depends
+++ b/xorg/libXdamage/depends
@ -1,3 +1,4 @@
 xorgproto make
 libX11
 libXfixes
 pkgconf   make
 xorgproto make
--- a/xorg/libXext/depends
+++ b/xorg/libXext/depends
@ -1,2 +1,3 @@
 libX11
 pkgconf   make
 xorgproto make
--- a/xorg/libXfixes/depends
+++ b/xorg/libXfixes/depends
@ -0,0 +1 @@
 pkgconf make
--- a/xorg/libXfont2/depends
+++ b/xorg/libXfont2/depends
@ -1,4 +1,5 @@
 freetype-harfbuzz
 libfontenc
-xorgproto         make
+pkgconf   make
-xtrans            make
+xorgproto make
 xtrans    make
--- a/xorg/libXft/depends
+++ b/xorg/libXft/depends
@ -1,4 +1,5 @@
 fontconfig        make
 freetype-harfbuzz make
 libXrender        make
 pkgconf           make
 xorgproto         make
--- a/xorg/libXi/depends
+++ b/xorg/libXi/depends
@ -1,3 +1,4 @@
 libXext
 libXfixes
 pkgconf   make
 xorgproto make
--- a/xorg/libXinerama/depends
+++ b/xorg/libXinerama/depends
@ -1,2 +1,3 @@
 libXext
 pkgconf make
 xorgproto
--- a/xorg/libXmu/depends
+++ b/xorg/libXmu/depends
@ -1,3 +1,4 @@
 libXext
 libXt
 pkgconf          make
 xorg-util-macros make
--- a/xorg/libXrandr/depends
+++ b/xorg/libXrandr/depends
@ -1,3 +1,4 @@
 libXext
 libXrender
-xorgproto  make
+pkgconf   make
 xorgproto make
--- a/xorg/libXrender/depends
+++ b/xorg/libXrender/depends
@ -1,2 +1,3 @@
 xorgproto make
 libXext   make
 pkgconf   make
 xorgproto make
--- a/xorg/libXt/depends
+++ b/xorg/libXt/depends
@ -1,3 +1,4 @@
 libSM
 libX11
 pkgconf   make
 xorgproto make
--- a/xorg/libXtst/depends
+++ b/xorg/libXtst/depends
@ -3,3 +3,4 @@ libXau
 libXext
 libXi
 libxcb
 pkgconf make
--- a/xorg/libXxf86vm/depends
+++ b/xorg/libXxf86vm/depends
@ -1,2 +1,3 @@
 xorgproto make
 libXext   make
 pkgconf   make
 xorgproto make
--- a/xorg/libfontenc/depends
+++ b/xorg/libfontenc/depends
@ -1,2 +1,3 @@
 pkgconf   make
 xorgproto make
 zlib
--- a/xorg/libxcb/depends
+++ b/xorg/libxcb/depends
@ -1,4 +1,5 @@
 libXau
-python make
+pkgconf make
 python  make
 xcb-proto
 xorg-util-macros
--- a/xorg/libxkbcommon/depends
+++ b/xorg/libxkbcommon/depends
@ -1,2 +1,3 @@
-bison make
+bison   make
-meson make
+meson   make
 pkgconf make
--- a/xorg/libxkbfile/depends
+++ b/xorg/libxkbfile/depends
@ -1,2 +1,3 @@
 libX11    make
 pkgconf   make
 xorgproto make
--- a/xorg/libxshmfence/depends
+++ b/xorg/libxshmfence/depends
@ -1 +1,2 @@
 pkgconf   make
 xorgproto make
--- a/xorg/setxkbmap/depends
+++ b/xorg/setxkbmap/depends
@ -1,2 +1,3 @@
 libX11
 libxkbfile
 pkgconf make
--- a/xorg/st/depends
+++ b/xorg/st/depends
@ -1,4 +1,5 @@
 fontconfig
 libX11
 libXft
-ncurses    make
+ncurses make
 pkgconf make
--- a/xorg/xauth/depends
+++ b/xorg/xauth/depends
@ -1,2 +1,3 @@
 libXmu
 pkgconf          make
 xorg-util-macros make
--- a/xorg/xcb-util-cursor/depends
+++ b/xorg/xcb-util-cursor/depends
@ -1,6 +1,7 @@
 libXau
 libxcb
-m4 make
+m4      make
 pkgconf make
 xcb-util
 xcb-util-image
 xcb-util-renderutil
--- a/xorg/xcb-util-image/depends
+++ b/xorg/xcb-util-image/depends
@ -1,3 +1,4 @@
 libXau
 libxcb
 pkgconf make
 xcb-util
--- a/xorg/xcb-util-keysyms/depends
+++ b/xorg/xcb-util-keysyms/depends
@ -1,2 +1,3 @@
 libxcb
 pkgconf  make
 xcb-util make
--- a/xorg/xcb-util-renderutil/depends
+++ b/xorg/xcb-util-renderutil/depends
@ -1,2 +1,3 @@
 libXau
 libxcb
 pkgconf make
--- a/xorg/xcb-util-wm/depends
+++ b/xorg/xcb-util-wm/depends
@ -1,3 +1,4 @@
 libxcb
 m4       make
 pkgconf  make
 xcb-util make
--- a/xorg/xcb-util/depends
+++ b/xorg/xcb-util/depends
@ -1,2 +1,3 @@
 libXau
 libxcb
 pkgconf make
--- a/xorg/xev/depends
+++ b/xorg/xev/depends
@ -1,4 +1,5 @@
 libX11
 libXrandr
 pkgconf          make
 xorg-util-macros make
 xorgproto        make
--- a/xorg/xf86-input-libinput/depends
+++ b/xorg/xf86-input-libinput/depends
@ -1,3 +1,4 @@
 libinput
 linux-headers make
 pkgconf       make
 xorg-server
--- a/xorg/xf86-video-amdgpu/depends
+++ b/xorg/xf86-video-amdgpu/depends
@ -3,4 +3,5 @@ libdrm
 libpciaccess
 linux-headers make
 mesa
 pkgconf       make
 xorgproto
--- a/xorg/xf86-video-ati/depends
+++ b/xorg/xf86-video-ati/depends
@ -3,4 +3,5 @@ libdrm
 libpciaccess
 linux-headers make
 mesa
 pkgconf       make
 xorgproto
--- a/xorg/xf86-video-intel/depends
+++ b/xorg/xf86-video-intel/depends
@ -4,5 +4,6 @@ libXinerama
 libXrandr
 libXtst
 linux-headers make
-meson make
+meson         make
 pkgconf       make
 xorg-server
--- a/xorg/xf86-video-nouveau/depends
+++ b/xorg/xf86-video-nouveau/depends
@ -1,3 +1,4 @@
 libdrm
 linux-headers make
 pkgconf       make
 xorgproto
--- a/xorg/xf86-video-vesa/depends
+++ b/xorg/xf86-video-vesa/depends
@ -1,3 +1,4 @@
 libXi
 pkgconf          make
 xorg-util-macros make
 xorgproto        make
--- a/xorg/xinit/depends
+++ b/xorg/xinit/depends
@ -1 +1,2 @@
 libX11
 pkgconf make
--- a/xorg/xinput/depends
+++ b/xorg/xinput/depends
@ -2,3 +2,4 @@ libX11
 libXmu
 libXi
 libXinerama
 pkgconf make
--- a/xorg/xkbcomp/depends
+++ b/xorg/xkbcomp/depends
@ -1,2 +1,3 @@
 libX11     make
 libxkbfile make
 pkgconf    make
--- a/xorg/xkeyboard-config/depends
+++ b/xorg/xkeyboard-config/depends
@ -1,3 +1,4 @@
 libX11  make
 pkgconf make
 python  make
 xkbcomp
--- a/xorg/xorg-server/depends
+++ b/xorg/xorg-server/depends
@ -18,6 +18,7 @@ libxshmfence
 linux-headers make
 mesa
 pixman
 pkgconf make
 xkeyboard-config
 xtrans make
 zlib
--- a/xorg/xprop/depends
+++ b/xorg/xprop/depends
@ -1,2 +1,3 @@
 libX11
 libXmu
 pkgconf make
--- a/xorg/xrandr/depends
+++ b/xorg/xrandr/depends
@ -1,2 +1,3 @@
 libXrandr
 pkgconf          make
 xorg-util-macros make
--- a/xorg/xrdb/depends
+++ b/xorg/xrdb/depends
@ -1,3 +1,4 @@
 libX11
 libXmu
 pkgconf          make
 xorg-util-macros make
--- a/xorg/xset/depends
+++ b/xorg/xset/depends
@ -1,2 +1,3 @@
 libXmu
 pkgconf          make
 xorg-util-macros make
--- a/xorg/xsetroot/depends
+++ b/xorg/xsetroot/depends
@ -2,4 +2,5 @@ libXmu
 libXrender
 libXfixes
 libXcursor
 pkgconf make
 xbitmaps
--- a/xorg/xtrans/depends
+++ b/xorg/xtrans/depends
@ -0,0 +1 @@
 pkgconf make
`@ -1 +1,2 @@`
		`pkgconf make`
	`xorgproto make`	`xorgproto make`