Tue Jul 13 12:35:12 2021 UTC ()
claws-mail: update to 4.0.0.

This is the first release using gtk3.


(nia)
diff -r1.118 -r1.119 pkgsrc/mail/claws-mail/Makefile
diff -r1.23 -r1.24 pkgsrc/mail/claws-mail/Makefile.common
diff -r1.26 -r1.27 pkgsrc/mail/claws-mail/Makefile.vers
diff -r1.29 -r1.30 pkgsrc/mail/claws-mail/PLIST
diff -r1.35 -r1.36 pkgsrc/mail/claws-mail/distinfo
diff -r1.78 -r1.79 pkgsrc/mail/claws-mail-archive/Makefile
diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-attachwarner/Makefile
diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-attremover/Makefile
diff -r1.74 -r1.75 pkgsrc/mail/claws-mail-bogofilter/Makefile
diff -r0 -r1.1 pkgsrc/mail/claws-mail-dillo/DESCR
diff -r0 -r1.1 pkgsrc/mail/claws-mail-dillo/Makefile
diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-fetchinfo/Makefile
diff -r0 -r1.1 pkgsrc/mail/claws-mail-libravatar/DESCR
diff -r0 -r1.1 pkgsrc/mail/claws-mail-libravatar/Makefile
diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-mailmbox/Makefile
diff -r1.40 -r1.41 pkgsrc/mail/claws-mail-managesieve/Makefile
diff -r1.82 -r1.83 pkgsrc/mail/claws-mail-newmail/Makefile
diff -r1.83 -r1.84 pkgsrc/mail/claws-mail-notification/Makefile
diff -r1.83 -r1.84 pkgsrc/mail/claws-mail-pgpcore/Makefile
diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-pgpinline/Makefile
diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-pgpmime/Makefile
diff -r1.91 -r1.92 pkgsrc/mail/claws-mail-rssyl/Makefile
diff -r1.84 -r1.85 pkgsrc/mail/claws-mail-smime/Makefile
diff -r1.73 -r1.74 pkgsrc/mail/claws-mail-spamassassin/Makefile
diff -r1.86 -r1.87 pkgsrc/mail/claws-mail-spamreport/Makefile
diff -r1.82 -r1.83 pkgsrc/mail/claws-mail-tnef/Makefile
diff -r1.99 -r1.100 pkgsrc/mail/claws-mail-vcalendar/Makefile
diff -r1.2 -r0 pkgsrc/mail/claws-mail/patches/patch-ab
diff -r1.4 -r0 pkgsrc/mail/claws-mail/patches/patch-af
diff -r1.3 -r0 pkgsrc/mail/claws-mail/patches/patch-ai
diff -r1.5 -r0 pkgsrc/mail/claws-mail/patches/patch-ca
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-po_Makefile.in.in
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-src_Makefile.in
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-src_plugins_vcalendar_vcal__folder.c
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-src_prefs__other.c

cvs diff -r1.118 -r1.119 pkgsrc/mail/claws-mail/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail/Makefile 2021/07/13 08:44:11 1.118
+++ pkgsrc/mail/claws-mail/Makefile 2021/07/13 12:35:09 1.119
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2021/07/13 08:44:11 nia Exp $
+# $NetBSD: Makefile,v 1.119 2021/07/13 12:35:09 nia Exp $
 
 INSTALLATION_DIRS+=	${EGDIR}
 INSTALLATION_DIRS+=	share/claws-mail
@@ -51,7 +51,7 @@
 .include "options.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .if "${OPSYS}" != "Darwin"
 .include "../../x11/startup-notification/buildlink3.mk"
 .endif

cvs diff -r1.23 -r1.24 pkgsrc/mail/claws-mail/Makefile.common (expand / switch to context diff)
--- pkgsrc/mail/claws-mail/Makefile.common 2020/12/08 09:22:14 1.23
+++ pkgsrc/mail/claws-mail/Makefile.common 2021/07/13 12:35:09 1.24
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2020/12/08 09:22:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.24 2021/07/13 12:35:09 nia Exp $
 
 # used by mail/claws-mail/plugins.mk
 
@@ -43,9 +43,11 @@
 CONFIGURE_ARGS+=	--disable-attachwarner-plugin
 CONFIGURE_ARGS+=	--disable-bsfilter-plugin
 CONFIGURE_ARGS+=	--disable-clamd-plugin
