repo/: revert to prefix=/usr - hovercats/oakiss@71928db

 1@@ -1,8 +1,5 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-export LDFLAGS="$LDFLAGS -L/pkg/lib -Wl,-rpath=/pkg/lib"
 6-
 7 # shellcheck disable=SC2016
 8 
 9 # dont use xinerama
10@@ -12,7 +9,7 @@ sed -e 's/\${XINERAMALIBS}//' \
11 mv -f _ config.mk
12 
13 make
14-make DESTDIR="$1" PREFIX=/pkg install
15+make DESTDIR="$1" PREFIX=/usr install
16 
17 # Compress manpages
18-find "$1/pkg/share/man" -type f | xargs gzip -n -9
19+find "$1/usr/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=/pkg \
6+    --prefix=/usr \
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=/pkg \
 6+        -DCMAKE_INSTALL_PREFIX=/usr \
 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=/pkg \
15+        --prefix=/usr \
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/pkg/share/cmake"*/Help \
24-    "$1/pkg/share/bash-completion"
25+    "$1/usr/share/cmake"*/Help \
26+    "$1/usr/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=/pkg install
 6+make DESTDIR="$1" PREFIX=/usr install
 7 
 8 # Compress manpages
 9-find "$1/pkg/share/man" -type f | xargs gzip -n -9
10+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 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:?}/pkg/share"
15+rm -rf "${1:?}/usr/share"

M repo/fontconfig/build

+4, -4

 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export LIBS="-L/pkg/lib"
 5-export CFLAGS="$CFLAGS -I/pkg/include"
 6+export LIBS="-L/usr/lib"
 7+export CFLAGS="$CFLAGS -I/usr/include"
 8 
 9 # Make the build system run /bin/true to generate
10 # a dummy file so our pre-generated one is used.
11@@ -10,10 +10,10 @@ mv -f _ src/Makefile.in
12 
13 ./configure \
14     GPERF=/bin/true \
15-    --prefix=/pkg \
16+    --prefix=/usr \
17     --localstatedir=/var \
18     --sysconfdir=/etc \
19-    --with-default-fonts=/pkg/share/fonts \
20+    --with-default-fonts=/usr/share/fonts \
21     --with-xmldir=/etc/fonts \
22     --enable-static \
23     --disable-docs \

M repo/freetype-harfbuzz/build

