From 27d2fcc4c747a5573a3249d944091d1f9c48f967 Mon Sep 17 00:00:00 2001
From: hippoz <paperplanelive@gmail.com>
Date: Wed, 14 Jul 2021 16:37:03 +0300
Subject: [PATCH] ** lots of small package cleanups and fixes

---
 alnux/package          |  2 +-
 bash/build             |  2 ++
 binutils/build         |  2 ++
 bison/build            |  1 +
 busybox/build          |  2 ++
 busybox/postdeploy     |  2 +-
 bzip2/build            |  2 ++
 cmake/build            |  3 ++-
 curses-lib/build       |  2 ++
 flex/build             |  3 +++
 gcc/build              |  5 ++++-
 gcc/package            |  2 +-
 git/build              |  1 +
 glibc/build            |  2 ++
 grub-defconfig/package |  2 +-
 gzip/build             | 19 ++++++++-----------
 gzip/package           |  2 +-
 hummingbird/build      |  1 +
 hummingbird/package    |  2 +-
 m4/build               |  2 ++
 make/build             |  1 +
 nano/build             |  5 +++--
 ninja/build            |  8 +++++---
 ninja/package          |  2 +-
 openrc/build           |  1 +
 pthread/build          |  2 ++
 tar/build              |  3 ++-
 ufetch/package         |  2 +-
 xz/build               |  3 ++-
 zlib/build             |  3 ++-
 zsh/build              |  3 ++-
 31 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/alnux/package b/alnux/package
index 76d9b8b..2121883 100755
--- a/alnux/package
+++ b/alnux/package
@@ -1,5 +1,5 @@
 pkg_config_deploy=true
-pkg_config_ver="0.3"
+pkg_config_ver="0.4"
 pkg_config_name="alnux"
 pkg_config_makedepends=""
 pkg_config_depends=""
\ No newline at end of file
diff --git a/bash/build b/bash/build
index c957546..ceaa300 100755
--- a/bash/build
+++ b/bash/build
@@ -1,7 +1,9 @@
 wget https://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz
 tar -xf bash-5.1.8.tar.gz
 cd bash-5.1.8
+
 sed -e 's/$(prefix)/$(DESTDIR)$(prefix)/g' -i Makefile
+
 ./configure
 make
 make install DESTDIR="$1"
diff --git a/binutils/build b/binutils/build
index 3ff2ad7..58f79ee 100755
--- a/binutils/build
+++ b/binutils/build
@@ -1,6 +1,7 @@
 wget -O binutils-2.36.1.tar.xz https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz
 tar -xf binutils-2.36.1.tar.xz
 cd binutils-2.36.1
+
 chmod +x makeinfo
 export PATH=$PATH:$PWD
 ./configure \
@@ -23,4 +24,5 @@ export PATH=$PATH:$PWD
 make configure-host
 make tooldir=/usr
 make DESTDIR="$1" tooldir=/usr install
+
 ln -sf ld.bfd "$1/usr/bin/ld"
diff --git a/bison/build b/bison/build
index 43d52ce..36b3e81 100755
--- a/bison/build
+++ b/bison/build
@@ -1,6 +1,7 @@
 wget https://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.xz
 tar -xf bison-3.7.6.tar.xz
 cd bison-3.7.6
+
 ./configure --prefix=/usr --docdir=/usr/share/doc/bison-3.7.6
 make
 make install DESTDIR="$1"
diff --git a/busybox/build b/busybox/build
index 6b82ef8..2a2aca2 100755
--- a/busybox/build
+++ b/busybox/build
@@ -1,9 +1,11 @@
 wget -O busybox-1.33.1.tar.bz2 https://busybox.net/downloads/busybox-1.33.1.tar.bz2
 tar -xf busybox-1.33.1.tar.bz2
 cd busybox-1.33.1
+
 make defconfig
 LDFLAGS="--static" make
 make install DESTDIR="$1"
+
 cd "_install"
 install linuxrc "$1"/linuxrc
 rsync -a ./bin/ "$1"/bin/
diff --git a/busybox/postdeploy b/busybox/postdeploy
index 611d550..7628ba5 100755
--- a/busybox/postdeploy
+++ b/busybox/postdeploy
@@ -1 +1 @@
-#/bin/busybox --install
+# /bin/busybox --install
diff --git a/bzip2/build b/bzip2/build
index a60e933..ab9cc2a 100755
--- a/bzip2/build
+++ b/bzip2/build
@@ -1,8 +1,10 @@
 wget -O bzip2-1.0.8.tar.gz https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
 tar -xf bzip2-1.0.8.tar.gz
 cd bzip2-1.0.8
