From a1868cd456254ae6d04251c1d8a8d4016422a66e Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Fri, 17 Mar 2023 12:11:33 +0530
Subject: [PATCH] Added JSON module to base/perl-modules since it is a
 dependency for net/samba Added code relating to psmisc in a subshell and
 discarded STRIP flag in base/procps-ng

---
 base/perl-modules/perl-modules.SMBuild |  8 +++++++-
 base/procps-ng/procps-ng.SMBuild       | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/base/perl-modules/perl-modules.SMBuild b/base/perl-modules/perl-modules.SMBuild
index 87a9931..9e18267 100755
--- a/base/perl-modules/perl-modules.SMBuild
+++ b/base/perl-modules/perl-modules.SMBuild
@@ -1,6 +1,6 @@
 app=perl-modules
 version=5.24.3
-build=2sml
+build=3sml
 homepage="https://www.perl.org/"
 download="https://www.perl.org/"
 desc="Collection of support addons for default perl installation"
@@ -14,6 +14,7 @@ htmlparserver=3.72
 xmlparserver=2.44
 xmlsimplever=2.22
 parseyapp=1.21
+jsonver=4.10
 
 prepbuilddir() {
   mkandenterbuilddir
@@ -66,6 +67,11 @@ build() {
   cp README $pkgdocs/README.PARSE-YAPP
   prepperlpackage
 
+  # JSON module
+  tar xf $srcdir/JSON-"$jsonver".tar.?z*
+  cd JSON-"$jsonver"
+  prepperlpackage
+
   # finally, XML-Simple module
   tar xf $srcdir/XML-Simple-"$xmlsimplever".tar.?z*
   cd XML-Simple-"$xmlsimplever"
diff --git a/base/procps-ng/procps-ng.SMBuild b/base/procps-ng/procps-ng.SMBuild
index 80f9fbf..03fc0c6 100755
--- a/base/procps-ng/procps-ng.SMBuild
+++ b/base/procps-ng/procps-ng.SMBuild
@@ -14,24 +14,28 @@ prepbuilddir() {
   cd $app-$version
   fixbuilddirpermissions
 
+  (
+    tar xf $srcdir/psmisc-$psmiscversion.tar.?z*
+    cd psmisc-$psmiscversion
+    fixbuilddirpermissions
+  )
+    
   applypatch $srcdir/procps-ng-netbsd-curses.patch
 }
 
 build() {
-  STRIP=false \
   CPPFLAGS="$CFLAGS -DGLOB_TILDE=0 -DAF_INET6=10 -DAF_INET=2" \
   ./configure \
     --prefix="" \
     --bindir=/bin \
     --sbindir=/bin \
-    --disable-nls 
+    --disable-nls
 
   make V=1 LDFLAGS="-all-static"
   make install DESTDIR=$pkg
 
   cp COPYING* $pkgdocs/
 
-  tar xf $srcdir/psmisc-$psmiscversion.tar.?z*
   cd psmisc-$psmiscversion
 
   LDFLAGS="-static" \