Added elfutils and fuse to base

Removed build options that placed elf binaries in /bin
Removed executable bit from some build files

base/bash/bash.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-bash-malloc \
     --disable-rpath \
     --enable-history \
@@ -31,7 +30,7 @@ build() {
 
   cp COPYING $pkgdocs/
 
-  ( cd $pkg/bin ; ln -s bash sh )
+  ( cd $pkg/usr/bin ; ln -s bash sh )
 
   mkfinalpkg
 }

base/bison/bison.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-nls
 
   make

base/boost/boost.SMBuild

@@ -27,10 +27,10 @@ build() {
       cflags=-fno-strict-aliasing --without-graph_parallel --without-mpi"
   
   ./b2 $build_options
-  ./b2 $build_options --bindir="$pkg"/bin --includedir="$pkg"/usr/include --libdir="$pkg"/usr/lib install
+  ./b2 $build_options --bindir="$pkg/usr/bin" --includedir="$pkg/usr/include" --libdir="$pkg/usr/lib" install
 
-  install -Dm 755 b2 $pkg/bin/b2
+  install -Dm 755 b2 $pkg/usr/bin/b2
-  ( cd $pkg/bin ; ln -s b2 bjam )
+  ( cd $pkg/usr/bin ; ln -s b2 bjam )
 
   cp LICENSE_1_0.txt $pkgdocs/LICENSE
 

base/brotli/brotli.SMBuild

@@ -21,7 +21,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static
 
   make

base/bubblewrap/bubblewrap.SMBuild

@@ -21,7 +21,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --with-priv-mode=setuid \
     --disable-man
 

base/busybox/busybox.SMBuild

@@ -26,12 +26,12 @@ build() {
   cp $srcdir/busybox.config .config
   make CC="$CC" 
 
-  install -Dm 755 busybox $pkg/bin/busybox
+  install -Dm 755 busybox $pkg/usr/bin/busybox
 
   cp LICENSE $pkgdocs/
   
   (
-    cd $pkg/bin
+    cd $pkg/usr/bin
 
     for f in ntpd passwd udhcpc udhcpd route ifconfig \
       telnet telnetd tftp microcom netstat killall5 setfont \
@@ -43,7 +43,7 @@ build() {
   )
 
   install -Dm 755 $srcdir/udhcpc-script $pkg/etc/udhcpc-script
-  install -Dm 755 $srcdir/dhclient $pkg/bin/dhclient
+  install -Dm 755 $srcdir/dhclient $pkg/usr/bin/dhclient
 
   mkdir -p $pkg/usr/share/man/man8
   for f in sv runsvchdir chpst runsvdir runit runsv runit ; 

base/bzip2/bzip2.SMBuild

@@ -29,11 +29,11 @@ build() {
   install -Dm 755 libbz2.so.$version $pkg/usr/lib/libbz2.so.$version
 
   # Copy binaries
-  install -Dm 755 bzdiff $pkg/bin/bzdiff
+  install -Dm 755 bzdiff $pkg/usr/bin/bzdiff
-  install -Dm 755 bzgrep $pkg/bin/bzgrep 
+  install -Dm 755 bzgrep $pkg/usr/bin/bzgrep 
-  install -Dm 755 bzmore $pkg/bin/bzmore
+  install -Dm 755 bzmore $pkg/usr/bin/bzmore
-  install -Dm 755 bzip2-shared $pkg/bin/bzip2
+  install -Dm 755 bzip2-shared $pkg/usr/bin/bzip2
-  install -Dm 755 bzip2recover $pkg/bin/bzip2recover
+  install -Dm 755 bzip2recover $pkg/usr/bin/bzip2recover
 
   # And man pages
   mkdir -p $pkg/usr/share/man/man1
@@ -48,7 +48,7 @@ build() {
    ln -sf libbz2.so.$version libbz2.so.1.0
    ln -sf libbz2.so.$version libbz2.so
 
-   cd $pkg/bin
+   cd $pkg/usr/bin
    ln -sf bzip2 bunzip2
    ln -sf bzip2 bzcat
    ln -sf bzmore bzless

base/ca-certificates/ca-certificates.SMBuild

@@ -21,10 +21,10 @@ build() {
   # Update to certdata.txt from $srcdir:
   xzcat $srcdir/certdata-${version}.txt.xz > mozilla/certdata.txt
 
-  mkdir -p $pkg/usr/share/ca-certificates $pkg/bin $pkg/usr/sbin 
+  mkdir -p $pkg/usr/share/ca-certificates $pkg/usr/bin $pkg/usr/sbin
 
   make 
-  make install DESTDIR=$pkg CERTSDIR=/usr/share/ca-certificates
+  make install DESTDIR=$pkg BINDIR=/usr/bin CERTSDIR=/usr/share/ca-certificates
   cp docs/copyright $pkgdocs/COPYRIGHT
 
   mkdir -p $pkg/etc/ca-certificates/update.d
@@ -38,7 +38,7 @@ build() {
   install -Dm 644 sbin/update-ca-certificates.8 $pkg/usr/share/man/man8/update-ca-certificates.8
 
   # Why do people hardcode paths in Makefiles!
-  mv $pkg/usr/sbin/* $pkg/bin/
+  mv $pkg/usr/sbin/* $pkg/usr/bin/
   rmdir $pkg/usr/sbin
 
   mkfinalpkg

base/ca-certificates/setup.11.cacerts

@@ -1,3 +1,3 @@
 #!/bin/sh
 #BLURB="Rebuild SSL certificate database."
-chroot . usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null
+chroot . usr/bin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null

base/ccache/ccache.SMBuild

@@ -20,7 +20,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --bindir=/bin
+    --libdir=/usr/lib
 
   make
   make install DESTDIR=$pkg
@@ -28,9 +28,9 @@ build() {
   cp GPL* $pkgdocs/
 
   # Make some necessary symlinks
-  mkdir -p $pkg/lib/ccache
+  mkdir -p $pkg/usr/lib/ccache
   (
-    cd $pkg/lib/ccache
+    cd $pkg/usr/lib/ccache
     ln -sf ../../bin/ccache gcc
     ln -sf ../../bin/ccache g++
     ln -sf ../../bin/ccache cc

base/chrony/chrony.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin \
-    --sbindir=/bin \
     --with-user=chrony
 
   make $MAKEFLAGS

base/chrpath/chrpath.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin 
 
   make
   make install DESTDIR=$pkg 

base/cmake/cmake.SMBuild

@@ -6,7 +6,6 @@ homepage="http://www.cmake.org"
 download="https://github.com/Kitware/CMake/releases/download/v$version/cmake-$version.tar.gz"
 desc="Cross-platform, open-source make system"
 requires="gcc-libs openssl libunistring libidn2"
-ignoreusrbin=1
 
 prepbuilddir() {
   mkandenterbuilddir

base/coreutils/coreutils.SMBuild

@@ -23,8 +23,7 @@ build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --libexecdir=/usr/libexec \
-    --libexecdir=/lib \
     --without-gmp
 
   make

base/cpio/cpio.SMBuild

@@ -20,7 +20,6 @@ build() {
   CFLAGS+=" -fcommon" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-nls
 
   make

base/crda/crda.SMBuild

@@ -24,8 +24,8 @@ prepbuilddir() {
 }
 
 build() {
-  make PREFIX="/usr" SBINDIR="/bin"
+  make PREFIX="/usr" SBINDIR="/usr/bin"
-  make PREFIX="/usr" SBINDIR="/bin" install DESTDIR=$pkg 
+  make PREFIX="/usr" SBINDIR="/usr/bin" UDEV_RULE_DIR="/usr/lib/udev/rules.d" install DESTDIR=$pkg 
 
   cp LICENSE $pkgdocs/
 

base/cryptsetup/cryptsetup.SMBuild

@@ -21,7 +21,7 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --sbindir=/bin 
+    --sbindir=/usr/bin 
 
   make
   make install DESTDIR=$pkg

base/curl/curl.SMBuild

@@ -21,7 +21,6 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --bindir=/bin \
     --with-libssh2 \
     --without-ca-bundle \
     --with-ca-path=/etc/ssl/certs \

base/cython/cython.SMBuild

@@ -8,10 +8,10 @@ desc="C-Extensions for Python3"
 
 prepbuilddir() {
   mkandenterbuilddir
-  rm -rf Cython-$version
+  rm -rf $app-$version
 
-  tar xf $srcdir/Cython-$version.tar.?z*
+  tar xf $srcdir/$app-$version.tar.?z*
-  cd Cython-$version
+  cd $app-$version
   fixbuilddirpermissions
 }
 
@@ -20,11 +20,9 @@ build() {
 
   cp COPYING.txt LICENSE.txt $pkgdocs/
 
-  mv $pkg/usr/bin $pkg/
-
   mkfinalpkg
 }
 
 sha512sums="
-6216e63996e83b887cdcee6cd912d42e7da853640336b9190f5115d687848a902ee5a8edd6bfaef645c066b89e17dcd80ca1387688eb80a527ec23a0a4636e8f  Cython-0.29.21.tar.gz
+7f5998024f307b91fdea33348e0314a241f27791aec7db915fb5f502a9cbaa12e635a814d53f318d393369f03db78064940c54071746bf095a324e3a986e13f2  cython-0.29.21.tar.lz
 "

base/db/db.SMBuild

@@ -29,7 +29,6 @@ build() {
   db_cv_atomic="$db_atomic" \
   ../dist/configure \
     --prefix=/usr \
-    --bindir=/bin \
     --enable-shared \
     --disable-static \
     --enable-dbm \

base/dcron/dcron.SMBuild

@@ -22,11 +22,11 @@ prepbuilddir() {
 }
 
 build() {
-  make PREFIX=/ BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root 
+  make PREFIX=/usr SBINDIR=/usr/bin CRONTAB_GROUP=root 
 
-  install -Dm 755 crond $pkg/bin/crond
+  install -Dm 755 crond $pkg/usr/bin/crond
-  install -Dm 4711 crontab $pkg/bin/crontab
+  install -Dm 4711 crontab $pkg/usr/bin/crontab
-  install -Dm 755 $srcdir/run-parts $pkg/bin/run-parts
+  install -Dm 755 $srcdir/run-parts $pkg/usr/bin/run-parts
 
   install -Dm 644 crontab.1 $pkg/usr/share/man/man1/crontab.1
   install -Dm 644 crond.8 $pkg/usr/share/man/man8/crond.8

base/desktop-file-utils/desktop-file-utils.SMBuild

@@ -20,8 +20,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make 
   make install DESTDIR=$pkg

base/dialog/dialog.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --with-shared \
     --without-x 
 
@@ -32,6 +31,5 @@ build() {
 }
 
 sha512sums="
-0cfdef91212009306101a91745183639a103d5b07d33d47601197fd95431ed9187eb38b0cd75537a91d98d35c9be0c92655e33ec4670d496bf9f6cc17701ee87  dialog-1.3-20170509.tar.lz
 12f68bf7ed42452c4ee3e9a763b7f4b9d7fc04d36cc4a1f4f66e3b2050f92b141f16ebcb05d16e520a20e1d2067ae55fa08f747efedbd77370455f4ad180dc63  dialog-1.3-20240619.tar.lz
-"
+"

base/diffutils/diffutils.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   LDFLAGS="-static" \
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/dmidecode/dmidecode.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 
 build() {
   make
-  make install DESTDIR=$pkg prefix=/usr sbindir=/bin mandir="/usr/share/man"
+  make install DESTDIR=$pkg prefix=/usr sbindir=/usr/bin mandir="/usr/share/man"
 
   cp LICENSE $pkgdocs/
  

base/dosfstools/dosfstools.SMBuild

@@ -19,7 +19,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --sbindir=/bin
+    --sbindir=/usr/bin
 
   make
   make install DESTDIR=$pkg

base/ed/ed.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin
 
   make CFLAGS="$CFLAGS"
   make install DESTDIR=$pkg

base/elfutils/elfutils.SMBuild

@@ -0,0 +1,51 @@
+# Maintainer: PktSurf <smlinux@pktsurf.in>
+# Generated by mksm SMLinux build file generator version 0.101
+app=elfutils
+version=0.191
+build=1sml
+homepage="https://sourceware.org/elfutils/"
+download="https://sourceware.org/elfutils/ftp/$version/elfutils-$version.tar.bz2"
+desc="Tools to manipulate ELF binary files"
+requires="bzip2 curl"
+noautoconfsite=1
+   
+prepbuilddir() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+  applypatch $srcdir/fix-uninitialized.patch
+  applypatch $srcdir/musl-asm-ptrace-h.patch
+  applypatch $srcdir/musl-macros.patch
+}
+
+build() {
+  sed -i 's:-Werror::' */Makefile.in
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --program-prefix=eu- \
+    --disable-debuginfod \
+    --disable-libdebuginfod \
+    --disable-nls \
+    --enable-deterministic-archives
+
+  make 
+  make install DESTDIR=$pkg
+
+  cp COPYING $pkgdocs/
+
+  mkfinalpkg
+}
+
+
+sha512sums="
+f44ba2c36bdf3019a61a35418f05cf138c68eab8fa258a5a74b8517a5d99841f3f92d32dd6d7d6f4d68f7d050768d915833353a21e2c811f029c2988373fa0f9  elfutils-0.191.tar.lz
+b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58  fix-uninitialized.patch
+7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf  musl-asm-ptrace-h.patch
+792be4a38b55d20a320605ab340357ad55dc295ab241af86cd3edf4ec84b0122e91ebcf78d8d6a0f926104b5eb22306be1356b0892f71ee3ba27ae38e9130aab  musl-macros.patch
+"

base/elfutils/fix-uninitialized.patch

@@ -0,0 +1,17 @@
+
+--- a/libcpu/i386_disasm.c	2015-08-21 14:22:37.000000000 +0200
++++ b/libcpu/i386_disasm.c	2015-11-20 06:30:59.250629957 +0100
+@@ -1,4 +1,4 @@
+-/* Disassembler for x86.
++/* Disassembler for x86.
+    Copyright (C) 2007, 2008, 2009, 2011 Red Hat, Inc.
+    This file is part of elfutils.
+    Written by Ulrich Drepper <drepper@redhat.com>, 2007.
+@@ -710,6 +710,7 @@
+ 
+ 		case 'm':
+ 		  /* Mnemonic.  */
++		  str = mnebuf;
+ 
+ 		  if (unlikely (instrtab[cnt].mnemonic == MNE_INVALID))
+ 		    {

base/elfutils/musl-asm-ptrace-h.patch

@@ -0,0 +1,10 @@
+--- a/backends/ppc_initreg.c	2019-11-26 23:48:42.000000000 +0100
++++ b/backends/ppc_initreg.c	2019-12-08 16:57:58.334872602 +0100
+@@ -32,6 +32,7 @@
+ 
+ #include <stdlib.h>
+ #if defined(__powerpc__) && defined(__linux__)
++# include <asm/ptrace.h>
+ # include <sys/ptrace.h>
+ # include <sys/user.h>
+ #endif

base/elfutils/musl-macros.patch

@@ -0,0 +1,78 @@
+diff -ur elfutils-0.187.orig/lib/libeu.h elfutils-0.187/lib/libeu.h
+--- elfutils-0.187.orig/lib/libeu.h	2022-06-16 18:48:12.916472948 +0200
++++ elfutils-0.187/lib/libeu.h	2022-06-16 18:48:54.219839323 +0200
+@@ -31,6 +31,18 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <unistd.h>
++#include <alloca.h>
++#include <string.h>
++
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++   ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
+ 
+ extern void *xmalloc (size_t) __attribute__ ((__malloc__));
+ extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
+diff -ur elfutils-0.187.orig/src/arlib.h elfutils-0.187/src/arlib.h
+--- elfutils-0.187.orig/src/arlib.h	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/arlib.h	2022-06-16 18:48:18.879811052 +0200
+@@ -29,6 +29,16 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
++#if !defined(ACCESSPERMS)
++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
++#endif
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
++#endif
++#if !defined(DEFFILEMODE)
++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
++#endif
++
+ 
+ /* State of -D/-U flags.  */
+ extern bool arlib_deterministic_output;
+diff -ur elfutils-0.187.orig/src/elfcompress.c elfutils-0.187/src/elfcompress.c
+--- elfutils-0.187.orig/src/elfcompress.c	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/elfcompress.c	2022-06-16 18:48:18.879811052 +0200
+@@ -37,6 +37,14 @@
+ #include "libeu.h"
+ #include "printversion.h"
+ 
++#if !defined(FNM_EXTMATCH)
++# define FNM_EXTMATCH 0
++#endif
++
++#if !defined(ALLPERMS)
++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) /* 07777 */
++#endif
++
+ /* Name and version of program.  */
+ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
+ 
+diff -ur elfutils-0.187.orig/src/strip.c elfutils-0.187/src/strip.c
+--- elfutils-0.187.orig/src/strip.c	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/strip.c	2022-06-16 18:48:18.879811052 +0200
+@@ -46,6 +46,14 @@
+ #include <system.h>
+ #include <printversion.h>
+ 
++#if !defined(FNM_EXTMATCH)
++# define FNM_EXTMATCH 0
++#endif
++
++#if !defined(ACCESSPERMS)
++#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ typedef uint8_t GElf_Byte;
+ 
+ /* Name and version of program.  */

base/enchant/enchant.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static 
 
   make
@@ -30,8 +29,8 @@ build() {
   (
     cd $pkg
     cd usr/include ; ln -sfv enchant-2 enchant 
-    cd ../../bin ; ln -sfv enchant-2 enchant 
+    cd ../bin ; ln -sfv enchant-2 enchant 
-    cd ../usr/lib ; ln -sfv libenchant-2.so libenchant.so 
+    cd ../lib ; ln -sfv libenchant-2.so libenchant.so 
     cd pkgconfig ; ln -sfv enchant-2.pc enchant.pc 
   )
 

base/eudev/eudev.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin \
-    --sbindir=/bin \
     --sysconfdir=/etc \
     --disable-introspection 
 

base/exfat-utils/exfat-utils.SMBuild

@@ -20,8 +20,7 @@ build() {
   CFLAGS+=" -std=c99" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin 
-    --sbindir=/bin 
 
   make
   make install DESTDIR=$pkg 

base/exiv2/exiv2.SMBuild

@@ -20,7 +20,6 @@ build() {
   mkdir -p smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_BINDIR=/bin  \
     -DCMAKE_INSTALL_LIBDIR=lib
 
   make

base/expat/expat.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static 
 
   make

base/faad2/faad2.SMBuild

@@ -20,7 +20,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static
 
   make

base/fftw/fftw.SMBuild

@@ -23,7 +23,6 @@ build() {
   defconfopts() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --enable-shared \
     --disable-static \
     --enable-threads \

base/file/file.SMBuild

@@ -21,7 +21,6 @@ build() {
   CFLAGS+=" --std=c99" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --datadir=/etc \
     --enable-fsect-man5 \
     --disable-libseccomp

base/findutils/findutils.SMBuild

@@ -23,8 +23,7 @@ build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --libexecdir=/usr/libexec
-    --libexecdir=/libexec
 
   make
   make install DESTDIR=$pkg

base/flac/flac.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --enable-sse
 
   make

base/flex/flex.SMBuild

@@ -20,7 +20,6 @@ build() {
   CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static \
     --disable-nls
 

base/fribidi/fribidi.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static 
 
   make

base/ftjam/ftjam.SMBuild

@@ -22,8 +22,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make
   make install DESTDIR="$pkg"

base/fuse/doinst.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Keep same perms on rc.fuse3.new:
+if [ -e etc/rc.d/rc.fuse3 ]; then
+  cp -a etc/rc.d/rc.fuse3 etc/rc.d/rc.fuse3.new.incoming
+  cat etc/rc.d/rc.fuse3.new > etc/rc.d/rc.fuse3.new.incoming
+  mv etc/rc.d/rc.fuse3.new.incoming etc/rc.d/rc.fuse3.new
+fi
+
+config etc/rc.d/rc.fuse.new

base/fuse/fuse.SMBuild

@@ -0,0 +1,39 @@
+# Maintainer: PktSurf <smlinux@pktsurf.in>
+app=fuse
+version=3.10.5
+build=1sml
+homepage="https://github.com/libfuse/libfuse"
+download="https://github.com/libfuse/libfuse/archive/refs/tags/fuse3-$version.tar.gz"
+desc="Filesystem in Userspace v3"
+requires="udev"
+
+prepbuilddir() {
+  mkandenterbuilddir
+  rm -rf $app-$version
+
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
+  fixbuilddirpermissions
+}
+
+build() {
+  mkdir -p smbuild && cd smbuild
+  sed -i 's@/etc/init.d/fuse3@/etc/rc.d/rc.fuse.new@g' ../util/install_helper.sh
+  meson .. \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    -Dexamples=false
+
+  ninja
+  DESTDIR="$pkg" ninja install
+
+  cp ../LICENSE $pkgdocs
+
+  rm -rv $pkg/dev
+
+  mkfinalpkg
+}
+
+sha512sums="
+d4c397ae6522cc841099e76bb1e11493555e1f2767169cd6980aa64eed6f41a27f19d1282d6f521e1602c533f58ef90af5b1b4bdf86dc032d7316cceba57ead1  fuse-3.10.5.tar.lz
+"

base/gawk/gawk.SMBuild

@@ -20,7 +20,6 @@ build() {
   LDFLAGS="-static" \
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --without-mpfr \
@@ -37,4 +36,4 @@ build() {
 
 sha512sums="
 b96e82265115800e703d3e2860f7d3463a827cf7e661d6227e8c5e711abeef63af3641cc411423f517d8a43c43be7ad68dd1ef3d7d90bceb6799b57746c9318f  gawk-5.2.2.tar.lz
-"
+"

base/gdb/gdb.SMBuild

@@ -20,7 +20,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-werror \
     --with-system-zlib \
     --disable-sim \

base/gdbm/gdbm.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static \
     --disable-nls
 

base/gettext/gettext.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-java \
     --disable-static \
     --disable-nls

base/giflib/giflib.SMBuild

@@ -20,7 +20,7 @@ prepbuilddir() {
 
 build() {
   make CFLAGS="$CFLAGS"
-  make install DESTDIR="$pkg" PREFIX=/usr BINDIR=/bin
+  make install DESTDIR="$pkg" PREFIX=/usr
 
   cp COPYING $pkgdocs/
 

base/glib/glib.SMBuild

@@ -20,7 +20,6 @@ build() {
   mkdir -p smbuild && cd smbuild
 
   meson .. --prefix=/usr \
-    --bindir=/bin \
     -Dman=false \
     -Dgtk_doc=false \
     -Dselinux=disabled \

base/gloox/gloox.SMBuild

@@ -21,7 +21,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --enable-shared \
     --disable-static \
     --without-tests \

base/gnupg2/gnupg2.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin
-    --sbindir=/bin
 
   make
   make install DESTDIR=$pkg 

base/gperf/gperf.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/gpgme/gpgme.SMBuild

@@ -21,7 +21,6 @@ build() {
   # TODO: disable linking against qt5 
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static \
     --disable-gpg-test \
     --enable-languages="cl cpp" \

base/gptfdisk/gptfdisk.SMBuild

@@ -21,7 +21,7 @@ build() {
   make
 
   for f in cgdisk gdisk sgdisk fixparts ; do
-    install -Dm 755 $f $pkg/bin/$f
+    install -Dm 755 $f $pkg/usr/bin/$f
     install -Dm 644 $f.8 $pkg/usr/share/man/man8/$f.8
   done  
 

base/grep/grep.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   LDFLAGS="-static" \
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/groff/groff.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --without-x
 
   make 

base/gsl/gsl.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static
 
   make

base/gstreamer/gstreamer.SMBuild

@@ -21,7 +21,6 @@ build() {
 
   meson .. \
     --prefix=/usr \
-    --bindir=/bin \
     --buildtype=plain \
     -Dintrospection=disabled 
 

base/gyp/gyp.SMBuild

@@ -26,8 +26,6 @@ build() {
 
   cp LICENSE $pkgdocs/
 
-  mv $pkg/usr/bin $pkg/
-
   mkfinalpkg
 }
 

base/gzip/gzip.SMBuild

@@ -18,8 +18,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
  
   make
   make install DESTDIR=$pkg

base/hdparm/hdparm.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   make
-  make install prefix="/usr" mandir="/usr/share/man" sbindir="/bin" DESTDIR="$pkg"
+  make install prefix="/usr" mandir="/usr/share/man" sbindir="/usr/bin" DESTDIR="$pkg"
 
   cp LICENSE.TXT $pkgdocs/
 

base/htop/htop.SMBuild

@@ -22,7 +22,6 @@ build() {
 # Meter.c:415:54: error: 'cchar_t' {aka 'const struct <anonymous>'} has no member named 'attr'
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-unicode \
     --enable-sensors \
     --enable-capabilities

base/hunspell/hunspell.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static
 
   make

base/hyphen/hyphen.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static 
 
   make

base/i2c-tools/i2c-tools.SMBuild

@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   make
-  make install PREFIX="/usr" mandir="/usr/share/man" DESTDIR="$pkg" bindir="/bin" sbindir="/bin"
+  make install PREFIX="/usr" mandir="/usr/share/man" DESTDIR="$pkg" sbindir="/usr/bin"
 
   cp COPYING* $pkgdocs/
 

base/icu/icu.SMBuild

@@ -20,8 +20,7 @@ build() {
   cd source
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin \
-    --sbindir=/bin \
     --docdir="/usr/share/doc/$app-$version" \
     --disable-tests \
     --disable-samples \

base/ijs/ijs.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --mandir=/usr/share/man \
     --enable-shared \
     --disable-static

base/intltool/intltool.SMBuild

@@ -20,8 +20,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=/usr \
+    --prefix=/usr
-    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/iptables/iptables.SMBuild

@@ -19,8 +19,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin \
-    --sbindir=/bin \
     --disable-nftables
 
   make
@@ -30,7 +29,7 @@ build() {
   
   # Fix awkward symlinking
   ( 
-    cd $pkg/bin 
+    cd $pkg/usr/bin 
     rm iptables-xml
     ln -sf xtables-legacy-multi iptables-xml
   )

xorg/dbus/dbus.SMBuild

@@ -21,8 +21,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
+    --sbindir=/usr/bin \
-    --sbindir=/bin \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
@@ -47,8 +46,6 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  mv $pkg/lib/dbus-1.0/include/dbus/dbus-arch-deps.h $pkg/include/dbus-1.0/dbus/
-  install -Dm 755 $srcdir/rc.messagebus $pkg/etc/rc.d/rc.messagebus
 
   cp COPYING $pkgdocs/
 

xorg/fontconfig/fontconfig.SMBuild

@@ -22,7 +22,6 @@ build() {
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --bindir=/bin \
     --localstatedir=/var \
     --disable-docs 
 

xorg/freetype/freetype.SMBuild

@@ -19,7 +19,6 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix=/usr \
-    --bindir=/bin \
     --disable-static \
     --with-harfbuzz=no
 
@@ -27,7 +26,7 @@ build() {
   make install DESTDIR=$pkg
  
   # For some reason, freetype-config is not installed, which breaks builds like dia
-  install -Dm 755 builds/unix/freetype-config $pkg/bin/freetype-config
+  install -Dm 755 builds/unix/freetype-config $pkg/usr/bin/freetype-config
 
   cp docs/GPLv2.TXT $pkgdocs/
 

xorg/glslang-vulkan-sdk/glslang-vulkan-sdk.SMBuild

@@ -21,7 +21,6 @@ build() {
   cmake .. \
   -DCMAKE_BUILD_TYPE=None \
   -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_INSTALL_BINDIR=/bin \
   -DCMAKE_INSTALL_LIBDIR=lib \
   -DBUILD_SHARED_LIBS=On \
   -DENABLE_OPT=0