+8, -8

 1@@ -7,7 +7,7 @@ build_freetype() (
 2     cd freetype
 3 
 4     meson setup \
 5-        -Dprefix=/pkg \
 6+        -Dprefix=/usr \
 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=/pkg \
15-        -Dpkg_config_path="$DESTDIR/pkg/lib/pkgconfig" \
16+        -Dprefix=/usr \
17+        -Dpkg_config_path="$DESTDIR/usr/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/pkg/include/harfbuzz"
26-export CFLAGS="$CFLAGS -L$DESTDIR/pkg/lib "
27-export PKG_CONFIG_PATH="$DESTDIR/pkg/lib/pkgconfig"
28+export CFLAGS="$CFLAGS -I$DESTDIR/usr/include/harfbuzz"
29+export CFLAGS="$CFLAGS -L$DESTDIR/usr/lib "
30+export PKG_CONFIG_PATH="$DESTDIR/usr/lib/pkgconfig"
31 
32 # Point Harfbuzz to the Freetype files.
33-export CXXFLAGS="$CXXFLAGS -I$DESTDIR/pkg/include/freetype2"
34-export CXXFLAGS="$CXXFLAGS -L$DESTDIR/pkg/lib"
35+export CXXFLAGS="$CXXFLAGS -I$DESTDIR/usr/include/freetype2"
36+export CXXFLAGS="$CXXFLAGS -L$DESTDIR/usr/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=/pkg \
 6+    -Dprefix=/usr \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/pkg/share/man \
 9+    -Dmandir=/usr/share/man \
10     -Ddebug=false \
11     -Djpeg=enabled \
12     -Dpng=enabled \

M repo/glazier/build

+10, -9

 1@@ -4,9 +4,10 @@
 2 (
 3 cd libwm
 4 
 5-make \
 6-	CFLAGS="$CFLAGS -I/. -I/pkg/include" \
 7-	LDFLAGS="$LDFLAGS -L/. -L/pkg/lib"
 8+export CFLAGS="$CFLAGS -I/."
 9+export LDFLAGS="$LDFLAGS -L/."
10+
11+make
12 
13 )
14 
15@@ -14,15 +15,15 @@ make \
16 sed 's/deadca7/836421/' config.def.h > _
17 mv _ config.def.h
18 
19-export CFLAGS="$CFLAGS -I/. -I/pkg/include"
20-export LDFLAGS="$LDFLAGS -L/. -L/pkg/lib"
21+export CFLAGS="$CFLAGS -I/. -I/usr/include"
22+export LDFLAGS="$LDFLAGS -L/. -L/usr/lib"
23 
24 make
25-make DESTDIR="$1" PREFIX=/pkg install
26+make DESTDIR="$1" PREFIX=/usr install
27 
28 # Makefile doesnt install manpages
29-mkdir -p     "$1/pkg/share/man/man1"
30-cp glazier.1 "$1/pkg/share/man/man1"
31+mkdir -p     "$1/usr/share/man/man1"
32+cp glazier.1 "$1/usr/share/man/man1"
33 
34 # Compress manpages
35-find "$1/pkg/share/man" -type f | xargs gzip -n -9
36+find "$1/usr/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=/pkg \
6+    -Dprefix=/usr \
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=/pkg \
 6-    -Dlibexecdir=/pkg/lib \
 7+    -Dprefix=/usr \
 8+    -Dlibexecdir=/usr/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/pkg/bin/gdbus"
17+rm -rf "$1/usr/bin/gdbus"

M repo/gnutls/build

+2, -2

 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg
 6+    --prefix=/usr
 7 
 8 make
 9 make install
10 
11 # Remove HTML documentation.
12-rm -rf "$1/pkg/share/doc"
13+rm -rf "$1/usr/share/doc"
14 
15 # Compress manpages
16-find "$1/pkg/share/man" -type f | xargs gzip -n -9
17+find "$1/usr/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=/pkg \
 6+    -Dprefix=/usr \
 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/pkg/bin/gtk-encode-symbolic-svg"
15+rm -f "$1/usr/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=/pkg \
 6-    --sbindir=/pkg/bin
 7+    --prefix=/usr \
 8+    --sbindir=/usr/bin
 9 
10 make
11 make DESTDIR="$1" install
12 
13 # Compress manpages
14-find "$1/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/imlib2/build

+3, -6

 1@@ -1,15 +1,12 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7-
 8 
 9 ./configure \
10-    --prefix=/pkg \
11+    --prefix=/usr \
12     --sysconfdir=/etc/imlib2 \
13-	--x-libraries-=/pkg/lib \
14-	--x-includes=/pkg/include  \
15+	--x-libraries-=/usr/lib \
16+	--x-includes=/usr/include  \
17     --enable-visibility-hiding
18 
19 make

M repo/libICE/build

+9, -11

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,20 +15,20 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }

M repo/libSM/build

+9, -11

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,20 +15,20 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }

M repo/libX11/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,23 +15,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXau/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export XAU_CFLAGS=-I/pkg/include
 6-export XAU_LIBS=-L/pkg/lib
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,23 +15,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/pkg/share/man" -type f | xargs gzip -n -9
44+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/pkg/share/man" -type f | xargs gzip -n -9
44+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }

M repo/libXdmcp/build

+9, -11

 1@@ -1,14 +1,12 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11     --host=x86_64-linux-musl \
