network/claws-mail-extra-plugins: Updated for version 3.6.1

4 files changed, 54 insertions, 57 deletions

diff --git a/network/claws-mail-extra-plugins/README b/network/claws-mail-extra-plugins/README
index 88c4ec3e95..bc13d77d7f 100644
--- a/network/claws-mail-extra-plugins/README
+++ b/network/claws-mail-extra-plugins/README
@@ -2,29 +2,32 @@ This builds a package of extra plugins for the Claws-Mail email client.
 These include:
 
 * acpi_notifier: Mail notification via LEDs on some laptops
+* archive: Adds archiving features to Claws Mail.
+* att_remover: Removes attachments from emails.
 * attachwarner: Warns about messages mentioning attachments that don't have
                 attachments.
-* att_remover: Removes attachments from emails.
 * cachesaver: Saves the cache to prevent loss of metadata on crashes.
 * fetchinfo: Insets headers containing download info into emails.
 * gtkhtml2_viewer: Renders HTML emails using the gtkhtml2 widget.
 * mailmbox: Handles mbox format mailboxes.
 * newmail: Writes email header summary to a log file.
 * notification: Provides various ways to notify the user of new and unread mail.
-* pdf_viewer: Displays PDF and PostScript using Poppler.
 * perl: Allows the use of perl for message filtering.
-* RSSyl: Allows you to read RSS newsfeeds.
-* S/MIME: Handles S/MIME signed and/or encrypted emails.
-* SynCE: Helps keep the address book of a Windows CD device in sync with Claw's
+* 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
-* vCalendar: Allows VCalendar message handling like Evolution or Outlook
+* tnef_parse: Enables reading application/ms-tnef attachments.
+* vcalendar: Allows VCalendar message handling like Evolution or Outlook
 
 Other Requirements:
   Claws-Mail (obviously) available from SlackBuilds.org.
-  The notification plugin also recommends libnotify, which is available from 
-    SlackBuilds.org.
-  The SynCE plugin requires libsynce and librapi2 both of which are available from 
-    http://synce.sourceforge.net/synce/.
+  The notification plugin requires libnotify.
+  The archive plugin requires libarchive.
+  The gtkhtml2_viewer plugin requires gail.
+  The SynCE plugin requires libsynce and librapi2.
+  All of these are available from SlackBuilds.org except libsynce and librapi2, 
+  and those two are at http://synce.sourceforge.net/synce/.
 
 Note: By default the package will include every plugin except SynCE; this can be
 changed very easily in the script - it uses a list of plugins to be built, and
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 307d20d516..89218dedc2 100644
--- a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
+++ b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
@@ -3,18 +3,19 @@
 # SlackBuild Script to build the extra plugins for claws mail
 
 # Copyright (c) 2007, Timothy Pollard
-# 
+# Copyright (c) 2008, Erik Hanson
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -27,29 +28,29 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Robby Workman <rworkman@slackbuilds.org>
-
 PRGNAM=claws-mail-extra-plugins
-VERSION=3.3.1
+VERSION=3.6.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # This is a *complete* list of available plugins
-#PLUGIN_LIST="acpi_notifier att_remover attachwarner cachesaver \
+#PLUGIN_LIST="acpi_notifier archive att_remover attachwarner cachesaver \
 #  fetchinfo-plugin gtkhtml2_viewer mailmbox newmail notification_plugin \
-#  pdf_viewer perl_plugin rssyl smime spam_report synce_plugin vcalendar"
+#  perl_plugin rssyl spam_report synce_plugin tnef_parse vcalendar"
 
 # This is the list of plugins that the script will build by default
