network/claws-mail-extra-plugins: Misc. script cleanups.

3 files changed, 17 insertions, 5 deletions

diff --git a/network/claws-mail-extra-plugins/README b/network/claws-mail-extra-plugins/README
index 9653062761f4d..6210cb7211424 100644
--- a/network/claws-mail-extra-plugins/README
+++ b/network/claws-mail-extra-plugins/README
@@ -6,7 +6,6 @@ These include:
 * att_remover: Removes attachments from emails.
 * attachwarner: Warns about messages mentioning attachments that don't have
                 attachments.
-* bsfilter_plugin: 
 * cachesaver: Saves the cache to prevent loss of metadata on crashes.
 * fancy: Renders html email using the GTK+ port of WebKit library.
 * fetchinfo: Insets headers containing download info into emails.
@@ -21,7 +20,7 @@ These include:
 * rssyl: Allows you to read RSS newsfeeds.
 * spam_report: Reports spam to various places.
 * synce: Helps keep the address book of a Windows CD device in sync with
-    Claw's addressbook
+         Claw's addressbook
 * tnef_parse: Enables reading application/ms-tnef attachments.
 * vcalendar: Allows VCalendar message handling like Evolution or Outlook
 
diff --git a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
index e7f4c946d98dc..913e10142637c 100644
--- a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
+++ b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
@@ -30,10 +30,19 @@
 
 PRGNAM=claws-mail-extra-plugins
 VERSION=3.7.6
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -56,6 +65,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -eu
diff --git a/network/claws-mail-extra-plugins/slack-desc b/network/claws-mail-extra-plugins/slack-desc
index e13a8680dc5c9..a2ac12d2d6441 100644
--- a/network/claws-mail-extra-plugins/slack-desc
+++ b/network/claws-mail-extra-plugins/slack-desc
@@ -4,15 +4,16 @@
 # the right side marks the last column you can put a character in.  You must make
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
+
                         |-----handy-ruler------------------------------------------------------|
 claws-mail-extra-plugins: Claws Mail Extra Plugins (Plugins for Claws-Mail)
 claws-mail-extra-plugins: 
 claws-mail-extra-plugins: This package includes extra plugins for the Claws-Mail email client.
 claws-mail-extra-plugins: Plugins range from an RSS reader to Perl message filtering.
-claws-mail-extra-plugins: 
-claws-mail-extra-plugins: 
+claws-mail-extra-plugins:
 claws-mail-extra-plugins: Check out the documentation directory or 
 claws-mail-extra-plugins: http://www.claws-mail.org for more details.
 claws-mail-extra-plugins:
 claws-mail-extra-plugins:
 claws-mail-extra-plugins:
+claws-mail-extra-plugins: