No more need for wrapper script, but needs workaround for keymaps, and downloading binutils with makepkg instead of wget. Adding tagline from upstream.

3 files changed, 22 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07283597111c..89a70abd0ec0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 123-bin
-	pkgdesc = Lotus 1-2-3 for Unix release 3.0
+	pkgdesc = Create, modify, and process financial or scientific models.
 	pkgver = 3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/taviso/123elf
 	arch = i386
 	arch = i686
@@ -11,7 +11,7 @@ pkgbase = 123-bin
 	makedepends = cpio
 	makedepends = gcc
 	makedepends = binutils
-	makedepends = wget
+	makedepends = xz
 	depends = lib32-ncurses
 	provides = 123
 	noextract = 123UNIX1.IMG
@@ -19,19 +19,20 @@ pkgbase = 123-bin
 	noextract = 123UNIX3.IMG
 	noextract = 123UNIX4.IMG
 	noextract = 123UNIX5.IMG
+	noextract = binutils-2.38.tar.xz
 	source = 123-bin::git+https://github.com/taviso/123elf.git
 	source = https://archive.org/download/123-unix/123UNIX1.IMG
 	source = https://archive.org/download/123-unix/123UNIX2.IMG
 	source = https://archive.org/download/123-unix/123UNIX3.IMG
 	source = https://archive.org/download/123-unix/123UNIX4.IMG
 	source = https://archive.org/download/123-unix/123UNIX5.IMG
-	source = 123.sh
+	source = https://ftp.gnu.org/gnu/binutils/binutils-2.38.tar.xz
 	sha256sums = SKIP
 	sha256sums = 09996c4e8e33f83cacbde257ad4b04ca6b1432102b1d6eef28e64bdf5d6b7315
 	sha256sums = 4bdc6559105fbf9e2237b06a896b2ea34ecadef086bdc08b1ee2b4928ad51239
 	sha256sums = 336a30d68115b4f2a51c8aee4605b5f95d7bfd22e43c6a5779b9938563929f87
 	sha256sums = 5a2fdc33cde7056522aa47740460cd44873e4b8c3bb4d3891b06610e95dd4218
 	sha256sums = 444d28234594436334231aaa06431bee3323ce7e300ba8e7c62fe16c87c11681
-	sha256sums = 02774d899d22c3ea807b5065e6ade1285eb5da175588507a4f047e65bce409b5
+	sha256sums = e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024
 
 pkgname = 123-bin
diff --git a/123.sh b/123.sh
deleted file mode 100644
index 4ef34dfb4bfc..000000000000
--- a/123.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Setup wrapper for 123 since setup123 isn't working
-
-setupfile="$HOME/.l123set"
-
-
-if ! [ -e "$setupfile" ]; then
-    echo -n "
-Since this is the first time you're running 123, settings is being copied for you into $setupfile.
-
-You can edit this as you see fit.
-
-Press return to continue"
-    read; 
-    cat <<EOF > "$setupfile"
-1001 Lotus 1-2-3 Version "10"
-1002 Base Directory "/usr/share/lotus/"
-1003 Printer Interface "lpr -o dest={dest} {file}"
-1004 Graphics Driver "dumb" "ega egas25cc.vbd"
-1007 Help Language "USA English" "USA-English"
-1011 Display Char. Set "US ASCII" "l_ascii.bun"
-1005 Country Driver "USA-English Numbers First" "l13cUSF3.cbd"
-1006 Resource Language "USA English" "USA-English"
-1012 File Character Set "US ASCII" "l_ascii.bun"
-1008 File Name Mode "UNIX file name mode" "0"
-1010 Keyboard "xterm"
-EOF
-fi
-exec /usr/share/lotus/bin/123.bin $@
diff --git a/PKGBUILD b/PKGBUILD
index 878bd2be167c..20176909adbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Audun-Marius Gangstø <audun@gangsto.org>
 pkgname=123-bin
 pkgver=3.0
