diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index c0af49673fbd..8ab9f7ca324d 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -1,48 +1,51 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
 
 PORTNAME=	gmime
 PORTVERSION=	2.4.33
 PORTREVISION?=	3
 CATEGORIES?=	mail
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	24
 
 MAINTAINER?=	bofh@FreeBSD.org
 COMMENT?=	Library (written in C) for parsing and creating messages using MIME
 
 LICENSE=	LGPL21
 
+DEPRECATED=	Use mail/gmime26 or mail/gmime30
+EXPIRATION_DATE=2021-11-30
+
 CONFLICTS=	gmime-1.0.*
 
 SLAVEDIRS=	mail/gmime2-sharp
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
 USES+=		gmake gnome iconv libtool pathfix pkgconfig tar:xz
 USE_GNOME?=	glib20
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 # www.freebsd.org/cgi/query-pr.cgi?pr=118092
 # Rename uudecode and uuencode to gmime-* to not conflict with userland
 # fix kept in case issue returns
 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
 		--enable-mono=no \
 		--program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/*/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in docs/reference/html/*
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/gmime24/files/patch-docs_Makefile.in b/mail/gmime24/files/patch-docs_Makefile.in
index 58d60ad4e11e..83804db975a7 100644
--- a/mail/gmime24/files/patch-docs_Makefile.in
+++ b/mail/gmime24/files/patch-docs_Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig
+--- docs/Makefile.in.orig	2021-10-14 17:45:21 UTC
 +++ docs/Makefile.in
-@@ -201,7 +201,7 @@
- target_alias = @target_alias@
+@@ -249,7 +249,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = reference tutorial
 +SUBDIRS = 
  EXTRA_DIST = gtkdocs_fix
  all: all-recursive
  
diff --git a/mail/gmime24/files/patch-gmime-2.4.pc.in b/mail/gmime24/files/patch-gmime-2.4.pc.in
index 1192ad41e49c..5c4b0b3b9ccd 100644
--- a/mail/gmime24/files/patch-gmime-2.4.pc.in
+++ b/mail/gmime24/files/patch-gmime-2.4.pc.in
@@ -1,10 +1,11 @@
---- gmime-2.4.pc.in.orig	Tue May  3 19:34:20 2005
-+++ gmime-2.4.pc.in	Wed Feb  1 00:51:53 2006
-@@ -7,6 +7,6 @@
+--- gmime-2.4.pc.in.orig	2010-12-05 16:19:53 UTC
++++ gmime-2.4.pc.in
+@@ -7,7 +7,7 @@ includedir=@includedir@
  Name: GMime
  Version: @VERSION@
  Description: MIME parser and utility library
 -Requires: glib-2.0,gobject-2.0
 +Requires: glib-2.0,gobject-2.0,gthread-2.0
- Libs: -L${libdir} @GMIME_LIBS@ @LIBS@
- Cflags: -I${includedir}/gmime-2.0 @GMIME_CFLAGS@
+ Libs.private: @GMIME_LIBS_PRIVATE@
+ Libs: -L${libdir} @GMIME_LIBS@
+ Cflags: -I${includedir}/gmime-@GMIME_API_VERSION@ @GMIME_CFLAGS@
diff --git a/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in b/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in
index 3074a8c5db5c..d30e26c8907c 100644
--- a/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in
+++ b/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in
@@ -1,7 +1,7 @@
---- mono/gmime-sharp.dll.config.in.orig
+--- mono/gmime-sharp.dll.config.in.orig	2011-03-15 23:36:00 UTC
 +++ mono/gmime-sharp.dll.config.in
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="gmime" target="libgmime-@GMIME_API_VERSION@.so.@GMIME_MAJOR_VERSION@"/>
 +  <dllmap dll="gmime" target="libgmime-@GMIME_API_VERSION@.so"/>
  </configuration>
diff --git a/mail/gmime24/files/patch-tests__test-mbox.c b/mail/gmime24/files/patch-tests__test-mbox.c
index bba86048372d..9e5d204b0a1c 100644
--- a/mail/gmime24/files/patch-tests__test-mbox.c
+++ b/mail/gmime24/files/patch-tests__test-mbox.c
@@ -1,10 +1,10 @@
---- tests/test-mbox.c.orig	Mon Feb 12 15:48:22 2007
-+++ tests/test-mbox.c	Mon Feb 12 15:48:54 2007
-@@ -26,6 +26,7 @@
+--- tests/test-mbox.c.orig	2012-10-22 06:07:54 UTC
++++ tests/test-mbox.c
+@@ -32,6 +32,7 @@
  #include <fcntl.h>
  #include <time.h>
  
 +#include <config.h>
  #include <gmime/gmime.h>
  
- #ifndef G_OS_WIN32
+ #include "testsuite.h"
diff --git a/mail/gmime24/files/patch-tests__test-mime.c b/mail/gmime24/files/patch-tests__test-mime.c
index 35067da0afa6..218e07ce1dbb 100644
--- a/mail/gmime24/files/patch-tests__test-mime.c
+++ b/mail/gmime24/files/patch-tests__test-mime.c
@@ -1,10 +1,10 @@
---- tests/test-mime.c.orig	Mon Feb 12 15:48:32 2007
-+++ tests/test-mime.c	Mon Feb 12 15:49:04 2007
-@@ -21,6 +21,7 @@
- #include <stdio.h>
+--- tests/test-mime.c.orig	2011-12-24 00:37:46 UTC
++++ tests/test-mime.c
+@@ -27,6 +27,7 @@
  #include <string.h>
+ #include <ctype.h>
  
 +#include <config.h>
  #include <gmime/gmime.h>
  
- #ifndef G_OS_WIN32
+ #include "testsuite.h"
diff --git a/mail/gmime24/files/patch-tests__test-parser.c b/mail/gmime24/files/patch-tests__test-parser.c
index a408ff684cfe..8cf1d14d4658 100644
--- a/mail/gmime24/files/patch-tests__test-parser.c
+++ b/mail/gmime24/files/patch-tests__test-parser.c
@@ -1,10 +1,10 @@
---- tests/test-parser.c.orig	Mon Feb 12 15:48:38 2007
-+++ tests/test-parser.c	Mon Feb 12 15:49:14 2007
-@@ -26,6 +26,7 @@
+--- tests/test-parser.c.orig	2011-08-09 02:23:26 UTC
++++ tests/test-parser.c
+@@ -30,6 +30,7 @@
  #include <fcntl.h>
  #include <time.h>
  
 +#include <config.h>
  #include <gmime/gmime.h>
  
- #ifndef G_OS_WIN32
+ #if !defined (G_OS_WIN32) || defined (__MINGW32__)