+CONFIGURE_ARGS+=	--disable-dillo-plugin
 CONFIGURE_ARGS+=	--disable-fancy-plugin
 CONFIGURE_ARGS+=	--disable-fetchinfo-plugin
 CONFIGURE_ARGS+=	--disable-gdata-plugin
+CONFIGURE_ARGS+=	--disable-libravatar-plugin
 CONFIGURE_ARGS+=	--disable-litehtml_viewer-plugin
 CONFIGURE_ARGS+=	--disable-mailmbox-plugin
 CONFIGURE_ARGS+=	--disable-managesieve-plugin
@@ -65,4 +67,4 @@
 #.include "../../net/libsoup/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/enchant2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"

cvs diff -r1.26 -r1.27 pkgsrc/mail/claws-mail/Makefile.vers (expand / switch to context diff)
--- pkgsrc/mail/claws-mail/Makefile.vers 2020/11/26 15:06:35 1.26
+++ pkgsrc/mail/claws-mail/Makefile.vers 2021/07/13 12:35:09 1.27
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.vers,v 1.26 2020/11/26 15:06:35 nia Exp $
+# $NetBSD: Makefile.vers,v 1.27 2021/07/13 12:35:09 nia Exp $
 #
-CLAWS_VERSION=	3.17.8
+CLAWS_VERSION=	4.0.0

cvs diff -r1.29 -r1.30 pkgsrc/mail/claws-mail/PLIST (expand / switch to context diff)
--- pkgsrc/mail/claws-mail/PLIST 2020/12/07 11:27:33 1.29
+++ pkgsrc/mail/claws-mail/PLIST 2021/07/13 12:35:09 1.30
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2020/12/07 11:27:33 nia Exp $
+@comment $NetBSD: PLIST,v 1.30 2021/07/13 12:35:09 nia Exp $
 bin/claws-mail
 include/claws-mail/account.h
 include/claws-mail/action.h
@@ -106,7 +106,6 @@
 include/claws-mail/gtk/gtkaspell.h
 include/claws-mail/gtk/gtkcmclist.h
 include/claws-mail/gtk/gtkcmctree.h
-include/claws-mail/gtk/gtkcmoptionmenu.h
 include/claws-mail/gtk/gtksctree.h
 include/claws-mail/gtk/gtkshruler.h
 include/claws-mail/gtk/gtkunit.h
@@ -162,6 +161,7 @@
 include/claws-mail/news.h
 include/claws-mail/news_gtk.h
 include/claws-mail/noticeview.h
+include/claws-mail/oauth2.h
 include/claws-mail/partial_download.h
 include/claws-mail/password.h
 include/claws-mail/password_gtk.h
@@ -254,7 +254,6 @@
 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
-share/locale/pt_PT/LC_MESSAGES/claws-mail.mo
 share/locale/ro/LC_MESSAGES/claws-mail.mo
 share/locale/ru/LC_MESSAGES/claws-mail.mo
 share/locale/sk/LC_MESSAGES/claws-mail.mo

cvs diff -r1.35 -r1.36 pkgsrc/mail/claws-mail/distinfo (expand / switch to context diff)
--- pkgsrc/mail/claws-mail/distinfo 2020/11/26 15:06:35 1.35
+++ pkgsrc/mail/claws-mail/distinfo 2021/07/13 12:35:09 1.36
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.35 2020/11/26 15:06:35 nia Exp $
+$NetBSD: distinfo,v 1.36 2021/07/13 12:35:09 nia Exp $
 
