Update to 3.5.0

7 files changed, 8 insertions, 39 deletions

diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 1abe90f1e364..89fa32f2a5e3 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sylpheed
-PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTVERSION=	3.5.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
 		LOCAL/ehaupt
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
index 474863973238..a626ef96f9bf 100644
--- a/mail/sylpheed/distinfo
+++ b/mail/sylpheed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sylpheed-3.4.3.tar.bz2) = 09fae954c775073b43ce2f660a6bed1087237659eade1c68913cb86add1fb905
-SIZE (sylpheed-3.4.3.tar.bz2) = 3474313
+SHA256 (sylpheed-3.5.0.tar.bz2) = 4a0b62d17bca6f1a96ab951ef55a9a67813d87bc1dc3ee55d8ec2c045366a05c
+SIZE (sylpheed-3.5.0.tar.bz2) = 3519735
diff --git a/mail/sylpheed/files/extra-patch-libsylph_ssl.c b/mail/sylpheed/files/extra-patch-libsylph_ssl.c
index ab8fcb9b8fc7..09b51ee15b82 100644
--- a/mail/sylpheed/files/extra-patch-libsylph_ssl.c
+++ b/mail/sylpheed/files/extra-patch-libsylph_ssl.c
@@ -1,4 +1,4 @@
---- libsylph/ssl.c.orig	2014-06-10 04:06:36 UTC
+--- libsylph/ssl.c.orig	2016-01-25 16:00:23 UTC
 +++ libsylph/ssl.c
 @@ -59,6 +59,7 @@ static gchar *find_certs_file(const gcha
  		LOOK_FOR("ca-bundle.crt");
@@ -8,12 +8,3 @@
  	}
  
  #undef LOOK_FOR
-@@ -117,7 +118,7 @@ void ssl_init(void)
- 			certs_dir = NULL;
- 		}
- #else
--		certs_file = find_certs_file("/etc/ssl");
-+		certs_file = find_certs_file("/usr/local/etc/ssl");
- 		if (!certs_file)
- 			certs_file = find_certs_file("/etc");
- #endif
diff --git a/mail/sylpheed/files/patch-libsylph-defs.h b/mail/sylpheed/files/patch-libsylph-defs.h
index 39b78aa5a050..58aab9a04762 100644
--- a/mail/sylpheed/files/patch-libsylph-defs.h
+++ b/mail/sylpheed/files/patch-libsylph-defs.h
@@ -1,4 +1,4 @@
---- libsylph/defs.h.orig	2014-06-10 04:06:36 UTC
+--- libsylph/defs.h.orig	2012-03-26 07:27:43 UTC
 +++ libsylph/defs.h
 @@ -89,8 +89,8 @@
  #else
@@ -16,7 +16,7 @@
  #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
  #else
 -#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
++#  define DEFAULT_SPOOL_PATH	"/var/spool"
  #endif
  
  #define BUFFSIZE			8192
diff --git a/mail/sylpheed/files/patch-libsylph_procmsg.c b/mail/sylpheed/files/patch-libsylph_procmsg.c
deleted file mode 100644
index 5ec92b21090f..000000000000
--- a/mail/sylpheed/files/patch-libsylph_procmsg.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libsylph/procmsg.c.orig	2014-06-10 04:06:35 UTC
-+++ libsylph/procmsg.c
-@@ -164,7 +164,7 @@ static gint procmsg_read_cache_data_str_
- 	if (endp - *p < sizeof(len))
- 		return -1;
- 
--	len = *(const guint32 *)(*p);
-+	memcpy(&len, *p, sizeof(len));
- 	*p += sizeof(len);
- 	if (len > G_MAXINT || len > endp - *p)
- 		return -1;
-@@ -197,7 +197,9 @@ static gint procmsg_read_cache_data_str_
- 		g_mapped_file_free(mapfile);			\
- 		return NULL;					\
- 	} else {						\
--		n = *(const guint32 *)p;			\
-+		guint32 v;					\
-+		memcpy(&v, p, sizeof(v));			\
-+		n = v;						\
- 		p += sizeof(guint32);				\
- 	}							\
- }
diff --git a/mail/sylpheed/files/patch-src-printing.c b/mail/sylpheed/files/patch-src-printing.c
index 3e063d98544d..67b8399634c9 100644
--- a/mail/sylpheed/files/patch-src-printing.c
+++ b/mail/sylpheed/files/patch-src-printing.c
@@ -1,4 +1,4 @@
---- src/printing.c.orig	2014-06-10 04:06:36 UTC
+--- src/printing.c.orig	2013-05-15 04:23:40 UTC
 +++ src/printing.c
 @@ -151,8 +151,6 @@ static gint layout_set_headers(PangoLayo
  
diff --git a/mail/sylpheed/pkg-plist b/mail/sylpheed/pkg-plist
index 1d5e19614e7e..eb2891dfff56 100644
--- a/mail/sylpheed/pkg-plist
+++ b/mail/sylpheed/pkg-plist
@@ -138,6 +138,7 @@ share/locale/eu/LC_MESSAGES/sylpheed.mo
 share/locale/fi/LC_MESSAGES/sylpheed.mo
 share/locale/fr/LC_MESSAGES/sylpheed.mo
 share/locale/gl/LC_MESSAGES/sylpheed.mo
+share/locale/he/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