+
 make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
 make CC="${CC:-cc} $CFLAGS -static -fPIC $LDFLAGS" bzip2
+
 mkdir -p "$1/usr/bin" "$1/usr/lib" "$1/usr/share/man/man1" "$1/usr/include"
 cp -f bzip2 bzdiff bzgrep bzmore "$1/usr/bin"
 cp -f libbz2.so.1.0.8 libbz2.a "$1/usr/lib"
diff --git a/cmake/build b/cmake/build
index ff388fa..1c924ad 100755
--- a/cmake/build
+++ b/cmake/build
@@ -1,6 +1,7 @@
 wget https://github.com/Kitware/CMake/releases/download/v3.21.0-rc2/cmake-3.21.0-rc2.tar.gz
 tar -xf cmake-3.21.0-rc2.tar.gz
 cd cmake-3.21.0-rc2.tar.gz
+
 ./bootstrap
 make
-make install DESTDIR="$1"
+make DESTDIR="$1" install
diff --git a/curses-lib/build b/curses-lib/build
index 12005b8..98f7abe 100755
--- a/curses-lib/build
+++ b/curses-lib/build
@@ -1,6 +1,7 @@
 wget https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.2.tar.gz
 tar -xf ncurses-6.2.tar.gz
 cd ncurses-6.2
+
 sed -i s/mawk// configure
 mkdir build
 pushd build
@@ -11,6 +12,7 @@ popd
 ./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec
 make
 make install DESTDIR="$1"
+
 cp libncursesw.so /lib/libncursesw.so
 ln -s /lib/libncursesw.so /lib/libncurses.so
 echo "INPUT(-lncursesw)" > $1/usr/lib/libncurses.so
diff --git a/flex/build b/flex/build
index dac4763..645b69c 100755
--- a/flex/build
+++ b/flex/build
@@ -1,9 +1,12 @@
 wget https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
 tar -xf flex-2.6.4.tar.gz
 cd flex-2.6.4
+
 sed -i "/math.h/a #include <malloc.h>" src/flexdef.h
 HELP2MAN=/tools/bin/true ./configure --prefix=/usr --docdir=/usr/share/doc/flex-2.6.4
+
 make
 make check
 make install DESTDIR="$1"
+
 ln -sv flex /usr/bin/lex
diff --git a/gcc/build b/gcc/build
index 98f24ac..4554068 100755
--- a/gcc/build
+++ b/gcc/build
@@ -7,18 +7,21 @@ wget https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz
 tar -xf gmp-6.2.1.tar.xz
 tar -xf mpfr-4.1.0.tar.xz
 tar -xf mpc-1.2.1.tar.gz
+
 mv gmp-6.2.1 gmp
 mv mpfr-4.1.0 mpfr
 mv mpc-1.2.1 mpc
+
 sed -i '/m64=/s/lib64/lib/' ./config/i386/t-linux64
 sed -i 's/lib64/lib/'       ./config/i386/linux64.h
 mkdir build
 cd build
+
 ../configure --prefix=/usr --enable-languages=c,c++,d,fortran,go,objc,obj-c++
 make
 make DESTDIR="$1" install
+
 ln -s gcc "$1/usr/bin/cc"
 echo "#!/bin/sh" > "$1"/usr/bin/c99
 echo "exec cc -std=c99 "$@"" >> "$1"/usr/bin/c99
 chmod +x "$1"/usr/bin/c99
-
diff --git a/gcc/package b/gcc/package
index d57d8a4..64ce766 100755
--- a/gcc/package
+++ b/gcc/package
@@ -1,5 +1,5 @@
 pkg_config_deploy="true"
-pkg_config_ver="0.1"
+pkg_config_ver="11.1.0"
 pkg_config_name="gcc"
 pkg_config_makedepends=""
 pkg_config_depends=""
diff --git a/git/build b/git/build
index 23ba522..29eff2c 100755
--- a/git/build
+++ b/git/build
@@ -1,6 +1,7 @@
 wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.9.5.tar.xz
 tar -xf git-2.9.5.tar.xz
 cd git-2.9.5
+
 ./configure --prefix=/usr
 make 
 make install DESTDIR="$1"
diff --git a/glibc/build b/glibc/build
index 11fb4b4..9010df0 100755
--- a/glibc/build
+++ b/glibc/build
@@ -1,8 +1,10 @@
 wget https://ftp.gnu.org/gnu/libc/glibc-2.33.tar.gz
 tar -xf glibc-2.33.tar.gz
 cd glibc-2.33
