ham/aprx: Use -fcommon. i486->i586. Fix README.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 27 insertions, 25 deletions

diff --git a/ham/aprx/README b/ham/aprx/README
index ed741bf03342..109fe84cdf6c 100644
--- a/ham/aprx/README
+++ b/ham/aprx/README
@@ -1,28 +1,31 @@
-aprx was originally a receive-only APRS iGate software, now extended to do 
-digipeating, and Tx-iGate. It works on any UNIX-like systems with minimal 
-requirements of system services, or system libraries beyond basic POSIX libc.
+aprx was originally a receive-only APRS iGate software, now extended to
+do digipeating, and Tx-iGate. It works on any UNIX-like systems with
+minimal requirements of system services, or system libraries beyond
+basic POSIX libc.
 
-The software is to be installed on a suitable UNIX-like system, and its 
+The software is to be installed on a suitable UNIX-like system, and its
 configuration file is then to be adjusted. Then it can:
 * Handle arbitrary number of radio modems connected to itself
-* Optionally relay APRS packets from radio receivers to APRS-IS 
+* Optionally relay APRS packets from radio receivers to APRS-IS
   (http://www.aprs-is.net) network
-* Optionally digipeat AX.25 packets with and without APRS NEWn-N 
+* Optionally digipeat AX.25 packets with and without APRS NEWn-N
   paradigm rules
-* Optionally relay APRS packets from APRS-IS network to radio channel 
+* Optionally relay APRS packets from APRS-IS network to radio channel
   (Tx-iGate)
 
-This software is intended for very limited resources environment, like small 
-embedded-like machines barely able to run the operating system with TCP/IP 
-networking.
-A receive-only Rx-iGate does not need any sort of licenses in most parts of 
-the world where radio amateur hobby is permitted to begin with.
+This software is intended for very limited resources environment, like
+small embedded-like machines barely able to run the operating system
+with TCP/IP networking.
 
-On version 2, aprx has gotten the ability to do APRS Digipeater function, 
-Aprx Tx-iGate, as well as a variation of that called Viscous APRS Digipeater, 
-which is an excellent choice for a Fill-In digipeater like on a mobile 
-station. Viscousness means that it will listen for other copies of same 
-packet for a small configurable number of seconds, and if it hears same 
-packet only once, it will do normal digipeating for it.
+A receive-only Rx-iGate does not need any sort of licenses in most parts
+of the world where radio amateur hobby is permitted to begin with.
 
-aprx can optionall be used with soundmodem in place of a hardware TNC.
+On version 2, aprx has gotten the ability to do APRS Digipeater
+function, Aprx Tx-iGate, as well as a variation of that called Viscous
+APRS Digipeater, which is an excellent choice for a Fill-In digipeater
+like on a mobile station. Viscousness means that it will listen for
+other copies of same packet for a small configurable number of seconds,
+and if it hears same packet only once, it will do normal digipeating for
+it.
+
+aprx can optionally be used with soundmodem in place of a hardware TNC.
diff --git a/ham/aprx/aprx.SlackBuild b/ham/aprx/aprx.SlackBuild
index 4e2f5b8097b0..37de8827a3e5 100644
--- a/ham/aprx/aprx.SlackBuild
+++ b/ham/aprx/aprx.SlackBuild
@@ -24,13 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=aprx
 VERSION=${VERSION:-2.9.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +48,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -77,8 +77,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \