From f8340102e3547f36ce70133950b6434c56621619 Mon Sep 17 00:00:00 2001 From: couderc Date: Mon, 5 Jun 2006 15:31:16 +0000 Subject: [PATCH] update to 2.2.5 --- mail/sylpheed/Makefile | 8 +-- mail/sylpheed/distinfo | 8 +-- ...patch-src_mbox_c => patch-libsylph_mbox_c} | 6 +- .../patches/patch-libsylph_procmime_c | 12 ++++ mail/sylpheed/patches/patch-libsylph_smtp_h | 14 ++++ mail/sylpheed/patches/patch-ltmain_sh | 10 +-- mail/sylpheed/patches/patch-src_inc_c | 8 +-- mail/sylpheed/patches/patch-src_procmime_c | 12 ---- mail/sylpheed/patches/patch-src_smtp_h | 14 ---- mail/sylpheed/pkg/PLIST | 66 +++++++++++++++++-- 10 files changed, 108 insertions(+), 50 deletions(-) rename mail/sylpheed/patches/{patch-src_mbox_c => patch-libsylph_mbox_c} (53%) create mode 100644 mail/sylpheed/patches/patch-libsylph_procmime_c create mode 100644 mail/sylpheed/patches/patch-libsylph_smtp_h delete mode 100644 mail/sylpheed/patches/patch-src_procmime_c delete mode 100644 mail/sylpheed/patches/patch-src_smtp_h diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 1fde8ae758b..d3793599415 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.60 2006/01/18 17:16:32 steven Exp $ +# $OpenBSD: Makefile,v 1.61 2006/06/05 15:31:16 couderc Exp $ COMMENT= "mail/news client in gtk+" -VERSION= 2.0.4 +VERSION= 2.2.5 DISTNAME= sylpheed-${VERSION} -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME} CATEGORIES= mail news x11 HOMEPAGE= http://sylpheed.good-day.net @@ -25,7 +25,7 @@ WANTLIB= X11 Xrender Xext Xft atk-1.0.0.0 c \ pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 ssl -MASTER_SITES= ${HOMEPAGE}/sylpheed/v2.0/ +MASTER_SITES= ${HOMEPAGE}/sylpheed/v2.2/ MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/} CONFIGURE_STYLE= gnu diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo index d14de0b56f0..7163a5706c3 100644 --- a/mail/sylpheed/distinfo +++ b/mail/sylpheed/distinfo @@ -1,4 +1,4 @@ -MD5 (sylpheed-2.0.4.tar.gz) = b72d661fe85c6763eba86e8490bd8e17 -RMD160 (sylpheed-2.0.4.tar.gz) = 2a2eb004b4fa70e6f2bfc4574d2a5cb3144f9123 -SHA1 (sylpheed-2.0.4.tar.gz) = f623d41492d3adcec59aabfa8f9d2e33b5ef1d1a -SIZE (sylpheed-2.0.4.tar.gz) = 3544360 +MD5 (sylpheed-2.2.5.tar.gz) = 45699e05e2bed288153cba8f0b1ec41f +RMD160 (sylpheed-2.2.5.tar.gz) = 5abb6c8331acf41ff87704c8673f558e1a79fdbe +SHA1 (sylpheed-2.2.5.tar.gz) = 38b27f08cc00127fc8cb62865414eb8512b0cc6a +SIZE (sylpheed-2.2.5.tar.gz) = 3869493 diff --git a/mail/sylpheed/patches/patch-src_mbox_c b/mail/sylpheed/patches/patch-libsylph_mbox_c similarity index 53% rename from mail/sylpheed/patches/patch-src_mbox_c rename to mail/sylpheed/patches/patch-libsylph_mbox_c index 1a500d651db..45d544fa0a4 100644 --- a/mail/sylpheed/patches/patch-src_mbox_c +++ b/mail/sylpheed/patches/patch-libsylph_mbox_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_mbox_c,v 1.1 2003/01/17 12:04:28 couderc Exp $ ---- src/mbox.c.orig Fri Jan 17 13:42:59 2003 -+++ src/mbox.c Fri Jan 17 13:43:22 2003 +$OpenBSD: patch-libsylph_mbox_c,v 1.1 2006/06/05 15:31:16 couderc Exp $ +--- libsylph/mbox.c.orig Fri Jan 17 13:42:59 2003 ++++ libsylph/mbox.c Fri Jan 17 13:43:22 2003 @@ -42,7 +42,9 @@ #include "account.h" #include "utils.h" diff --git a/mail/sylpheed/patches/patch-libsylph_procmime_c b/mail/sylpheed/patches/patch-libsylph_procmime_c new file mode 100644 index 00000000000..32c0835dd8b --- /dev/null +++ b/mail/sylpheed/patches/patch-libsylph_procmime_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-libsylph_procmime_c,v 1.1 2006/06/05 15:31:16 couderc Exp $ +--- libsylph/procmime.c.orig Fri Mar 17 05:16:24 2006 ++++ libsylph/procmime.c Thu May 11 23:47:00 2006 +@@ -1344,7 +1344,7 @@ static GHashTable *procmime_get_mime_typ + procmime_get_mime_type_list(SYSCONFDIR "/mime.types"); + if (!mime_type_list) + mime_type_list = +- procmime_get_mime_type_list("/etc/mime.types"); ++ procmime_get_mime_type_list("/var/www/conf/mime.types"); + #endif + dir = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, + "mime.types", NULL); diff --git a/mail/sylpheed/patches/patch-libsylph_smtp_h b/mail/sylpheed/patches/patch-libsylph_smtp_h new file mode 100644 index 00000000000..5167ed47030 --- /dev/null +++ b/mail/sylpheed/patches/patch-libsylph_smtp_h @@ -0,0 +1,14 @@ +$OpenBSD: patch-libsylph_smtp_h,v 1.1 2006/06/05 15:31:16 couderc Exp $ +--- libsylph/smtp.h.orig Thu Dec 1 06:13:57 2005 ++++ libsylph/smtp.h Thu May 11 23:41:52 2006 +@@ -33,7 +33,9 @@ typedef struct _SMTPSession SMTPSession; + + #define SMTP_SESSION(obj) ((SMTPSession *)obj) + +-#define MSGBUFSIZE 8192 ++#ifndef MSGBUFSIZE ++# define MSGBUFSIZE 8192 ++#endif + + typedef enum + { diff --git a/mail/sylpheed/patches/patch-ltmain_sh b/mail/sylpheed/patches/patch-ltmain_sh index cdb88a7148f..860a5208f91 100644 --- a/mail/sylpheed/patches/patch-ltmain_sh +++ b/mail/sylpheed/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.5 2005/10/03 20:20:29 couderc Exp $ ---- ltmain.sh.orig Wed Jul 27 11:19:30 2005 -+++ ltmain.sh Thu Aug 11 22:46:36 2005 -@@ -1371,6 +1371,17 @@ EOF +$OpenBSD: patch-ltmain_sh,v 1.6 2006/06/05 15:31:16 couderc Exp $ +--- ltmain.sh.orig Sat Mar 11 19:49:04 2006 ++++ ltmain.sh Thu May 11 23:22:41 2006 +@@ -1607,6 +1607,17 @@ EOF continue ;; @@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.5 2005/10/03 20:20:29 couderc Exp $ -module) module=yes continue -@@ -2020,6 +2031,10 @@ EOF +@@ -2279,6 +2290,10 @@ EOF fi continue ;; diff --git a/mail/sylpheed/patches/patch-src_inc_c b/mail/sylpheed/patches/patch-src_inc_c index 6eda8231f95..fc932ce3eca 100644 --- a/mail/sylpheed/patches/patch-src_inc_c +++ b/mail/sylpheed/patches/patch-src_inc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_inc_c,v 1.4 2005/10/03 20:20:29 couderc Exp $ ---- src/inc.c.orig Fri Jun 17 10:21:07 2005 -+++ src/inc.c Thu Aug 11 22:46:36 2005 -@@ -74,7 +74,9 @@ static GdkPixbuf *current_pixbuf; +$OpenBSD: patch-src_inc_c,v 1.5 2006/06/05 15:31:16 couderc Exp $ +--- src/inc.c.orig Thu Mar 9 07:01:45 2006 ++++ src/inc.c Thu May 11 23:22:41 2006 +@@ -67,7 +67,9 @@ static GdkPixbuf *current_pixbuf; static GdkPixbuf *error_pixbuf; static GdkPixbuf *ok_pixbuf; diff --git a/mail/sylpheed/patches/patch-src_procmime_c b/mail/sylpheed/patches/patch-src_procmime_c deleted file mode 100644 index a1450ccf6df..00000000000 --- a/mail/sylpheed/patches/patch-src_procmime_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_procmime_c,v 1.5 2005/10/03 20:20:29 couderc Exp $ ---- src/procmime.c.orig Thu Jul 14 09:49:28 2005 -+++ src/procmime.c Thu Aug 11 22:46:36 2005 -@@ -1000,7 +1000,7 @@ static GHashTable *procmime_get_mime_typ - mime_type_list = - procmime_get_mime_type_list(SYSCONFDIR "/mime.types"); - if (!mime_type_list) { -- list = procmime_get_mime_type_list("/etc/mime.types"); -+ list = procmime_get_mime_type_list("/var/www/conf/mime.types"); - mime_type_list = g_list_concat(mime_type_list, list); - } - dir = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, RC_DIR, diff --git a/mail/sylpheed/patches/patch-src_smtp_h b/mail/sylpheed/patches/patch-src_smtp_h deleted file mode 100644 index fa1225954ac..00000000000 --- a/mail/sylpheed/patches/patch-src_smtp_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_smtp_h,v 1.2 2004/04/10 19:13:50 couderc Exp $ ---- src/smtp.h.orig 2003-04-30 03:23:08.000000000 +0200 -+++ src/smtp.h 2004-04-09 17:07:33.000000000 +0200 -@@ -32,7 +32,9 @@ typedef struct _SMTPSession SMTPSession; - - #define SMTP_SESSION(obj) ((SMTPSession *)obj) - --#define MSGBUFSIZE 8192 -+#ifndef MSGBUFSIZE -+# define MSGBUFSIZE 8192 -+#endif - - typedef enum - { diff --git a/mail/sylpheed/pkg/PLIST b/mail/sylpheed/pkg/PLIST index 387d816bd00..1931b8cc99a 100644 --- a/mail/sylpheed/pkg/PLIST +++ b/mail/sylpheed/pkg/PLIST @@ -1,37 +1,93 @@ -@comment $OpenBSD: PLIST,v 1.22 2005/11/14 18:27:22 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.23 2006/06/05 15:31:16 couderc Exp $ bin/sylpheed +share/locale/ +share/locale/bg/ +share/locale/bg/LC_MESSAGES/ share/locale/bg/LC_MESSAGES/sylpheed.mo +share/locale/cs/ +share/locale/cs/LC_MESSAGES/ share/locale/cs/LC_MESSAGES/sylpheed.mo +share/locale/da/ +share/locale/da/LC_MESSAGES/ share/locale/da/LC_MESSAGES/sylpheed.mo +share/locale/de/ +share/locale/de/LC_MESSAGES/ share/locale/de/LC_MESSAGES/sylpheed.mo +share/locale/el/ +share/locale/el/LC_MESSAGES/ share/locale/el/LC_MESSAGES/sylpheed.mo +share/locale/es/ +share/locale/es/LC_MESSAGES/ share/locale/es/LC_MESSAGES/sylpheed.mo +share/locale/et/ +share/locale/et/LC_MESSAGES/ share/locale/et/LC_MESSAGES/sylpheed.mo +share/locale/fr/ +share/locale/fr/LC_MESSAGES/ share/locale/fr/LC_MESSAGES/sylpheed.mo +share/locale/gl/ +share/locale/gl/LC_MESSAGES/ share/locale/gl/LC_MESSAGES/sylpheed.mo +share/locale/hr/ +share/locale/hr/LC_MESSAGES/ share/locale/hr/LC_MESSAGES/sylpheed.mo +share/locale/hu/ +share/locale/hu/LC_MESSAGES/ share/locale/hu/LC_MESSAGES/sylpheed.mo +share/locale/it/ +share/locale/it/LC_MESSAGES/ share/locale/it/LC_MESSAGES/sylpheed.mo +share/locale/ja/ +share/locale/ja/LC_MESSAGES/ share/locale/ja/LC_MESSAGES/sylpheed.mo +share/locale/ko/ +share/locale/ko/LC_MESSAGES/ share/locale/ko/LC_MESSAGES/sylpheed.mo share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/sylpheed.mo +share/locale/nl/ +share/locale/nl/LC_MESSAGES/ share/locale/nl/LC_MESSAGES/sylpheed.mo +share/locale/pl/ +share/locale/pl/LC_MESSAGES/ share/locale/pl/LC_MESSAGES/sylpheed.mo +share/locale/pt_BR/ +share/locale/pt_BR/LC_MESSAGES/ share/locale/pt_BR/LC_MESSAGES/sylpheed.mo +share/locale/ro/ +share/locale/ro/LC_MESSAGES/ share/locale/ro/LC_MESSAGES/sylpheed.mo +share/locale/ru/ +share/locale/ru/LC_MESSAGES/ share/locale/ru/LC_MESSAGES/sylpheed.mo +share/locale/sk/ +share/locale/sk/LC_MESSAGES/ share/locale/sk/LC_MESSAGES/sylpheed.mo +share/locale/sl/ +share/locale/sl/LC_MESSAGES/ share/locale/sl/LC_MESSAGES/sylpheed.mo +share/locale/sr/ +share/locale/sr/LC_MESSAGES/ share/locale/sr/LC_MESSAGES/sylpheed.mo +share/locale/sv/ +share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/sylpheed.mo +share/locale/tr/ +share/locale/tr/LC_MESSAGES/ share/locale/tr/LC_MESSAGES/sylpheed.mo +share/locale/uk/ +share/locale/uk/LC_MESSAGES/ share/locale/uk/LC_MESSAGES/sylpheed.mo +share/locale/vi/ +share/locale/vi/LC_MESSAGES/ +share/locale/vi/LC_MESSAGES/sylpheed.mo +share/locale/zh_CN/ +share/locale/zh_CN/LC_MESSAGES/ share/locale/zh_CN/LC_MESSAGES/sylpheed.mo -share/locale/zh_TW.Big5/ -share/locale/zh_TW.Big5/LC_MESSAGES/ -share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo +share/locale/zh_TW/ +share/locale/zh_TW/LC_MESSAGES/ +share/locale/zh_TW/LC_MESSAGES/sylpheed.mo share/sylpheed/ share/sylpheed/faq/ share/sylpheed/faq/de/ @@ -96,6 +152,8 @@ share/sylpheed/manual/ja/sylpheed-18.html share/sylpheed/manual/ja/sylpheed-19.html share/sylpheed/manual/ja/sylpheed-2.html share/sylpheed/manual/ja/sylpheed-20.html +share/sylpheed/manual/ja/sylpheed-21.html +share/sylpheed/manual/ja/sylpheed-22.html share/sylpheed/manual/ja/sylpheed-3.html share/sylpheed/manual/ja/sylpheed-4.html share/sylpheed/manual/ja/sylpheed-5.html