summaryrefslogtreecommitdiff
path: root/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild')
-rw-r--r--network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild13
1 files changed, 13 insertions, 0 deletions
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"