12-    --prefix=/pkg \
13+    --prefix=/usr \
14     --sysconfdir=/etc \
15     --localstatedir=/var \
16     --without-xmlto \
17@@ -18,23 +16,23 @@ TMPDIR="$1/tmp"
18 make
19 make install
20 
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+# Some X11 packages install to /usr/share.
26+! [ -d "$1/usr/share/pkgconfig" ] || {
27+    mkdir -p "$1/usr/lib"
28+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
29 }
30 
31 # We need to keep this around.
32-! [ -d "$1/pkg/share/aclocal" ] || {
33+! [ -d "$1/usr/share/aclocal" ] || {
34     mkdir -p "$TMPDIR"
35-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
36+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
37 }
38 
39 # Restore kept directories.
40 ! [ -d "$TMPDIR" ] || {
41-    mv -f "$TMPDIR/"* "$1/pkg/share"
42+    mv -f "$TMPDIR/"* "$1/usr/share"
43     rm -rf "$TMPDIR"
44 }
45 
46 # Remove docs
47-rm -rf "$1/pkg/share/doc"
48+rm -rf "$1/usr/share/doc"

M repo/libXext/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,23 +15,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXfixes/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,23 +15,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXfont/build

+9, -11

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -19,20 +17,20 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }

M repo/libXft/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -19,23 +17,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXi/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -18,23 +16,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/pkg/share/man" -type f | xargs gzip -n -9
44+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXmu/build

+9, -11

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,20 +15,20 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }

M repo/libXrandr/build

+10, -10

 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/pkg/share/man" -type f | xargs gzip -n -9
44+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXrender/build

+9, -11

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -18,20 +16,20 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }

M repo/libXt/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs
19@@ -17,23 +15,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXtst/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -18,23 +16,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libXxf86vm/build

+10, -12

 1@@ -1,15 +1,13 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7 
 8 TMPDIR="$1/tmp"
 9 
