git: 72ed1c4dd5f4 - main - mail/roundcube: Update to 1.6.0

From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sun, 18 Sep 2022 10:29:33 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=72ed1c4dd5f42fd755001a099aff0344de45fe7c

commit 72ed1c4dd5f42fd755001a099aff0344de45fe7c
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-09-18 10:17:01 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-09-18 10:29:25 +0000

    mail/roundcube: Update to 1.6.0
    
    PR:             265653
    Approved by:    Maintainer timeout
---
 UPDATING                   | 11 +++++++++++
 mail/roundcube/Makefile    |  6 ++----
 mail/roundcube/distinfo    |  6 +++---
 mail/roundcube/pkg-message | 17 ++++++++++++++++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/UPDATING b/UPDATING
index f94aa1ff7729..0bbf5abbe5b1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20220918:
+  AFFECTS: users of mail/roundcube
+  AUTHOR: brnrd@FreeBSD.org
+
+  Roundcube has been upgraded to 1.6.0 and introduces breaking changes to
+  configuration options of remote services (imap, smtp, ldap, sieve). Check
+  https://roundcube.net/news/2022/07/28/roundcube-1.6.0-released for details.
+
+  Version 1.6 no longer includes the Classic and Larry skins, which are now
+  available as separate mail/roundcube-classic and mail/roundcube-larry ports.
+
 20220910:
   AFFECTS: users of devel/cmake
   AUTHOR: diizzy@FreeBSD.org
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 93a12b7575a4..65c24e06af94 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	roundcube
-DISTVERSION=	1.5.3
+DISTVERSION=	1.6.0
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
@@ -27,7 +27,7 @@ CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
 
 USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif ctype
-IGNORE_WITH_PHP=81 82
+IGNORE_WITH_PHP=82
 
 OPTIONS_DEFINE=	LDAP GD PSPELL NSC DOCS EXAMPLES
 OPTIONS_MULTI=	DB
@@ -56,8 +56,6 @@ SUB_FILES=	newsyslog.conf
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
-	@${RMDIR} ${WRKSRC}/plugins/archive/skins/larry
-
 do-install:
 	-${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index 4df07af77491..ba112a5b19bb 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656320094
-SHA256 (roundcubemail-1.5.3-complete.tar.gz) = 4bcfac219f2e0005c912dac3227743cc1ed0ded69c822f74c81a70d041e5a3bd
-SIZE (roundcubemail-1.5.3-complete.tar.gz) = 7857655
+TIMESTAMP = 1659704574
+SHA256 (roundcubemail-1.6.0-complete.tar.gz) = 2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba
+SIZE (roundcubemail-1.6.0-complete.tar.gz) = 5970153
diff --git a/mail/roundcube/pkg-message b/mail/roundcube/pkg-message
index 2fd69172e77e..0a5c8f0185c0 100644
--- a/mail/roundcube/pkg-message
+++ b/mail/roundcube/pkg-message
@@ -5,10 +5,25 @@ If this is a first installation of RoundCube you have to create
 a new database and a db user. Read INSTALL for detailed instructions.
 EOM
 }
-{ type: install
+{ type: upgrade
   message: <<EOM
 If you already had a previous version of RoundCube installed,
 you should check your config files and DB schema are up-to-date.
+Read UPGRADING for detailed instructions.
+EOM
+}
+{ type: upgrade
+  maximum_version: "1.6.0"
+  message: <<EOM
+Roundcube 1.6 has a number of breaking changes in the smtp, imap,
+ldap, and managesieve connection configuration. Check 
+https://roundcube.net/news/2022/07/28/roundcube-1.6.0-released for
+details.
+ 
+Roundcube 1.6 no longer includes the "Classic" and "Larry" skins.
+The skins can be found as mail/rouncube-larry and
+mail/roundcube-classic ports.
+
 Read UPGRADING for detailed instructions.
 EOM
 }