From b20a1640b2a9bb0b2e765dc2c2bf2b52cb74914b Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 25 Aug 2026 13:32:59 +0300 Subject: [PATCH] ports: Fix packaging of bunch of ports --- ports/SpecSeek/build.sh | 1 + ports/bash/build.sh | 4 ++-- ports/boost/build.sh | 6 ++++-- ports/bzip2/build.sh | 3 ++- ports/doom/build.sh | 2 +- ports/ncurses/build.sh | 12 ++++++++---- ports/nyancat/build.sh | 2 +- ports/openssl/build.sh | 2 +- ports/python3/build.sh | 2 +- ports/sdl12-compat/build.sh | 2 +- ports/sdl2-compat/build.sh | 2 +- ports/tcc/build.sh | 3 ++- ports/tinygb/build.sh | 1 + ports/xclock/build.sh | 3 +++ 14 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ports/SpecSeek/build.sh b/ports/SpecSeek/build.sh index 15c47f08..ef9ee0a6 100755 --- a/ports/SpecSeek/build.sh +++ b/ports/SpecSeek/build.sh @@ -19,5 +19,6 @@ build() { } install() { + mkdir -p "$DESTDIR/usr/bin" cp -v bin/gcc/$specseek_arch/specseek_$specseek_arch "$DESTDIR/usr/bin/specseek" || exit 1 } diff --git a/ports/bash/build.sh b/ports/bash/build.sh index 5115ae29..2c740e8e 100755 --- a/ports/bash/build.sh +++ b/ports/bash/build.sh @@ -16,7 +16,7 @@ CONFIGURE_OPTIONS=( ) post_install() { - if [ ! -L $DESTDIR/usr/bin/sh ]; then - ln -s bash $DESTDIR/usr/bin/sh + if [ ! -L "$DESTDIR/usr/bin/sh" ]; then + ln -sv "bash $DESTDIR/usr/bin/sh" fi } diff --git a/ports/boost/build.sh b/ports/boost/build.sh index 60954f83..9ac13647 100755 --- a/ports/boost/build.sh +++ b/ports/boost/build.sh @@ -17,9 +17,11 @@ configure() { } build() { - ./b2 --user-config=user-config.jam toolset=gcc target-os=banan_os || exit 1 + ./b2 --user-config=user-config.jam \ + toolset=gcc target-os=banan_os || exit 1 } install() { - ./b2 --user-config=user-config.jam toolset=gcc target-os=banan_os install || exit 1 + ./b2 --user-config=user-config.jam --prefix="$DESTDIR/usr" \ + toolset=gcc target-os=banan_os install || exit 1 } diff --git a/ports/bzip2/build.sh b/ports/bzip2/build.sh index f5d47f9b..06bd2e24 100755 --- a/ports/bzip2/build.sh +++ b/ports/bzip2/build.sh @@ -22,7 +22,8 @@ install() { mkdir -p "$DESTDIR/usr/include" cp -v bzlib.h "$DESTDIR/usr/include/" || exit 1 - cat > $DESTDIR/usr/lib/pkgconfig/bzip2.pc << EOF + mkdir -p "$DESTDIR/usr/lib/pkgconfig" + cat > "$DESTDIR/usr/lib/pkgconfig/bzip2.pc" << EOF prefix=/usr exec_prefix=\${prefix} bindir=\${exec_prefix}/bin diff --git a/ports/doom/build.sh b/ports/doom/build.sh index dd2c51fe..c658e87a 100755 --- a/ports/doom/build.sh +++ b/ports/doom/build.sh @@ -11,7 +11,7 @@ configure() { build() { if [ ! -f ../doom1.wad ]; then - wget https://distro.ibiblio.org/slitaz/sources/packages/d/doom1.wad -O ../doom1.wad || exit 1 + wget 'https://bananymous.com/files/doom1.wad' -O ../doom1.wad || exit 1 fi make -C doomgeneric -f Makefile.sdl CC="$CC" SDL_PATH="$BANAN_SYSROOT/usr/bin/" || exit 1 diff --git a/ports/ncurses/build.sh b/ports/ncurses/build.sh index e0265c75..abf2125f 100755 --- a/ports/ncurses/build.sh +++ b/ports/ncurses/build.sh @@ -6,7 +6,7 @@ DOWNLOAD_URL="https://ftpmirror.gnu.org/gnu/ncurses/ncurses-$VERSION.tar.gz#355b CONFIG_SUB=('config.sub') CONFIGURE_OPTIONS=( "--with-pkg-config='$PKG_CONFIG'" - "--with-pkg-config-libdir=/usr/lib/pkgconfig" + '--with-pkg-config-libdir=/usr/lib/pkgconfig' '--enable-pc-files' '--enable-sigwinch' '--with-shared' @@ -16,12 +16,16 @@ CONFIGURE_OPTIONS=( CFLAGS='-std=c17' ) +pre_configure() { + unset TERMINFO TERMINFO_DIRS +} + post_install() { - for lib in ncurses ncurses++ form panel menu; do - ln -sv ${lib}w.pc "$DESTDIR/usr/lib/pkgconfig/$lib.pc" + for lib in ncurses form panel menu; do + ln -svf ${lib}w.pc "$DESTDIR/usr/lib/pkgconfig/$lib.pc" done - ln -sv libncursesw.so "$DESTDIR/usr/lib/libncurses.so" + ln -svf libncursesw.so "$DESTDIR/usr/lib/libncurses.so" mkdir -p "$DESTDIR/etc/profile.d" echo 'export NCURSES_NO_UTF8_ACS=1' > "$DESTDIR/etc/profile.d/ncurses.sh" diff --git a/ports/nyancat/build.sh b/ports/nyancat/build.sh index b13afdde..682435e7 100755 --- a/ports/nyancat/build.sh +++ b/ports/nyancat/build.sh @@ -10,5 +10,5 @@ configure() { install() { mkdir -p "$DESTDIR/usr/bin" - cp src/nyancat "$DESTDIR/usr/bin/" + cp -v src/nyancat "$DESTDIR/usr/bin/" || exit 1 } diff --git a/ports/openssl/build.sh b/ports/openssl/build.sh index 6a856a2f..9314abfb 100755 --- a/ports/openssl/build.sh +++ b/ports/openssl/build.sh @@ -20,7 +20,7 @@ post_install() { openssl rehash "$BANAN_SYSROOT/etc/cacert/extracted" find "$BANAN_SYSROOT/etc/cacert/extracted" -type l -print0 | while IFS= read -r -d '' link; do - ln -s "../../cacert/extracted/$(readlink "$link")" "$DESTDIR/etc/ssl/certs/${link##*/}" + ln -sf "../../cacert/extracted/$(readlink "$link")" "$DESTDIR/etc/ssl/certs/${link##*/}" rm "$link" done } diff --git a/ports/python3/build.sh b/ports/python3/build.sh index c50b61b3..af808789 100755 --- a/ports/python3/build.sh +++ b/ports/python3/build.sh @@ -18,5 +18,5 @@ CONFIGURE_OPTIONS=( post_install() { mkdir -p "$DESTDIR/usr/bin" - ln -sf python3 "$DESTDIR/usr/bin/python" + ln -svf python3 "$DESTDIR/usr/bin/python" || exit 1 } diff --git a/ports/sdl12-compat/build.sh b/ports/sdl12-compat/build.sh index 3ee7f8d9..399d4342 100755 --- a/ports/sdl12-compat/build.sh +++ b/ports/sdl12-compat/build.sh @@ -20,5 +20,5 @@ build() { install() { DESTDIR="$DESTDIR" cmake --install build || exit 1 - ln -s sdl12_compat.pc "$DESTDIR"/usr/lib/pkgconfig/sdl.pc || exit 1 + ln -svf sdl12_compat.pc "$DESTDIR"/usr/lib/pkgconfig/sdl.pc || exit 1 } diff --git a/ports/sdl2-compat/build.sh b/ports/sdl2-compat/build.sh index 65cfc591..592228c1 100755 --- a/ports/sdl2-compat/build.sh +++ b/ports/sdl2-compat/build.sh @@ -20,5 +20,5 @@ build() { install() { DESTDIR="$DESTDIR" cmake --install build || exit 1 - ln -sf sdl2-compat.pc "$DESTDIR"/usr/lib/pkgconfig/sdl2.pc || exit 1 + ln -svf sdl2-compat.pc "$DESTDIR"/usr/lib/pkgconfig/sdl2.pc || exit 1 } diff --git a/ports/tcc/build.sh b/ports/tcc/build.sh index bb7361d7..e658804e 100755 --- a/ports/tcc/build.sh +++ b/ports/tcc/build.sh @@ -26,5 +26,6 @@ configure() { } post_install() { - ln -sf $tcc_arch-tcc $DESTDIR/usr/bin/tcc + mkdir -p "$DESTDIR/usr/bin" + ln -svf $tcc_arch-tcc "$DESTDIR/usr/bin/tcc" } diff --git a/ports/tinygb/build.sh b/ports/tinygb/build.sh index f229fbe8..9e137878 100755 --- a/ports/tinygb/build.sh +++ b/ports/tinygb/build.sh @@ -15,5 +15,6 @@ build() { } install() { + mkdir -p "$DESTDIR/usr/bin/" cp -v tinygb "$DESTDIR/usr/bin/" || exit 1 } diff --git a/ports/xclock/build.sh b/ports/xclock/build.sh index e2ae265a..4df9f26b 100755 --- a/ports/xclock/build.sh +++ b/ports/xclock/build.sh @@ -5,3 +5,6 @@ VERSION='1.1.1' DOWNLOAD_URL="https://www.x.org/releases/individual/app/xclock-$VERSION.tar.xz#df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c" DEPENDENCIES=('libXaw' 'libXmu' 'libX11' 'libXft' 'libxkbfile') CONFIG_SUB=('config.sub') +CONFIGURE_OPTIONS=( + '--with-appdefaultdir=/usr/share/X11/app-defaults' +)