network/claws-mail-extra-plugins: Make plugins easier to define.

This is probably the most expected behavior. Also added gdata_plugin,
although it cannot be compiled (yet) it expects libgdata.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

2 files changed, 17 insertions, 5 deletions

diff --git a/network/claws-mail-extra-plugins/README b/network/claws-mail-extra-plugins/README
index 288cf83d82..4b797b5f21 100644
--- a/network/claws-mail-extra-plugins/README
+++ b/network/claws-mail-extra-plugins/README
@@ -11,6 +11,7 @@ These include:
 * clamd: Scans messages using clamd (Clam AV).
 * fancy: Renders html email using the GTK+ port of WebKit library.
 * fetchinfo: Insets headers containing download info into emails.
+* gdata_plugin: Access to GData (Google services) for Claws Mail.
 * geolocation_plugin: Display a map showing the location of the sender.
 * gtkhtml2_viewer: Renders HTML emails using the gtkhtml2 widget.
 * mailmbox: Handles mbox format mailboxes.
@@ -24,10 +25,8 @@ These include:
 * tnef_parse: Enables reading application/ms-tnef attachments.
 * vcalendar: Allows VCalendar message handling like Evolution or Outlook.
 
-Requirements:
+All of the above plugins will be built, with the exception of the following:
   The fancy plugin requires webkit.
+  The gdata plugin requires libgdata, which is not available at SBo.
   The geolocation plugin requires libchamplain.
-
-Note: By default the package will include every plugin; this can be changed
-very easily in the script - it uses a list of plugins to be built, and plugins
-can be added or removed easily enough.
+If you want to build them, add them to the PLUGIN_LIST variable.
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 14b34bd612..26b3a5c8c0 100644
--- a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
+++ b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
@@ -30,7 +30,11 @@
 
 PRGNAM=claws-mail-extra-plugins
 VERSION=3.7.10
+<<<<<<< HEAD
 BUILD=${BUILD:-1}
+=======
+BUILD=${BUILD:-3}
+>>>>>>> 25cbc9c... network/claws-mail-extra-plugins: Make plugins easier to define.
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -46,6 +50,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+<<<<<<< HEAD
 
 # This is a *complete* list of available plugins, see the README for
 # information on plugins you may wish you remove from this list.
@@ -53,6 +58,14 @@ PLUGIN_LIST="acpi_notifier address_keeper archive att_remover attachwarner \
   bsfilter_plugin clamd fancy fetchinfo-plugin geolocation_plugin \
   gtkhtml2_viewer mailmbox newmail notification_plugin perl_plugin \
   python_plugin rssyl spam_report tnef_parse vcalendar"
+=======
+# This is an *incomplete* list of available plugins, see the README for
+# information on plugins you may wish you add/remove from this list.
+PLUGIN_LIST=${PLUGIN_LIST:-"acpi_notifier address_keeper archive \
+ att_remover attachwarner bsfilter_plugin clamd fetchinfo-plugin \
+ gtkhtml2_viewer mailmbox newmail notification_plugin \
+ perl_plugin python_plugin rssyl spam_report tnef_parse vcalendar"}
+>>>>>>> 25cbc9c... network/claws-mail-extra-plugins: Make plugins easier to define.
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i486"