-SHA1 (claws-mail-3.17.8.tar.xz) = 6e14cca60a1a0e47ccc071f0cababb2dd1a6ab22
-RMD160 (claws-mail-3.17.8.tar.xz) = 550256d32db8ea2e9c450f20febe7d4e391b193c
-SHA512 (claws-mail-3.17.8.tar.xz) = dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
-Size (claws-mail-3.17.8.tar.xz) = 6435692 bytes
-SHA1 (patch-ab) = d1c89842cedad037c9ac3836da630244fe8ff9c9
-SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
-SHA1 (patch-ai) = f70a8b1e4f169740f90707b4c9b05851196c9323
-SHA1 (patch-ca) = 03d632bb8856acc6d3b7067d58942f69c91e141e
+SHA1 (claws-mail-4.0.0.tar.xz) = b4befc25649a28e89274ba72b50e9f9f66bf09b6
+RMD160 (claws-mail-4.0.0.tar.xz) = 4025b64ac0e78fe3d1687cdf8a47a52ce6c147c9
+SHA512 (claws-mail-4.0.0.tar.xz) = 26d207fb8b5ce8b814a8a712843a209f58c8c9df3e9623387322b2e70ac351c71ac8b1ff77c52c5df9a14a46be7f65413efc0a4dbcda1e70ecb453f042da153e
+Size (claws-mail-4.0.0.tar.xz) = 6390300 bytes
+SHA1 (patch-po_Makefile.in.in) = 88cb5106595d2959f31d7825b7474861281b290c
+SHA1 (patch-src_Makefile.in) = 8e8cc2d08ab640aa51c6a761bb8913f518d1ad65
 SHA1 (patch-src_common_unmime.c) = b572895a8a3be4d6d78b34f6466cc2e80fa9d96f
 SHA1 (patch-src_plugins_pgpcore_sgpgme.c) = 1e972ddb501655ae347c35e623ccb4694776cf3e
+SHA1 (patch-src_plugins_vcalendar_vcal__folder.c) = 41978f0e0e390e3665fd92c5200b04ec06aa3e9d
+SHA1 (patch-src_prefs__other.c) = 871782f31872ec459598caa667b6cb518f7a8b35

cvs diff -r1.78 -r1.79 pkgsrc/mail/claws-mail-archive/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-archive/Makefile 2021/05/24 19:52:36 1.78
+++ pkgsrc/mail/claws-mail-archive/Makefile 2021/07/13 12:35:09 1.79
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2021/05/24 19:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2021/07/13 12:35:09 nia Exp $
 #
 
 PLUGIN_NAME=    archive
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-attachwarner/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-attachwarner/Makefile 2021/05/24 19:52:37 1.81
+++ pkgsrc/mail/claws-mail-attachwarner/Makefile 2021/07/13 12:35:09 1.82
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2021/07/13 12:35:09 nia Exp $
 #
 
 PLUGIN_NAME=    attachwarner
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-attremover/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-attremover/Makefile 2021/05/24 19:52:37 1.80
+++ pkgsrc/mail/claws-mail-attremover/Makefile 2021/07/13 12:35:09 1.81
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2021/07/13 12:35:09 nia Exp $
 #
 
 PLUGIN_NAME=    att_remover
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.74 -r1.75 pkgsrc/mail/claws-mail-bogofilter/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-bogofilter/Makefile 2021/05/24 19:52:37 1.74
+++ pkgsrc/mail/claws-mail-bogofilter/Makefile 2021/07/13 12:35:09 1.75
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2021/07/13 12:35:09 nia Exp $
 #
 
 PLUGIN_NAME=	bogofilter
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

File Added: pkgsrc/mail/claws-mail-dillo/DESCR
Enables the viewing of html messages using the Dillo web browser, version
3.0.0 or newer. It uses Dillo's --local option by default for safe browsing.

File Added: pkgsrc/mail/claws-mail-dillo/Makefile
# $NetBSD: Makefile,v 1.1 2021/07/13 12:35:10 nia Exp $
#

PLUGIN_NAME=    dillo

.include "../../mail/claws-mail/plugins.mk"

MAINTAINER=	pkgsrc-users@NetBSD.org
COMMENT=	Enables viewing HTML messages using the Dillo web browser

DEPENDS+=	dillo-[0-9]*:../../www/dillo

TOOLS_BROKEN+=		perl
CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin

DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail

.include "../../mk/bsd.pkg.mk"

cvs diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-fetchinfo/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-fetchinfo/Makefile 2021/05/24 19:52:37 1.81
+++ pkgsrc/mail/claws-mail-fetchinfo/Makefile 2021/07/13 12:35:10 1.82
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2021/07/13 12:35:10 nia Exp $
 #
 
 PLUGIN_NAME=    fetchinfo
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

File Added: pkgsrc/mail/claws-mail-libravatar/DESCR
Displays libravatar/gravatar profiles' images or a dynamically generated or
predefined alternative. Libravatar federated user domains are also supported.

File Added: pkgsrc/mail/claws-mail-libravatar/Makefile
# $NetBSD: Makefile,v 1.1 2021/07/13 12:35:10 nia Exp $
#

PLUGIN_NAME=    libravatar

.include "../../mail/claws-mail/plugins.mk"