+
 mkdir build
 cd build
+
 ../configure --prefix=/usr
 make 
 make install DESTDIR="$1"
diff --git a/grub-defconfig/package b/grub-defconfig/package
index 6dae383..9ae2b10 100755
--- a/grub-defconfig/package
+++ b/grub-defconfig/package
@@ -1,5 +1,5 @@
 pkg_config_deploy=true
-pkg_config_ver="0.2"
+pkg_config_ver="0.3"
 pkg_config_name="grub-defconfig"
 pkg_config_makedepends=""
 pkg_config_depends=""
\ No newline at end of file
diff --git a/gzip/build b/gzip/build
index 8ab96e9..c4b6873 100755
--- a/gzip/build
+++ b/gzip/build
@@ -1,11 +1,8 @@
-wget https://zlib.net/pigz/pigz-2.6.tar.gz
-tar -xf pigz-2.6.tar.gz
-cd pigz-2.6 
-make CC="${CC:-cc} -static"
-mkdir -p "$1/usr/bin" "$1/usr/share/man/man1"
-cp -f pigz unpigz "$1/usr/bin"
-cp -f pigz.1 "$1/usr/share/man/man1"
-ln -sf pigz   "$1/usr/bin/gzip"
-ln -sf pigz   "$1/usr/bin/zcat"
-ln -sf unpigz "$1/usr/bin/gunzip"
-ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1"
+wget https://mirrors.nav.ro/gnu/gzip/gzip-1.10.tar.gz
+tar -xf gzip-1.10.tar.gz
+cd gzip-1.10
+
+./configure --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/gzip/package b/gzip/package
index 7a5b471..d7b38b0 100755
--- a/gzip/package
+++ b/gzip/package
@@ -1,5 +1,5 @@
 pkg_config_deploy=true
-pkg_config_ver="2.6"
+pkg_config_ver="1.10"
 pkg_config_name="gzip"
 pkg_config_makedepends=""
 pkg_config_depends=""
diff --git a/hummingbird/build b/hummingbird/build
index 923c049..dd5e07a 100755
--- a/hummingbird/build
+++ b/hummingbird/build
@@ -1,4 +1,5 @@
 git clone https://github.com/Sweets/hummingbird hummingbird-build
 cd hummingbird-build
+
 make
 make install DESTDIR=$1
diff --git a/hummingbird/package b/hummingbird/package
index 4e2c75a..8d8cdd1 100755
--- a/hummingbird/package
+++ b/hummingbird/package
@@ -1,5 +1,5 @@
 pkg_config_deploy=true
-pkg_config_ver="0.1"
+pkg_config_ver="b1f7ea13c94d5990af4de74b2691ebf4d681fd66"
 pkg_config_name="hummingbird"
 pkg_config_makedepends=""
 pkg_config_depends=""
\ No newline at end of file
diff --git a/m4/build b/m4/build
index b4f1b63..6c79b96 100755
--- a/m4/build
+++ b/m4/build
@@ -1,8 +1,10 @@
 wget https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
 tar -xf m4-1.4.19.tar.xz
 cd m4-1.4.19
+
 sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
+
 ./configure --prefix=/usr  --build=$(build-aux/config.guess)
 make
 make install DESTDIR="$1"
diff --git a/make/build b/make/build
index d0139f8..520f721 100755
--- a/make/build
+++ b/make/build
@@ -1,6 +1,7 @@
 wget https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
 tar -xf make-4.3.tar.gz
 cd make-4.3
+
 export CFLAGS="$CFLAGS -static"
 ./configure --prefix=/usr
 make
diff --git a/nano/build b/nano/build
index ceca9be..7a3ffa6 100755
--- a/nano/build
+++ b/nano/build
@@ -1,10 +1,11 @@
 wget https://www.nano-editor.org/dist/v5/nano-5.8.tar.xz
 tar -xf nano-5.8.tar.xz
 cd nano-5.8
+
 ./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-utf8     \
+            --disable-docs    \
             --docdir=/usr/share/doc/nano-5.8
 make
-make install &&
-install -v -m644 doc/{nano.html,sample.nanorc} /usr/share/doc/nano-5.8
+make DESTDIR="$1" install
diff --git a/ninja/build b/ninja/build
index dea8f27..3462221 100755
--- a/ninja/build
+++ b/ninja/build
@@ -1,4 +1,6 @@
-git clone https://github.com/ninja-build/ninja.git
-cd ninja
+git clone https://github.com/ninja-build/ninja/archive/refs/tags/v1.10.2.tar.gz
+tar -xf v1.10.2.tar.gz
+cd v1.10.2
+
 ./configure.py --bootstrap
