Update to 1.9.99.

Note: this still doesn't fix a nasty IMAP bug (some unread messages wrongly
marked as read).

12 files changed, 42 insertions, 54 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 61851ad2be21..7aca9e2b4769 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.15
-PORTREVISION=	1
+PORTVERSION=	1.9.99
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -36,7 +35,7 @@ WANT_GNOME=	yes
 
 MAN1=		sylpheed-claws.1
 
-CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6 \
+CONFIGURE_ARGS=	--enable-ipv6 \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-manualdir=${DOCSDIR}/manual \
 		--with-faqdir=${DOCSDIR}/faq
@@ -178,7 +177,7 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-.for i in NEWS README README.claws RELEASE_NOTES.claws TODO tools/README.sylprint
+.for i in NEWS README RELEASE_NOTES TODO tools/README.sylprint
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
@@ -188,7 +187,7 @@ post-install:
 		${INSTALL_SCRIPT} OOo2sylpheed.pl acroread2sylpheed.pl \
 		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
 		freshmeat_search.pl gif2xface.pl google_msgid.pl \
-		google_search.pl gpg-sign-syl kmail2sylpheed.pl \
+		google_search.pl kmail2sylpheed.pl \
 		kmail2sylpheed_v2.pl maildir2sylpheed.pl multiwebsearch.conf \
 		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
 		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
@@ -207,7 +206,6 @@ post-install:
 	@${CHMOD} -R a+r ${DATADIR}/themes
 	@${FIND} ${DATADIR}/themes -type d -print0 | ${XARGS} -0 ${CHMOD} a+x
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
 	@${MKDIR} ${PREFIX}/share/pixmaps
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 9300ac7663a9..48b1b5e73171 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-1.9.15.tar.bz2) = 0d187526e0eca23b87ffa4981f7e1765
-SIZE (sylpheed-claws-1.9.15.tar.bz2) = 3481018
+MD5 (sylpheed-claws-1.9.99.tar.bz2) = 9ea5fe5173a2137ecbafb4bc3c5d2339
+SIZE (sylpheed-claws-1.9.99.tar.bz2) = 3463192
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/files/patch-doc-man-Makefile.in b/mail/claws-mail/files/patch-doc-man-Makefile.in
new file mode 100644
index 000000000000..40953fde2124
--- /dev/null
+++ b/mail/claws-mail/files/patch-doc-man-Makefile.in
@@ -0,0 +1,10 @@
+--- doc/man/Makefile.in.orig	Sat Nov  5 12:14:20 2005
++++ doc/man/Makefile.in	Sat Nov  5 12:15:52 2005
+@@ -329,6 +329,7 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  inst=`echo $$inst | sed -e 's:sylpheed\.1:sylpheed-claws.1:'`; \
+ 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
diff --git a/mail/claws-mail/files/patch-sylpheed-claws.desktop b/mail/claws-mail/files/patch-sylpheed-claws.desktop
deleted file mode 100644
index 1eea74683a46..000000000000
--- a/mail/claws-mail/files/patch-sylpheed-claws.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- sylpheed-claws.desktop.orig	Sat Jul 30 11:17:58 2005
-+++ sylpheed-claws.desktop	Sat Jul 30 11:18:16 2005
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=Sylpheed-Claws
--Exec=sylpheed
-+Exec=sylpheed-claws
- Icon=sylpheed-claws.png
- Info="Sylpheed-Claws"
- Categories=Application;Network;
diff --git a/mail/claws-mail/files/patch-tools-README.sylprint b/mail/claws-mail/files/patch-tools-README.sylprint
index 22b5e00325d4..1085b058553b 100644
--- a/mail/claws-mail/files/patch-tools-README.sylprint
+++ b/mail/claws-mail/files/patch-tools-README.sylprint
@@ -1,5 +1,5 @@
---- tools/README.sylprint.orig	Sun Jan  6 17:05:30 2002
-+++ tools/README.sylprint	Tue Jan 15 00:19:12 2002
+--- tools/README.sylprint.orig	Sat Nov  5 11:35:01 2005
++++ tools/README.sylprint	Sat Nov  5 11:36:54 2005
 @@ -144,11 +144,12 @@
  	sylprint.pl
  		The script itself.
@@ -10,9 +10,9 @@
  		Stores user default preferred configuration for the
  		script. Settings in this file may be overriden by
 -		command line options. Must be stored in the same
--		directory of the script and/or in the ~/.sylpheed
+-		directory of the script and/or in the ~/.sylpheed-claws
 +		command line options. Must be stored in the local
