6 files changed, 49 insertions, 26 deletions

diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 89f23dc8699b..7c33a4cc53a0 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	0.4.66
+PORTVERSION=	0.6.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 
-MAINTAINER=	shigeri@m10.alpha-net.ne.jp
+MAINTAINER=	lehmann@ans-netz.de
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -20,14 +20,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-compface --disable-gdk-pixbuf --enable-ipv6
 
-PORTDOCS=	ChangeLog ChangeLog.jp INSTALL INSTALL.jp README README.jp \
-		TODO.jp
+PORTDOCS=	ChangeLog INSTALL README TODO
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/sylpheed
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/sylpheed
+	${INSTALL_DATA} ${WRKSRC}/${i}.jp ${PREFIX}/share/doc/sylpheed
 .endfor
 .endif
 
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
index 7194837e5a04..c743e06dd792 100644
--- a/mail/sylpheed3/distinfo
+++ b/mail/sylpheed3/distinfo
@@ -1 +1 @@
-MD5 (sylpheed-0.4.66.tar.bz2) = dd997ca324a77d08de834cf81a66da0e
+MD5 (sylpheed-0.6.0.tar.bz2) = 4d54947b1193969cc760a74cd8503b29
diff --git a/mail/sylpheed3/files/patch-ae b/mail/sylpheed3/files/patch-ae
deleted file mode 100644
index 2a17d6252a4c..000000000000
--- a/mail/sylpheed3/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Sep 28 15:45:18 2000
-+++ configure	Thu Sep 28 22:39:24 2000
-@@ -3441,7 +3441,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/mail/sylpheed3/pkg-comment b/mail/sylpheed3/pkg-comment
index b677f5028775..747436f717e9 100644
--- a/mail/sylpheed3/pkg-comment
+++ b/mail/sylpheed3/pkg-comment
@@ -1 +1 @@
-A GTK+ based, lightweight, and fast e-mail client
+A lightweight, featureful, and fast GTK+ based e-mail client
diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr
index 21f2c3ffcf9e..3a29c9d17c70 100644
--- a/mail/sylpheed3/pkg-descr
+++ b/mail/sylpheed3/pkg-descr
@@ -1,3 +1,12 @@
-This program is a GTK+ based, lightweight, and fast e-mail client.
+Sylpheed is an e-mail client (and news reader) based on GTK+, running on
+X Window System, and aiming for:
+  * Quick response
+  * Graceful, and sophisticated interface
+  * Easy configuration, intuitive operation
+  * Abundant features
+
+Currently, many features are supported including POP3, IMAP, NNTP,
+multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
+AUTH, SSL, IPv6, GnuPG, internalization, and more.
 
 WWW: http://sylpheed.good-day.net
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
index 69b4495f8693..cbcf741657a0 100644
--- a/mail/sylpheed3/pkg-plist
+++ b/mail/sylpheed3/pkg-plist
@@ -1,11 +1,12 @@
 bin/sylpheed
-share/doc/sylpheed/ChangeLog
-share/doc/sylpheed/ChangeLog.jp
-share/doc/sylpheed/INSTALL
-share/doc/sylpheed/INSTALL.jp
-share/doc/sylpheed/README
-share/doc/sylpheed/README.jp
-share/doc/sylpheed/TODO.jp
+%%PORTDOCS%%share/doc/sylpheed/ChangeLog
+%%PORTDOCS%%share/doc/sylpheed/ChangeLog.jp
+%%PORTDOCS%%share/doc/sylpheed/INSTALL
+%%PORTDOCS%%share/doc/sylpheed/INSTALL.jp
+%%PORTDOCS%%share/doc/sylpheed/README
+%%PORTDOCS%%share/doc/sylpheed/README.jp
+%%PORTDOCS%%share/doc/sylpheed/TODO
+%%PORTDOCS%%share/doc/sylpheed/TODO.jp
 share/locale/cs/LC_MESSAGES/sylpheed.mo
 share/locale/de/LC_MESSAGES/sylpheed.mo
 share/locale/el/LC_MESSAGES/sylpheed.mo
@@ -15,10 +16,33 @@ share/locale/it/LC_MESSAGES/sylpheed.mo
 share/locale/ja/LC_MESSAGES/sylpheed.mo
 share/locale/ko/LC_MESSAGES/sylpheed.mo
 share/locale/nl/LC_MESSAGES/sylpheed.mo
+share/locale/pl/LC_MESSAGES/sylpheed.mo
 share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
 share/locale/ru/LC_MESSAGES/sylpheed.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/sylpheed.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
+share/sylpheed/manual/en/sylpheed-1.html
+share/sylpheed/manual/en/sylpheed-10.html
+share/sylpheed/manual/en/sylpheed-11.html
+share/sylpheed/manual/en/sylpheed-12.html
+share/sylpheed/manual/en/sylpheed-13.html
+share/sylpheed/manual/en/sylpheed-14.html
+share/sylpheed/manual/en/sylpheed-15.html
+share/sylpheed/manual/en/sylpheed-16.html
+share/sylpheed/manual/en/sylpheed-17.html
+share/sylpheed/manual/en/sylpheed-18.html
+share/sylpheed/manual/en/sylpheed-19.html
+share/sylpheed/manual/en/sylpheed-2.html
+share/sylpheed/manual/en/sylpheed-20.html
+share/sylpheed/manual/en/sylpheed-21.html
+share/sylpheed/manual/en/sylpheed-3.html
+share/sylpheed/manual/en/sylpheed-4.html
+share/sylpheed/manual/en/sylpheed-5.html
+share/sylpheed/manual/en/sylpheed-6.html
+share/sylpheed/manual/en/sylpheed-7.html
+share/sylpheed/manual/en/sylpheed-8.html
+share/sylpheed/manual/en/sylpheed-9.html
+share/sylpheed/manual/en/sylpheed.html
 share/sylpheed/manual/ja/sylpheed-1.html
 share/sylpheed/manual/ja/sylpheed-10.html
 share/sylpheed/manual/ja/sylpheed-11.html
@@ -38,7 +62,8 @@ share/sylpheed/manual/ja/sylpheed-8.html
 share/sylpheed/manual/ja/sylpheed-9.html
 share/sylpheed/manual/ja/sylpheed.html
 share/sylpheed/manual/ja/sylpheed.sgml
-@dirrm share/doc/sylpheed
 @dirrm share/sylpheed/manual/ja
+@dirrm share/sylpheed/manual/en
 @dirrm share/sylpheed/manual
 @dirrm share/sylpheed
+%%PORTDOCS%%@dirrm share/doc/sylpheed