10 ./configure \
11-    --prefix=/pkg \
12+    --prefix=/usr \
13     --sysconfdir=/etc \
14-    --mandir=/pkg/share/man \
15+    --mandir=/usr/share/man \
16     --localstatedir=/var \
17     --without-xmlto \
18     --disable-specs \
19@@ -18,23 +16,23 @@ TMPDIR="$1/tmp"
20 make
21 make install
22 
23-# Some X11 packages install to /pkg/share.
24-! [ -d "$1/pkg/share/pkgconfig" ] || {
25-    mkdir -p "$1/pkg/lib"
26-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
27+# Some X11 packages install to /usr/share.
28+! [ -d "$1/usr/share/pkgconfig" ] || {
29+    mkdir -p "$1/usr/lib"
30+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
31 }
32 
33 # We need to keep this around.
34-! [ -d "$1/pkg/share/aclocal" ] || {
35+! [ -d "$1/usr/share/aclocal" ] || {
36     mkdir -p "$TMPDIR"
37-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
38+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
39 }
40 
41 # Restore kept directories.
42 ! [ -d "$TMPDIR" ] || {
43-    mv -f "$TMPDIR/"* "$1/pkg/share"
44+    mv -f "$TMPDIR/"* "$1/usr/share"
45     rm -rf "$TMPDIR"
46 }
47 
48 # Compress manpages
49-find "$1/pkg/share/man" -type f | xargs gzip -n -9
50+find "$1/usr/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=/pkg \
6+	-Dprefix=/usr \
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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
 6+    -Dprefix=/usr \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/pkg/share/man \
 9-    -Dpkg_config_path=/pkg/lib/pkgconfig \
10+    -Dmandir=/usr/share/man \
11+    -Dpkg_config_path=/usr/lib/pkgconfig \
12     -Dx11=true \
13     output
14

M repo/liberation-fonts/build

+2, -2

1@@ -2,5 +2,5 @@
2 
3 export DESTDIR="$1"
4 
5-mkdir -p   "$1/pkg/share/fonts/TTF"
6-cp ./*.ttf "$1/pkg/share/fonts/TTF"
7+mkdir -p   "$1/usr/share/fonts/TTF"
8+cp ./*.ttf "$1/usr/share/fonts/TTF"

M repo/libffi/build

+2, -2

 1@@ -1,7 +1,7 @@
 2 #!/bin/sh -e
 3 
 4 ./configure \
 5-    --prefix=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libfontenc/build

+2, -5

 1@@ -1,11 +1,8 @@
 2 #!/bin/sh -e
 3 
 4-export LIBS="-L/pkg/lib"
 5-export CFLAGS="$CFLAGS -I/pkg/include"
 6-
 7 ./configure \
 8-    --prefix=/pkg \
 9-    --with-fontrootdir=/pkg/share/fonts/X11 \
10+    --prefix=/usr \
11+    --with-fontrootdir=/usr/share/fonts/X11 \
12     --disable-shared
13 
14 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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/share/man \
10     --localstatedir=/var
11 
12 make
13 make DESTDIR="$1" install
14 
15 # Compress manpages
16-find "$1/pkg/share/man" -type f | xargs gzip -n -9
17+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/share/man \
10     --localstatedir=/var
11 
12 make
13 make DESTDIR="$1" install
14 
15 # Compress manpages
16-find "$1/pkg/share/man" -type f | xargs gzip -n -9
17+find "$1/usr/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=/pkg \
 6-    -DCMAKE_INSTALL_LIBDIR=/pkg/lib \
 7-    -DCMAKE_INSTALL_BINDIR=/pkg/bin \
 8-    -DCMAKE_INSTALL_INCLUDEDIR=/pkg/bin \
 9-    -DCMAKE_INSTALL_MANDIR=/pkg/share \
10+    -DCMAKE_INSTALL_PREFIX=/usr \
11+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
12+    -DCMAKE_INSTALL_BINDIR=/usr/bin \
13+    -DCMAKE_INSTALL_INCLUDEDIR=/usr/bin \
14+    -DCMAKE_INSTALL_MANDIR=/usr/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/pkg/share/man" -type f | xargs gzip -n -9
23+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
6+    -Dprefix=/usr \
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=/pkg
 6+    --prefix=/usr
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/pkg/share/man" -type f | xargs gzip -n -9
13+find "$1/usr/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=/pkg
 6+    --prefix=/usr
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/pkg/share/man" -type f | xargs gzip -n -9
13+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
6+    -Dprefix=/usr \
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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/libxcb/build

+12, -12

 1@@ -1,38 +1,38 @@
 2 #!/bin/sh -e
 3 
 4 export DESTDIR="$1"
 5-export LIBS="-L/pkg/lib"
 6-export CFLAGS="$CFLAGS -I/pkg/include"
 7+export LIBS="-L/usr/lib"
 8+export CFLAGS="$CFLAGS -I/usr/include"
 9 
10 TMPDIR="$1/tmp"
11 
12 ./configure \
13-    --prefix=/pkg \
14+    --prefix=/usr \
15     --sysconfdir=/etc \
16-    --mandir=/pkg/share/man \
17+    --mandir=/usr/share/man \
18     --localstatedir=/var \
19     ac_cv_lib_Xdmcp_XdmcpWrap=no
20 
21 make
22 make install
23 
24-# Some X11 packages install to /pkg/share.
25-! [ -d "$1/pkg/share/pkgconfig" ] || {
26-    mkdir -p "$1/pkg/lib"
27-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
28+# Some X11 packages install to /usr/share.
29+! [ -d "$1/usr/share/pkgconfig" ] || {
30+    mkdir -p "$1/usr/lib"
31+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
32 }
33 
34 # We need to keep this around.
35-! [ -d "$1/pkg/share/aclocal" ] || {
36+! [ -d "$1/usr/share/aclocal" ] || {
37     mkdir -p "$TMPDIR"
38-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
39+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
40 }
41 
42 # Restore kept directories.
43 ! [ -d "$TMPDIR" ] || {
44-    mv -f "$TMPDIR/"* "$1/pkg/share"
45+    mv -f "$TMPDIR/"* "$1/usr/share"
46     rm -rf "$TMPDIR"
47 }
48 
49 # Compress manpages
50-find "$1/pkg/share/man" -type f | xargs gzip -n -9
51+find "$1/usr/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=/pkg \
 6-    -Dlibexecdir=/pkg/lib \
 7+    -Dprefix=/usr \
 8+    -Dlibexecdir=/usr/lib \
 9     -Ddefault_library=static \
10     -Denable-docs=false \
11     -Denable-wayland=false \
12     -Denable-xkbregistry=false \
13-    -Dpkg_config_path=/pkg/lib/pkgconfig \
14+    -Dpkg_config_path=/usr/lib/pkgconfig \
15     output
16 
17 samu -C output
18 samu -C output install
19 
20 # Compress manpages
21-find "$1/pkg/share/man" -type f | xargs gzip -n -9
22+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
6+    --prefix=/usr \
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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg
6+    --prefix=/usr
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=/pkg \
 6+    -Dprefix=/usr \
 7     -Dsysconfdir=/etc \
 8-    -Dmandir=/pkg/share/man \
 9+    -Dmandir=/usr/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/pkg/bin" \
 6-	"$1/pkg/share/man/man1"
 7+	"$1/usr/bin" \
 8+	"$1/usr/share/man/man1"
 9 
10-cp -f meson "$1/pkg/bin"
11-cp -f man/meson.1 "$1/pkg/share/man/man1"
12+cp -f meson "$1/usr/bin"
13+cp -f man/meson.1 "$1/usr/share/man/man1"
14 
15 # Compress manpages
16-find "$1/pkg/share/man" -type f | xargs gzip -n -9
17+find "$1/usr/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=/pkg \
6+      -Dprefix=/usr \
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=/pkg \
6+    --prefix=/usr \
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=/pkg \
6+    -Dprefix=/usr \
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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
 6-    -Dvendorprefix=/pkg \
 7+    -Dprefix=/usr \
 8+    -Dvendorprefix=/usr \
 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=/pkg/share/man/man1 \
17-    -Dman3dir=/pkg/share/man/man3 \
18-    -Dinstallman1dir=/pkg/share/man/man1 \
19-    -Dinstallman3dir=/pkg/share/man/man3 \
20+    -Dman1dir=/usr/share/man/man1 \
21+    -Dman3dir=/usr/share/man/man3 \
22+    -Dinstallman1dir=/usr/share/man/man1 \
23+    -Dinstallman3dir=/usr/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/pkg/lib" -type f -exec chmod 644 {} \;
32+find "$1/usr/lib" -type f -exec chmod 644 {} \;
33 
34 # Compress manpages
35-find "$1/pkg/share/man" -type f | xargs gzip -n -9
36+find "$1/usr/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=/pkg \
6+    -Dprefix=/usr \
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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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/pkg/bin/pkg-config"
16+ln -s pkgconf "$1/usr/bin/pkg-config"
17 
18 # Remove documentation (README, etc).
19-rm -rf "$1/pkg/share/doc"
20+rm -rf "$1/usr/share/doc"
21 
22 # Compress manpages
23-find "$1/pkg/share/man" -type f | xargs gzip -n -9
24+find "$1/usr/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/pkg/lib/python3*/site-packages/flit_core/tests"
6+rm -rf "$1/usr/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/pkg/bin"
 6-cp gpep517.bin "$1/pkg/bin/gpep517"
 7-chmod 755 "$1/pkg/bin/gpep517"
 8+mkdir -p "$1/usr/bin"
 9+cp gpep517.bin "$1/usr/bin/gpep517"
10+chmod 755 "$1/usr/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=/pkg \
6+    --prefix=/usr \
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=/pkg \
6+    --prefix=/usr \
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=/pkg \
 6-    --libdir=/pkg/lib \
 7+    --prefix=/usr \
 8+    --libdir=/usr/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/pkg/bin/python"
17-ln -s pip3    "$1/pkg/bin/pip"
18+ln -s python3 "$1/usr/bin/python"
19+ln -s pip3    "$1/usr/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/pkg/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/pkg/lib/python"*
28+    cd "$1/usr/lib/python"*
29     rm -rf test ./*/test ./*/tests
30     rm -rf pydoc* idlelib turtle* config-*
31 
32-    cd "$1/pkg/bin"
33+    cd "$1/usr/bin"
34     rm -f pydoc* idle*
35 }
36 
37 # Compress manpages
38-find "$1/pkg/share/man" -type f | xargs gzip -n -9
39+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 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/pkg/share/man" -type f | xargs gzip -n -9
15+find "$1/usr/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=/pkg \
6+    --prefix=/usr \
7     --enable-threadsafe \
8     --enable-dynamic-extensions \
9     --enable-fts5 \

M repo/st/build

+3, -4

 1@@ -12,9 +12,8 @@ mv -f _ config.mk
 2 
 3 make \
 4 	LDFLAGS="$LDFLAGS -static-pie -lX11 -lXft \
 5-	-lxcb -lX11-xcb -lXrender -lXau -L/pkg/lib" \
 6-	CFLAGS="$CFLAGS -fPIE -I/pkg/include"
 7-make PREFIX=/pkg DESTDIR="$1" install
 8+	-lxcb -lX11-xcb -lXrender -lXau"
 9+make PREFIX=/usr DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/pkg/share/man" -type f | xargs gzip -n -9
13+find "$1/usr/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=/pkg install
 6+make DESTDIR="$1" PREFIX=/usr install
 7 
 8 # Compress manpages
 9-find "$1/pkg/share/man" -type f | xargs gzip -n -9
10+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/sx/build

+5, -5

 1@@ -7,14 +7,14 @@ sed -e 's/-keeptty//' \
 2 mv -f _ sx
 3 
 4 mkdir -p \
 5-	"$1/pkg/bin" \
 6-	"$1/pkg/share/man/man1"
 7+	"$1/usr/bin" \
 8+	"$1/usr/share/man/man1"
 9 
10 chmod 755 sx
11 chmod 655 sx.1
12 
13-cp -f sx "$1/pkg/bin"
14-cp -f sx.1 "$1/pkg/share/man/man1"
15+cp -f sx "$1/usr/bin"
16+cp -f sx.1 "$1/usr/share/man/man1"
17 
18 # Compress manpages
19-find "$1/pkg/share/man" -type f | xargs gzip -n -9
20+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/sxhkd/build

+4, -5

 1@@ -1,13 +1,12 @@
 2 #!/bin/sh -e
 3 
 4-export LDFLAGS="$LDFLAGS -static -L/pkg/lib -lxcb -lXau"
 5-export CFLAGS="$CFLAGS -I/pkg/include"
 6+export LDFLAGS="$LDFLAGS -static -lxcb -lXau"
 7 
 8 make
 9-make DESTDIR="$1" PREFIX=/pkg install
10+make DESTDIR="$1" PREFIX=/usr install
11 
12 # Remove docs
13-rm -rf "$1/pkg/share/doc"
14+rm -rf "$1/usr/share/doc"
15 
16 # Compress manpages
17-find "$1/pkg/share/man" -type f | xargs gzip -n -9
18+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/tamzen-font/build

+2, -2

1@@ -1,4 +1,4 @@
2 #!/bin/sh -e
3 
4-mkdir -p "$1/pkg/share/fonts/TTF"
5-cp -f ttf/*.ttf "$1/pkg/share/fonts/TTF"
6+mkdir -p "$1/usr/share/fonts/TTF"
7+cp -f ttf/*.ttf "$1/usr/share/fonts/TTF"

M repo/tinyx/build

+8, -8

 1@@ -1,23 +1,23 @@
 2 #!/bin/sh -e
 3 
 4 export LDFLAGS="$LDFLAGS -static-pie"
 5-export XSERVERCFLAGS_CFLAGS="-fPIE -I/pkg/include"
 6-export XSERVERLIBS_LIBS="-L/pkg/lib /pkg/lib/*.a -lz -lfreetype -lpng16"
 7+export XSERVERCFLAGS_CFLAGS="-fPIE"
 8+export XSERVERLIBS_LIBS="/usr/lib/*.a -lz -lfreetype -lpng16"
 9 
10 ./configure \
11-  --prefix=/pkg \
12-  --with-fontdir=/pkg/share/fonts \
13+  --prefix=/usr \
14+  --with-fontdir=/usr/share/fonts \
15   --disable-xdmcp \
16   --disable-xdm-auth-1
17 
18 make
19 make DESTDIR="$1" install
20 
21-chmod u+s "$1/pkg/bin/Xfbdev"
22+chmod u+s "$1/usr/bin/Xfbdev"
23 
24 # not compatible
25-rm -rf    "$1/pkg/bin/Xvesa"
26+rm -rf    "$1/usr/bin/Xvesa"
27 
28 #install minimum requirement for bitmap fonts
29-mkdir -p "$1/pkg/share/fonts/misc"
30-cp ./*.pcf.gz fonts.alias fonts.dir "$1/pkg/share/fonts/misc"
31+mkdir -p "$1/usr/share/fonts/misc"
32+cp ./*.pcf.gz fonts.alias fonts.dir "$1/usr/share/fonts/misc"

M repo/unifdef/build

+2, -2

 1@@ -3,7 +3,7 @@
 2 export DESTDIR="$1"
 3 
 4 make
 5-make prefix=/pkg install
 6+make prefix=/usr install
 7 
 8 # Compress manpages
 9-find "$1/pkg/share/man" -type f | xargs gzip -n -9
10+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/unzip/build

+4, -4

 1@@ -5,9 +5,9 @@ while read -r p; do
 2 done < series
 3 
 4 export DESTDIR="$1"
 5-export LDFLAGS="$LDFLAGS -static -L/src/oakiss/out/pkg/bzip2"
 6+export LDFLAGS="$LDFLAGS -static -L/src/oakiss/out/usr/bzip2"
 7 export CFLAGS="$CFLAGS \
 8-	-I/src/oakiss/pkg/bzip2/src \
 9+	-I/src/oakiss/usr/bzip2/src \
10 	-D_FILE_OFFSET_BITS=64 \
11 	-DWILD_STOP_AT_DIR \
12 	-DLARGE_FILE_SUPPORT \
13@@ -27,8 +27,8 @@ make \
14 
15 make \
16     prefix="$1/"  \
17-    MANDIR=/pkg/share/man/man1 \
18+    MANDIR=/usr/share/man/man1 \
19     -f unix/Makefile install
20 
21 # Compress manpages
22-find "$1/pkg/share/man" -type f | xargs gzip -n -9
23+find "$1/usr/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=/pkg \
 6-    -DCMAKE_INSTALL_LIBEXECDIR=/pkg/lib \
 7-    -DLIB_INSTALL_DIR=/pkg/lib \
 8+    -DCMAKE_INSTALL_PREFIX=/usr \
 9+    -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
10+    -DLIB_INSTALL_DIR=/usr/lib \
11     -DPORT=GTK \
12     -DCMAKE_SKIP_RPATH=ON \
13     -DENABLE_BUBBLEWRAP_SANDBOX=OFF \

M repo/xauth/build

+12, -12

 1@@ -5,32 +5,32 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/share/man \
10     --localstatedir=/var \
11-    XAUTH_CFLAGS="-static -I/pkg/include"
12+    XAUTH_CFLAGS="-static"
13 
14-make LIBS="-L/pkg/lib /pkg/lib/*.a /pkg/lib/libXau.a /pkg/lib/libxcb.a"
15+make LIBS="/usr/lib/*.a /usr/lib/libXau.a /usr/lib/libxcb.a"
16 make install
17 
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+# Some X11 packages install to /usr/share.
23+! [ -d "$1/usr/share/pkgconfig" ] || {
24+    mkdir -p "$1/usr/lib"
25+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
26 }
27 
28 # We need to keep this around.
29-! [ -d "$1/pkg/share/aclocal" ] || {
30+! [ -d "$1/usr/share/aclocal" ] || {
31     mkdir -p "$TMPDIR"
32-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
33+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
34 }
35 
36 # Restore kept directories.
37 ! [ -d "$TMPDIR" ] || {
38-    mv -f "$TMPDIR/"* "$1/pkg/share"
39+    mv -f "$TMPDIR/"* "$1/usr/share"
40     rm -rf "$TMPDIR"
41 }
42 
43 # Compress manpages
44-find "$1/pkg/share/man" -type f | xargs gzip -n -9
45+find "$1/usr/share/man" -type f | xargs gzip -n -9

M repo/xbanish/build

+2, -2

 1@@ -2,7 +2,7 @@
 2 
 3 make
 4 make \
 5-    PREFIX=/pkg \
 6-    MANDIR=/pkg/share/man/man1 \
 7+    PREFIX=/usr \
 8+    MANDIR=/usr/share/man/man1 \
 9 	DESTDIR="$1" \
10     install

M repo/xcb-proto/build

+9, -9

 1@@ -5,9 +5,9 @@ export DESTDIR="$1"
 2 TMPDIR="$1/tmp"
 3 
 4 ./configure \
 5-    --prefix=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }

M repo/xcb-util-cursor/build

+1, -3

 1@@ -1,9 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-
 6 ./configure \
 7-    --prefix=/pkg \
 8+    --prefix=/usr \
 9     --disable-shared
10 
11 make

M repo/xcb-util-image/build

+1, -4

 1@@ -1,10 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-export LDFLAGS="$LDFLAGS -L/pkg/lib"
 6-
 7 ./configure \
 8-    --prefix=/pkg \
 9+    --prefix=/usr \
10     --disable-shared
11 
12 make

M repo/xcb-util-keysyms/build

+1, -3

 1@@ -1,9 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-
 6 ./configure \
 7-    --prefix=/pkg \
 8+    --prefix=/usr \
 9     --disable-shared
10 
11 make

M repo/xcb-util-renderutil/build

+1, -3

 1@@ -1,9 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-
 6 ./configure \
 7-    --prefix=/pkg \
 8+    --prefix=/usr \
 9     --disable-shared \
10     --enable-static
11

M repo/xcb-util/build

+1, -3

 1@@ -1,9 +1,7 @@
 2 #!/bin/sh -e
 3 
 4-export CFLAGS="$CFLAGS -I/pkg/include"
 5-
 6 ./configure \
 7-    --prefix=/pkg \
 8+    --prefix=/usr \
 9     --disable-shared
10 
11 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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Remove docs
43-rm -rf "$1/pkg/share/doc"
44+rm -rf "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Compress manpages
43-find "$1/pkg/share/man" -type f | xargs gzip -n -9
44+find "$1/usr/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=/pkg \
 6+    --prefix=/usr \
 7     --sysconfdir=/etc \
 8-    --mandir=/pkg/share/man \
 9+    --mandir=/usr/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 /pkg/share.
18-! [ -d "$1/pkg/share/pkgconfig" ] || {
19-    mkdir -p "$1/pkg/lib"
20-    mv -f "$1/pkg/share/pkgconfig" "$1/pkg/lib"
21+# Some X11 packages install to /usr/share.
22+! [ -d "$1/usr/share/pkgconfig" ] || {
23+    mkdir -p "$1/usr/lib"
24+    mv -f "$1/usr/share/pkgconfig" "$1/usr/lib"
25 }
26 
27 # We need to keep this around.
28-! [ -d "$1/pkg/share/aclocal" ] || {
29+! [ -d "$1/usr/share/aclocal" ] || {
30     mkdir -p "$TMPDIR"
31-    mv -f "$1/pkg/share/aclocal" "$TMPDIR"
32+    mv -f "$1/usr/share/aclocal" "$TMPDIR"
33 }
34 
35 # Restore kept directories.
36 ! [ -d "$TMPDIR" ] || {
37-    mv -f "$TMPDIR/"* "$1/pkg/share"
38+    mv -f "$TMPDIR/"* "$1/usr/share"
39     rm -rf "$TMPDIR"
40 }
41 
42 # Remove docs
43-rm -rf "$1/pkg/share/doc"
44+rm -rf "$1/usr/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/pkg/bin"
6+cp -f yt-dlp "$1/usr/bin"

M repo/zip/build

+4, -4

 1@@ -7,14 +7,14 @@ for p in *.patch; do
 2 done
 3 
 4 make \
 5-    prefix=/pkg \
 6+    prefix=/usr \
 7     CC="$CC -static $LDFLAGS $CFLAGS $CXXFLAGS" \
 8     -f unix/Makefile generic
 9 
10 make \
11-    prefix="$1/pkg" \
12-    MANDIR="$1/pkg/share/man/man1" \
13+    prefix="$1/usr" \
14+    MANDIR="$1/usr/share/man/man1" \
15     -f unix/Makefile install
16 
17 # Compress manpages
18-find "$1/pkg/share/man" -type f | xargs gzip -n -9
19+find "$1/usr/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=/pkg
 6+    --prefix=/usr
 7 
 8 make
 9 make DESTDIR="$1" install
10 
11 # Compress manpages
12-find "$1/pkg/share/man" -type f | xargs gzip -n -9
13+find "$1/usr/share/man" -type f | xargs gzip -n -9

commit 71928db

commit `71928db`