From 7cc7f7ac54a76e84a5f7ada2a8e23473ca0c82ea Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Thu, 21 Jan 2021 19:12:25 +0100
Subject: [PATCH] Ports: Clean up some package.sh scripts

- Remove superfluous function overrides and use makeopts instead
- Remove superfluous installopts
- Use run rather than cd'ing manually
- Ensure empty line between functions
---
 Ports/gcc/package.sh       | 2 ++
 Ports/jq/package.sh        | 4 ----
 Ports/nasm/package.sh      | 3 +--
 Ports/openssh/package.sh   | 6 +++---
 Ports/stress-ng/package.sh | 6 +-----
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh
index d54c256624..ef757db1ac 100755
--- a/Ports/gcc/package.sh
+++ b/Ports/gcc/package.sh
@@ -11,9 +11,11 @@ installopts="DESTDIR=$SERENITY_ROOT/Build/Root install-gcc install-target-libgcc
 depends="binutils"
 auth_type="sig"
 auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig"
+
 post_fetch() {
     run contrib/download_prerequisites
 }
+
 build() {
     run make $makeopts
     run find ./host-i686-pc-serenity/gcc/ -maxdepth 1 -type f -executable -exec strip --strip-debug {} \; || echo
diff --git a/Ports/jq/package.sh b/Ports/jq/package.sh
index f7a8b95015..9eacbd7515 100755
--- a/Ports/jq/package.sh
+++ b/Ports/jq/package.sh
@@ -6,10 +6,6 @@ configopts="--with-oniguruma=builtin --disable-maintainer-mode"
 files="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz jq-1.6.tar.gz"
 makeopts="LDFLAGS=-all-static"
 
-build() {
-    run make $makeopts
-}
-
 pre_configure() {
     pushd $workdir/modules/oniguruma
     autoreconf -fi
diff --git a/Ports/nasm/package.sh b/Ports/nasm/package.sh
index cab5e87823..689bad937a 100755
--- a/Ports/nasm/package.sh
+++ b/Ports/nasm/package.sh
@@ -5,7 +5,6 @@ files="https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz na
 useconfigure=true
 makeopts=
 
-configure() {
+pre_configure() {
 	run ./autogen.sh
-	run ./"$configscript" --host=i686-pc-serenity $configopts
 }
diff --git a/Ports/openssh/package.sh b/Ports/openssh/package.sh
index d6f3f4574e..4b5f0425ad 100755
--- a/Ports/openssh/package.sh
+++ b/Ports/openssh/package.sh
@@ -7,11 +7,11 @@ depends="zlib openssl"
 useconfigure=true
 usr_local=$SERENITY_ROOT/Build/Root/usr/local/
 configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=$usr_local/lib"
+
 pre_configure() {
-	cd "${workdir}"
-	autoreconf
-	cd ..
+	run autoreconf
 }
+
 install() {
 	# Can't make keys outside of Serenity since ssh-keygen is built for Serenity.
 	run make DESTDIR="$SERENITY_ROOT"/Build/Root $installopts install-nokeys
diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh
index 887ad87559..42fdee42a9 100755
--- a/Ports/stress-ng/package.sh
+++ b/Ports/stress-ng/package.sh
@@ -3,8 +3,4 @@ port=stress-ng
 version=0.11.23
 workdir=stress-ng-${version}
 files="https://github.com/ColinIanKing/stress-ng/archive/V${version}.tar.gz stress-ng-${version}.tar.gz"
-installopts="DESTDIR=$SERENITY_ROOT/Build/Root"
-
-build() {
-    run make STATIC=1
-}
+makeopts="STATIC=1"