4 files changed, 90 insertions, 64 deletions

diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 7fc0faab602c..6aad9d781ac2 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	2.4.0.b7
-PORTREVISION=	1
+PORTVERSION=	2.5.0.b1
+PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v2.4beta/
+MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.0\.[^\.]*$//}beta/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.b/beta/}
 
 MAINTAINER=	nork@FreeBSD.org
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 #IGNORE=	"is out-of-dated, use mail/sylpheed2 instead of this, until the next development starts."
 
-LATEST_LINK=	${PORTNAME}24
+LATEST_LINK=	${PORTNAME}25
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -52,7 +52,7 @@ OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
 .if !defined(WITHOUT_SSL)
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root.crt:${PORTSDIR}/security/ca-roots
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 CONFIGURE_ARGS+=--enable-ssl
 .else
 CONFIGURE_ARGS+=--disable-ssl
@@ -113,6 +113,10 @@ post-patch:
 		s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
 		${WRKSRC}/libsylph/procmime.c
+
+	# to prevent breaking cc of ldif.c because of a base64.h in PREFIX/include
+	@${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \
+		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/share/certs|g' \
 		${WRKSRC}/libsylph/ssl.c
 
diff --git a/mail/sylpheed2-devel/distinfo b/mail/sylpheed2-devel/distinfo
index 3c724dc30a3b..106fa6c63a0a 100644
--- a/mail/sylpheed2-devel/distinfo
+++ b/mail/sylpheed2-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sylpheed-2.4.0beta7.tar.bz2) = f8d679b295b99a9f940d24af0c00b510
-SHA256 (sylpheed-2.4.0beta7.tar.bz2) = de369a5e6aa8f11d00941c2de0bc61ecb1ef04d2b9e8b45d1d7f57d344f5177b
-SIZE (sylpheed-2.4.0beta7.tar.bz2) = 2720369
+MD5 (sylpheed-2.5.0beta1.tar.bz2) = 0a8be05fb297c45470998c728b9e535e
+SHA256 (sylpheed-2.5.0beta1.tar.bz2) = ff42360212d84bc544d3222ea7518a2031dc7c7e985eda25394d2672b2dd315c
+SIZE (sylpheed-2.5.0beta1.tar.bz2) = 2764565
diff --git a/mail/sylpheed2-devel/files/patch-src-printing.c b/mail/sylpheed2-devel/files/patch-src-printing.c
new file mode 100644
index 000000000000..f13f0b756bfd
--- /dev/null
+++ b/mail/sylpheed2-devel/files/patch-src-printing.c
@@ -0,0 +1,22 @@
+--- src/printing.c.orig	Wed Dec 27 15:50:14 2006
++++ src/printing.c	Wed Dec 27 16:28:28 2006
+@@ -149,8 +149,6 @@
+ 
+ 	desc = pango_font_description_from_string(prefs_common_get()->textfont);
+ 	size = pango_font_description_get_size(desc);
+-	pango_font_description_free(desc);
+-	desc = gtkut_get_default_font_desc();
+ 	pango_font_description_set_size(desc, size);
+ 	pango_layout_set_font_description(layout, desc);
+ 	pango_font_description_free(desc);
+@@ -406,10 +404,6 @@
+ 	}
+ 	g_print("count = %d\n", count);
+ 
+-	desc = gtkut_get_default_font_desc();
+-	pango_font_description_set_size(desc, font_size);
+-	pango_layout_set_font_description(layout, desc);
+-	pango_font_description_free(desc);
+ 	g_snprintf(buf, sizeof(buf), "- %d -", pinfo->page_nr_per_msg + 1);
+ 	pango_layout_set_text(layout, buf, -1);
+ 	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
index c6ba8f3b5e11..e3bbc6b4b9f9 100644
--- a/mail/sylpheed2-devel/pkg-plist
+++ b/mail/sylpheed2-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/sylpheed
-share/applications/sylpheed.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -8,36 +7,59 @@ share/applications/sylpheed.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/TODO.ja
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
+share/applications/sylpheed.desktop
+share/locale/be/LC_MESSAGES/sylpheed.mo
+share/locale/cs/LC_MESSAGES/sylpheed.mo
+share/locale/bg/LC_MESSAGES/sylpheed.mo
+share/locale/da/LC_MESSAGES/sylpheed.mo
+share/locale/de/LC_MESSAGES/sylpheed.mo
+share/locale/el/LC_MESSAGES/sylpheed.mo
+share/locale/es/LC_MESSAGES/sylpheed.mo
+share/locale/et/LC_MESSAGES/sylpheed.mo
+share/locale/fr/LC_MESSAGES/sylpheed.mo
+share/locale/gl/LC_MESSAGES/sylpheed.mo
+share/locale/hr/LC_MESSAGES/sylpheed.mo
+share/locale/hu/LC_MESSAGES/sylpheed.mo
+share/locale/it/LC_MESSAGES/sylpheed.mo
+share/locale/ja/LC_MESSAGES/sylpheed.mo
+share/locale/ko/LC_MESSAGES/sylpheed.mo
+share/locale/lt/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/ro/LC_MESSAGES/sylpheed.mo
+share/locale/ru/LC_MESSAGES/sylpheed.mo
+share/locale/sk/LC_MESSAGES/sylpheed.mo
+share/locale/sl/LC_MESSAGES/sylpheed.mo
+share/locale/sr/LC_MESSAGES/sylpheed.mo
+share/locale/sv/LC_MESSAGES/sylpheed.mo
+share/locale/tr/LC_MESSAGES/sylpheed.mo
+share/locale/uk/LC_MESSAGES/sylpheed.mo
+share/locale/vi/LC_MESSAGES/sylpheed.mo
+share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
+share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
+share/pixmaps/sylpheed.png
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html
@@ -48,18 +70,17 @@ share/applications/sylpheed.desktop
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html
@@ -70,42 +91,21 @@ share/applications/sylpheed.desktop
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-21.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-22.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-23.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-24.html
-share/locale/be/LC_MESSAGES/sylpheed.mo
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/lt/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/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/vi/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
-share/pixmaps/sylpheed.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual