ham/7plus: Fixes for the 64bit build.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

4 files changed, 34 insertions, 18 deletions

diff --git a/ham/7plus/7plus.SlackBuild b/ham/7plus/7plus.SlackBuild
index d61b297708..7157cb7a47 100644
--- a/ham/7plus/7plus.SlackBuild
+++ b/ham/7plus/7plus.SlackBuild
@@ -58,16 +58,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -76,8 +72,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/7pl225sr.zip
-mv 7plsrc.225 $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+# the readme suggests forcing plain text for correct newlines (-aa)
+unzip -j -aa $CWD/7pl225sr.zip "7plsrc.225/*" -d $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -86,6 +83,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# some extra includes
+patch -p1 --verbose <$CWD/C-includes.patch
+
+# fixes to get x86_64 to compile
+sed -i "s,^CFLAGS = -O2,& $SLKCFLAGS -fcommon," linux.mak
+sed -i "s,^LDFLAGS = -s,& -fcommon," linux.mak
+sed -i "s,^DEFINES =,& -D__i386__," linux.mak
+
 make -f linux.mak
 install -D -g root -o root -m 0755 7plus $PKG/usr/bin/7plus
 
diff --git a/ham/7plus/7plus.info b/ham/7plus/7plus.info
index 2063ac0f2f..af3623c5cb 100644
--- a/ham/7plus/7plus.info
+++ b/ham/7plus/7plus.info
@@ -3,7 +3,7 @@ VERSION="2.25"
 HOMEPAGE="https://web.archive.org/web/20120117043523/http://www.linux-ax25.org/wiki/7Plus"
 DOWNLOAD="http://ponce.cc/slackware/sources/repo/7pl225sr.zip"
 MD5SUM="74e89f8fa00b7d02ef45386dc9f7352f"
-DOWNLOAD_x86_64="UNSUPPORTED"
+DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="JK Wood"
diff --git a/ham/7plus/C-includes.patch b/ham/7plus/C-includes.patch
new file mode 100644
index 0000000000..41a0ee65ba
--- /dev/null
+++ b/ham/7plus/C-includes.patch
@@ -0,0 +1,12 @@
+diff -Naur a/7plus.h b/7plus.h
+--- a/7plus.h	2000-01-10 10:03:02.000000000 +0000
++++ b/7plus.h	2022-02-13 21:16:05.186445213 +0000
+@@ -24,6 +24,8 @@
+ /* #define setvbuf(a,b,c,d) */
+ 
+ /** these includes should work anywhere **/
++#include <unistd.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
diff --git a/ham/7plus/README b/ham/7plus/README
index dd18c8ddaa..5e8420805e 100644
--- a/ham/7plus/README
+++ b/ham/7plus/README
@@ -1,13 +1,12 @@
 7PLUS is an encoder vaguely similar to Unix's UUENCODE.
-It uses a very effective radix216 encoding and incorporates
-diverse mechanisms to ensure decoded data is not corrupted.
-It also includes an interactive repair mechanism which allows
-the repair of damaged files using correction files, thus
-eliminating the need to retransmit entire files. In case of
-a corruption, only the faulty sections are resent. 7PLUS
-is only meant to be used within the Packet Radio network
-for the tranport of binary data through Packet Radio mail.
-It cannot be used for Internet eMail since it needs a
-(almost) transparent path from end to end.
 
-This will not build on x86_84, patches welcome.
+It uses a very effective radix216 encoding and incorporates diverse
+mechanisms to ensure decoded data is not corrupted.  It also includes an
+interactive repair mechanism which allows the repair of damaged files
+using correction files, thus eliminating the need to retransmit entire
+files. In case of a corruption, only the faulty sections are resent.
+
+7PLUS is only meant to be used within the Packet Radio network for the
+tranport of binary data through Packet Radio mail.  It cannot be used
+for Internet eMail since it needs a (almost) transparent path from end
+to end.