network/sylpheed: Updated for version 2.6.0

5 files changed, 63 insertions, 51 deletions

diff --git a/network/sylpheed/README b/network/sylpheed/README
index 802d6b8654ca5..f80a05352ce9c 100644
--- a/network/sylpheed/README
+++ b/network/sylpheed/README
@@ -1,5 +1,23 @@
-Sylpheed is an e-mail client based on GTK+ GUI toolkit.
-It runs on X Window System, and Microsoft Windows.
+Sylpheed is a simple, lightweight but featureful, and easy-to-use e-mail 
+client (mailer, MUA).
 
-Sylpheed is a free software distributed under the GNU GPL.
+Sylpheed runs on Unix-like systems such as Linux, BSD, and Mac OS X. It 
+also supports Windows.
 
+Sylpheed uses GTK+ GUI toolkit. The newest version of Sylpheed works with 
+GTK+ 2.4 or later (2.6 or later is recommended).
+
+Sylpheed has the following features:
+
+* Simple, beautiful, and well-polished user interface
+* Comfortable operationality which is built in detail
+* Well-organized, easy-to-understand configuration
+* Lightweight operation
+* High reliability
+* Internationalization and Multilingualization support
+* High-level Japanese processing
+* Various protocols support
+* Security features (GnuPG, SSL/TLSv1)
+* Powerful filtering and search
+* Junk mail control
+* Flexible cooperation with external commands
diff --git a/network/sylpheed/doinst.sh b/network/sylpheed/doinst.sh
index 3412314ed0094..24e4bc11e0955 100644
--- a/network/sylpheed/doinst.sh
+++ b/network/sylpheed/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
 fi
 
diff --git a/network/sylpheed/slack-desc b/network/sylpheed/slack-desc
index 91d19b414218e..917e365694e2f 100644
--- a/network/sylpheed/slack-desc
+++ b/network/sylpheed/slack-desc
@@ -5,15 +5,16 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler------------------------------------------------------|
-sylpheed: sylpheed (email client)
+        |-----handy-ruler--------------------------------------------------|
+sylpheed: sylpheed (lightweight and user-friendly e-mail client)
 sylpheed:
 sylpheed: Sylpheed is an e-mail client based on GTK+ GUI toolkit.
 sylpheed: It runs on X Window System, and Microsoft Windows.
 sylpheed:
 sylpheed: Sylpheed is a free software distributed under the GNU GPL.
 sylpheed:
+sylpheed: Homepage: http://sylpheed.sraoss.jp/en/ 
 sylpheed:
+sylpheed: 
 sylpheed:
-sylpheed:
-sylpheed:
+
diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild
index 7e2deead5535d..6d484acbdd939 100644
--- a/network/sylpheed/sylpheed.SlackBuild
+++ b/network/sylpheed/sylpheed.SlackBuild
@@ -2,46 +2,32 @@
 
 # Slackware build script for sylpheed
 
-# Copyright 2006 Martin Lefebvre (http://dadexter.slackadelic.com)
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 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 the SlackBuilds.org project
-
-set -e
+# Written by GPLeo <slackbuilds@gmail.com>
 
 PRGNAM=sylpheed
-VERSION=2.4.1
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-2.6.0}	
+ARCH=${ARCH:-i486}		
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-_SBo}		
+
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
- 
+OUTPUT=${OUTPUT:-/tmp}	
+
+DOCS="ABOUT-NLS AUTHORS COPYING COPYING.LIB INSTALL LICENSE README README.es TODO"
+
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -49,17 +35,24 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --enable-gpgme \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
-make
-make install-strip DESTDIR=$PKG
+make 
+make install-strip DESTDIR=$PKG 
 
 # Install desktop file and icon  (we'll use the largest icon available by 
 # default - that way, it will scale down just fine for users who need a
@@ -69,12 +62,13 @@ install -m 0644 sylpheed.desktop $PKG/usr/share/applications/sylpheed.desktop
 install -m 0644 sylpheed-128x128.png $PKG/usr/share/pixmaps/sylpheed.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING* ChangeLog* INSTALL* LICENSE NEWS* README* \
-  TODO* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+
 # Put links to manual and faq in doc directory (leave them in current location
 # in case any app-specific help files look there)
+
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
   ln -s ../../share/sylpheed/faq faq
   ln -s ../../share/sylpheed/manual manual
diff --git a/network/sylpheed/sylpheed.info b/network/sylpheed/sylpheed.info
index 4ac49c079b357..9b7265a53b8f9 100644
--- a/network/sylpheed/sylpheed.info
+++ b/network/sylpheed/sylpheed.info
@@ -1,8 +1,8 @@
 PRGNAM="sylpheed"
-VERSION="2.4.1"
+VERSION="2.6.0"
 HOMEPAGE="http://sylpheed.sraoss.jp/en/"
-DOWNLOAD="http://sylpheed.sraoss.jp/sylpheed/v2.4/sylpheed-2.4.1.tar.bz2"
-MD5SUM="88b51ceaba16ac40d19eae414a87dcbe"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@slackadelic.com"
-APPROVED="rworkman,Alan_Hicks"
+DOWNLOAD="http://sylpheed.sraoss.jp/sylpheed/v2.6/sylpheed-2.6.0.tar.bz2"
+MD5SUM="5b7ed03b106e2a0d300b103652dd34c2"
+MAINTAINER="GPLeo"
+EMAIL="slackbuilds@gmail.com"
+APPROVED="dsomero"