diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 6ea04806096c..484539c8c320 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,42 +1,46 @@
 PORTNAME=	mailsync
 PORTVERSION=	5.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Keeps collection of mailboxes synchronized
 WWW=		https://mailsync.sourceforge.net/
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libc-client4.so:mail/cclient
+DEPRECATED=	Depends on outdated mail/cclient
+EXPIRATION_DATE=	2023-12-16
+
+LIB_DEPENDS=	libc-client.so:mail/panda-cclient
 
 USES=		autoreconf gmake ssl
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-c-client=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS NEWS README \
 		THANKS TODO ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ABSTRACT HACKING \
 		mail_open_close_flowchart.dia \
 		mail_open_close_flowchart.svg \
 		mail_open_close_flowchart2.svg ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4 b/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4
index d1ae01083795..c2aa47061184 100644
--- a/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4
+++ b/mail/mailsync/files/patch-acinclude_ac__with__cclient.m4
@@ -1,54 +1,54 @@
 FreeBSD sh(1) does not support the Brace Expansion.
 
 --- acinclude/ac_with_cclient.m4.orig	2018-05-22 07:37:52 UTC
 +++ acinclude/ac_with_cclient.m4
 @@ -3,7 +3,7 @@ dnl Output:
  dnl AC_SUBST: @CCLIENT_INCLUDES@ @CCLIENT_LIBS@ @CCLIENT_CXXFLAGS@
  dnl AM_CONDITIONAL: HAVE_CCLIENT
  AC_DEFUN(AC_WITH_CCLIENT,[
 - CCLIENTLOCATIONS="/usr,/usr/local"
 + CCLIENTLOCATIONS=""
   HAVE_CCLIENT="no"
   CCLIENT_LIBS=""
   CCLIENT_INCLUDES=""
 @@ -16,7 +16,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[
     if test "$withval" = "no" ; then
      CCLIENTLOCATIONS=""
     else
 -    test "$withval" = "yes" || CCLIENTLOCATIONS="$withval,${CCLIENTLOCATIONS}"
 +    test "$withval" = "yes" || CCLIENTLOCATIONS="$withval"
     fi
    ]
   )
 @@ -28,7 +28,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[
    dnl Looking for headers c-client headers
    dnl
     AC_MSG_CHECKING([for c-client.h])
 -  for p in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/include/c-client,/include,/include/imap}"` ; do
 +  p=${CCLIENTLOCATIONS}/include/c-client
     if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then
      CCLIENT_INCLUDES="-I${p}"
      CCLIENT_LINKAGE_H="${p}/linkage.h"
 @@ -36,7 +36,6 @@ AC_DEFUN(AC_WITH_CCLIENT,[
      AC_MSG_RESULT([found in ${p}])
      break
     fi
 -  done
    if test -z "${CCLIENT_INCLUDES}" ; then
     AC_MSG_RESULT([not found])
     ifelse([$2], , :, [$2])
 @@ -48,13 +47,12 @@ AC_DEFUN(AC_WITH_CCLIENT,[
     dnl Looking for c-client libraries
     dnl
     AC_MSG_CHECKING([for c-client library])
 -   for l in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/lib,/lib64}/{libc-client,libc-client4,c-client}{${SOP}}"` ; do
-+   l=${CCLIENTLOCATIONS}/lib/libc-client4.so
++   l=${CCLIENTLOCATIONS}/lib/libc-client.so
      if test -r "$l" ; then
       AC_MSG_RESULT([found ${l}])
       CCLIENT_LIBS="$l"
       break
      fi
 -   done
     if test -z "${CCLIENT_LIBS}" ; then
      AC_MSG_RESULT([not found])
      ifelse([$2], , :, [$2])