-pkgrel=2
+pkgrel=3
 epoch=
-pkgdesc="Lotus 1-2-3 for Unix release 3.0"
+pkgdesc="Create, modify, and process financial or scientific models."
 arch=("i386" "i686" "x86_64")
 url="https://github.com/taviso/123elf"
 license=('unknown')
 groups=()
 depends=("lib32-ncurses")
-makedepends=('unzip' 'cpio' 'gcc' 'binutils' 'wget')
+makedepends=('unzip' 'cpio' 'gcc' 'binutils' 'xz')
 checkdepends=()
 optdepends=()
 provides=('123')
@@ -19,13 +19,15 @@ backup=()
 options=()
 install=
 changelog=
+BINUTILS_DL="https://ftp.gnu.org/gnu/binutils"
+BINUTILS_XZ="binutils-2.38.tar.xz"
 source=("${pkgname}::git+https://github.com/taviso/123elf.git"
 "https://archive.org/download/123-unix/123UNIX1.IMG"
 "https://archive.org/download/123-unix/123UNIX2.IMG"
 "https://archive.org/download/123-unix/123UNIX3.IMG"
 "https://archive.org/download/123-unix/123UNIX4.IMG"
 "https://archive.org/download/123-unix/123UNIX5.IMG"
-"123.sh"
+"$BINUTILS_DL/$BINUTILS_XZ"
 )
 noextract=(
 '123UNIX1.IMG'
@@ -33,6 +35,7 @@ noextract=(
 '123UNIX3.IMG'
 '123UNIX4.IMG'
 '123UNIX5.IMG'
+"$BINUTILS_XZ"
 )
 sha256sums=(
     'SKIP'
@@ -41,20 +44,24 @@ sha256sums=(
     '336a30d68115b4f2a51c8aee4605b5f95d7bfd22e43c6a5779b9938563929f87'
     '5a2fdc33cde7056522aa47740460cd44873e4b8c3bb4d3891b06610e95dd4218'
     '444d28234594436334231aaa06431bee3323ce7e300ba8e7c62fe16c87c11681'
-    '02774d899d22c3ea807b5065e6ade1285eb5da175588507a4f047e65bce409b5'
+    'e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024'
     )
 validpgpkeys=()
 
 prepare() {
-    cp 123UNIX1.IMG 123UNIX2.IMG 123UNIX3.IMG 123UNIX4.IMG 123UNIX5.IMG "$pkgname"/
+    cp 123UNIX1.IMG 123UNIX2.IMG 123UNIX3.IMG 123UNIX4.IMG 123UNIX5.IMG "$BINUTILS_XZ" "$pkgname"/
 	cd "$pkgname"
     y | ./extract.sh
 }
 
 build() {
-	cd "$pkgname"
+    cd "$pkgname"
+    KEYMAPS=""
+    for k in xterm rxvt-unicode-256color xterm-256color rxvt terminology; do
+        [ -e /usr/share/terminfo/${k:0:1}/$k ] && KEYMAPS="${KEYMAPS} ${k}";
+    done
     ./binutils.sh || true
-	make
+    PATH="$PWD:$PATH" make KEYMAPS="$KEYMAPS"
 }
 
 check() {
@@ -65,10 +72,5 @@ check() {
 package() {
 	cd "$pkgname"
     mkdir -p "$pkgdir/usr/bin"
-    install -D -m755 "123" "$pkgdir/usr/share/lotus/bin/123.bin"
-    install -D -m755 "../123.sh" "$pkgdir/usr/bin/123"
-    gzip -kf root/lotus/man/man1/123.1
-    install -D -m644 root/lotus/man/man1/123.1.gz "$pkgdir/usr/share/man/man1/123.1.gz"
-    install -d "$pkgdir/usr/share/lotus"
-    cp -r "root/lotus/123.v10" "$pkgdir/usr/share/lotus/"
+    make prefix="$pkgdir/usr" KEYMAPS="$KEYMAPS" install
 }