diff options
26 files changed, 46 insertions, 71 deletions
diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile index 2587f13d43d..1baaabb44b6 100644 --- a/mail/claws-mail-archive/Makefile +++ b/mail/claws-mail-archive/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2015/01/21 09:12:41 obache Exp $ +# $NetBSD: Makefile,v 1.34 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= archive -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile index bb120845d33..02b95fd08b7 100644 --- a/mail/claws-mail-attachwarner/Makefile +++ b/mail/claws-mail-attachwarner/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.39 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= attachwarner -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile index 4faf9b896ee..fbc34a2d195 100644 --- a/mail/claws-mail-attremover/Makefile +++ b/mail/claws-mail-attremover/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.38 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= att_remover -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile index aa51041ba18..ac2a9e30342 100644 --- a/mail/claws-mail-bogofilter/Makefile +++ b/mail/claws-mail-bogofilter/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.33 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= bogofilter -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile index 5b5d850054a..0a68f345af4 100644 --- a/mail/claws-mail-fetchinfo/Makefile +++ b/mail/claws-mail-fetchinfo/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.39 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= fetchinfo -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile index d5e6595eadb..436a694365e 100644 --- a/mail/claws-mail-mailmbox/Makefile +++ b/mail/claws-mail-mailmbox/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.38 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= mailmbox -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile index fa1c01c63a5..89054dfaf64 100644 --- a/mail/claws-mail-newmail/Makefile +++ b/mail/claws-mail-newmail/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= newmail -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index d2349d79f69..b8326cb5628 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= notification -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile index 002e2de959d..64dc47083ad 100644 --- a/mail/claws-mail-pgpcore/Makefile +++ b/mail/claws-mail-pgpcore/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= pgpcore -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org @@ -10,8 +9,6 @@ COMMENT= Handles core PGP functions PLIST_SRC+= PLIST -PLIST_SRC+= PLIST - CONFIGURE_ARGS+= --enable-pgpcore-plugin CONFIGURE_ARGS+= --enable-pgpmime-plugin CONFIGURE_ARGS+= --enable-pgpinline-plugin diff --git a/mail/claws-mail-pgpcore/PLIST b/mail/claws-mail-pgpcore/PLIST index be219957371..3d88bb0f803 100644 --- a/mail/claws-mail-pgpcore/PLIST +++ b/mail/claws-mail-pgpcore/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2014/01/15 17:22:31 drochner Exp $ +@comment $NetBSD: PLIST,v 1.5 2015/04/03 12:34:44 nros Exp $ +include/claws-mail/plugins/pgpcore/autocompletion.h include/claws-mail/plugins/pgpcore/passphrase.h include/claws-mail/plugins/pgpcore/pgp_utils.h include/claws-mail/plugins/pgpcore/pgp_viewer.h include/claws-mail/plugins/pgpcore/prefs_gpg.h include/claws-mail/plugins/pgpcore/select-keys.h include/claws-mail/plugins/pgpcore/sgpgme.h -lib/claws-mail/plugins/pgpcore.la diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile index 3eb1ab98db1..de124e79bbc 100644 --- a/mail/claws-mail-pgpinline/Makefile +++ b/mail/claws-mail-pgpinline/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2015/04/03 12:34:44 nros Exp $ # PLUGIN_NAME= pgpinline -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile index a1c0a275c6a..e34f192a301 100644 --- a/mail/claws-mail-pgpmime/Makefile +++ b/mail/claws-mail-pgpmime/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= pgpmime -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index 8ffb29ea3f5..77e04c9a97e 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.46 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= rssyl -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile index 1abf0582eec..63dec0f573f 100644 --- a/mail/claws-mail-smime/Makefile +++ b/mail/claws-mail-smime/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2014/05/05 00:48:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= smime -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile index 06686a7e32d..16bd312aa6f 100644 --- a/mail/claws-mail-spamassassin/Makefile +++ b/mail/claws-mail-spamassassin/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.32 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= spamassassin -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile index 38226e71a68..5b151da8b72 100644 --- a/mail/claws-mail-spamreport/Makefile +++ b/mail/claws-mail-spamreport/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2014/04/09 07:27:10 obache Exp $ +# $NetBSD: Makefile,v 1.43 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= spam_report -PKGREVISION= 1 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile index 8016cf65205..0e29544fd9b 100644 --- a/mail/claws-mail-tnef/Makefile +++ b/mail/claws-mail-tnef/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= tnef_parse -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index 5cee41080dc..aa0a87350ef 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2014/05/29 23:36:44 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2015/04/03 12:34:45 nros Exp $ # PLUGIN_NAME= vcalendar -PKGREVISION= 2 .include "../../mail/claws-mail/plugins.mk" MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index c32f23b15e0..c0aa5f36ab9 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2014/06/09 14:18:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2015/04/03 12:34:44 nros Exp $ INSTALLATION_DIRS+= ${EGDIR} INSTALLATION_DIRS+= share/claws-mail @@ -6,7 +6,6 @@ INSTALLATION_DIRS+= share/claws-mail .include "Makefile.common" PKGNAME= claws-mail-${CLAWS_VERSION} -PKGREVISION= 5 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= X based e-mail and netnews client @@ -60,10 +59,14 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif +INSTALLATION_DIRS+= share/applications + post-install: ${INSTALL_DATA} ${FILESDIR}/mime.types ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/claws-mail*.png \ ${DESTDIR}${PREFIX}/share/claws-mail + ${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop \ + ${DESTDIR}${PREFIX}/share/applications .if exists(files/shred.${OPSYS}) ${INSTALL_SCRIPT} files/shred.${OPSYS} \ ${DESTDIR}${PREFIX}/bin/claws-mail-shred diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common index f9a1a1cd847..a1f5dc4b285 100644 --- a/mail/claws-mail/Makefile.common +++ b/mail/claws-mail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2013/07/24 15:26:11 drochner Exp $ +# $NetBSD: Makefile.common,v 1.13 2015/04/03 12:34:44 nros Exp $ # used by mail/claws-mail/plugins.mk @@ -6,8 +6,8 @@ DISTNAME= claws-mail-${CLAWS_VERSION} CATEGORIES= mail news x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=claws-mail/} +EXTRACT_SUFX= .tar.xz HOMEPAGE= http://claws-mail.org/ LICENSE= gnu-gpl-v3 diff --git a/mail/claws-mail/Makefile.vers b/mail/claws-mail/Makefile.vers index 68cc0a88cdd..0865f9b4f40 100644 --- a/mail/claws-mail/Makefile.vers +++ b/mail/claws-mail/Makefile.vers @@ -1,3 +1,3 @@ -# $NetBSD: Makefile.vers,v 1.17 2014/01/15 17:19:30 drochner Exp $ +# $NetBSD: Makefile.vers,v 1.18 2015/04/03 12:34:44 nros Exp $ # -CLAWS_VERSION= 3.9.3 +CLAWS_VERSION= 3.11.1 diff --git a/mail/claws-mail/PLIST b/mail/claws-mail/PLIST index c9f5f34cfec..2d43f2dffd5 100644 --- a/mail/claws-mail/PLIST +++ b/mail/claws-mail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2014/01/15 17:19:30 drochner Exp $ +@comment $NetBSD: PLIST,v 1.21 2015/04/03 12:34:44 nros Exp $ bin/claws-mail bin/sylpheed-claws include/claws-mail/account.h @@ -25,6 +25,7 @@ include/claws-mail/addrselect.h include/claws-mail/advsearch.h include/claws-mail/alertpanel.h include/claws-mail/autofaces.h +include/claws-mail/avatars.h include/claws-mail/browseldap.h include/claws-mail/claws-features.h include/claws-mail/codeconv.h @@ -70,6 +71,7 @@ include/claws-mail/edittags.h include/claws-mail/editvcard.h include/claws-mail/enriched.h include/claws-mail/etpan/etpan-errors.h +include/claws-mail/etpan/etpan-ssl.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 @@ -232,6 +234,7 @@ share/locale/ca/LC_MESSAGES/claws-mail.mo share/locale/cs/LC_MESSAGES/claws-mail.mo share/locale/de/LC_MESSAGES/claws-mail.mo share/locale/en_GB/LC_MESSAGES/claws-mail.mo +share/locale/eo/LC_MESSAGES/claws-mail.mo share/locale/es/LC_MESSAGES/claws-mail.mo share/locale/fi/LC_MESSAGES/claws-mail.mo share/locale/fr/LC_MESSAGES/claws-mail.mo @@ -241,6 +244,7 @@ share/locale/id_ID/LC_MESSAGES/claws-mail.mo share/locale/it/LC_MESSAGES/claws-mail.mo share/locale/ja/LC_MESSAGES/claws-mail.mo share/locale/lt/LC_MESSAGES/claws-mail.mo +share/locale/nb/LC_MESSAGES/claws-mail.mo share/locale/nl/LC_MESSAGES/claws-mail.mo share/locale/pl/LC_MESSAGES/claws-mail.mo share/locale/pt_BR/LC_MESSAGES/claws-mail.mo diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk index 533bd0cf16c..7b01e6a7d9f 100644 --- a/mail/claws-mail/buildlink3.mk +++ b/mail/claws-mail/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:05:22 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2015/04/03 12:34:44 nros Exp $ BUILDLINK_TREE+= claws-mail @@ -6,7 +6,7 @@ BUILDLINK_TREE+= claws-mail CLAWS_MAIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0 -BUILDLINK_ABI_DEPENDS.claws-mail+= claws-mail>=3.8.1nb3 +BUILDLINK_ABI_DEPENDS.claws-mail+= claws-mail>=3.11.1 BUILDLINK_PKGSRCDIR.claws-mail?= ../../mail/claws-mail .include "../../textproc/enchant/buildlink3.mk" diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index ce8890ffb45..e551d8e1429 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.25 2014/01/15 17:19:30 drochner Exp $ +$NetBSD: distinfo,v 1.26 2015/04/03 12:34:44 nros Exp $ -SHA1 (claws-mail-3.9.3.tar.bz2) = 82026ac7dfc0123544def8ef338a4d0746671284 -RMD160 (claws-mail-3.9.3.tar.bz2) = e9258dd2323010596782e2090a40f3fe674344e2 -Size (claws-mail-3.9.3.tar.bz2) = 9463943 bytes +SHA1 (claws-mail-3.11.1.tar.xz) = b0c07906043f7a3ec726c7a96d6dcfc3c148b9cc +RMD160 (claws-mail-3.11.1.tar.xz) = 6cdcae95d8c367da3d170dba55b9707b181fa723 +Size (claws-mail-3.11.1.tar.xz) = 6908772 bytes SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9 SHA1 (patch-ae) = f1991ef4e31bd6a7cbddf6655f489f72fb40308b SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691 -SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb SHA1 (patch-ah) = cdfd816669c0c1ae6dba0d97a6d1fe5a8c2e4626 -SHA1 (patch-ai) = 22b9ad0763ee3053f8b3082a639991b6574e6f65 +SHA1 (patch-ai) = e2da8ef08afc0543cbbd00b71720d0002f8b9faf SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5 SHA1 (patch-ca) = 6243d9a22cf7e9b355e53ce301069f84278c6274 SHA1 (patch-cb) = 41c8d3f48a22885854c5bef71558e38b60084e22 diff --git a/mail/claws-mail/patches/patch-ag b/mail/claws-mail/patches/patch-ag deleted file mode 100644 index 2820afae79f..00000000000 --- a/mail/claws-mail/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.7 2012/07/02 19:07:50 drochner Exp $ - ---- src/common/ssl.c.orig 2012-03-31 15:29:18.000000000 +0000 -+++ src/common/ssl.c -@@ -29,6 +29,7 @@ - #include <glib/gi18n.h> - #include <errno.h> - #include <pthread.h> -+#include <gnutls/gnutls.h> - - #if GNUTLS_VERSION_NUMBER <= 0x020b00 - #include <gcrypt.h> diff --git a/mail/claws-mail/patches/patch-ai b/mail/claws-mail/patches/patch-ai index 675906afba6..c9b6bac6ad1 100644 --- a/mail/claws-mail/patches/patch-ai +++ b/mail/claws-mail/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.1 2013/07/24 15:26:11 drochner Exp $ +$NetBSD: patch-ai,v 1.2 2015/04/03 12:34:44 nros Exp $ ---- src/Makefile.in.orig 2013-05-06 16:32:55.000000000 +0000 +--- src/Makefile.in.orig 2014-10-27 18:59:09.000000000 +0000 +++ src/Makefile.in -@@ -530,7 +530,7 @@ top_srcdir = @top_srcdir@ +@@ -614,7 +614,7 @@ top_srcdir = @top_srcdir@ @CLAWS_LIBETPAN_TRUE@etpan_dir = etpan @CLAWS_LIBETPAN_FALSE@etpan_library = @CLAWS_LIBETPAN_TRUE@etpan_library = etpan/libclawsetpan.la -SUBDIRS = common gtk $(etpan_dir) . plugins -+SUBDIRS = common gtk $(etpan_dir) . ++SUBDIRS = common gtk $(etpan_dir) . @PLATFORM_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \ - @PLATFORM_WIN32_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ + @PLATFORM_WIN32_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(IFLAGS) | \ @PLATFORM_WIN32_TRUE@ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` |