Added man-pages to base

Added xfce4-sensors-plugin to xfce
Updated base and xfce4 build lists
Cleaned up code in bldpkg

base/.buildlist.base

@@ -112,6 +112,7 @@ parted
 mlocate
 groff
 mandoc
+man-pages
 pinfo
 haveged
 procps-ng

base/man-pages/man-pages.SMBuild

@@ -0,0 +1,34 @@
+app=man-pages
+version=5.13
+build=1sml
+homepage="https://www.kernel.org/doc/man-pages/"
+download="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-5.13.tar.xz"
+desc="Linux man pages"
+requires="musl"
+   
+build() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+
+  make install prefix="" DESTDIR=$pkg
+
+  # Provided by mandoc
+  rm -fv "$pkg"/share/man/man7/man* \
+    "$pkg"/share/man/man7/mdoc*
+
+  # Provided by tzdata
+  rm -fv "$pkg"/share/man/man5/tzfile* \
+    "$pkg"/share/man/man8/tzselect* \
+    "$pkg"/share/man/man8/zic* \
+    "$pkg"/share/man/man8/zdump*
+
+  mkfinalpkg
+}
+
+sha512sums="
+a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499  man-pages-5.13.tar.xz
+"

bldpkg

@@ -2,7 +2,7 @@
 # Part of the SMLinux distribution
 # http://git.pktsurf.in/smlinux
 #
-# Bash script to build SMLinux-specific and general Slackware packages
+# Bash script to build SMLinux-specific packages
 #
 # Copyright (c) 2022 PktSurf <smlinux@pktsurf.in>
 #
@@ -50,6 +50,7 @@ srcdir="$PWD"
 srcdirpath="$(basename $srcdir)"
 buildfile="$srcdirpath.SMBuild"
 
+# Function to source build file
 sourcebuildfile() {
   if [[ -f $buildfile ]] ; then
     source "$buildfile"
@@ -61,13 +62,13 @@ sourcebuildfile() {
   fi
 }
 
+# Function to set buildfile if an argument is passed via getopts
 setbuildfile() {
-  buildfile0="$OPTARG"
+  buildfile="$OPTARG"
-  if [[ ! -f $OPTARG ]] ; then
+  if [[ ! -f $buildfile ]] ; then
-    echo "[ERROR] Build file $buildfile0 not found!"
+    echo "[ERROR] Build file $buildfile not found!"
     exit 1
   fi
-  buildfile="$buildfile0"
 }
 
 # Function to invoke bash shell's -x mode for troubleshooting
@@ -75,21 +76,23 @@ tracemode() {
   set -x
 }
 
+# Function to enable building of packages with debug symbols using -g3 argument
 debugmode() {
   debug=1
 }
 
+# Function to override extractprompt in bldpkg.conf and auto-extract into pkg source directory
 autoextractmode() {
-  # Override extractprompt in bldpkg.conf
   extractprompt=0
   autoextract=1
 }
 
+# Override showsummary in bldpkg.conf
 displaysummary() {
-  # Override showsummary in bldpkg.conf
   showsummary=1
 }
 
+# Function to set number of make jobs, overrides those in bldpkg.conf
 setcputhreads() {
   cputhreads0="$OPTARG"
   # Validate if the argument is a number. If not, throw an error and exit.
@@ -113,12 +116,14 @@ genchecksum() {
   echo "[INFO] Adding new sha512sums in $tempbuildfile"
   printf 'sha512sums="\n' >> "$tempbuildfile"
 
-  # File types
-  files=( *.tar.* *.zip *.t?z *.patch *.diff *.c *.h )
-
   # Checksum digest to be used along with arguments
   checksumbinary="sha512sum"
 
+  # File types whose checksums will go into the new build file
+  files=( *.tar.* *.zip *.t?z *.patch *.diff *.c *.h )
+
+  # For loop that searches for files matching the above extension 
+  # and prints them to the bottom of the build file
   for file in ${files[@]} ; do
     if [[ -f $file ]] ; then
       $checksumbinary $file >> "$tempbuildfile"
@@ -183,7 +188,7 @@ EOF
 exit 0
 }
 
-# Function for providing handy arguments to users
+# Function for providing handy arguments to users. Some will override bldpkg.conf.
 while getopts ':def:ghj:sx' option; do
   case "$option" in
     d) debugmode ;;
@@ -244,7 +249,6 @@ if [[ -n $download ]]; then
 fi
 
 # Validate $desc
-#if [ "$(echo "$desc" | wc -c)" -gt 100 ] ; then
 if [[ ${#desc} -gt 100 ]] ; then
   echo "[ERROR] Package description should not exceed 100 characters in the build file."
   exit 1

xfce/.buildlist.xfce

@@ -24,6 +24,7 @@ xfce4-netload-plugin
 xfce4-diskperf-plugin
 xfce4-cpugraph-plugin
 xfce4-datetime-plugin
+xfce4-sensors-plugin
 xfce4-systemload-plugin
 xfce4-weather-plugin
 xfce4-wavelan-plugin

xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild

@@ -0,0 +1,31 @@
+app=xfce4-sensors-plugin
+version=1.4.3
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2"
+desc="Sensors plugin for XFCE panel"
+requires="lm-sensors xfce4-panel libnotify"
+   
+build() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+
+  ./configure \
+    --prefix="" \
+    --sysconfdir=/etc
+
+  make 
+  make install DESTDIR=$pkg
+
+  cp LICENSE $pkgdocs/
+
+  mkfinalpkg
+}
+
+sha512sums="
+2cb91afaf740db5bbbb8451cfa0540ee979671e6a1a640ad61dfeb41328c057bc16fa668e9d536595ef460bfbd41617e8b3d27f63e02324e9764543fa6a0b2b5  xfce4-sensors-plugin-1.4.3.tar.bz2
+"