-mv ninja "$1"/usr/bin
+cp -pv ninja "$1"/usr/bin
diff --git a/ninja/package b/ninja/package
index 56506ce..6cdc999 100755
--- a/ninja/package
+++ b/ninja/package
@@ -1,5 +1,5 @@
 pkg_config_deploy=true
-pkg_config_ver="1.10.2-git"
+pkg_config_ver="1.10.2"
 pkg_config_name="ninja"
 pkg_config_makedepends=""
 pkg_config_depends=""
diff --git a/openrc/build b/openrc/build
index 86a59da..5ec7904 100755
--- a/openrc/build
+++ b/openrc/build
@@ -1,6 +1,7 @@
 wget -O openrc-0.43.3.tar.gz https://github.com/OpenRC/openrc/archive/refs/tags/0.43.3.tar.gz
 tar -xf openrc-0.43.3.tar.gz
 cd openrc-0.43.3
+
 make
 make install BRANDING=\"Alnux/$(uname -s)\" SH=/bin/sh DESTDIR="$1"/sbin/openrc  PREFIX="$1"
 cat tmpfs /tmp tmpfs rw,nosuid,noatime,nodev,size=20G,mode=1777 0 0 > "$1"/etc/fstab
diff --git a/pthread/build b/pthread/build
index f9309a8..59dabbc 100755
--- a/pthread/build
+++ b/pthread/build
@@ -1,7 +1,9 @@
 wget https://ftp.gnu.org/gnu/pth/pth-2.0.7.tar.gz
 tar -xf pth-2.0.7.tar.gz
 cd pth-2.0.7
+
 sed -i 's#$(LOBJS): Makefile#$(LOBJS): pth_p.h Makefile#' Makefile.in
+
 ./configure --prefix=/usr --disable-static --mandir=/usr/share/man
 make
 make install &&
diff --git a/tar/build b/tar/build
index c94cbfe..d2070e5 100755
--- a/tar/build
+++ b/tar/build
@@ -1,6 +1,7 @@
 wget https://ftp.gnu.org/gnu/tar/tar-1.34.tar.xz
 tar -xf tar-1.34
 cd tar-1.34
+
 ./configure DEFAULT_RMT_DIR=/etc
 make
-make install DESTDIR="$1"
+make DESTDIR="$1" install
diff --git a/ufetch/package b/ufetch/package
index d59f27c..d50e2ce 100755
--- a/ufetch/package
+++ b/ufetch/package
@@ -1,5 +1,5 @@
 pkg_config_deploy="true"
-pkg_config_ver="0.0.1"
+pkg_config_ver="0.3"
 pkg_config_name="ufetch"
 pkg_config_makedepends=""
 pkg_config_depends=""
diff --git a/xz/build b/xz/build
index f7e7af0..11068e8 100755
--- a/xz/build
+++ b/xz/build
@@ -1,6 +1,7 @@
 wget https://tukaani.org/xz/xz-5.2.5.tar.gz 
 tar -xf xz-5.2.5.tar.gz
 cd xz-5.2.5
+
 ./configure --prefix=/usr --disable-nls
 make
-make install DESTDIR="$1"
+make DESTDIR="$1" install
diff --git a/zlib/build b/zlib/build
index 6ce6c40..60be936 100755
--- a/zlib/build
+++ b/zlib/build
@@ -1,7 +1,8 @@
 wget  https://zlib.net/zlib-1.2.11.tar.gz
 tar -xf zlib-1.2.11.tar.gz
 cd zlib-1.2.11
+
 export CFLAGS="$CFLAGS -fPIC"
 ./configure --prefix="$1" --shared
 make
-make install DESTDIR="$1"
+make DESTDIR="$1" install
diff --git a/zsh/build b/zsh/build
index 9b30e78..2fdc3b8 100755
--- a/zsh/build
+++ b/zsh/build
@@ -1,6 +1,7 @@
 wget https://www.zsh.org/pub/zsh-5.8.tar.xz
 tar -xf zsh-5.8.tar.xz
 cd zsh-5.8
+
 ./configure --prefix=/usr --sysconfdir=/etc/zsh --enable-etcdir=/etc/zsh
 make
-make install DESTDIR="$1"
+make DESTDIR="$1" install