Ports: Improve consistency and quality of ports

- Replaced /Root with
- Improved documentation.
- Removed a few typos.
- Replaced  with
- Added brackets in some cases.

Most of the changes were reviewed and applied manually.

Ports/README.md

@@ -190,7 +190,7 @@ keyring and can later be used for verification using [`auth_opts`](#auth_opts).
 
 Options passed to `make install` in the default `install` function.
 
-`DESTDIR="${SERENITY_BUILD_DIR}/Root"` (`"${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}/Root"`)
+`DESTDIR="${SERENITY_INSTALL_ROOT}"` (`"${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}/Root"`)
 is always passed, override the `install` function if that's undesirable.
 
 #### `makeopts`

Ports/SDL2/package.sh

@@ -4,7 +4,7 @@ version=serenity-git
 workdir=SDL-main-serenity
 useconfigure=true
 files="https://github.com/SerenityOS/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz"
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
+configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF"
 
 configure() {
     run cmake $configopts

Ports/SDL2_gfx/package.sh

@@ -6,9 +6,9 @@ files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar
 auth_type=md5
 depends="SDL2"
 useconfigure=true
-configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
+configopts="--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
 
 install() {
-    run make install DESTDIR=$DESTDIR $installopts
-    run ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_gfx.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive
+    run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts
+    run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive
 }

Ports/SDL2_image/package.sh

@@ -9,7 +9,7 @@ auth_type=md5
 configure() {
     run ./configure \
         --host="${SERENITY_ARCH}-pc-serenity" \
-        --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
+        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --enable-webp=false --enable-webp-shared=false     \
         LDFLAGS="-lgui -lgfx -lipc -lcore -lm"
 }
@@ -19,7 +19,7 @@ build() {
 }
 
 install() {
-    run make -k DESTDIR="${SERENITY_BUILD_DIR}/Root" install
-    ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_image.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_image.a -Wl,--no-whole-archive -lpng -ljpeg -ltiff
-    rm -f $DESTDIR/usr/local/lib/libSDL2_image.la
+    run make -k DESTDIR="${SERENITY_INSTALL_ROOT}" install
+    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.a -Wl,--no-whole-archive -lpng -ljpeg -ltiff
+    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.la
 }

Ports/SDL2_mixer/package.sh

@@ -9,7 +9,7 @@ depends="SDL2 libvorbis"
 configure() {
     run ./configure \
         --host="${SERENITY_ARCH}-pc-serenity" \
-        --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
+        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --enable-music-opus=false --enable-music-opus-shared=false \
         --enable-music-mod-modplug=false --enable-music-mod-modplug-shared=false \
         EXTRA_LDFLAGS="-lgui -lgfx -lipc -lcore -lcompression"
@@ -20,7 +20,7 @@ build() {
 }
 
 install() {
-    run make -k DESTDIR="${SERENITY_BUILD_DIR}/Root" install
-    ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_mixer.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_mixer.a -Wl,--no-whole-archive -Wl,--no-as-needed -lvorbis -lvorbisfile
-    rm -f $DESTDIR/usr/local/lib/libSDL2_mixer.la
+    run make -k DESTDIR="${SERENITY_INSTALL_ROOT}" install
+    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.a -Wl,--no-whole-archive -Wl,--no-as-needed -lvorbis -lvorbisfile
+    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.la
 }

Ports/SDL2_ttf/package.sh

@@ -9,13 +9,13 @@ depends="SDL2 freetype"
 configure() {
     run ./configure \
         --host="${SERENITY_ARCH}-pc-serenity" \
-        --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
+        --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \
         --with-x=no \
-        FT2_CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/freetype2" \
+        FT2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" \
         LIBS="-lgui -lgfx -lipc -lcore -lcompress"
 }
 
 install() {
-    run make install DESTDIR=$DESTDIR $installopts
-    run ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_ttf.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive
+    run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts
+    run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive
 }

Ports/SDLPoP/package.sh

@@ -7,13 +7,12 @@ workdir=SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68
 configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
 files="https://github.com/NagyD/SDLPoP/archive/86988c668eeaa10f218e1d4938fc5b4e42314d68.zip PoP.zip d18cae8541fb8cbcc374fd998316993d561429a83f92061bc0754337ada774c5"
 auth_type=sha256
-install_location="Root/opt/PrinceOfPersia"
 
 configure() {
     run cmake $configopts ./src
 }
 
 install() {
-    mkdir -p "${SERENITY_BUILD_DIR}/${install_location}"
-    run cp -r prince data SDLPoP.ini "${SERENITY_BUILD_DIR}/${install_location}" 
+    mkdir -p "${SERENITY_INSTALL_ROOT}/opt/PrinceOfPersia"
+    run cp -r prince data SDLPoP.ini "${SERENITY_INSTALL_ROOT}/opt/PrinceOfPersia" 
 }

Ports/Super-Mario/package.sh

@@ -7,13 +7,12 @@ workdir=Super-Mario-Clone-Cpp-master
 configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
 files="https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp/archive/refs/heads/master.zip master.zip 11f622721d1ba504acf75c024aa0dbe3"
 auth_type=md5
-install_location="Root/opt/Super_Mario"
 
 configure() {
     run cmake $configopts
 }
 
 install() {
-    run mkdir -p "${SERENITY_BUILD_DIR}/${install_location}"
-    run cp -r uMario app.ico icon2.ico files "${SERENITY_BUILD_DIR}/${install_location}" 
+    run mkdir -p "${SERENITY_INSTALL_ROOT}/opt/Super_Mario"
+    run cp -r uMario app.ico icon2.ico files "${SERENITY_INSTALL_ROOT}/opt/Super_Mario" 
 }

Ports/bash/package.sh

@@ -16,6 +16,6 @@ build() {
 }
 
 post_install() {
-    mkdir -p "${SERENITY_BUILD_DIR}/Root/bin"
-    ln -sf /usr/local/bin/bash "${SERENITY_BUILD_DIR}/Root/bin/bash"
+    mkdir -p "${SERENITY_INSTALL_ROOT}/bin"
+    ln -sf /usr/local/bin/bash "${SERENITY_INSTALL_ROOT}/bin/bash"
 }

Ports/binutils/package.sh

@@ -2,7 +2,7 @@
 port=binutils
 version=2.32
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --disable-werror --disable-gdb --disable-nls"
+configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --disable-werror --disable-gdb --disable-nls"
 files="https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz binutils-${version}.tar.xz
 https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz.sig binutils-${version}.tar.xz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"

Ports/bison/package.sh

@@ -2,6 +2,6 @@
 port=bison
 version=1.25
 useconfigure=true
-configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
+configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local"
 files="https://ftpmirror.gnu.org/gnu/bison/bison-${version}.tar.gz bison-${version}.tar.gz 65f577d0f8ffaf61ae21c23c0918d225"
 auth_type="md5"

Ports/bzip2/package.sh

@@ -4,12 +4,12 @@ version=1.0.8
 files="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz bzip2-${version}.tar.gz 67e051268d0c475ea773822f7500d0e5"
 auth_type=md5
 makeopts=bzip2
-installopts="PREFIX=${SERENITY_BUILD_DIR}/Root/usr/local"
+installopts="PREFIX=${SERENITY_INSTALL_ROOT}/usr/local"
 
 build() {
     run make CC="${CC}" $makeopts bzip2
 }
 
 install() {
-    run make DESTDIR=$DESTDIR CC="${CC}" $installopts install
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" $installopts install
 }

Ports/c-ray/package.sh

@@ -13,6 +13,6 @@ configure() {
 }
 
 install() {
-	mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray"
-	cp -r "${port}-${version}"/* "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray"
+	mkdir -p "${SERENITY_INSTALL_ROOT}/home/anon/c-ray"
+	cp -r "${port}-${version}"/* "${SERENITY_INSTALL_ROOT}/home/anon/c-ray"
 }

Ports/carl/package.sh

@@ -10,6 +10,6 @@ build() {
 }
 
 install() {
-    run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local"
-    run cp carl "${SERENITY_BUILD_DIR}/Root/usr/local/bin"
+    run mkdir -p "${SERENITY_INSTALL_ROOT}/usr/local"
+    run cp carl "${SERENITY_INSTALL_ROOT}/usr/local/bin"
 }

Ports/chester/package.sh

@@ -4,7 +4,7 @@ useconfigure=true
 version=git
 depends="SDL2"
 workdir=chester-public
-configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt"
+configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt"
 files="https://github.com/veikkos/chester/archive/public.tar.gz chester.tar.gz f09d797209e7bfd9b1460d2540525186"
 auth_type=md5
 
@@ -13,5 +13,5 @@ configure() {
 }
 
 install() {
-    run cp bin/chester "${SERENITY_BUILD_DIR}/Root/bin"
+    run cp bin/chester "${SERENITY_INSTALL_ROOT}/bin"
 }

Ports/cmatrix/package.sh

@@ -13,5 +13,5 @@ configure() {
 }
 
 install() {
-    run cp cmatrix "${SERENITY_BUILD_DIR}/Root/bin"
+    run cp cmatrix "${SERENITY_INSTALL_ROOT}/bin"
 }

Ports/cmatrix/patches/fix_cmakelists.patch

@@ -6,8 +6,8 @@ index a808a98..7b8753a 100644
  project(CMatrix LANGUAGES C)
  set(VERSION "2.0")
 
-+set(CMAKE_INCLUDE_PATH "${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses")
-+set(CURSES_NCURSES_LIBRARY "${SERENITY_BUILD_DIR}/Root/usr/local/lib/libncurses.a")
++set(CMAKE_INCLUDE_PATH "${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses")
++set(CURSES_NCURSES_LIBRARY "${SERENITY_INSTALL_ROOT}/usr/local/lib/libncurses.a")
 +
  # These are relative to CMAKE_INSTALL_PREFIX
  # which by default is "/usr/local"

Ports/dash/package.sh

@@ -28,5 +28,5 @@ build() {
 }
 
 install() {
-    run sh -c "cd target-build && make DESTDIR="${SERENITY_BUILD_DIR}/Root" $installopts install"
+    run sh -c "cd target-build && make DESTDIR="${SERENITY_INSTALL_ROOT}" $installopts install"
 }

Ports/dialog/package.sh

@@ -8,4 +8,4 @@ auth_type="sig"
 auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB"
 auth_opts="dialog-${version}.tgz.asc dialog-${version}.tgz"
 useconfigure=true
-configopts="--prefix=/usr/local --with-ncurses --with-curses-dir=${SERENITY_SOURCE_DIR}/Build/i686/Root/usr/local/include/ncurses"
+configopts="--prefix=/usr/local --with-ncurses --with-curses-dir=${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses"

Ports/dmidecode/package.sh

@@ -15,9 +15,9 @@ install() {
 }
 
 post_install() {
-    mkdir -p "${SERENITY_BUILD_DIR}/Root/bin"
-    run make install-bin DESTDIR="${SERENITY_BUILD_DIR}/Root"
-    ln -sf /usr/local/sbin/dmidecode "${SERENITY_BUILD_DIR}/Root/bin/dmidecode"
-    ln -sf /usr/local/sbin/biosdecode "${SERENITY_BUILD_DIR}/Root/bin/biosdecode"
-    ln -sf /usr/local/sbin/vpddecode "${SERENITY_BUILD_DIR}/Root/bin/vpddecode"
+    mkdir -p "${SERENITY_INSTALL_ROOT}/bin"
+    run make install-bin DESTDIR="${SERENITY_INSTALL_ROOT}"
+    ln -sf /usr/local/sbin/dmidecode "${SERENITY_INSTALL_ROOT}/bin/dmidecode"
+    ln -sf /usr/local/sbin/biosdecode "${SERENITY_INSTALL_ROOT}/bin/biosdecode"
+    ln -sf /usr/local/sbin/vpddecode "${SERENITY_INSTALL_ROOT}/bin/vpddecode"
 }

Ports/emu2/package.sh

@@ -6,5 +6,5 @@ auth_type=md5
 
 build() {
     export CC="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin/${SERENITY_ARCH}-pc-serenity-gcc"
-    run make DESTDIR="${SERENITY_BUILD_DIR}/Root" CC="${CC}" $installopts
+    run make DESTDIR="${SERENITY_INSTALL_ROOT}" CC="${CC}" $installopts
 }

Ports/frotz/package.sh

@@ -9,7 +9,7 @@ depends="ncurses"
 build() {
     run make \
         PKG_CONFIG_CURSES=no \
-        CURSES_CFLAGS="-I${SERENITY_SOURCE_DIR}/Build/i686/Root/usr/local/include/ncurses" \
+        CURSES_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" \
         CURSES_LDFLAGS="-lncurses -ltinfo" \
         CURSES=ncurses \
         USE_UTF8=no \

Ports/gcc/package.sh

@@ -2,12 +2,12 @@
 port=gcc
 version=10.3.0
 useconfigure=true
-configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared"
+configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared"
 files="https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz
 https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz.sig gcc-${version}.tar.xz.sig
 https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg"
 makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)"
-installopts="DESTDIR=${SERENITY_BUILD_DIR}/Root install-gcc install-target-libgcc install-target-libstdc++-v3"
+installopts="DESTDIR=${SERENITY_INSTALL_ROOT} install-gcc install-target-libgcc install-target-libstdc++-v3"
 depends="binutils"
 auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig"

Ports/git/package.sh

@@ -13,8 +13,8 @@ build() {
 }
 
 post_install() {
-    run mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon"
-    run cp "../default_gitconfig" "${SERENITY_BUILD_DIR}/Root/home/anon/.gitconfig"
+    run mkdir -p "${SERENITY_INSTALL_ROOT}/home/anon"
+    run cp "../default_gitconfig" "${SERENITY_INSTALL_ROOT}/home/anon/.gitconfig"
 }
 
 export NO_OPENSSL=1

Ports/gnupg/package.sh

@@ -2,20 +2,20 @@
 port=gnupg
 version=2.3.0
 useconfigure=true
-configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \
-  --with-libgcrypt-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \
-  --with-libassuan-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \
-  --with-ntbtls-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \
-  --with-npth-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \
+configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
+  --with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
+  --with-libassuan-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
+  --with-ntbtls-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
+  --with-npth-prefix=${SERENITY_INSTALL_ROOT}/usr/local \
   --disable-dirmngr"
 files="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2 gnupg-${version}.tar.bz2 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4"
 auth_type=sha256
 depends="libiconv libgpg-error libgcrypt libksba libassuan npth ntbtls"
 
 pre_configure() {
-    export GPGRT_CONFIG="${SERENITY_BUILD_DIR}/Root/usr/local/bin/gpgrt-config"
-    export CFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/include"
-    export LDFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/lib -lm -liconv"
+    export GPGRT_CONFIG="${SERENITY_INSTALL_ROOT}/usr/local/bin/gpgrt-config"
+    export CFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/include"
+    export LDFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib -lm -liconv"
 }
 
 configure() {

Ports/gnuplot/package.sh

@@ -5,7 +5,7 @@ useconfigure=true
 # Note: gnuplot's source code is hosted on SourceForge, but using the GitHub mirror makes downloading a versioned .tar.gz easier.
 files="https://github.com/gnuplot/gnuplot/archive/${version}.tar.gz gnuplot-${version}.tar.gz 292f983e273cd50cf02e0737043fae0e"
 auth_type=md5
-configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local --with-readline=builtin --without-latex"
+configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local --with-readline=builtin --without-latex"
 
 pre_configure() {
     run ./prepare

Ports/indent/package.sh

@@ -9,7 +9,7 @@ auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg indent-${version}.tar.gz.sig"
 
 post_install() {
-    man_dir="${SERENITY_BUILD_DIR}/Root/usr/local/share/man/man1/"
+    man_dir="${SERENITY_INSTALL_ROOT}/usr/local/share/man/man1/"
     run mkdir -p "${man_dir}"
     run cp man/indent.1 "${man_dir}"
 }

Ports/libassuan/package.sh

@@ -2,7 +2,7 @@
 port=libassuan
 version=2.5.5
 useconfigure=true
-#configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
+#configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
 files="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2 libassuan-${version}.tar.bz2 7194453152bb67e3d45da698762b5d6f"
 auth_type=md5
 

Ports/libgcrypt/package.sh

@@ -2,7 +2,7 @@
 port=libgcrypt
 version=1.9.2
 useconfigure=true
-configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
+configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local"
 files="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2 libgcrypt-${version}.tar.bz2 00121b05e1ff4cc85a4a6503e0a7d9fb"
 auth_type=md5
 

Ports/libiconv/package.sh

@@ -11,6 +11,6 @@ auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg libiconv-${version}.tar.gz.sig"
 
 install() {
-    run make DESTDIR=$DESTDIR $installopts install
-    run ${SERENITY_ARCH}-pc-serenity-gcc -shared -o $DESTDIR/usr/local/lib/libiconv.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libiconv.a -Wl,--no-whole-archive
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    run ${SERENITY_ARCH}-pc-serenity-gcc -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.a -Wl,--no-whole-archive
 }

Ports/libjpeg/package.sh

@@ -7,7 +7,7 @@ auth_type="md5"
 workdir="jpeg-$version"
 
 install() {
-    run make DESTDIR=$DESTDIR $installopts install
-    ${CC} -shared -o $DESTDIR/usr/local/lib/libjpeg.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libjpeg.a -Wl,--no-whole-archive
-    rm -f $DESTDIR/usr/local/lib/libjpeg.la
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.a -Wl,--no-whole-archive
+    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.la
 }

Ports/libogg/package.sh

@@ -6,7 +6,7 @@ files="https://github.com/xiph/ogg/releases/download/v${version}/libogg-${versio
 auth_type=md5
 
 install() {
-    run make DESTDIR=$DESTDIR $installopts install
-    ${CC} -shared -o $DESTDIR/usr/local/lib/libogg.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libogg.a -Wl,--no-whole-archive
-    rm -f $DESTDIR/usr/local/lib/libogg.la
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.a -Wl,--no-whole-archive
+    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.la
 }

Ports/libpng/package.sh

@@ -7,8 +7,8 @@ auth_type=md5
 depends="zlib"
 
 install() {
-    run make DESTDIR=$DESTDIR $installopts install
-    ${CC} -shared -o $DESTDIR/usr/local/lib/libpng16.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libpng16.a -Wl,--no-whole-archive -lz
-    ln -sf libpng16.so $DESTDIR/usr/local/lib/libpng.so
-    rm -f $DESTDIR/usr/local/lib/libpng16.la $DESTDIR/usr/local/lib/libpng.la
+    run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install
+    ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.a -Wl,--no-whole-archive -lz
+    ln -sf libpng16.so ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.so
+    rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.la
 }