-+		configuration directory and/or in the ~/.sylpheed
++		configuration directory and/or in the ~/.sylpheed-claws
  		one (Sylpheed user's configuration directory).
  	
  	/tmp/sylprint.username.number
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 364638a1c84f..3a23719ac762 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -1,5 +1,4 @@
 bin/sylpheed-claws
-bin/sylpheed-switcher
 bin/sylprint.pl
 etc/sylprint.rc.example
 include/sylpheed-claws/account.h
@@ -221,10 +220,9 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.claws
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.claws
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
@@ -394,7 +392,6 @@ share/pixmaps/sylpheed-claws.png
 %%DATADIR%%/gif2xface.pl
 %%DATADIR%%/google_msgid.pl
 %%DATADIR%%/google_search.pl
-%%DATADIR%%/gpg-sign-syl
 %%DATADIR%%/kmail2sylpheed.pl
 %%DATADIR%%/kmail2sylpheed_v2.pl
 %%DATADIR%%/maildir2sylpheed.pl
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 61851ad2be21..7aca9e2b4769 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.15
-PORTREVISION=	1
+PORTVERSION=	1.9.99
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -36,7 +35,7 @@ WANT_GNOME=	yes
 
 MAN1=		sylpheed-claws.1
 
-CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6 \
+CONFIGURE_ARGS=	--enable-ipv6 \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-manualdir=${DOCSDIR}/manual \
 		--with-faqdir=${DOCSDIR}/faq
@@ -178,7 +177,7 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-.for i in NEWS README README.claws RELEASE_NOTES.claws TODO tools/README.sylprint
+.for i in NEWS README RELEASE_NOTES TODO tools/README.sylprint
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
@@ -188,7 +187,7 @@ post-install:
 		${INSTALL_SCRIPT} OOo2sylpheed.pl acroread2sylpheed.pl \
 		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
 		freshmeat_search.pl gif2xface.pl google_msgid.pl \
-		google_search.pl gpg-sign-syl kmail2sylpheed.pl \
+		google_search.pl kmail2sylpheed.pl \
 		kmail2sylpheed_v2.pl maildir2sylpheed.pl multiwebsearch.conf \
 		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
 		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
@@ -207,7 +206,6 @@ post-install:
 	@${CHMOD} -R a+r ${DATADIR}/themes
 	@${FIND} ${DATADIR}/themes -type d -print0 | ${XARGS} -0 ${CHMOD} a+x
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
 	@${MKDIR} ${PREFIX}/share/pixmaps
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index 9300ac7663a9..48b1b5e73171 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-1.9.15.tar.bz2) = 0d187526e0eca23b87ffa4981f7e1765
-SIZE (sylpheed-claws-1.9.15.tar.bz2) = 3481018
+MD5 (sylpheed-claws-1.9.99.tar.bz2) = 9ea5fe5173a2137ecbafb4bc3c5d2339
+SIZE (sylpheed-claws-1.9.99.tar.bz2) = 3463192
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/sylpheed-claws/files/patch-doc-man-Makefile.in b/mail/sylpheed-claws/files/patch-doc-man-Makefile.in
new file mode 100644
index 000000000000..40953fde2124
--- /dev/null
+++ b/mail/sylpheed-claws/files/patch-doc-man-Makefile.in
@@ -0,0 +1,10 @@
+--- doc/man/Makefile.in.orig	Sat Nov  5 12:14:20 2005
++++ doc/man/Makefile.in	Sat Nov  5 12:15:52 2005
+@@ -329,6 +329,7 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  inst=`echo $$inst | sed -e 's:sylpheed\.1:sylpheed-claws.1:'`; \
+ 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ 	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
diff --git a/mail/sylpheed-claws/files/patch-sylpheed-claws.desktop b/mail/sylpheed-claws/files/patch-sylpheed-claws.desktop
deleted file mode 100644
index 1eea74683a46..000000000000
--- a/mail/sylpheed-claws/files/patch-sylpheed-claws.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
---- sylpheed-claws.desktop.orig	Sat Jul 30 11:17:58 2005
-+++ sylpheed-claws.desktop	Sat Jul 30 11:18:16 2005
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=Sylpheed-Claws
--Exec=sylpheed
-+Exec=sylpheed-claws
- Icon=sylpheed-claws.png
- Info="Sylpheed-Claws"
- Categories=Application;Network;
diff --git a/mail/sylpheed-claws/files/patch-tools-README.sylprint b/mail/sylpheed-claws/files/patch-tools-README.sylprint
index 22b5e00325d4..1085b058553b 100644
--- a/mail/sylpheed-claws/files/patch-tools-README.sylprint
+++ b/mail/sylpheed-claws/files/patch-tools-README.sylprint
@@ -1,5 +1,5 @@
---- tools/README.sylprint.orig	Sun Jan  6 17:05:30 2002
-+++ tools/README.sylprint	Tue Jan 15 00:19:12 2002
+--- tools/README.sylprint.orig	Sat Nov  5 11:35:01 2005
++++ tools/README.sylprint	Sat Nov  5 11:36:54 2005
 @@ -144,11 +144,12 @@
  	sylprint.pl
  		The script itself.
@@ -10,9 +10,9 @@
  		Stores user default preferred configuration for the
  		script. Settings in this file may be overriden by
 -		command line options. Must be stored in the same
--		directory of the script and/or in the ~/.sylpheed
+-		directory of the script and/or in the ~/.sylpheed-claws
 +		command line options. Must be stored in the local
-+		configuration directory and/or in the ~/.sylpheed
++		configuration directory and/or in the ~/.sylpheed-claws
  		one (Sylpheed user's configuration directory).
  	
  	/tmp/sylprint.username.number
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 364638a1c84f..3a23719ac762 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -1,5 +1,4 @@
 bin/sylpheed-claws
-bin/sylpheed-switcher
 bin/sylprint.pl
 etc/sylprint.rc.example
 include/sylpheed-claws/account.h
@@ -221,10 +220,9 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.claws
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.claws
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
@@ -394,7 +392,6 @@ share/pixmaps/sylpheed-claws.png
 %%DATADIR%%/gif2xface.pl
 %%DATADIR%%/google_msgid.pl
 %%DATADIR%%/google_search.pl
-%%DATADIR%%/gpg-sign-syl
 %%DATADIR%%/kmail2sylpheed.pl
 %%DATADIR%%/kmail2sylpheed_v2.pl
 %%DATADIR%%/maildir2sylpheed.pl