update package to -current and restructure installation to more closely follow arch standards

1 files changed, 47 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5c670d084ca0..1a5cb515c3c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
-# Maintainer: R. van Elst <https://raymii.org>
+# Maintainer: Alexander Jacocks <alexander@redhat.com>
+# Maintainer emeritus: R. van Elst <https://raymii.org>
 
 pkgname="simh-git"
-pkgver=4.0.Beta.1.757.gff95fb8 
-pkgrel=1
+pkgver=4.0.Beta.1.2670.g3c1c92dc 
+pkgrel=2
 pkgdesc="The Computer History Simulation Project"
 arch=('i686' 'x86_64')
 url="http://simh.trailing-edge.com/"
 license=('MIT')
-depends=('libpcap' 'unzip')
-makedepends=()
+depends=('libpcap' 'unzip' 'sdl2' 'ttf-dejavu' 'zlib' 'libpng')
+makedepends=('unoconv')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 source=('git+https://github.com/simh/simh.git')
 sha512sums=('SKIP')
 
+_cpus=$( nproc )
+
 pkgver() {
   cd "${pkgname%-*}"
   printf "%s" "$(git describe --long --tags | sed 's/v//; s/-/./g')"
@@ -21,18 +24,52 @@ pkgver() {
 
 build() {
   cd "${pkgname%-*}"
-  make 
+  if [ $_cpus -gt 1 ]; then
+    make -j $_cpus
+  else
+    make 
+  fi
 }
 
 package() {
+  echo "Entering directory $srcdir/simh/BIN."
+  install -d "$pkgdir/usr/bin"
   cd "$srcdir/simh/BIN"
   for i in *; do
-    install -D $i "$pkgdir/usr/bin/simh-$i"
+    if [ -d "$i" ]; then
+      echo "Skipping directory $i."
+    else
+      install "$i" "$pkgdir/usr/bin/simh-$i"
+    fi
+  done
+  cd "$srcdir/simh/BIN/buildtools"
+  echo "Entering directory $srcdir/simh/BIN/buildtools."
+  for i in *; do
+    if [ -d "$i" ]; then
+      echo "Skipping directory $i."
+    else
+      install "$i" "$pkgdir/usr/bin/simh-$i"
+    fi
   done
 
-  cd "$srcdir/simh/VAX"
-  mkdir -p "$pkgdir/usr/lib/simh"
-  cp *.bin "$pkgdir/usr/lib/simh"
+  for dir in VAX swtp6800/swtp6800 3B2; do
+    echo "Entering directory $srcdir/simh/$dir."
+    cd "$srcdir/simh/$dir"
+    find . -type f -name "*.bin" -exec install -D -t "$pkgdir/usr/lib/$pkgname" {} \;
+    find . -type f -name "*.exe" -exec install -D -t "$pkgdir/usr/lib/$pkgname" {} \;
+  done
+
+  echo "Entering directory $srcdir/simh/doc."
+  cd "$srcdir/simh/doc"
+  unoconv -d document --format=txt *.doc
+  install -D -t "$pkgdir/usr/share/doc/$pkgname" *.doc
+  install -D -t "$pkgdir/usr/share/doc/$pkgname" *.pdf
+  install -D -t "$pkgdir/usr/share/doc/$pkgname" *.txt
+
+  echo "Entering directory $srcdir/simh."
+  cd "$srcdir/simh"
+  install -D -t "$pkgdir/usr/share/doc/$pkgname" *.md
+  install -D -t "$pkgdir/usr/share/doc/$pkgname" *.txt
 }