diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index ba14385dc538..f20ebd934f47 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	websieve
 PORTVERSION=	0.63.a
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${SIEVEVERSION}
 DISTNAME?=	${PORTNAME}-${SIEVEVERSION}
@@ -17,56 +17,34 @@ SIEVEVERSION=	${PORTVERSION:S/.//g}
 USES=		cpe perl5 shebangfix
 CPE_VENDOR=	${PORTNAME}_project
 USE_PERL5=	run
+
 SHEBANG_FILES=	websieve.pl
 
-NO_BUILD=	yes
 NO_ARCH=	yes
-
-OPTIONS_SINGLE=	TYPE
-OPTIONS_SINGLE_TYPE=	PERL CYRUS
-OPTIONS_RADIO=	CYRDEP
-OPTIONS_RADIO_CYRDEP=	CYRUS_IMAPD_23 CYRUS_IMAPD_24 CYRUS_IMAPD_25 \
-			CYRUS_IMAPD_30
-OPTIONS_DEFAULT=	CYRUS CYRUS_IMAPD_24
-
-TYPE_DESC=	Choose which sieve backend to use
-PERL_DESC=	Depend on generic Perl modules
-CYRUS_DESC=	Depend on Cyrus IMAPd Perl modules
-CYRDEP_DESC=	Which version of Cyrus IMAPd to depend on
-CYRUS_IMAPD_23_DESC=	Cyrus IMAPd version 2.3.x
-CYRUS_IMAPD_24_DESC=	Cyrus IMAPd version 2.4.x
-CYRUS_IMAPD_25_DESC=	Cyrus IMAPd version 2.5.x
-CYRUS_IMAPD_30_DESC=	Cyrus IMAPd version 3.0.x
-
-CYRUS_IMAPD_30_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30
-CYRUS_IMAPD_25_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd25
-CYRUS_IMAPD_24_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd24
-CYRUS_IMAPD_23_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd23
-
-PERL_RUN_DEPENDS=	p5-IMAP-Admin>=0:mail/p5-IMAP-Admin \
-			p5-IMAP-Sieve>=0:mail/p5-IMAP-Sieve
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCYRUS}
-FUNCLIB_PL=	funclib.cyrus
-.else
-FUNCLIB_PL=	funclib.pl
-.endif
-
+NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
-_check-config: my-check-config
-my-check-config:
-.if ${PORT_OPTIONS:MPERL}
-.if !empty(PORT_OPTIONS:MCYRUS_IMAPD_23) || \
-    !empty(PORT_OPTIONS:MCYRUS_IMAPD_24) || \
-    !empty(PORT_OPTIONS:MCYRUS_IMAPD_25) || \
-    !empty(PORT_OPTIONS:MCYRUS_IMAPD_30)
-	@${ECHO_MSG} "====> You cannot select a dependency on cyrus with the PERL option"
-_CHECK_CONFIG_ERROR=	true
-.endif
-.endif
+OPTIONS_DEFAULT=	CYRUS CYRUS_IMAPD_25
+OPTIONS_RADIO=	CYRDEP
+OPTIONS_RADIO_CYRDEP=	CYRUS_IMAPD_25 CYRUS_IMAPD_30
+OPTIONS_SINGLE=	TYPE
+OPTIONS_SINGLE_TYPE=	PERL CYRUS
+
+CYRDEP_DESC=	Which version of Cyrus IMAPd to depend on
+CYRUS_DESC=	Depend on Cyrus IMAPd Perl modules
+CYRUS_IMAPD_25_DESC=	Cyrus IMAPd version 2.5.x
+CYRUS_IMAPD_30_DESC=	Cyrus IMAPd version 3.0.x
+PERL_DESC=	Depend on generic Perl modules
+TYPE_DESC=	Choose which sieve backend to use
+
+CYRUS_VARS=	FUNCLIB_PL=funclib.cyrus
+CYRUS_VARS_OFF=	FUNCLIB_PL=funclib.pl
+CYRUS_IMAPD_25_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd25
+CYRUS_IMAPD_30_RUN_DEPENDS=	${SITE_ARCH}/Cyrus/SIEVE/managesieve.pm:mail/cyrus-imapd30
+PERL_PREVENTS=	CYRUS_IMAPD_25 CYRUS_IMAPD_30
+PERL_PREVENTS_MSG=You cannot select a dependency on cyrus with the PERL option
+PERL_RUN_DEPENDS=	p5-IMAP-Admin>=0:mail/p5-IMAP-Admin \
+			p5-IMAP-Sieve>=0:mail/p5-IMAP-Sieve
 
 post-configure:
 	@${REINPLACE_CMD} -e "s,require[ 	]*'\./\([^']*\)',require '${PREFIX}/etc/websieve/\1'," \
diff --git a/mail/websieve/files/patch-funclib.pl b/mail/websieve/files/patch-funclib.pl
index be0e951d1e2f..158c946226f1 100644
--- a/mail/websieve/files/patch-funclib.pl
+++ b/mail/websieve/files/patch-funclib.pl
@@ -1,6 +1,6 @@
---- funclib.pl.orig	Mon Sep 24 14:50:50 2001
-+++ funclib.pl	Wed Apr 23 19:24:59 2003
-@@ -51,7 +51,7 @@
+--- funclib.pl.orig	2004-07-07 00:20:09 UTC
++++ funclib.pl
+@@ -51,7 +51,7 @@ sub getquota {
  	$IMAPERROR=$imap->{'Error'} unless (defined(@tmp) && scalar(@tmp) > 1);
  	return  unless (defined(@tmp) && scalar(@tmp) > 1);
  #recreate array and remove extra spaces - fixes array properly
diff --git a/mail/websieve/files/patch-websieve.pl b/mail/websieve/files/patch-websieve.pl
index 4a8b3babc3c7..8ed87676272e 100644
--- a/mail/websieve/files/patch-websieve.pl
+++ b/mail/websieve/files/patch-websieve.pl
@@ -1,6 +1,6 @@
---- websieve.pl.orig	Tue Jul  6 21:20:09 2004
-+++ websieve.pl	Sat Sep 29 16:02:22 2007
-@@ -640,7 +640,7 @@
+--- websieve.pl.orig	2023-09-20 11:39:29 UTC
++++ websieve.pl
+@@ -640,7 +640,7 @@ sub getuserinfo {
  #creates global variables $mode,@rules,@mailboxes,@quota and %vacation;
  # get quota
  	@quota=&getquota("INBOX") if ($havequota || !$useprocmail);