-# Note that the synce_plugin is not included, as it requires two other 
-# library dependencies that are not available at SlackBuilds.org
-PLUGIN_LIST="acpi_notifier att_remover attachwarner cachesaver \
+# Note that synce_plugin, archive and gtkhtml2_viewer are not included,
+# as it requires library dependencies that are may not be available
+# (see the README for more details) at SlackBuilds.org
+PLUGIN_LIST="acpi_notifier archive att_remover attachwarner cachesaver \
   fetchinfo-plugin gtkhtml2_viewer mailmbox newmail notification_plugin \
-  pdf_viewer perl_plugin rssyl smime spam_report vcalendar"
+  perl_plugin rssyl spam_report tnef_parse vcalendar"
 
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i486"
@@ -57,7 +58,7 @@ elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
-set -e 		# Exit on most errors
+set -eu
 
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
@@ -70,27 +71,24 @@ chmod -R u+w,go+r-w,a-s .
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp README $PKG/usr/doc/$PRGNAM-$VERSION
 
-for plugin in $(echo $PLUGIN_LIST) ; do
-  ( echo "Building plugin: $plugin"
-    cd ./$plugin-*  || exit 1
-
-    CFLAGS="$SLKCFLAGS" \
+for plugin in $PLUGIN_LIST ; do
+  cd ./$plugin-*
+  CFLAGS="$SLKCFLAGS" \
     ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static || exit 1
-
-    make || exit 1
-    make install DESTDIR=$PKG || exit 1
-
-    mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$plugin
-    for docfile in AUTHORS COPYING ChangeLog INSTALL NEWS README TODO ; do
-      [ -e $docfile ] && cp -a $docfile $PKG/usr/doc/$PRGNAM-$VERSION/$plugin
-    done
-
-    echo "Finished building plugin: $plugin"
-  ) || exit 1
+    --localstatedir=/var/lib \
+    --disable-static \
+    --build=$ARCH-slackware-linux
+
+  make
+  make install DESTDIR=$PKG
+
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$plugin
+  for docfile in AUTHORS COPYING ChangeLog INSTALL NEWS README TODO ; do
+    [ -e $docfile ] && cp -a $docfile $PKG/usr/doc/$PRGNAM-$VERSION/$plugin
+  done
+  cd -
 done
 
 cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
@@ -99,12 +97,8 @@ find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : \
-         | xargs strip -- strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : \
-         | xargs strip -- strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | egrep "ELF.*shared object" | cut -f 1 -d : \
+          | xargs strip --strip-unneeded 2> /dev/null
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.info b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.info
index bd972972a7..408ffc78e3 100644
--- a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.info
+++ b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.info
@@ -1,8 +1,8 @@
 PRGNAM="claws-mail-extra-plugins"
-VERSION="3.3.1"
+VERSION="3.6.1"
 HOMEPAGE="http://www.claws-mail.org/"
-DOWNLOAD="http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-3.3.1.tar.bz2"
-MD5SUM="ddd2e136308ca98838352e4010ad746b"
-MAINTAINER="Timothy Pollard"
-EMAIL="t.pollard.12@scu.edu.au"
-APPROVED="Michiel"
\ No newline at end of file
+DOWNLOAD="http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-3.6.1.tar.bz2"
+MD5SUM="2cde81793cd8b727023d7aebe738a5a9"
+MAINTAINER="Erik Hanson"
+EMAIL="erik@slackbuilds.org"
+APPROVED="rworkman"
diff --git a/network/claws-mail-extra-plugins/slack-desc b/network/claws-mail-extra-plugins/slack-desc
index 6090f4acfd..f2029dee89 100644
--- a/network/claws-mail-extra-plugins/slack-desc
+++ b/network/claws-mail-extra-plugins/slack-desc
@@ -5,9 +5,9 @@
 # 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: Extra Plugins for Claws-Mail
+claws-mail-extra-plugins: Claws Mail Extra Plugins (Plugins for Claws-Mail)
 claws-mail-extra-plugins: 
-claws-mail-extra-plugins: This package includes 15 extra plugins for the 
+claws-mail-extra-plugins: This package includes extra plugins for the 
 claws-mail-extra-plugins: Claws-Mail email client. Plugins range from an
 claws-mail-extra-plugins: RSS reader to Perl message filtering.
 claws-mail-extra-plugins: