Index: head/mail/sylpheed/Makefile =================================================================== --- head/mail/sylpheed/Makefile (revision 395947) +++ head/mail/sylpheed/Makefile (revision 395948) @@ -1,113 +1,114 @@ # Created by: shigeri # $FreeBSD$ PORTNAME= sylpheed PORTVERSION= 3.4.3 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \ LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Lightweight, featureful, and fast GTK+ based e-mail client LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support USES= gettext iconv gmake pkgconfig tar:bzip2 desktop-file-utils \ libtool USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ --program-transform-name='' CONFLICTS= sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]* OPTIONS_DEFINE= CA_BUNDLE COMPFACE CURL DOCS GPGME GTKSPELL JPILOT LDAP \ ONIGURUMA SSL CA_BUNDLE_DESC= Include CA bundle for certificate verification COMPFACE_DESC= X-Face support CURL_DESC= libcurl dependency (remote update check) GPGME_DESC= GnuPG support using GPGME GTKSPELL_DESC= Spell checking support JPILOT_DESC= JPilot support ONIGURUMA_DESC= Oniguruma support OPTIONS_DEFAULT=CA_BUNDLE CURL GTKSPELL SSL CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CA_BUNDLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-libsylph_ssl.c COMPFACE_LIB_DEPENDS= libcompface.so:${PORTSDIR}/mail/faces COMPFACE_CONFIGURE_ENABLE= compface CURL_RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl GPGME_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme GPGME_RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg GPGME_CONFIGURE_ENABLE= gpgme GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell GTKSPELL_CONFIGURE_ENABLE= gtkspell JPILOT_LIB_DEPENDS= libpisock.so:${PORTSDIR}/palm/pilot-link JPILOT_RUN_DEPENDS= jpilot:${PORTSDIR}/palm/jpilot JPILOT_CONFIGURE_ENABLE= jpilot LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= openldap=yes ONIGURUMA_BUILD_DEPENDS= ${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma5 ONIGURUMA_CONFIGURE_ENABLE= oniguruma SSL_CONFIGURE_ENABLE= ssl SSL_USE= openssl=yes .include MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \ faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \ manual/ja/Makefile.in src/Makefile.in libsylph/Makefile.in \ src/icons/Makefile.in post-patch: @${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|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 .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src plugin po manual faq nsis$$|SUBDIRS = ac libsylph src plugin po nsis|g' \ ${WRKSRC}/Makefile.in .else .for i in ${MAKEFILES} @${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \ s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \ ${WRKSRC}/${i} .endfor .endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ChangeLog INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${i}.ja ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Index: head/mail/sylpheed/files/extra-patch-libsylph_ssl.c =================================================================== --- head/mail/sylpheed/files/extra-patch-libsylph_ssl.c (revision 395947) +++ head/mail/sylpheed/files/extra-patch-libsylph_ssl.c (revision 395948) @@ -1,19 +1,19 @@ ---- libsylph/ssl.c.orig 2014-06-10 06:06:36.000000000 +0200 -+++ libsylph/ssl.c 2015-02-16 16:38:30.082429979 +0100 -@@ -59,6 +59,7 @@ +--- libsylph/ssl.c.orig 2014-06-10 04:06:36 UTC ++++ libsylph/ssl.c +@@ -59,6 +59,7 @@ static gchar *find_certs_file(const gcha LOOK_FOR("ca-bundle.crt"); LOOK_FOR("ca-root.crt"); LOOK_FOR("certs.crt"); + LOOK_FOR("cert.pem"); } #undef LOOK_FOR -@@ -117,7 +118,7 @@ +@@ -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 Index: head/mail/sylpheed/files/patch-libsylph-defs.h =================================================================== --- head/mail/sylpheed/files/patch-libsylph-defs.h (revision 395947) +++ head/mail/sylpheed/files/patch-libsylph-defs.h (revision 395948) @@ -1,22 +1,22 @@ ---- libsylph/defs.h.orig Tue Sep 13 16:55:49 2005 -+++ libsylph/defs.h Mon Sep 19 03:23:15 2005 -@@ -81,8 +81,8 @@ +--- libsylph/defs.h.orig 2014-06-10 04:06:36 UTC ++++ libsylph/defs.h +@@ -89,8 +89,8 @@ #else # define DEFAULT_SIGNATURE ".signature" #endif -#define DEFAULT_INC_PATH "/usr/bin/mh/inc" -#define DEFAULT_INC_PROGRAM "inc" +#define DEFAULT_INC_PATH "" +#define DEFAULT_INC_PROGRAM "" /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" -@@ -91,7 +91,7 @@ +@@ -103,7 +103,7 @@ #ifdef _PATH_MAILDIR # define DEFAULT_SPOOL_PATH _PATH_MAILDIR #else -# define DEFAULT_SPOOL_PATH "/var/spool/mail" +# define DEFAULT_SPOOL_PATH "/var/mail" #endif #define BUFFSIZE 8192 Index: head/mail/sylpheed/files/patch-libsylph_procmsg.c =================================================================== --- head/mail/sylpheed/files/patch-libsylph_procmsg.c (revision 395947) +++ head/mail/sylpheed/files/patch-libsylph_procmsg.c (revision 395948) @@ -1,20 +1,22 @@ --- 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,7 @@ static gint procmsg_read_cache_data_str_ +@@ -197,7 +197,9 @@ static gint procmsg_read_cache_data_str_ g_mapped_file_free(mapfile); \ return NULL; \ } else { \ - n = *(const guint32 *)p; \ -+ memcpy(&n, p, sizeof(n)); \ ++ guint32 v; \ ++ memcpy(&v, p, sizeof(v)); \ ++ n = v; \ p += sizeof(guint32); \ } \ } Index: head/mail/sylpheed/files/patch-src-printing.c =================================================================== --- head/mail/sylpheed/files/patch-src-printing.c (revision 395947) +++ head/mail/sylpheed/files/patch-src-printing.c (revision 395948) @@ -1,22 +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 @@ +--- src/printing.c.orig 2014-06-10 04:06:36 UTC ++++ src/printing.c +@@ -151,8 +151,6 @@ static gint layout_set_headers(PangoLayo 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 @@ +@@ -417,10 +415,6 @@ static void draw_page(GtkPrintOperation } - g_print("count = %d\n", count); + debug_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);