From ce327c3f3475c39898942f01abeae0de5e9cc1aa Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 8 Jan 2008 23:13:23 +0000 Subject: [PATCH] Long due update to 3.2.0, diff mostly from Ulrich Kahl (MAINTAINER) - gnomeprint flavor has been removed, it uses gtkprint now - patch-src_procmime_c updated to fix a problem reported by Marten King - pgp* plugins are built but not installed, due to a severe threading bug : see http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1348 tested by many, ok ajacoutot@ kili@ and MAINTAINER --- mail/claws-mail/Makefile | 56 +++++++++---------- mail/claws-mail/distinfo | 10 ++-- mail/claws-mail/patches/patch-configure_ac | 12 ++-- .../patch-src_common_ssl_certificate_c | 13 +++++ mail/claws-mail/patches/patch-src_inc_c | 10 ++-- mail/claws-mail/patches/patch-src_procmime_c | 16 ++++-- mail/claws-mail/pkg/PLIST-docs | 3 +- mail/claws-mail/pkg/PLIST-main | 36 +++++++----- 8 files changed, 93 insertions(+), 63 deletions(-) create mode 100644 mail/claws-mail/patches/patch-src_common_ssl_certificate_c diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index bbb5103c763..26c2378c149 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2007/12/18 15:56:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2008/01/08 23:13:23 landry Exp $ COMMENT-main= mail and news client COMMENT-docs= documentation @@ -7,14 +7,14 @@ COMMENT-clamav= clamav plugin COMMENT-dillo= dillo plugin COMMENT-spamassassin= spamassassin plugin -V= 3.0.1 +V= 3.2.0 DISTNAME= claws-mail-${V} -PKGNAME-main= ${DISTNAME}p1 +PKGNAME-main= ${DISTNAME} FULLPKGNAME-docs= claws-mail-docs-${V} -FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V}p0 -FULLPKGNAME-clamav= claws-mail-clamav-${V}p0 -FULLPKGNAME-dillo= claws-mail-dillo-${V}p0 -FULLPKGNAME-spamassassin= claws-mail-spamassassin-${V}p0 +FULLPKGNAME-bogofilter= claws-mail-bogofilter-${V} +FULLPKGNAME-clamav= claws-mail-clamav-${V} +FULLPKGNAME-dillo= claws-mail-dillo-${V} +FULLPKGNAME-spamassassin= claws-mail-spamassassin-${V} CATEGORIES= mail news @@ -35,7 +35,7 @@ DIST_SUBDIR= claws MULTI_PACKAGES= -main -docs -bogofilter -clamav -dillo \ -spamassassin -FLAVORS= jpilot gnomeprint compface ldap debug +FLAVORS= jpilot compface ldap debug FLAVOR?= FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g} @@ -50,9 +50,9 @@ RUN_DEPENDS-dillo= ::${BUILD_PKGPATH} \ RUN_DEPENDS-spamassassin=::${BUILD_PKGPATH} \ ::mail/p5-Mail-SpamAssassin -WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ - Xcomposite Xdamage pcre \ - Xrender crypto expat fontconfig freetype m ssl z +WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ + Xi Xinerama Xrandr Xrender crypto expat fontconfig \ + freetype m ssl z pcre WANTLIB-main= ${WANTLIB} ICE SM c pthread stdc++ @@ -71,12 +71,15 @@ LIB_DEPENDS= atk-1.0::devel/atk \ RUN_DEPENDS-main= ${RUN_DEPENDS} \ :desktop-file-utils-*:devel/desktop-file-utils +# at the moment, pgpcore/pgpinline/pgpmime plugins are built but not installed +# http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1348 LIB_DEPENDS-main= ${LIB_DEPENDS} \ gthread-2.0::devel/glib2 \ startup-notification-1::devel/startup-notification \ aspell::textproc/aspell/core \ gpgme::security/gpgme \ gpg-error::security/libgpg-error +CONFIGURE_ARGS+= --disable-gnomeprint LIB_DEPENDS-docs= PKG_ARCH-docs= * @@ -102,15 +105,6 @@ RUN_DEPENDS-main+= ::comms/jpilot CONFIGURE_ARGS+= --disable-jpilot .endif -.if ${FLAVOR:L:Mgnomeprint} -WANTLIB-main+= art_lgpl_2 xml2 -LIB_DEPENDS-main+= gnomecanvas-2::x11/gnome/libgnomecanvas \ - gnomeprint-2-2::x11/gnome/libgnomeprint \ - gnomeprintui-2-2::x11/gnome/libgnomeprintui -.else -CONFIGURE_ARGS+= --disable-gnomeprint -.endif - .if ${FLAVOR:L:Mcompface} PERMIT_PACKAGE_CDROM= No Fee PERMIT_DISTFILES_CDROM= No Fee @@ -134,32 +128,35 @@ INSTALL_STRIP= TOOLS= OOo2claws-mail.pl \ acroread2claws-mail.pl \ calypso_convert.pl \ + claws-mail-compose-insert-files.pl \ convert_mbox.pl \ + csv2addressbook.pl \ eud2gc.py \ filter_conv.pl filter_conv_new.pl \ fix_date.sh \ freshmeat_search.pl \ gif2xface.pl \ google_msgid.pl google_search.pl \ - kmail2claws-mail.pl kmail2claws-mail_v2.pl \ kmail-mailbox2claws-mail.pl \ - multiwebsearch.pl \ + kmail2claws-mail.pl kmail2claws-mail_v2.pl \ + mairix.sh \ + mew2claws-mail.pl \ + multiwebsearch.conf multiwebsearch.pl \ nautilus2claws-mail.sh \ outlook2claws-mail.pl \ - sylprint.pl sylprint.rc \ + popfile-link.sh \ tb2claws-mail tbird2claws.py \ textviewer.pl textviewer.sh \ thunderbird-filters-convertor.pl \ - update-po \ uudec uuooffice \ vcard2xml.py \ - README README.sylprint \ - kdeservicemenu/install.sh kdeservicemenu/claws-mail-kdeservicemenu.pl \ + README \ + kdeservicemenu/install.sh \ + kdeservicemenu/claws-mail-attach-files.desktop.template \ + kdeservicemenu/claws-mail-kdeservicemenu.pl \ kdeservicemenu/README post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop ${PREFIX}/share/applications/claws-mail.desktop ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps ${INSTALL_DATA} ${WRKSRC}/claws-mail.png ${PREFIX}/share/icons/hicolor/48x48/apps/claws-mail.png ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps @@ -172,4 +169,7 @@ post-install: ${PREFIX}/share/claws-mail/tools/${i} .endfor + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/claws-mail + ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/claws-mail + .include diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 3d6ad4fef86..e6676d594b8 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,5 +1,5 @@ -MD5 (claws/claws-mail-3.0.1.tar.bz2) = cAxrTv6xDMM6QxEcKnNNuA== -RMD160 (claws/claws-mail-3.0.1.tar.bz2) = QxqzygUTgtseMH7xq6/FzmWfSqM= -SHA1 (claws/claws-mail-3.0.1.tar.bz2) = ZwwnMb9r8gnKfTvTQbOPwxCOY5A= -SHA256 (claws/claws-mail-3.0.1.tar.bz2) = WCWa/W8jmCmurxWjcJeOENi5igitXrTra3D7dpbv7DA= -SIZE (claws/claws-mail-3.0.1.tar.bz2) = 5654189 +MD5 (claws/claws-mail-3.2.0.tar.bz2) = rL/ZGfe2M9UelqBBmsB4Ag== +RMD160 (claws/claws-mail-3.2.0.tar.bz2) = Ma9AQ5O/0Vsmsg7CwFbeH4KtPjE= +SHA1 (claws/claws-mail-3.2.0.tar.bz2) = I+CTr7nK5UH0rOdPQReKVRrsOSE= +SHA256 (claws/claws-mail-3.2.0.tar.bz2) = Ju1szqKCzsl4ooZ3O7oFgaE/Zv5ddKbMFgpi2azFXSE= +SIZE (claws/claws-mail-3.2.0.tar.bz2) = 5880889 diff --git a/mail/claws-mail/patches/patch-configure_ac b/mail/claws-mail/patches/patch-configure_ac index 5fe44789fa1..d342773e957 100644 --- a/mail/claws-mail/patches/patch-configure_ac +++ b/mail/claws-mail/patches/patch-configure_ac @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_ac,v 1.2 2007/09/28 22:12:01 pyr Exp $ ---- configure.ac.orig Mon Sep 17 04:49:36 2007 -+++ configure.ac Tue Sep 18 21:45:38 2007 -@@ -567,6 +567,7 @@ else +$OpenBSD: patch-configure_ac,v 1.3 2008/01/08 23:13:23 landry Exp $ +--- configure.ac.orig Mon Dec 17 06:37:36 2007 ++++ configure.ac Tue Dec 18 19:36:05 2007 +@@ -614,6 +614,7 @@ else AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv") AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") @@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2007/09/28 22:12:01 pyr Exp $ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",, $LDAP_LIBS) -@@ -582,7 +583,8 @@ else +@@ -629,7 +630,8 @@ else AC_CHECK_LIB(ldap, ldap_start_tls_s, [ ac_cv_have_tls=yes ], @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2007/09/28 22:12:01 pyr Exp $ fi -@@ -619,7 +621,7 @@ if test "$ac_cv_enable_jpilot" = yes; then +@@ -666,7 +668,7 @@ if test "$ac_cv_enable_jpilot" = yes; then AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ]) fi diff --git a/mail/claws-mail/patches/patch-src_common_ssl_certificate_c b/mail/claws-mail/patches/patch-src_common_ssl_certificate_c new file mode 100644 index 00000000000..b6044dd73ae --- /dev/null +++ b/mail/claws-mail/patches/patch-src_common_ssl_certificate_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_common_ssl_certificate_c,v 1.1 2008/01/08 23:13:23 landry Exp $ +--- src/common/ssl_certificate.c.orig Tue Dec 18 19:40:50 2007 ++++ src/common/ssl_certificate.c Tue Dec 18 20:07:02 2007 +@@ -37,6 +37,9 @@ + #include + #include + ++#include ++#include ++ + #ifdef G_OS_WIN32 + #include "winsock2.h" + #endif diff --git a/mail/claws-mail/patches/patch-src_inc_c b/mail/claws-mail/patches/patch-src_inc_c index c1d49385f67..149198848d1 100644 --- a/mail/claws-mail/patches/patch-src_inc_c +++ b/mail/claws-mail/patches/patch-src_inc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_inc_c,v 1.3 2007/09/28 22:12:01 pyr Exp $ ---- src/inc.c.orig Mon Sep 17 04:14:33 2007 -+++ src/inc.c Tue Sep 18 21:45:32 2007 -@@ -83,7 +83,7 @@ static GdkPixbuf *currentpix; +$OpenBSD: patch-src_inc_c,v 1.4 2008/01/08 23:13:23 landry Exp $ +--- src/inc.c.orig Mon Dec 17 06:37:00 2007 ++++ src/inc.c Tue Dec 18 19:35:55 2007 +@@ -88,7 +88,7 @@ static GdkPixbuf *currentpix; static GdkPixbuf *errorpix; static GdkPixbuf *okpix; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_inc_c,v 1.3 2007/09/28 22:12:01 pyr Exp $ static void inc_finished (MainWindow *mainwin, gboolean new_messages, -@@ -938,7 +938,7 @@ static void inc_progress_dialog_set_label(IncProgressD +@@ -954,7 +954,7 @@ static void inc_progress_dialog_set_label(IncProgressD static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog, IncSession *inc_session) { diff --git a/mail/claws-mail/patches/patch-src_procmime_c b/mail/claws-mail/patches/patch-src_procmime_c index 7740a70efd8..09424b49061 100644 --- a/mail/claws-mail/patches/patch-src_procmime_c +++ b/mail/claws-mail/patches/patch-src_procmime_c @@ -1,7 +1,15 @@ -$OpenBSD: patch-src_procmime_c,v 1.3 2007/09/28 22:12:01 pyr Exp $ ---- src/procmime.c.orig Mon Sep 17 04:14:33 2007 -+++ src/procmime.c Tue Sep 18 21:45:32 2007 -@@ -1154,7 +1154,7 @@ GList *procmime_get_mime_type_list(void) +$OpenBSD: patch-src_procmime_c,v 1.4 2008/01/08 23:13:23 landry Exp $ +--- src/procmime.c.orig Mon Dec 17 06:37:02 2007 ++++ src/procmime.c Fri Dec 28 23:49:56 2007 +@@ -1055,14 +1055,14 @@ GList *procmime_get_mime_type_list(void) + if (mime_type_list) + return mime_type_list; + +-#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if ((fp = g_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) + #else + if ((fp = g_fopen("/usr/share/mime/globs", "rb")) == NULL) #endif { fp_is_glob_file = FALSE; diff --git a/mail/claws-mail/pkg/PLIST-docs b/mail/claws-mail/pkg/PLIST-docs index f189045fbba..479d4907a00 100644 --- a/mail/claws-mail/pkg/PLIST-docs +++ b/mail/claws-mail/pkg/PLIST-docs @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST-docs,v 1.2 2007/04/20 05:42:51 steven Exp $ +@comment $OpenBSD: PLIST-docs,v 1.3 2008/01/08 23:13:23 landry Exp $ @pkgpath mail/sylpheed-claws,-docs${FLAVOR_STRING} share/doc/claws-mail/ +share/doc/claws-mail/COPYING share/doc/claws-mail/RELEASE_NOTES share/doc/claws-mail/manual/ share/doc/claws-mail/manual/en/ diff --git a/mail/claws-mail/pkg/PLIST-main b/mail/claws-mail/pkg/PLIST-main index 0285962b46d..0af96a77249 100644 --- a/mail/claws-mail/pkg/PLIST-main +++ b/mail/claws-mail/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.7 2007/12/18 15:56:16 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.8 2008/01/08 23:13:23 landry Exp $ @pkgpath mail/sylpheed-claws,-main${FLAVOR_STRING} @pkgpath mail/sylpheed-claws${FLAVOR_STRING} bin/claws-mail @@ -11,7 +11,9 @@ include/claws-mail/addr_compl.h include/claws-mail/addrbook.h include/claws-mail/addrcache.h include/claws-mail/addrclip.h +include/claws-mail/addrcustomattr.h include/claws-mail/addrdefs.h +include/claws-mail/addrduplicates.h include/claws-mail/addressadd.h include/claws-mail/addressbook.h include/claws-mail/addressbook_foldersel.h @@ -33,7 +35,6 @@ include/claws-mail/common/hooks.h include/claws-mail/common/log.h include/claws-mail/common/md5.h include/claws-mail/common/mgutils.h -include/claws-mail/common/nntp.h include/claws-mail/common/passcrypt.h include/claws-mail/common/plugin.h include/claws-mail/common/prefs.h @@ -75,6 +76,7 @@ include/claws-mail/etpan/etpan-errors.h include/claws-mail/etpan/etpan-thread-manager-types.h include/claws-mail/etpan/etpan-thread-manager.h include/claws-mail/etpan/imap-thread.h +include/claws-mail/etpan/nntp-thread.h include/claws-mail/exphtmldlg.h include/claws-mail/expldifdlg.h include/claws-mail/export.h @@ -196,6 +198,7 @@ include/claws-mail/prefs_template.h include/claws-mail/prefs_themes.h include/claws-mail/prefs_toolbar.h include/claws-mail/prefs_wrapping.h +include/claws-mail/printing.h include/claws-mail/privacy.h include/claws-mail/procheader.h include/claws-mail/procmime.h @@ -222,14 +225,14 @@ include/claws-mail/vcard.h include/claws-mail/wizard.h lib/claws-mail/ lib/claws-mail/plugins/ -lib/claws-mail/plugins/pgpcore.la -lib/claws-mail/plugins/pgpcore.so -lib/claws-mail/plugins/pgpinline.deps -lib/claws-mail/plugins/pgpinline.la -lib/claws-mail/plugins/pgpinline.so -lib/claws-mail/plugins/pgpmime.deps -lib/claws-mail/plugins/pgpmime.la -lib/claws-mail/plugins/pgpmime.so +@comment lib/claws-mail/plugins/pgpcore.la +@comment lib/claws-mail/plugins/pgpcore.so +@comment lib/claws-mail/plugins/pgpinline.deps +@comment lib/claws-mail/plugins/pgpinline.la +@comment lib/claws-mail/plugins/pgpinline.so +@comment lib/claws-mail/plugins/pgpmime.deps +@comment lib/claws-mail/plugins/pgpmime.la +@comment lib/claws-mail/plugins/pgpmime.so lib/claws-mail/plugins/trayicon.la lib/claws-mail/plugins/trayicon.so lib/pkgconfig/ @@ -241,10 +244,11 @@ share/claws-mail/ share/claws-mail/tools/ share/claws-mail/tools/OOo2claws-mail.pl share/claws-mail/tools/README -share/claws-mail/tools/README.sylprint share/claws-mail/tools/acroread2claws-mail.pl share/claws-mail/tools/calypso_convert.pl +share/claws-mail/tools/claws-mail-compose-insert-files.pl share/claws-mail/tools/convert_mbox.pl +share/claws-mail/tools/csv2addressbook.pl share/claws-mail/tools/eud2gc.py share/claws-mail/tools/filter_conv.pl share/claws-mail/tools/filter_conv_new.pl @@ -255,22 +259,24 @@ share/claws-mail/tools/google_msgid.pl share/claws-mail/tools/google_search.pl share/claws-mail/tools/kdeservicemenu/ share/claws-mail/tools/kdeservicemenu/README +share/claws-mail/tools/kdeservicemenu/claws-mail-attach-files.desktop.template share/claws-mail/tools/kdeservicemenu/claws-mail-kdeservicemenu.pl share/claws-mail/tools/kdeservicemenu/install.sh share/claws-mail/tools/kmail-mailbox2claws-mail.pl share/claws-mail/tools/kmail2claws-mail.pl share/claws-mail/tools/kmail2claws-mail_v2.pl +share/claws-mail/tools/mairix.sh +share/claws-mail/tools/mew2claws-mail.pl +share/claws-mail/tools/multiwebsearch.conf share/claws-mail/tools/multiwebsearch.pl share/claws-mail/tools/nautilus2claws-mail.sh share/claws-mail/tools/outlook2claws-mail.pl -share/claws-mail/tools/sylprint.pl -share/claws-mail/tools/sylprint.rc +share/claws-mail/tools/popfile-link.sh share/claws-mail/tools/tb2claws-mail share/claws-mail/tools/tbird2claws.py share/claws-mail/tools/textviewer.pl share/claws-mail/tools/textviewer.sh share/claws-mail/tools/thunderbird-filters-convertor.pl -share/claws-mail/tools/update-po share/claws-mail/tools/uudec share/claws-mail/tools/uuooffice share/claws-mail/tools/vcard2xml.py @@ -313,3 +319,5 @@ share/locale/zh_CN/LC_MESSAGES/claws-mail.mo share/locale/zh_TW/LC_MESSAGES/claws-mail.mo @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database +@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor +@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor