git: 5c903c910108 - main - mail/claws-mail*: Update 4.3.1 => 4.4.0, remove GTK2 option that use version 3.21.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Mar 2026 15:05:14 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5c903c910108f7789bfff37824660db2f7f72d13
commit 5c903c910108f7789bfff37824660db2f7f72d13
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-03-27 14:56:03 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-27 14:56:03 +0000
mail/claws-mail*: Update 4.3.1 => 4.4.0, remove GTK2 option that use version 3.21.0
Release Notes:
https://lists.claws-mail.org/pipermail/users/2026-March/034710.html
- Remove option GTK2 - GTK2 supported in 3.x only, but 3.x reached EoL.
- Make cosmetic improvements and cleanups.
PR: 293704
Approved by: Chris Hutchinson <portmaster@bsdforge.com> (maintainer)
Co-authored-by: Polarian <polarian@polarian.dev>
Co-authored-by: Chris Hutchinson <portmaster@bsdforge.com>
---
mail/claws-mail-acpi_notifier/Makefile | 2 +-
mail/claws-mail-fancy/Makefile | 13 +++---------
mail/claws-mail-keyword_warner/Makefile | 2 +-
mail/claws-mail-litehtml_viewer/Makefile | 1 -
mail/claws-mail-newmail/Makefile | 2 ++
mail/claws-mail-notification/Makefile | 15 +++++---------
mail/claws-mail-pgp/Makefile | 4 ++--
mail/claws-mail-plugins/Makefile | 6 ++++--
mail/claws-mail/Makefile | 12 ++++-------
mail/claws-mail/Makefile.claws | 35 ++++++++++++--------------------
mail/claws-mail/Makefile.ver | 11 +---------
mail/claws-mail/distinfo | 9 +++-----
mail/claws-mail/pkg-plist | 4 +---
13 files changed, 40 insertions(+), 76 deletions(-)
diff --git a/mail/claws-mail-acpi_notifier/Makefile b/mail/claws-mail-acpi_notifier/Makefile
index c5f695491c6b..2cc02f1dd516 100644
--- a/mail/claws-mail-acpi_notifier/Makefile
+++ b/mail/claws-mail-acpi_notifier/Makefile
@@ -5,5 +5,5 @@ WWW= https://www.claws-mail.org/plugin.php?plugin=acpinotifier
CLAWS_PLUGINS_BUILD= ${PORTNAME}
-.include "${.CURDIR}/../claws-mail/Makefile.claws"
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 0dde7e7c57de..147c48c55e9d 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -3,16 +3,9 @@ PORTNAME= fancy
COMMENT= Webkit based HTML renderer plugin for Claws Mail
WWW= https://www.claws-mail.org/plugins.php
-LIB_DEPENDS= libcurl.so:ftp/curl
-
-.include "../claws-mail/Makefile.ver"
-
-.if ${MASTER_OPTIONS:MGTK2}
-IGNORE= depends on www/webkit-gtk2, which has been removed
-.endif
-.if ${MASTER_OPTIONS:MGTK3}
-LIB_DEPENDS+= libwebkit2gtk-4.0.so:www/webkit2-gtk@40
-.endif
+LIB_DEPENDS= libcurl.so:ftp/curl \
+ libsoup-3.0.so:devel/libsoup3 \
+ libwebkit2gtk-4.1.so:www/webkit2-gtk@41
CLAWS_PLUGINS_BUILD= ${PORTNAME}
diff --git a/mail/claws-mail-keyword_warner/Makefile b/mail/claws-mail-keyword_warner/Makefile
index f0cbe9ac705e..a97b4e5125ab 100644
--- a/mail/claws-mail-keyword_warner/Makefile
+++ b/mail/claws-mail-keyword_warner/Makefile
@@ -5,5 +5,5 @@ WWW= https://www.claws-mail.org/plugins.php
CLAWS_PLUGINS_BUILD= ${PORTNAME}
-.include "${.CURDIR}/../claws-mail/Makefile.claws"
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-litehtml_viewer/Makefile b/mail/claws-mail-litehtml_viewer/Makefile
index 672b475ccd28..b66c1561dff7 100644
--- a/mail/claws-mail-litehtml_viewer/Makefile
+++ b/mail/claws-mail-litehtml_viewer/Makefile
@@ -1,5 +1,4 @@
PORTNAME= litehtml_viewer
-PORTREVISION= 1
COMMENT= Viewer plugin for HTML emails, using the litehtml library
WWW= https://www.claws-mail.org/plugins.php
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 94ae9a4c5000..95cd96a9c25e 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -5,5 +5,7 @@ WWW= https://www.claws-mail.org/plugins.php
CLAWS_PLUGINS_BUILD= ${PORTNAME}
+NO_GTK= yes
+
.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 0acd46e7bb1c..3ed5395225b5 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -3,16 +3,11 @@ PORTNAME= notification
COMMENT= New mail notification plugin for Claws Mail
WWW= https://www.claws-mail.org/plugin.php?plugin=notification
-LIB_DEPENDS= libnotify.so:devel/libnotify
-
-.include "../claws-mail/Makefile.ver"
-
-.if ${MASTER_OPTIONS:MGTK2}
-LIB_DEPENDS+= libcanberra-gtk.so:audio/libcanberra-gtk2
-.endif
-.if ${MASTER_OPTIONS:MGTK3}
-LIB_DEPENDS+= libcanberra-gtk3.so:audio/libcanberra-gtk3
-.endif
+LIB_DEPENDS= libnotify.so:devel/libnotify \
+ libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+ libcanberra.so:audio/libcanberra
+USES= xorg
+USE_XORG= x11
CLAWS_PLUGINS_BUILD= ${PORTNAME}
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index c814092f29aa..a3a72bcfc580 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -1,10 +1,10 @@
PORTNAME= pgp
-PORTREVISION= 1
COMMENT= PGP plugins for Claws Mail
WWW= https://www.claws-mail.org/plugin.php?plugin=gpg
-LIB_DEPENDS= libgpg-error.so:security/libgpg-error \
+LIB_DEPENDS= libenchant.so:textproc/enchant \
+ libgpg-error.so:security/libgpg-error \
libgpgme.so:security/gpgme
CLAWS_PLUGINS_BUILD= pgpcore pgpinline pgpmime smime
diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
index 83b091a315af..4c4a8a70f018 100644
--- a/mail/claws-mail-plugins/Makefile
+++ b/mail/claws-mail-plugins/Makefile
@@ -1,4 +1,5 @@
PORTNAME= claws-mail-plugins
+DISTVERSION= ${CLAWSVERSION}
CATEGORIES= mail news
MAINTAINER= portmaster@BSDforge.com
@@ -7,8 +8,8 @@ WWW= https://www.claws-mail.org/plugins.php
USES= metaport
-.include "${.CURDIR}/../claws-mail/Makefile.ver"
-.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
+.include "../claws-mail/Makefile.ver"
+.include "../claws-mail/Makefile.claws.plugins"
# pgpcore, pgpinline, pgpmime, smime
CLAWS_PLUGINS+= pgp
@@ -22,6 +23,7 @@ ${_addon:tu}_DESC!= ${MAKE} -C ../claws-mail-${_addon} -V COMMENT
. endif
. endif
.endfor
+OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
.include <bsd.port.options.mk>
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 0eb2494183a2..14d71af3cf0a 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,5 +1,4 @@
PORTNAME= claws-mail
-PORTREVISION= 1
CATEGORIES= mail news
COMMENT= Lightweight and featureful GTK based e-mail and news client
@@ -23,15 +22,11 @@ CPPFLAGS+= -DGDK_DISABLE_DEPRECATION_WARNINGS
OPTIONS_DEFINE= COMPFACE DEBUG DOCS ENCHANT IPV6 LDAP NLS STARTUP \
THEMES
-OPTIONS_DEFAULT= COMPFACE ENCHANT GTK2 STARTUP THEMES
-OPTIONS_RADIO= BRANCH
-OPTIONS_RADIO_BRANCH= GTK2 GTK3
+OPTIONS_DEFAULT= COMPFACE ENCHANT STARTUP THEMES
OPTIONS_SUB= yes
COMPFACE_DESC= X-Face support
ENCHANT_DESC= Spell checking support
-GTK2_DESC= Build GTK2+ release
-GTK3_DESC= Build GTK3+ release
STARTUP_DESC= Startup notification support
THEMES_DESC= Additional themes
@@ -48,13 +43,14 @@ IPV6_CONFIGURE_ENABLE= ipv6
LDAP_USES= ldap
LDAP_CONFIGURE_ENABLE= ldap
+NLS_USES= gettext-tools
+NLS_CONFIGURE_ENABLE= nls
+
STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
STARTUP_CONFIGURE_ENABLE= startup-notification
THEMES_RUN_DEPENDS= claws-mail-themes>0:x11-themes/claws-mail-themes
-.include <bsd.port.options.mk>
-MASTER_OPTIONS= ${PORT_OPTIONS}
.include "Makefile.claws"
post-patch:
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 9ad662ea94c0..571af97596f3 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,31 +1,22 @@
+DISTVERSION= ${CLAWSVERSION}
+PORTREVISION?= 0
CATEGORIES?= mail
MASTER_SITES= http://www.claws-mail.org/download.php?file=releases/
-MAINTAINER= portmaster@bsdforge.com
+MAINTAINER= portmaster@BSDforge.com
LICENSE= GPLv3
-USES+= gmake gnome iconv libtool pkgconfig tar:xz
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
-
-.include "${.CURDIR}/../claws-mail/Makefile.ver"
-
-.if ${MASTER_OPTIONS:MNLS}
-USES+= gettext
-CONFIGURE_ARGS+=--enable-nls
-.else
-CONFIGURE_ARGS+=--disable-nls
-.endif
-
-.if ${MASTER_OPTIONS:MGTK2}
-USE_GNOME+= gtk20
-.endif
-.if ${MASTER_OPTIONS:MGTK3}
+USES+= gmake iconv libtool pkgconfig tar:xz
+.if !defined(NO_GTK)
+USES+= gnome
USE_GNOME+= gtk30
.endif
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
-.include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
+.include "../claws-mail/Makefile.ver"
+.include "../claws-mail/Makefile.claws.plugins"
.for p in ${CLAWS_PLUGINS}
. if empty(CLAWS_PLUGINS_BUILD:M${p})
@@ -34,11 +25,11 @@ CONFIGURE_ARGS+= --disable-${p}-plugin
.endfor
.if defined(CLAWS_PLUGINS_BUILD)
-DISTNAME= claws-mail-${PORTVERSION}
+DISTNAME= claws-mail-${DISTVERSION}
PKGNAMEPREFIX= claws-mail-
-BUILD_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail
-RUN_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail
+BUILD_DEPENDS+= claws-mail>=${DISTVERSION}:mail/claws-mail
+RUN_DEPENDS+= claws-mail>=${DISTVERSION}:mail/claws-mail
DISTINFO_FILE= ${.CURDIR}/../claws-mail/distinfo
diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver
index 69843c7f3886..6b14f3d95cbd 100644
--- a/mail/claws-mail/Makefile.ver
+++ b/mail/claws-mail/Makefile.ver
@@ -1,10 +1 @@
-.if !defined(MASTER_OPTIONS)
-MASTER_OPTIONS!= ${MAKE} -C ${.CURDIR}/../claws-mail -V PORT_OPTIONS
-.endif
-
-.if ${MASTER_OPTIONS:MGTK2}
-PORTVERSION= 3.21.0
-.endif
-.if ${MASTER_OPTIONS:MGTK3}
-PORTVERSION= 4.3.1
-.endif
+CLAWSVERSION= 4.4.0
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 372dd320ddad..c60eac033ccc 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,6 +1,3 @@
-TIMESTAMP = 1718021837
-SHA256 (claws-mail-3.21.0.tar.xz) = 333f3ac1b6c98542098678d8606583da4adfc7439eb4e81043f7675b45e91a96
-SIZE (claws-mail-3.21.0.tar.xz) = 6848648
-TIMESTAMP = 1718021875
-SHA256 (claws-mail-4.3.1.tar.xz) = d8adf210c767ab58252dfc5ab3c69e603d7ffdb7281a1e3340d2d86062f468a6
-SIZE (claws-mail-4.3.1.tar.xz) = 6782236
+TIMESTAMP = 1773435929
+SHA256 (claws-mail-4.4.0.tar.xz) = 03e0549d5f0fcd7a59804186524105d05ebb5e534d42a4b86a9a90f729ca255b
+SIZE (claws-mail-4.4.0.tar.xz) = 6723204
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index cb37a503a94d..d058751cd542 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -97,7 +97,6 @@ include/claws-mail/gtk/about.h
include/claws-mail/gtk/authors.h
include/claws-mail/gtk/claws-marshal.h
include/claws-mail/gtk/colorlabel.h
-%%GTK2%%include/claws-mail/gtk/colorsel.h
include/claws-mail/gtk/combobox.h
include/claws-mail/gtk/description_window.h
include/claws-mail/gtk/filesel.h
@@ -105,7 +104,6 @@ include/claws-mail/gtk/foldersort.h
include/claws-mail/gtk/gtkaspell.h
include/claws-mail/gtk/gtkcmclist.h
include/claws-mail/gtk/gtkcmctree.h
-%%GTK2%%include/claws-mail/gtk/gtkcmoptionmenu.h
include/claws-mail/gtk/gtksctree.h
include/claws-mail/gtk/gtkshruler.h
include/claws-mail/gtk/gtkunit.h
@@ -234,7 +232,6 @@ lib/claws-mail/plugins/pgpinline.deps
lib/claws-mail/plugins/pgpmime.deps
lib/claws-mail/plugins/smime.deps
libdata/pkgconfig/claws-mail.pc
-share/man/man1/claws-mail.1.gz
share/applications/claws-mail.desktop
%%DATADIR%%/acroread2claws-mail.pl
%%DATADIR%%/calypso_convert.pl
@@ -300,3 +297,4 @@ share/icons/hicolor/64x64/apps/claws-mail.png
%%NLS%%share/locale/sv/LC_MESSAGES/claws-mail.mo
%%NLS%%share/locale/tr/LC_MESSAGES/claws-mail.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
+share/man/man1/claws-mail.1.gz