MAINTAINER=	pkgsrc-users@NetBSD.org
COMMENT=	Displays libravatar/gravatar profile images

TOOLS_BROKEN+=		perl
CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin

DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail

.include "../../mk/bsd.pkg.mk"

cvs diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-mailmbox/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-mailmbox/Makefile 2021/05/24 19:52:37 1.80
+++ pkgsrc/mail/claws-mail-mailmbox/Makefile 2021/07/13 12:35:10 1.81
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2021/07/13 12:35:10 nia Exp $
 #
 
 PLUGIN_NAME=    mailmbox
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.40 -r1.41 pkgsrc/mail/claws-mail-managesieve/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-managesieve/Makefile 2021/05/24 19:52:37 1.40
+++ pkgsrc/mail/claws-mail-managesieve/Makefile 2021/07/13 12:35:10 1.41
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2021/07/13 12:35:10 nia Exp $
 #
 
 PLUGIN_NAME=    managesieve
 
-PKGREVISION= 5
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.82 -r1.83 pkgsrc/mail/claws-mail-newmail/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-newmail/Makefile 2021/05/24 19:52:37 1.82
+++ pkgsrc/mail/claws-mail-newmail/Makefile 2021/07/13 12:35:10 1.83
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2021/07/13 12:35:10 nia Exp $
 #
 
 PLUGIN_NAME=    newmail
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.83 -r1.84 pkgsrc/mail/claws-mail-notification/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-notification/Makefile 2021/05/24 19:52:37 1.83
+++ pkgsrc/mail/claws-mail-notification/Makefile 2021/07/13 12:35:10 1.84
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2021/05/24 19:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2021/07/13 12:35:10 nia Exp $
 #
 
 PLUGIN_NAME=    notification
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.83 -r1.84 pkgsrc/mail/claws-mail-pgpcore/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-pgpcore/Makefile 2021/05/24 19:52:38 1.83
+++ pkgsrc/mail/claws-mail-pgpcore/Makefile 2021/07/13 12:35:11 1.84
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=	pgpcore
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.81 -r1.82 pkgsrc/mail/claws-mail-pgpinline/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-pgpinline/Makefile 2021/04/21 13:24:57 1.81
+++ pkgsrc/mail/claws-mail-pgpinline/Makefile 2021/07/13 12:35:11 1.82
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2021/04/21 13:24:57 adam Exp $
+# $NetBSD: Makefile,v 1.82 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=	pgpinline
 
-PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,6 +16,4 @@
 PLIST_SRC+=	PLIST
 
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.80 -r1.81 pkgsrc/mail/claws-mail-pgpmime/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-pgpmime/Makefile 2021/04/21 13:24:57 1.80
+++ pkgsrc/mail/claws-mail-pgpmime/Makefile 2021/07/13 12:35:11 1.81
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2021/04/21 13:24:57 adam Exp $
+# $NetBSD: Makefile,v 1.81 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=	pgpmime
 
-PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.91 -r1.92 pkgsrc/mail/claws-mail-rssyl/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-rssyl/Makefile 2021/05/24 19:52:38 1.91
+++ pkgsrc/mail/claws-mail-rssyl/Makefile 2021/07/13 12:35:11 1.92
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=    rssyl
 
-PKGREVISION= 3
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.84 -r1.85 pkgsrc/mail/claws-mail-smime/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-smime/Makefile 2021/04/21 13:24:57 1.84
+++ pkgsrc/mail/claws-mail-smime/Makefile 2021/07/13 12:35:11 1.85
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2021/04/21 13:24:57 adam Exp $
+# $NetBSD: Makefile,v 1.85 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=	smime
 
-PKGREVISION= 1
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.73 -r1.74 pkgsrc/mail/claws-mail-spamassassin/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-spamassassin/Makefile 2021/05/24 19:52:38 1.73
+++ pkgsrc/mail/claws-mail-spamassassin/Makefile 2021/07/13 12:35:11 1.74
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2021/07/13 12:35:11 nia Exp $
 #
 
 PLUGIN_NAME=	spamassassin
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.86 -r1.87 pkgsrc/mail/claws-mail-spamreport/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-spamreport/Makefile 2021/05/24 19:52:38 1.86
+++ pkgsrc/mail/claws-mail-spamreport/Makefile 2021/07/13 12:35:12 1.87
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.86 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2021/07/13 12:35:12 nia Exp $
 #
 
 PLUGIN_NAME=		spam_report
 PLUGIN_FILE=		spamreport
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

