Removed vintage build options from base/diffutils,libshout,libpthread-stubs

Added /usr to a handful of base build files

base/diffutils/diffutils.SMBuild

@@ -1,7 +1,7 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=diffutils
 version=3.6
-build=2sml
+build=1sml
 homepage="https://www.gnu.org/software/diffutils/"
 download="https://ftp.gnu.org/gnu/diffutils/diffutils-$version.tar.xz"
 desc="Utilities to find and apply differences between files"
@@ -14,17 +14,13 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
-
-  for i in tests gnulib-tests doc ; do
-    printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > "$i"/Makefile.in
-  done
 }
 
 build() {
-  CPPFLAGS="$($srcdir/gnulibfix lib)" \
   LDFLAGS="-static" \
   ./configure \
-    --prefix=
+    --prefix=/usr \
+    --bindir=/bin
 
   make
   make install DESTDIR=$pkg

base/diffutils/gnulibfix

@@ -1,185 +0,0 @@
-#!/bin/sh
-empty_file() {
-        rm -f "$1"
-        touch "$1"
-}
-
-dir="$1"
-# fix files breaking the build entirely
-for i in freadahead.c fseterr.c ; do empty_file "$dir"/$i ; done
-echo "void close_stdin(void) {}" > "$dir"/closein.c
-
-# fix stuff trying to reimplement libc
-culprits=`cat << EOF
-accept4
-acosl
-alloca
-alphasort
-asinl
-asprintf
-atanl
-atexit
-atoll
-bcopy
-btowc
-chown
-closedir
-cosl
-dirfd
-dprintf
-dup2
-dup3
-_Exit
-expl
-fchdir
-fchown-stub
-fdatasync
-fdopendir
-ffs
-flock
-fnmatch
-forkpty
-fpending
-fprintf
-freeaddrinfo
-fsync
-ftell
-ftruncate
-futimens
-gai_strerror
-getaddrinfo
-getdelim
-getdtablesize
-getgroups
-gethostname
-getline
-getlogin
-getlogin_r
-getnameinfo
-getpagesize
-getpass
-getsubopt
-gettimeofday
-getusershell
-gmtime_r
-grantpt
-imaxabs
-imaxdiv
-inet_ntop
-inet_pton
-isblank
-iswblank
-lchmod
-lchown
-ldexp
-ldexpl
-link
-linkat
-logl
-mbrlen
-mbrtowc
-mbsinit
-memmove
-mempcpy
-mkdtemp
-mkfifo
-mkfifoat
-mknod
-mknodat
-mkstemp
-mktime
-nanosleep
-nl_langinfo
-open
-openat
-opendir
-openpty
-pclose
-perror
-pipe
-pipe2
-poll
-popen
-pread
-pselect
-ptsname
-pwrite
-raise
-readdir
-readlink
-renameat
-rewinddir
-setenv
-sigaction
-sigaddset
-sigdelset
-sigemptyset
-sigfillset
-sigismember
-sigpending
-sigprocmask
-sinl
-snprintf
-spawnattr_destroy
-spawnattr_getdefault
-spawnattr_getflags
-spawnattr_getpgroup
-spawnattr_getsigmask
-spawnattr_init
-spawnattr_setdefault.c
-spawnattr_setflags
-spawnattr_setpgroup
-spawnattr_setsigmask
-spawn_faction_addclose
-spawn_faction_adddup2
-spawn_faction_addopen
-spawn_faction_destroy
-spawn_faction_init
-spawn_factions_addopen
-spawn_factions_destroy
-spawn_factions_init
-sprintf
-sqrtl
-stdio-read
-stdio-write
-strcasecmp
-strcasestr
-strchrnul
-strcspn
-strncasecmp
-strndup
-strnlen
-strpbrk
-strsep
-strsignal
-strstr
-strtod
-strtoimax
-strtol
-symlink
-symlinkat
-tanl
-tcgetsid
-timegm
-time_r
-times
-tmpfile
-uname
-unlockpt
-unsetenv
-usleep
-vasprintf
-vdprintf
-waitpid
-wcrtomb
-wctob
-EOF
-`
-#fixme check fsusage
-flags="-Drpl_tzset=tzset -Drpl_localtime=localtime -Dgnu_fnmatch=fnmatch \
-       -Dposix_fnmatch=fnmatch -Drpl_gmtime=gmtime"
-for i in $culprits ; do
-	empty_file "$dir"/$i.c
-	flags="$flags -Drpl_$i=$i"
-done
-printf "%s\n" "$flags"

base/dosfstools/dosfstools.SMBuild

@@ -1,7 +1,7 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=dosfstools
 version=4.1
-build=2sml
+build=1sml
 homepage="https://github.com/dosfstools/dosfstools"
 download="https://github.com/dosfstools/dosfstools/releases/download/v$version/dosfstools-$version.tar.gz"
 desc="Tools for working with FAT filesystems"
@@ -17,11 +17,9 @@ prepbuilddir() {
 }
 
 build() {
-  LDFLAGS="-static" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
-    --sbindir=/bin \
+    --sbindir=/bin
-    --enable-compat-symlinks
 
   make
   make install DESTDIR=$pkg

base/file/file.SMBuild

@@ -1,7 +1,7 @@
 # Maintainer: PktSurf <smlinux@pktsurf.in>
 app=file
 version=5.44
-build=4sml
+build=1sml
 homepage="https://www.darwinsys.com/file/"
 download="http://astron.com/pub/file/file-$version.tar.gz"
 desc="Utility to determine file types"
@@ -14,16 +14,14 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
-
-  #applypatch $srcdir/file.etc.file.diff
-  #applypatch $srcdir/file.short.diff
 }
 
 build() {
   # linking against libseccomp causes weird "Bad system call" issues
   CFLAGS+=" --std=c99" \
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --datadir=/etc \
     --enable-fsect-man5 \
     --disable-libseccomp
@@ -49,4 +47,4 @@ build() {
 
 sha512sums="
 aafc7bb8a84d64ec77b6e325868ce6149dea3fb3cb46868892c7c872dfeb7f56180cd231f2eecba4d256c7dd4936a6886de56b1ef3d69874ce798c1e49b91c05  file-5.44.tar.lz
-"
+"

base/i2c-tools/i2c-tools.SMBuild

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

base/libksba/libksba.SMBuild

@@ -17,7 +17,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
+    --bindir=/bin \
     --enable-shared=yes \
     --enable-static=no
 

base/libminizip/libminizip.SMBuild

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

base/libmms/libmms.SMBuild

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

base/libplist/libplist.SMBuild

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

base/libpthread-stubs/libpthread-stubs.SMBuild

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

base/libshout/libshout.SMBuild

@@ -18,9 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix= \
+    --prefix=/usr \
-    --disable-static \
+    --disable-static
-    $builddist
 
   make
   make install DESTDIR=$pkg 

base/yasm/yasm.SMBuild

@@ -18,7 +18,8 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix=
+    --prefix=/usr \
+    --bindir=/bin
 
   sed -i 's@gnu99@gnu99 -fPIC@g' Makefile