- Update to 3.5.0

- Respect NOPORTDOCS

Approved by:	netchild (maintainer implicit)

6 files changed, 56 insertions, 103 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index fe395cae0ce4..fb430896caea 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	claws-mail
-PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTVERSION=	3.5.0
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -191,13 +190,10 @@ post-patch:
 	@${REINPLACE_CMD} -e "s:-Wno-unused-function::" ${WRKSRC}/src/Makefile.in
 	@for f in `${FIND} ${WRKSRC}/tools -type f -print`; do \
 		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
-.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-.for i in NEWS README RELEASE_NOTES TODO
+.for i in NEWS RELEASE_NOTES README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 5d06976514bd..50f391a93a3c 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,6 +1,6 @@
-MD5 (claws-mail-3.4.0.tar.bz2) = ec5ee743baa198c7fd707b0461b6c68a
-SHA256 (claws-mail-3.4.0.tar.bz2) = 1934bf2c55216e350228d8ba5000426a1a6f1320ce04b2b82916a184729d9ce8
-SIZE (claws-mail-3.4.0.tar.bz2) = 5999033
+MD5 (claws-mail-3.5.0.tar.bz2) = 597a9a0b9d113325de6fd01500c0af98
+SHA256 (claws-mail-3.5.0.tar.bz2) = 51ea44e171ffa009884ecdddb68d9fed086d9afbc546cc303e8462de89a8abfa
+SIZE (claws-mail-3.5.0.tar.bz2) = 4819732
 MD5 (claws-mail-themes-20070116.tar.gz) = 4dba190413eabbf053b9ddc97110f8e5
 SHA256 (claws-mail-themes-20070116.tar.gz) = 73b600f9ed774f46a11e20b67e6fb8bb8553a20d436ae9a7c2eb3fe717977167
 SIZE (claws-mail-themes-20070116.tar.gz) = 1827645