cvs diff -r1.82 -r1.83 pkgsrc/mail/claws-mail-tnef/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-tnef/Makefile 2021/05/24 19:52:38 1.82
+++ pkgsrc/mail/claws-mail-tnef/Makefile 2021/07/13 12:35:12 1.83
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2021/07/13 12:35:12 nia Exp $
 #
 
 PLUGIN_NAME=    tnef_parse
 
-PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,5 +14,4 @@
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mail/libytnef/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

cvs diff -r1.99 -r1.100 pkgsrc/mail/claws-mail-vcalendar/Makefile (expand / switch to context diff)
--- pkgsrc/mail/claws-mail-vcalendar/Makefile 2021/05/24 19:52:38 1.99
+++ pkgsrc/mail/claws-mail-vcalendar/Makefile 2021/07/13 12:35:12 1.100
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2021/05/24 19:52:38 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2021/07/13 12:35:12 nia Exp $
 #
 
 PLUGIN_NAME=    vcalendar
 
-PKGREVISION= 3
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

File Deleted: pkgsrc/mail/claws-mail/patches/Attic/patch-ab

File Deleted: pkgsrc/mail/claws-mail/patches/Attic/patch-af

File Deleted: pkgsrc/mail/claws-mail/patches/Attic/patch-ai

File Deleted: pkgsrc/mail/claws-mail/patches/Attic/patch-ca

File Added: pkgsrc/mail/claws-mail/patches/patch-po_Makefile.in.in
$NetBSD: patch-po_Makefile.in.in,v 1.1 2021/07/13 12:35:09 nia Exp $

--- po/Makefile.in.in.orig	2021-07-10 08:47:06.000000000 +0000
+++ po/Makefile.in.in
@@ -40,8 +40,8 @@ INSTALL_DATA = @INSTALL_DATA@
 # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
+mkinstalldirs = @install_sh@ -d
+install_sh = @install_sh@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 

File Added: pkgsrc/mail/claws-mail/patches/patch-src_Makefile.in
$NetBSD: patch-src_Makefile.in,v 1.1 2021/07/13 12:35:09 nia Exp $

--- src/Makefile.in.orig	2021-07-10 08:51:54.000000000 +0000
+++ src/Makefile.in
@@ -729,7 +729,7 @@ unity_LIBS = @unity_LIBS@
 @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 $(am__append_1)
+SUBDIRS = common gtk $(etpan_dir) . $(am__append_1)
 @BUILD_TESTS_TRUE@GTESTER = gtester
 @BUILD_TESTS_TRUE@GTESTER_REPORT = gtester-report
 

File Added: pkgsrc/mail/claws-mail/patches/patch-src_plugins_vcalendar_vcal__folder.c
$NetBSD: patch-src_plugins_vcalendar_vcal__folder.c,v 1.1 2021/07/13 12:35:09 nia Exp $

--- src/plugins/vcalendar/vcal_folder.c.orig	2021-07-10 08:47:14.000000000 +0000
+++ src/plugins/vcalendar/vcal_folder.c
@@ -778,7 +778,7 @@ GSList *vcal_get_events_list(FolderItem 
         			struct icaltimetype dtstart;
         			struct icaltimetype next;
         			icalrecur_iterator* ritr;
-				time_t duration = (time_t) NULL;
+				time_t duration = (time_t) 0;
 				struct icaldurationtype ical_dur;
 				int i = 0;
 

File Added: pkgsrc/mail/claws-mail/patches/patch-src_prefs__other.c
$NetBSD: patch-src_prefs__other.c,v 1.1 2021/07/13 12:35:09 nia Exp $

--- src/prefs_other.c.orig	2021-07-10 08:47:08.000000000 +0000
+++ src/prefs_other.c
@@ -582,7 +582,7 @@ static void prefs_other_create_widget(Pr
 	PACK_CHECK_BUTTON (vbox2, checkbtn_askonfilter,
 			   _("Ask about account specific filtering rules when "
 			     "filtering manually"));
-	shred_binary = g_find_program_in_path("shred");
+	shred_binary = g_find_program_in_path("claws-mail-shred");
 	if (shred_binary) {
 		PACK_CHECK_BUTTON (vbox2, checkbtn_use_shred,
 				   _("Use secure file deletion if possible"));