Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -6,6 +6,18 @@
 you update your ports collection, before attempting any port upgrades.
 
 
+20200713:
+  AFFECTS: users of mail/php7[2-4]-imap
+  AUTHOR: tz@FreeBSD.org
+
+  The imap module of PHP was compiled against cclient till now. But this lib is
+  unmaintained for over 7 years. When combined with modern OpenSSL there are
+  various crashes reported.
+
+  Switching to the fork panda-cclient fixes these issues. Therefore we make the
+  usage of Panda cclient the new default. If you want to use the old cclient,
+  you need to enable it now!
+  
 20200616:
   AFFECTS: users of www/baikal
   AUTHOR: gahr@FreeBSD.org
Index: lang/php72/Makefile.ext
===================================================================
--- lang/php72/Makefile.ext
+++ lang/php72/Makefile.ext
@@ -146,7 +146,10 @@
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=	30
-OPTIONS_DEFINE=	PANDA
+OPTIONS_RADIO=  CLIENT
+OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
+OPTIONS_DEFAULT=PANDA
+CCLIENT_DESC=	Uses the original but unmaintained cclient
 PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
Index: lang/php73/Makefile.ext
===================================================================
--- lang/php73/Makefile.ext
+++ lang/php73/Makefile.ext
@@ -146,7 +146,10 @@
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=	30
-OPTIONS_DEFINE=	PANDA
+OPTIONS_RADIO=  CLIENT
+OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
+OPTIONS_DEFAULT=PANDA
+CCLIENT_DESC=	Uses the original but unmaintained cclient
 PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
Index: lang/php74/Makefile.ext
===================================================================
--- lang/php74/Makefile.ext
+++ lang/php74/Makefile.ext
@@ -144,7 +144,10 @@
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=	30
-OPTIONS_DEFINE=	PANDA
+OPTIONS_RADIO=  CLIENT
+OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
+OPTIONS_DEFAULT=PANDA
+CCLIENT_DESC=	Uses the original but unmaintained cclient
 PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \