commit 92e64cf

hovercats  ·  2024-02-24 17:48:50 +0000 UTC
parent 8f791f3 
repo/: set prefix to /pkg
96 files changed,  +429, -429
M repo/bgs/build
M repo/cairo/build
M repo/cmake/build
M repo/dmenu/build
M repo/expat/build
M repo/fontconfig/build
M repo/freetype-harfbuzz/build
M repo/gdk-pixbuf/build
M repo/glazier/build
M repo/glib-networking/build
M repo/glib/build
M repo/gnutls/build
M repo/gperf/build
M repo/gtk+3/build
M repo/icu/build
M repo/imlib2/build
M repo/libICE/build
M repo/libSM/build
M repo/libX11/build
M repo/libXau/build
M repo/libXcomposite/build
M repo/libXcursor/build
M repo/libXdamage/build
M repo/libXdmcp/build
M repo/libXext/build
M repo/libXfixes/build
M repo/libXfont/build
M repo/libXft/build
M repo/libXi/build
M repo/libXinerama/build
M repo/libXmu/build
M repo/libXrandr/build
M repo/libXrender/build
M repo/libXt/build
M repo/libXtst/build
M repo/libXxf86vm/build
M repo/libdrm/build
M repo/libelf/build
M repo/libepoxy/build
M repo/libffi/build
M repo/libfontenc/build
M repo/libgcrypt/build
M repo/libgpg-error/build
M repo/libjpeg-turbo/build
M repo/libnghttp2/build
M repo/libpciaccess/build
M repo/libpng/build
M repo/libpsl/build
M repo/libressl/build
M repo/libsoup3/build
M repo/libwebp/build
M repo/libxcb/build
M repo/libxkbcommon/build
M repo/libxml2/build
M repo/libxshmfence/build
M repo/libxslt/build
M repo/libyaml/build
M repo/mesa/build
M repo/meson/build
M repo/muon/build
M repo/nettle/build
M repo/pango/build
M repo/pcre2/build
M repo/perl/build
M repo/pixman/build
M repo/pkgconf/build
M repo/python-flit-core/build
M repo/python-gpep517/build
M repo/python-mako/build
M repo/python-markupsafe/build
M repo/python/build
M repo/ruby/build
M repo/sqlite/build
M repo/st/build
M repo/surf/build
M repo/sx/build
M repo/sxhkd/build
M repo/tinyx/build
M repo/unifdef/build
M repo/unzip/build
M repo/webkit2gtk/build
M repo/xauth/build
M repo/xbanish/build
M repo/xcb-proto/build
M repo/xcb-util-cursor/build
M repo/xcb-util-image/build
M repo/xcb-util-keysyms/build
M repo/xcb-util-renderutil/build
M repo/xcb-util/build
M repo/xorg-util-macros/build
M repo/xorgproto/build
M repo/xprop/build
M repo/xtrans/build
M repo/yt-dlp/build
M repo/zip/build
M repo/zlib/build
M repo/bgs/build
+2, -2 
 1@@ -9,7 +9,7 @@ sed -e 's/\${XINERAMALIBS}//' \
 2 mv -f _ config.mk
 3 
 4 make
 5-make DESTDIR="$1" PREFIX=/ install
 6+make DESTDIR="$1" PREFIX=/pkg install
 7 
 8 # Compress manpages
 9-find "$1/share/man" -type f | xargs gzip -n -9
10+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/cairo/build
+1, -1 
1@@ -13,7 +13,7 @@ sed 's/boilerplate test perf//g;s/src doc/src/g' Makefile.in > _
2 mv -f _ Makefile.in
3 
4 sh ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-static \
8     --enable-tee \
9     --enable-gl \
M repo/cmake/build
+4, -4 
 1@@ -10,7 +10,7 @@ mv -f _ Utilities/cmlibarchive/libarchive/archive_hmac.c
 2 
 3 if kiss l cmake; then
 4     cmake -B build \
 5-        -DCMAKE_INSTALL_PREFIX=/ \
 6+        -DCMAKE_INSTALL_PREFIX=/pkg \
 7         -DCMAKE_BUILD_TYPE=Release \
 8         -DCMAKE_USE_SYSTEM_CURL=False \
 9         -DCMAKE_USE_SYSTEM_EXPAT=True \
10@@ -25,7 +25,7 @@ if kiss l cmake; then
11 
12 else
13     ./configure \
14-        --prefix=/ \
15+        --prefix=/pkg \
16         --no-system-curl \
17         --system-expat \
18         --system-zlib \
19@@ -39,5 +39,5 @@ fi
20 
21 rm -rf \
22     "$1/doc" \
23-    "$1/share/cmake"*/Help \
24-    "$1/share/bash-completion"
25+    "$1/pkg/share/cmake"*/Help \
26+    "$1/pkg/share/bash-completion"
M repo/dmenu/build
+2, -2 
 1@@ -5,7 +5,7 @@ for p in *.patch; do
 2 done
 3 
 4 make LDFLAGS="$LDFLAGS -static"
 5-make DESTDIR="$1" PREFIX=/ install
 6+make DESTDIR="$1" PREFIX=/pkg install
 7 
 8 # Compress manpages
 9-find "$1/share/man" -type f | xargs gzip -n -9
10+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/expat/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --without-xmlwf \
 8     --without-examples \
 9     --without-tests \
10@@ -11,4 +11,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Remove documentation (Changelogs, etc).
14-rm -rf "${1:?}/share"
15+rm -rf "${1:?}/pkg/share"
M repo/fontconfig/build
+2, -2 
 1@@ -1,13 +1,13 @@
 2 #!/bin/sh -e
 3 
 4-# Make the build system run /bin/true to generate
 5+# Make the build system run /pkg/bin/true to generate
 6 # a dummy file so our pre-generated one is used.
 7 sed 's/fcobjshash\.h/fcjunk.h/' src/Makefile.in > _
 8 mv -f _ src/Makefile.in
 9 
10 ./configure \
11     GPERF=/bin/true \
12-    --prefix=/ \
13+    --prefix=/pkg \
14     --localstatedir=/var \
15     --sysconfdir=/etc \
16     --with-xmldir=/etc/fonts \
M repo/freetype-harfbuzz/build
+8, -8 
 1@@ -7,7 +7,7 @@ build_freetype() (
 2     cd freetype
 3 
 4     meson setup \
 5-        -Dprefix=/ \
 6+        -Dprefix=/pkg \
 7         -Ddefault_library=both \
 8         -Dbzip2=disabled \
 9         -Dzlib=disabled \
10@@ -28,8 +28,8 @@ build_harfbuzz() (
11 kiss list icu  >/dev/null 2>&1 || icu_enabled=disabled
12 
13     meson setup \
14-        -Dprefix=/ \
15-        -Dpkg_config_path="$DESTDIR/lib/pkgconfig" \
16+        -Dprefix=/pkg \
17+        -Dpkg_config_path="$DESTDIR/pkg/lib/pkgconfig" \
18         -Ddefault_library=both \
19         -Dglib=disabled \
20         -Dfreetype=enabled \
21@@ -46,13 +46,13 @@ kiss list icu  >/dev/null 2>&1 || icu_enabled=disabled
22 )
23 
24 # Point Freetype to the Harfbuzz files.
25-export CFLAGS="$CFLAGS -I$DESTDIR/include/harfbuzz"
26-export CFLAGS="$CFLAGS -L$DESTDIR/lib "
27-export PKG_CONFIG_PATH="$DESTDIR/lib/pkgconfig"
28+export CFLAGS="$CFLAGS -I$DESTDIR/pkg/include/harfbuzz"
29+export CFLAGS="$CFLAGS -L$DESTDIR/pkg/lib "
30+export PKG_CONFIG_PATH="$DESTDIR/pkg/lib/pkgconfig"
31 
32 # Point Harfbuzz to the Freetype files.
33-export CXXFLAGS="$CXXFLAGS -I$DESTDIR/include/freetype2"
34-export CXXFLAGS="$CXXFLAGS -L$DESTDIR/lib"
35+export CXXFLAGS="$CXXFLAGS -I$DESTDIR/pkg/include/freetype2"
36+export CXXFLAGS="$CXXFLAGS -L$DESTDIR/pkg/lib"
37 
38 build_freetype -Dharfbuzz=disabled
39 build_harfbuzz
M repo/gdk-pixbuf/build
+2, -2 
 1@@ -3,9 +3,9 @@
 2 export DESTDIR="$1"
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6+    -Dprefix=/pkg \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/share/man \
 9+    -Dmandir=/pkg/share/man \
10     -Ddebug=false \
11     -Djpeg=enabled \
12     -Dpng=enabled \
M repo/glazier/build
+4, -4 
 1@@ -15,11 +15,11 @@ sed 's/deadca7/836421/' config.def.h > _
 2 mv _ config.def.h
 3 
 4 make
 5-make DESTDIR="$1" PREFIX=/ install
 6+make DESTDIR="$1" PREFIX=/pkg install
 7 
 8 # Makefile doesnt install manpages
 9-mkdir -p     "$1/share/man/man1"
10-cp glazier.1 "$1/share/man/man1"
11+mkdir -p     "$1/pkg/share/man/man1"
12+cp glazier.1 "$1/pkg/share/man/man1"
13 
14 # Compress manpages
15-find "$1/share/man" -type f | xargs gzip -n -9
16+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/glib-networking/build
+1, -1 
1@@ -7,7 +7,7 @@ sed "/subdir('tests')/d" tls/meson.build > _
2 mv -f _ tls/meson.build
3 
4 meson setup \
5-    -Dprefix=/ \
6+    -Dprefix=/pkg \
7     -Dsysconfdir=/etc \
8     -Dlocalstatedir=/var \
9     -Dlibproxy=disabled \
M repo/glib/build
+3, -3 
 1@@ -5,8 +5,8 @@ export DESTDIR="$1"
 2 : > fuzzing/meson.build
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6-    -Dlibexecdir=/lib \
 7+    -Dprefix=/pkg \
 8+    -Dlibexecdir=/pkg/lib \
 9     -Dlibmount=disabled \
10     -Dinstalled_tests=false \
11     -Dman=false \
12@@ -18,4 +18,4 @@ meson setup \
13 samu -C build
14 samu -C build install
15 
16-rm -rf "$1/bin/gdbus"
17+rm -rf "$1/pkg/bin/gdbus"
M repo/gnutls/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --disable-nls \
 8     --with-nettle-mini \
 9     --with-included-libtasn1 \
10@@ -13,4 +13,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/gperf/build
+3, -3 
 1@@ -3,13 +3,13 @@
 2 export DESTDIR="$1"
 3 
 4 ./configure \
 5-    --prefix=/
 6+    --prefix=/pkg
 7 
 8 make
 9 make install
10 
11 # Remove HTML documentation.
12-rm -rf "$1/share/doc"
13+rm -rf "$1/pkg/share/doc"
14 
15 # Compress manpages
16-find "$1/share/man" -type f | xargs gzip -n -9
17+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/gtk+3/build
+2, -2 
 1@@ -26,7 +26,7 @@ sed '/<atk-bridge.h>/d;/atk_bridge_adaptor_init/d' \
 2 mv -f _ gtk/a11y/gtkaccessibility.c
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6+    -Dprefix=/pkg \
 7     -Dx11_backend=true \
 8     -Dwayland_backend=false \
 9     -Dxinerama=yes \
10@@ -43,4 +43,4 @@ ninja -C output install
11 
12 # We don't compile with librsvg which leads to this utility solely causing
13 # compiler errors for some packages. It has no use at all.
14-rm -f "$1/bin/gtk-encode-symbolic-svg"
15+rm -f "$1/pkg/bin/gtk-encode-symbolic-svg"
M repo/icu/build
+3, -3 
 1@@ -12,11 +12,11 @@ sed '/LICENSE/d' icu4c/source/Makefile.in > _
 2 mv -f _ icu4c/source/Makefile.in
 3 
 4 sh icu4c/source/configure \
 5-    --prefix=/ \
 6-    --sbindir=/bin
 7+    --prefix=/pkg \
 8+    --sbindir=/pkg/bin
 9 
10 make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/imlib2/build
+1, -1 
1@@ -4,7 +4,7 @@ export DESTDIR="$1"
2 
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --sysconfdir=/etc/imlib2 \
8     --enable-visibility-hiding
9
M repo/libICE/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,20 +15,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libSM/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,20 +15,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libX11/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXau/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXcomposite/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=//share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,23 +17,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to //share.
18-! [ -d "$1//share/pkgconfig" ] || {
19-    mkdir -p "$1//lib"
20-    mv -f "$1//share/pkgconfig" "$1//lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1//share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1//share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1//share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXcursor/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,23 +17,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXdamage/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -16,20 +16,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libXdmcp/build
+9, -9 
 1@@ -6,7 +6,7 @@ TMPDIR="$1/tmp"
 2 
 3 ./configure \
 4     --host=x86_64-linux-musl \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8     --localstatedir=/var \
 9     --without-xmlto \
10@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
11 make
12 make install
13 
14-# Some X11 packages install to /share.
15-! [ -d "$1/share/pkgconfig" ] || {
16-    mkdir -p "$1/lib"
17-    mv -f "$1/share/pkgconfig" "$1/lib"
18+# Some X11 packages install to /pkg/share.
19+! [ -d "$1/pkg/share/pkgconfig" ] || {
20+    mkdir -p "$1/pkg/lib"
21+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
22 }
23 
24 # We need to keep this around.
25-! [ -d "$1/share/aclocal" ] || {
26+! [ -d "$1/pkg/share/aclocal" ] || {
27     mkdir -p "$TMPDIR"
28-    mv -f "$1/share/aclocal" "$TMPDIR"
29+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
30 }
31 
32 # Restore kept directories.
33 ! [ -d "$TMPDIR" ] || {
34-    mv -f "$TMPDIR/"* "$1/share"
35+    mv -f "$TMPDIR/"* "$1/pkg/share"
36     rm -rf "$TMPDIR"
37 }
38 
39 # Remove docs
40-rm -rf "$1/share/doc"
41+rm -rf "$1/pkg/share/doc"
M repo/libXext/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXfixes/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXfont/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,20 +17,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libXft/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,23 +17,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXi/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXinerama/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,23 +17,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXmu/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,20 +15,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libXrandr/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -17,23 +17,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXrender/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -16,20 +16,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/libXt/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXtst/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libXxf86vm/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs \
13@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libdrm/build
+1, -1 
1@@ -3,7 +3,7 @@
2 export DESTDIR="$1"
3 
4 meson setup \
5-	-Dprefix=/ \
6+	-Dprefix=/pkg \
7 	-Dintel=disabled \
8 	-Dnouveau=disabled \
9 	-Damdgpu=disabled \
M repo/libelf/build
+2, -2 
 1@@ -6,7 +6,7 @@ patch -p1 < musl.patch
 2 export CFLAGS="$CFLAGS -Wno-error"
 3 
 4 sh ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --disable-symbol-versioning \
 8     --disable-debuginfod \
 9     --disable-libdebuginfod \
10@@ -29,4 +29,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libepoxy/build
+3, -3 
 1@@ -6,10 +6,10 @@ export DESTDIR="$1"
 2 : > test/meson.build
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6+    -Dprefix=/pkg \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/share/man \
 9-    -Dpkg_config_path=/lib/pkgconfig \
10+    -Dmandir=/pkg/share/man \
11+    -Dpkg_config_path=/pkg/lib/pkgconfig \
12     -Dx11=true \
13     output
14
M repo/libffi/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --disable-exec-static-tramp \
 8     --enable-static
 9 
10@@ -9,4 +9,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libfontenc/build
+2, -2 
 1@@ -1,8 +1,8 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6-    --with-fontrootdir=/share/fonts/X11 \
 7+    --prefix=/pkg \
 8+    --with-fontrootdir=/pkg/share/fonts/X11 \
 9     --disable-shared
10 
11 make
M repo/libgcrypt/build
+3, -3 
 1@@ -6,13 +6,13 @@ sed '/^#ifdef USE_JENT/a #include <fcntl.h>\n#include <limits.h>' \
 2 mv -f _ random/rndjent.c
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var
11 
12 make
13 make DESTDIR="$1" install
14 
15 # Compress manpages
16-find "$1/share/man" -type f | xargs gzip -n -9
17+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libgpg-error/build
+3, -3 
 1@@ -1,13 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var
11 
12 make
13 make DESTDIR="$1" install
14 
15 # Compress manpages
16-find "$1/share/man" -type f | xargs gzip -n -9
17+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libjpeg-turbo/build
+6, -6 
 1@@ -5,11 +5,11 @@ export DESTDIR="$1"
 2 patch -p1 < no-docs.patch
 3 
 4 cmake -B build \
 5-    -DCMAKE_INSTALL_PREFIX=/ \
 6-    -DCMAKE_INSTALL_LIBDIR=/lib \
 7-    -DCMAKE_INSTALL_BINDIR=/bin \
 8-    -DCMAKE_INSTALL_INCLUDEDIR=/bin \
 9-    -DCMAKE_INSTALL_MANDIR=/share \
10+    -DCMAKE_INSTALL_PREFIX=/pkg \
11+    -DCMAKE_INSTALL_LIBDIR=/pkg/lib \
12+    -DCMAKE_INSTALL_BINDIR=/pkg/bin \
13+    -DCMAKE_INSTALL_INCLUDEDIR=/pkg/bin \
14+    -DCMAKE_INSTALL_MANDIR=/pkg/share \
15     -DCMAKE_SHARED_LIBS=False \
16     -DCMAKE_STATIC_LIBS=True \
17     -DCMAKE_BUILD_TYPE=Release \
18@@ -19,4 +19,4 @@ cmake --build   build
19 cmake --install build
20 
21 # Compress manpages
22-find "$1/share/man" -type f | xargs gzip -n -9
23+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libnghttp2/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --disable-examples \
 8     --disable-python-bindings \
 9     --enable-lib-only
10@@ -10,4 +10,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libpciaccess/build
+1, -1 
1@@ -5,7 +5,7 @@ patch -p1 < lfs64.patch
2 export DESTDIR="$1"
3 
4 meson setup \
5-    -Dprefix=/ \
6+    -Dprefix=/pkg \
7     -Ddefault_library=static \
8     build
9
M repo/libpng/build
+2, -2 
 1@@ -3,10 +3,10 @@
 2 patch -p1 < apng.patch
 3 
 4 ./configure \
 5-    --prefix=/
 6+    --prefix=/pkg
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/share/man" -type f | xargs gzip -n -9
13+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libpsl/build
+2, -2 
 1@@ -1,10 +1,10 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/
 6+    --prefix=/pkg
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/share/man" -type f | xargs gzip -n -9
13+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libressl/build
+2, -2 
 1@@ -2,7 +2,7 @@
 2 
 3 ./configure \
 4 	PROG_LDADD=-all-static \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8     --disable-tests
 9 
10@@ -13,4 +13,4 @@ make DESTDIR="$1" install
11 rm -rf "$1/etc/ssl"
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libsoup3/build
+1, -1 
1@@ -17,7 +17,7 @@ export CFLAGS="$CFLAGS -w"
2 export CXXFLAGS="$CXXFLAGS -w"
3 
4 meson setup \
5-    -Dprefix=/ \
6+    -Dprefix=/pkg \
7     -Dsysconfdir=/etc \
8     -Dlocalstatedir=/var \
9     -Dtests=false \
M repo/libwebp/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --disable-tiff \
 8     --enable-libwebpmux \
 9     --enable-libwebpdemux \
10@@ -11,4 +11,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libxcb/build
+10, -10 
 1@@ -5,32 +5,32 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     ac_cv_lib_Xdmcp_XdmcpWrap=no
12 
13 make
14 make install
15 
16-# Some X11 packages install to /share.
17-! [ -d "$1/share/pkgconfig" ] || {
18-    mkdir -p "$1/lib"
19-    mv -f "$1/share/pkgconfig" "$1/lib"
20+# Some X11 packages install to /pkg/share.
21+! [ -d "$1/pkg/share/pkgconfig" ] || {
22+    mkdir -p "$1/pkg/lib"
23+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
24 }
25 
26 # We need to keep this around.
27-! [ -d "$1/share/aclocal" ] || {
28+! [ -d "$1/pkg/share/aclocal" ] || {
29     mkdir -p "$TMPDIR"
30-    mv -f "$1/share/aclocal" "$TMPDIR"
31+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32 }
33 
34 # Restore kept directories.
35 ! [ -d "$TMPDIR" ] || {
36-    mv -f "$TMPDIR/"* "$1/share"
37+    mv -f "$TMPDIR/"* "$1/pkg/share"
38     rm -rf "$TMPDIR"
39 }
40 
41 # Compress manpages
42-find "$1/share/man" -type f | xargs gzip -n -9
43+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libxkbcommon/build
+4, -4 
 1@@ -3,17 +3,17 @@
 2 export DESTDIR="$1"
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6-    -Dlibexecdir=/lib \
 7+    -Dprefix=/pkg \
 8+    -Dlibexecdir=/pkg/lib \
 9     -Ddefault_library=static \
10     -Denable-docs=false \
11     -Denable-wayland=false \
12     -Denable-xkbregistry=false \
13-    -Dpkg_config_path=/lib/pkgconfig \
14+    -Dpkg_config_path=/pkg/lib/pkgconfig \
15     output
16 
17 samu -C output
18 samu -C output install
19 
20 # Compress manpages
21-find "$1/share/man" -type f | xargs gzip -n -9
22+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libxml2/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --with-threads \
 8     --with-history \
 9     --without-python \
10@@ -11,4 +11,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libxshmfence/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --with-shared-memory-dir=/dev/shm \
8     --disable-shared
9
M repo/libxslt/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --without-python \
 8     --without-debugger \
 9     --without-debug \
10@@ -11,4 +11,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/libyaml/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/
6+    --prefix=/pkg
7 
8 make
9 make DESTDIR="$1" install
M repo/mesa/build
+2, -2 
 1@@ -15,9 +15,9 @@ mv -f _ meson.build
 2 ! kiss list libglvnd >/dev/null 2>&1 || glvnd_enabled=true
 3 
 4 meson setup \
 5-    -Dprefix=/ \
 6+    -Dprefix=/pkg \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/share/man \
 9+    -Dmandir=/pkg/share/man \
10     -Dlocalstatedir=/var \
11     -Dbuildtype=release \
12     -Dglx-read-only-text=true \
M repo/meson/build
+5, -5 
 1@@ -8,11 +8,11 @@ chmod 755 meson
 2 chmod 655 man/meson.1
 3 
 4 mkdir -p \
 5-	"$1/bin" \
 6-	"$1/share/man/man1"
 7+	"$1/pkg/bin" \
 8+	"$1/pkg/share/man/man1"
 9 
10-cp -f meson "$1/bin"
11-cp -f man/meson.1 "$1/share/man/man1"
12+cp -f meson "$1/pkg/bin"
13+cp -f man/meson.1 "$1/pkg/share/man/man1"
14 
15 # Compress manpages
16-find "$1/share/man" -type f | xargs gzip -n -9
17+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/muon/build
+1, -1 
1@@ -13,7 +13,7 @@ command -v muon > /dev/null || {
2 }
3 
4 muon setup \
5-      -Dprefix=/ \
6+      -Dprefix=/pkg \
7       -Ddocs=disabled \
8       -Dlibcurl=disabled \
9       -Dlibpkgconf=disabled \
M repo/nettle/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --enable-static \
8     --enable-mini-gmp \
9     --disable-documentation
M repo/pango/build
+1, -1 
1@@ -15,7 +15,7 @@ rm -rf subprojects
2 : > docs/meson.build
3 
4 meson setup \
5-    -Dprefix=/ \
6+    -Dprefix=/pkg \
7     -Dgtk_doc=false \
8     -Dintrospection=disabled \
9     output
M repo/pcre2/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --enable-pcre2-16 \
 8     --enable-pcre2-32 \
 9     --enable-pcre2grep-libz \
10@@ -11,4 +11,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/perl/build
+8, -8 
 1@@ -7,8 +7,8 @@ export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
 2 
 3 ./Configure \
 4     -des \
 5-    -Dprefix=/ \
 6-    -Dvendorprefix=/ \
 7+    -Dprefix=/pkg \
 8+    -Dvendorprefix=/pkg \
 9     -Dusevendorprefix \
10     -Duseshrplib \
11     -Dusesoname \
12@@ -24,10 +24,10 @@ export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
13     -Dar="$AR" \
14     -Dnm="$NM" \
15     -Dranlib="$RANLIB" \
16-    -Dman1dir=/share/man/man1 \
17-    -Dman3dir=/share/man/man3 \
18-    -Dinstallman1dir=/share/man/man1 \
19-    -Dinstallman3dir=/share/man/man3 \
20+    -Dman1dir=/pkg/share/man/man1 \
21+    -Dman3dir=/pkg/share/man/man3 \
22+    -Dinstallman1dir=/pkg/share/man/man1 \
23+    -Dinstallman3dir=/pkg/share/man/man3 \
24     -Dman1ext=1 \
25     -Dman3ext=3pm \
26     -Dperl_static_inline="static __inline__" \
27@@ -46,7 +46,7 @@ find "$1" -name \*.bs        -exec rm -f {} +
28 find "$1" -name \*.0 -type f -exec rm -f {} +
29 
30 # Fix permissions.
31-find "$1/lib" -type f -exec chmod 644 {} \;
32+find "$1/pkg/lib" -type f -exec chmod 644 {} \;
33 
34 # Compress manpages
35-find "$1/share/man" -type f | xargs gzip -n -9
36+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/pixman/build
+1, -1 
1@@ -3,7 +3,7 @@
2 export DESTDIR="$1"
3 
4 meson setup \
5-    -Dprefix=/ \
6+    -Dprefix=/pkg \
7     -Dgtk=disabled \
8     -Ddefault_library=static \
9     output
M repo/pkgconf/build
+5, -5 
 1@@ -4,18 +4,18 @@ export LDFLAGS="$LDFLAGS -static-pie"
 2 export CFLAGS="$CFLAGS -fPIE"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --disable-shared
11 
12 make bin_PROGRAMS=pkgconf
13 make bin_PROGRAMS=pkgconf DESTDIR="$1" install
14 
15-ln -s pkgconf "$1/bin/pkg-config"
16+ln -s pkgconf "$1/pkg/bin/pkg-config"
17 
18 # Remove documentation (README, etc).
19-rm -rf "$1/share/doc"
20+rm -rf "$1/pkg/share/doc"
21 
22 # Compress manpages
23-find "$1/share/man" -type f | xargs gzip -n -9
24+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/python-flit-core/build
+1, -1 
1@@ -5,4 +5,4 @@ python flit_core/build_dists.py
2 
3 python -m installer -d "$1" "flit_core/dist/flit_core-$2-py3-none-any.whl"
4 
5-rm -rf "$1/lib/python3*/site-packages/flit_core/tests"
6+rm -rf "$1/pkg/lib/python3*/site-packages/flit_core/tests"
M repo/python-gpep517/build
+3, -3 
 1@@ -8,6 +8,6 @@ mkdir -p "$1/$sitedir"
 2 cp -pR gpep517 "$1/$sitedir"
 3 python -m compileall "$1/$sitedir"
 4 
 5-mkdir -p "$1/bin"
 6-cp gpep517.bin "$1/bin/gpep517"
 7-chmod 755 "$1/bin/gpep517"
 8+mkdir -p "$1/pkg/bin"
 9+cp gpep517.bin "$1/pkg/bin/gpep517"
10+chmod 755 "$1/pkg/bin/gpep517"
M repo/python-mako/build
+1, -1 
1@@ -2,5 +2,5 @@
2 
3 python3 setup.py build
4 python3 setup.py install \
5-    --prefix= \
6+    --prefix=/pkg \
7     --root="$1"
M repo/python-markupsafe/build
+1, -1 
1@@ -2,5 +2,5 @@
2 
3 python3 setup.py build
4 python3 setup.py install \
5-    --prefix= \
6+    --prefix=/pkg \
7     --root="$1"
M repo/python/build
+7, -7 
 1@@ -16,8 +16,8 @@ export CFLAGS="$CFLAGS -fno-semantic-interposition"
 2 export LDFLAGS="$LDFLAGS -fno-semantic-interposition"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6-    --libdir=/lib \
 7+    --prefix=/pkg \
 8+    --libdir=/pkg/lib \
 9     --enable-shared \
10     --with-system-ffi \
11     --with-ensurepip=yes \
12@@ -30,8 +30,8 @@ export LDFLAGS="$LDFLAGS -fno-semantic-interposition"
13 make EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000"
14 make DESTDIR="$1" install
15 
16-ln -s python3 "$1/bin/python"
17-ln -s pip3    "$1/bin/pip"
18+ln -s python3 "$1/pkg/bin/python"
19+ln -s pip3    "$1/pkg/bin/pip"
20 
21 # Let's make some kind of effort to reduce the overall
22 # size of Python by removing a bunch of rarely used and
23@@ -40,13 +40,13 @@ ln -s pip3    "$1/bin/pip"
24 # This can't be done via ./configure as the build system
25 # doesn't give you this much control over the process.
26 {
27-    cd "$1/lib/python"*
28+    cd "$1/pkg/lib/python"*
29     rm -rf test ./*/test ./*/tests
30     rm -rf pydoc* idlelib turtle* config-*
31 
32-    cd "$1/bin"
33+    cd "$1/pkg/bin"
34     rm -f pydoc* idle*
35 }
36 
37 # Compress manpages
38-find "$1/share/man" -type f | xargs gzip -n -9
39+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/ruby/build
+2, -2 
 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --enable-shared \
 8     --enable-static \
 9     --disable-rpath
10@@ -10,4 +10,4 @@ make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/share/man" -type f | xargs gzip -n -9
15+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/sqlite/build
+1, -1 
1@@ -4,7 +4,7 @@
2 export CPPFLAGS="$CPPFLAGS -DSQLITE_ENABLE_COLUMN_METADATA"
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --enable-threadsafe \
8     --enable-dynamic-extensions \
9     --enable-fts5 \
M repo/st/build
+2, -2 
 1@@ -14,7 +14,7 @@ make \
 2 	LDFLAGS="$LDFLAGS -static-pie -lX11 -lXft \
 3 	-lxcb -lX11-xcb -lXrender -lXau" \
 4 	CFLAGS="$CFLAGS -fPIE"
 5-make PREFIX=/ DESTDIR="$1" install
 6+make PREFIX=/pkg DESTDIR="$1" install
 7 
 8 # Compress manpages
 9-find "$1/share/man" -type f | xargs gzip -n -9
10+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/surf/build
+2, -2 
 1@@ -9,7 +9,7 @@ sed 's/4.0/4.1/g' config.mk > _
 2 mv -f _ config.mk
 3 
 4 make
 5-make DESTDIR="$1" PREFIX=/ install
 6+make DESTDIR="$1" PREFIX=/pkg install
 7 
 8 # Compress manpages
 9-find "$1/share/man" -type f | xargs gzip -n -9
10+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/sx/build
+4, -4 
 1@@ -7,11 +7,11 @@ sed -e 's/-keeptty//' \
 2 mv -f _ sx
 3 
 4 mkdir -p \
 5-	"$1/bin" \
 6-	"$1/share/man/man1"
 7+	"$1/pkg/bin" \
 8+	"$1/pkg/share/man/man1"
 9 
10 chmod 755 sx
11 chmod 655 sx.1
12 
13-cp -f sx "$1/bin"
14-cp -f sx.1 "$1/share/man/man1"
15+cp -f sx "$1/pkg/bin"
16+cp -f sx.1 "$1/pkg/share/man/man1"
M repo/sxhkd/build
+3, -3 
 1@@ -3,10 +3,10 @@
 2 export LDFLAGS="$LDFLAGS -static -lxcb -lXau"
 3 
 4 make
 5-make DESTDIR="$1" PREFIX=/ install
 6+make DESTDIR="$1" PREFIX=/pkg install
 7 
 8 # Remove docs
 9-rm -rf "$1/share/doc"
10+rm -rf "$1/pkg/share/doc"
11 
12 # Compress manpages
13-find "$1/share/man" -type f | xargs gzip -n -9
14+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/tinyx/build
+7, -7 
 1@@ -2,22 +2,22 @@
 2 
 3 export LDFLAGS="$LDFLAGS -static-pie"
 4 export XSERVERCFLAGS_CFLAGS="-fPIE"
 5-export XSERVERLIBS_LIBS="/lib/*.a -lz -lfreetype -lpng16"
 6+export XSERVERLIBS_LIBS="/pkg/lib/*.a -lz -lfreetype -lpng16"
 7 
 8 ./configure \
 9-  --prefix=/ \
10-  --with-fontdir=/share/fonts \
11+  --prefix=/pkg \
12+  --with-fontdir=/pkg/share/fonts \
13   --disable-xdmcp \
14   --disable-xdm-auth-1
15 
16 make
17 make DESTDIR="$1" install
18 
19-chmod u+s "$1/bin/Xfbdev"
20+chmod u+s "$1/pkg/bin/Xfbdev"
21 
22 # not compatible
23-rm -rf    "$1/bin/Xvesa"
24+rm -rf    "$1/pkg/bin/Xvesa"
25 
26 #install minimum requirement for bitmap fonts
27-mkdir -p "$1/share/fonts/misc"
28-cp ./*.pcf.gz fonts.alias fonts.dir "$1/share/fonts/misc"
29+mkdir -p "$1/pkg/share/fonts/misc"
30+cp ./*.pcf.gz fonts.alias fonts.dir "$1/pkg/share/fonts/misc"
M repo/unifdef/build
+2, -2 
 1@@ -3,7 +3,7 @@
 2 export DESTDIR="$1"
 3 
 4 make
 5-make prefix=/ install
 6+make prefix=/pkg install
 7 
 8 # Compress manpages
 9-find "$1/share/man" -type f | xargs gzip -n -9
10+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/unzip/build
+2, -2 
 1@@ -27,8 +27,8 @@ make \
 2 
 3 make \
 4     prefix="$1/"  \
 5-    MANDIR=/share/man/man1 \
 6+    MANDIR=/pkg/share/man/man1 \
 7     -f unix/Makefile install
 8 
 9 # Compress manpages
10-find "$1/share/man" -type f | xargs gzip -n -9
11+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/webkit2gtk/build
+3, -3 
 1@@ -68,9 +68,9 @@ export LDFLAGS="$LDFLAGS -Wl,--no-keep-memory"
 2 
 3 cmake -B build \
 4     -DCMAKE_BUILD_TYPE=Release \
 5-    -DCMAKE_INSTALL_PREFIX=/ \
 6-    -DCMAKE_INSTALL_LIBEXECDIR=/lib \
 7-    -DLIB_INSTALL_DIR=/lib \
 8+    -DCMAKE_INSTALL_PREFIX=/pkg \
 9+    -DCMAKE_INSTALL_LIBEXECDIR=/pkg/lib \
10+    -DLIB_INSTALL_DIR=/pkg/lib \
11     -DPORT=GTK \
12     -DCMAKE_SKIP_RPATH=ON \
13     -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
M repo/xauth/build
+11, -11 
 1@@ -5,32 +5,32 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     XAUTH_CFLAGS="-static"
12 
13-make LIBS="/lib/*.a /lib/libXau.a /lib/libxcb.a"
14+make LIBS="/pkg/lib/*.a /pkg/lib/libXau.a /pkg/lib/libxcb.a"
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/xbanish/build
+3, -3 
 1@@ -4,9 +4,9 @@
 2 make LIBS="$LIBS -static"
 3 make \
 4 	DESTDIR="$1" \
 5-    PREFIX=/ \
 6-    MANDIR=/share/man/man1 \
 7+    PREFIX=/pkg \
 8+    MANDIR=/pkg/share/man/man1 \
 9     install
10 
11 # Compress manpages
12-find "$1/share/man" -type f | xargs gzip -n -9
13+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/xcb-proto/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,20 +15,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/xcb-util-cursor/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-shared
8 
9 make
M repo/xcb-util-image/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-shared
8 
9 make
M repo/xcb-util-keysyms/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-shared
8 
9 make
M repo/xcb-util-renderutil/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-shared \
8     --enable-static
9
M repo/xcb-util/build
+1, -1 
1@@ -1,7 +1,7 @@
2 #!/bin/sh -e
3 
4 ./configure \
5-    --prefix=/ \
6+    --prefix=/pkg \
7     --disable-shared
8 
9 make
M repo/xorg-util-macros/build
+9, -9 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,20 +15,20 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
M repo/xorgproto/build
+10, -10 
 1@@ -6,9 +6,9 @@ TMPDIR="$1/tmp"
 2 
 3 ./configure \
 4     --host=x86_64-linux-musl \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Remove docs
43-rm -rf "$1/share/doc"
44+rm -rf "$1/pkg/share/doc"
M repo/xprop/build
+10, -10 
 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -15,23 +15,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/share/man" -type f | xargs gzip -n -9
44+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/xtrans/build
+10, -10 
 1@@ -6,9 +6,9 @@ TMPDIR="$1/tmp"
 2 
 3 ./configure \
 4     --host=x86_64-linux-musl \
 5-    --prefix=/ \
 6+    --prefix=/pkg \
 7     --sysconfdir=/etc \
 8-    --mandir=/share/man \
 9+    --mandir=/pkg/share/man \
10     --localstatedir=/var \
11     --without-xmlto \
12     --disable-specs
13@@ -16,23 +16,23 @@ TMPDIR="$1/tmp"
14 make
15 make install
16 
17-# Some X11 packages install to /share.
18-! [ -d "$1/share/pkgconfig" ] || {
19-    mkdir -p "$1/lib"
20-    mv -f "$1/share/pkgconfig" "$1/lib"
21+# Some X11 packages install to /pkg/share.
22+! [ -d "$1/pkg/share/pkgconfig" ] || {
23+    mkdir -p "$1/pkg/lib"
24+    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/share/aclocal" ] || {
29+! [ -d "$1/pkg/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/share/aclocal" "$TMPDIR"
32+    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/share"
38+    mv -f "$TMPDIR/"* "$1/pkg/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Remove docs
43-rm -rf "$1/share/doc"
44+rm -rf "$1/pkg/share/doc"
M repo/yt-dlp/build
+1, -1 
1@@ -5,4 +5,4 @@ make yt-dlp
2 
3 chmod 755 yt-dlp
4 
5-cp -f yt-dlp "$1/bin"
6+cp -f yt-dlp "$1/pkg/bin"
M repo/zip/build
+3, -3 
 1@@ -7,14 +7,14 @@ for p in *.patch; do
 2 done
 3 
 4 make \
 5-    prefix=/ \
 6+    prefix=/pkg \
 7     CC="$CC -static $LDFLAGS $CFLAGS $CXXFLAGS" \
 8     -f unix/Makefile generic
 9 
10 make \
11     prefix="$1/" \
12-    MANDIR="$1/share/man/man1" \
13+    MANDIR="$1/pkg/share/man/man1" \
14     -f unix/Makefile install
15 
16 # Compress manpages
17-find "$1/share/man" -type f | xargs gzip -n -9
18+find "$1/pkg/share/man" -type f | xargs gzip -n -9
M repo/zlib/build
+2, -2 
 1@@ -5,10 +5,10 @@ patch -p1 < configure-Pass-LDFLAGS-to-link-tests.patch
 2 export CFLAGS="$CFLAGS -fPIC"
 3 
 4 ./configure \
 5-    --prefix=/
 6+    --prefix=/pkg
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/share/man" -type f | xargs gzip -n -9
13+find "$1/pkg/share/man" -type f | xargs gzip -n -9