diff --git a/mail/claws-mail/files/patch-Makefile.in b/mail/claws-mail/files/patch-Makefile.in
new file mode 100644
index 000000000000..06c9c39ab9b4
--- /dev/null
+++ b/mail/claws-mail/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	2008-06-28 00:29:01.000000000 +0200
++++ Makefile.in	2008-06-28 00:29:43.000000000 +0200
+@@ -39,7 +39,7 @@
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/claws-mail.pc.in $(srcdir)/config.h.in \
+ 	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+-	INSTALL NEWS TODO
++	INSTALL NEWS TODO RELEASE_NOTES
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal-include.m4 \
+ 	$(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \
+@@ -304,7 +304,6 @@
+ 	ChangeLog.gtk1 \
+ 	ChangeLog.pre2.0.0 \
+ 	ChangeLog.2.0.0-3.0.0 \
+-	RELEASE_NOTES \
+ 	claws-mail-128x128.png \
+ 	claws-mail-64x64.png \
+ 	claws-mail.pc.in \
+@@ -325,8 +324,6 @@
+ clawsinclude_HEADERS = \
+ 	config.h
+ 
+-relnotesdir = $(docdir)
+-relnotes_DATA = RELEASE_NOTES
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/mail/claws-mail/files/patch-src_compose.c b/mail/claws-mail/files/patch-src_compose.c
deleted file mode 100644
index d3c6a9939677..000000000000
--- a/mail/claws-mail/files/patch-src_compose.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/compose.c	2008/04/30 06:46:01	1.382.2.446
-+++ src/compose.c	2008/05/04 15:58:59	1.382.2.447
-@@ -1591,7 +1591,7 @@
- 
- 		} else {
- 			qmark = prefs_common.quotemark;
--			body_fmt = prefs_common.quotefmt;
-+			body_fmt = gettext(prefs_common.quotefmt);
- 		}
- 	}
- 
-@@ -1746,7 +1746,7 @@
- 		g_free(msgfile);
- 	} else {
- 		const gchar *qmark = NULL;
--		const gchar *body_fmt = prefs_common.fw_quotefmt;
-+		const gchar *body_fmt = gettext(prefs_common.fw_quotefmt);
- 		MsgInfo *full_msginfo;
- 
- 		full_msginfo = procmsg_msginfo_get_full_info(msginfo);
-@@ -1767,7 +1767,7 @@
- 
- 		} else {
- 			qmark = prefs_common.fw_quotemark;
--			body_fmt = prefs_common.fw_quotefmt;
-+			body_fmt = gettext(prefs_common.fw_quotefmt);
- 		}
- 
- 		/* empty quotemark is not allowed */
diff --git a/mail/claws-mail/files/patch-src_prefs_common.c b/mail/claws-mail/files/patch-src_prefs_common.c
deleted file mode 100644
index 4a5f21ffe602..000000000000
--- a/mail/claws-mail/files/patch-src_prefs_common.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/prefs_common.c	2008/04/24 05:39:34	1.204.2.167
-+++ src/prefs_common.c	2008/05/04 15:59:02	1.204.2.168
-@@ -226,7 +226,7 @@
- 	 NULL, NULL, NULL},
- 	{"compose_subject_format", "",
- 	 &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL},
--	{"compose_body_format", NULL,
-+	{"compose_body_format", N_("Hello,\\n"),
- 	 &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
- 
- 	{"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
-@@ -293,12 +293,16 @@
- 	/* Quote */
- 	{"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
- 	 NULL, NULL, NULL},
--	{"reply_quote_format", NULL,
-+	{"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q"),
- 	 &prefs_common.quotefmt, P_STRING, NULL, NULL, NULL},
- 
- 	{"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
- 	 NULL, NULL, NULL},
--	{"forward_quote_format", NULL, &prefs_common.fw_quotefmt, P_STRING,
-+	{"forward_quote_format",
-+	 N_("\\n\\nBegin forwarded message:\\n\\n"
-+ 	 "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
-+ 	 "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"),
-+	 &prefs_common.fw_quotefmt, P_STRING,
- 	 NULL, NULL, NULL},
- 	{"quote_chars", ">", &prefs_common.quote_chars, P_STRING,
- 	 NULL, NULL, NULL},
-
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index cdecb21c72a3..87d8469dc78e 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -21,6 +21,7 @@ include/claws-mail/addritem.h
 include/claws-mail/addrquery.h
 include/claws-mail/addrselect.h
 include/claws-mail/alertpanel.h
+include/claws-mail/autofaces.h
 include/claws-mail/browseldap.h
 include/claws-mail/codeconv.h
 include/claws-mail/printing.h
@@ -242,48 +243,36 @@ share/applications/claws-mail.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
+%%DOCSDIR%%/manual/en/claws-mail-manual.html
+%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
+%%DOCSDIR%%/manual/en/claws-mail-manual.ps
+%%DOCSDIR%%/manual/en/claws-mail-manual.txt
+%%DOCSDIR%%/manual/es/claws-mail-manual.html
+%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
+%%DOCSDIR%%/manual/es/claws-mail-manual.ps
+%%DOCSDIR%%/manual/es/claws-mail-manual.txt
+%%DOCSDIR%%/manual/fr/claws-mail-manual.html
+%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
+%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
+%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
+%%DOCSDIR%%/manual/pl/claws-mail-manual.html
+%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
+%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
+%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
 share/icons/hicolor/48x48/apps/claws-mail.png
-share/locale/bg/LC_MESSAGES/claws-mail.mo
 share/locale/ca/LC_MESSAGES/claws-mail.mo
-share/locale/cs/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
-share/locale/el/LC_MESSAGES/claws-mail.mo
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
 share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
-share/locale/he/LC_MESSAGES/claws-mail.mo
-share/locale/hr/LC_MESSAGES/claws-mail.mo
 share/locale/hu/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
-share/locale/ja/LC_MESSAGES/claws-mail.mo
-share/locale/ko/LC_MESSAGES/claws-mail.mo
-share/locale/nb/LC_MESSAGES/claws-mail.mo
-share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
-share/locale/ru/LC_MESSAGES/claws-mail.mo
 share/locale/sk/LC_MESSAGES/claws-mail.mo
 share/locale/sr/LC_MESSAGES/claws-mail.mo
-share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
-share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
 share/pixmaps/claws-mail-128x128.png
 share/pixmaps/claws-mail-64x64.png
 share/pixmaps/claws-mail.png
@@ -2663,12 +2652,12 @@ share/pixmaps/claws-mail.png
 %%THEMES%%@dirrm %%DATADIR%%/themes/Crystal
 %%THEMES%%@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/pl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DOCSDIR%%/manual/pl
+@dirrm %%DOCSDIR%%/manual/fr
+@dirrm %%DOCSDIR%%/manual/es
+@dirrm %%DOCSDIR%%/manual/en
+@dirrm %%DOCSDIR%%/manual
+@dirrmtry %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail