[pkgsrc/trunk]: pkgsrc/www/php-dotclear dotclear: Update to 2.22

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22dc8284866e
branches:  trunk
changeset: 379982:22dc8284866e
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Thu May 26 21:08:37 2022 +0000

description:
dotclear: Update to 2.22

upstream changes:
-----------------
  * PHP 7.4+ is required, PHP 8.0/8.1 compliance
  * Bug fixes

diffstat:

 www/php-dotclear/Makefile                                 |    4 +-
 www/php-dotclear/PLIST                                    |  210 ++++++-------
 www/php-dotclear/distinfo                                 |   20 +-
 www/php-dotclear/patches/patch-admin_install_index.php    |    8 +-
 www/php-dotclear/patches/patch-admin_install_wizard.php   |   22 +-
 www/php-dotclear/patches/patch-inc_config.php.in          |   21 +-
 www/php-dotclear/patches/patch-inc_core_class.dc.core.php |   14 +-
 www/php-dotclear/patches/patch-inc_load__plugin__file.php |    8 +-
 www/php-dotclear/patches/patch-inc_prepend.php            |    8 +-
 9 files changed, 136 insertions(+), 179 deletions(-)

diffs (truncated from 608 to 300 lines):

diff -r 34ec63324313 -r 22dc8284866e www/php-dotclear/Makefile
--- a/www/php-dotclear/Makefile Thu May 26 21:04:33 2022 +0000
+++ b/www/php-dotclear/Makefile Thu May 26 21:08:37 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2022/01/25 08:31:38 triaxx Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/26 21:08:37 triaxx Exp $
 
-DISTNAME=      dotclear-2.20.1
+DISTNAME=      dotclear-2.22
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  https://download.dotclear.org/latest/ \
diff -r 34ec63324313 -r 22dc8284866e www/php-dotclear/PLIST
--- a/www/php-dotclear/PLIST    Thu May 26 21:04:33 2022 +0000
+++ b/www/php-dotclear/PLIST    Thu May 26 21:08:37 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/25 08:31:38 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/05/26 21:08:37 triaxx Exp $
 share/dotclear/admin/_charte.php
 share/dotclear/admin/auth.php
 share/dotclear/admin/blog.php
@@ -23,14 +23,13 @@
 share/dotclear/admin/images/collapser-hide.png
 share/dotclear/admin/images/collapser-show.png
 share/dotclear/admin/images/comments.png
-share/dotclear/admin/images/date-picker.png
 share/dotclear/admin/images/disabled_down.png
 share/dotclear/admin/images/disabled_up.png
 share/dotclear/admin/images/dotclear_pw.png
 share/dotclear/admin/images/down.png
 share/dotclear/admin/images/dragndrop.svg
 share/dotclear/admin/images/edit-mini.png
-share/dotclear/admin/images/expand.png
+share/dotclear/admin/images/expand.svg
 share/dotclear/admin/images/fav-off.png
 share/dotclear/admin/images/fav-on.png
 share/dotclear/admin/images/favicon.ico
@@ -39,12 +38,12 @@
 share/dotclear/admin/images/grid-off.png
 share/dotclear/admin/images/grid-on.png
 share/dotclear/admin/images/hidden.png
-share/dotclear/admin/images/hide.png
+share/dotclear/admin/images/hide.svg
 share/dotclear/admin/images/junk.png
 share/dotclear/admin/images/list-off.png
 share/dotclear/admin/images/list-on.png
 share/dotclear/admin/images/locker.png
-share/dotclear/admin/images/logout.png
+share/dotclear/admin/images/logout.svg
 share/dotclear/admin/images/media/audio.png
 share/dotclear/admin/images/media/blank.png
 share/dotclear/admin/images/media/document.png
@@ -58,57 +57,50 @@
 share/dotclear/admin/images/media/spreadsheet.png
 share/dotclear/admin/images/media/text.png
 share/dotclear/admin/images/media/video.png
-share/dotclear/admin/images/menu/blog-pref-b.png
-share/dotclear/admin/images/menu/blog-pref.png
-share/dotclear/admin/images/menu/blog-theme-b-update.png
-share/dotclear/admin/images/menu/blog-theme-b.png
-share/dotclear/admin/images/menu/blogs-b.png
-share/dotclear/admin/images/menu/blogs.png
-share/dotclear/admin/images/menu/categories-b.png
-share/dotclear/admin/images/menu/categories.png
-share/dotclear/admin/images/menu/comments-b.png
-share/dotclear/admin/images/menu/comments.png
-share/dotclear/admin/images/menu/edit-b.png
-share/dotclear/admin/images/menu/edit.png
-share/dotclear/admin/images/menu/entries-b.png
-share/dotclear/admin/images/menu/entries.png
-share/dotclear/admin/images/menu/help-b.png
-share/dotclear/admin/images/menu/help.png
-share/dotclear/admin/images/menu/langs-b.png
-share/dotclear/admin/images/menu/langs.png
-share/dotclear/admin/images/menu/media-b.png
-share/dotclear/admin/images/menu/media.png
-share/dotclear/admin/images/menu/plugins-b-update.png
-share/dotclear/admin/images/menu/plugins-b.png
-share/dotclear/admin/images/menu/plugins.png
-share/dotclear/admin/images/menu/search-b.png
-share/dotclear/admin/images/menu/search.png
-share/dotclear/admin/images/menu/themes.png
-share/dotclear/admin/images/menu/update.png
-share/dotclear/admin/images/menu/user-pref-b.png
-share/dotclear/admin/images/menu/user-pref.png
-share/dotclear/admin/images/menu/users-b.png
-share/dotclear/admin/images/menu/users.png
-share/dotclear/admin/images/menu_off.png
-share/dotclear/admin/images/menu_on.png
-share/dotclear/admin/images/minus-theme.png
+share/dotclear/admin/images/menu/blog-pref-dark.svg
+share/dotclear/admin/images/menu/blog-pref.svg
+share/dotclear/admin/images/menu/blogs-dark.svg
+share/dotclear/admin/images/menu/blogs.svg
+share/dotclear/admin/images/menu/categories-dark.svg
+share/dotclear/admin/images/menu/categories.svg
+share/dotclear/admin/images/menu/comments-dark.svg
+share/dotclear/admin/images/menu/comments.svg
+share/dotclear/admin/images/menu/edit-dark.svg
+share/dotclear/admin/images/menu/edit.svg
+share/dotclear/admin/images/menu/entries-dark.svg
+share/dotclear/admin/images/menu/entries.svg
+share/dotclear/admin/images/menu/help.svg
+share/dotclear/admin/images/menu/langs-dark.svg
+share/dotclear/admin/images/menu/langs.svg
+share/dotclear/admin/images/menu/media-dark.svg
+share/dotclear/admin/images/menu/media.svg
+share/dotclear/admin/images/menu/no-icon.svg
+share/dotclear/admin/images/menu/plugins-dark-update.svg
+share/dotclear/admin/images/menu/plugins-dark.svg
+share/dotclear/admin/images/menu/plugins-update.svg
+share/dotclear/admin/images/menu/plugins.svg
+share/dotclear/admin/images/menu/search-dark.svg
+share/dotclear/admin/images/menu/search.svg
+share/dotclear/admin/images/menu/themes-dark-update.svg
+share/dotclear/admin/images/menu/themes-dark.svg
+share/dotclear/admin/images/menu/themes-update.svg
+share/dotclear/admin/images/menu/themes.svg
+share/dotclear/admin/images/menu/update-dark.svg
+share/dotclear/admin/images/menu/update.svg
+share/dotclear/admin/images/menu/user-pref.svg
+share/dotclear/admin/images/menu/users.svg
 share/dotclear/admin/images/module.png
 share/dotclear/admin/images/noscreenshot.png
-share/dotclear/admin/images/outgoing-blue.png
 share/dotclear/admin/images/outgoing-link.svg
-share/dotclear/admin/images/outgoing.png
-share/dotclear/admin/images/page_help.png
-share/dotclear/admin/images/pagination/first.png
-share/dotclear/admin/images/pagination/last.png
-share/dotclear/admin/images/pagination/next.png
-share/dotclear/admin/images/pagination/no-first.png
-share/dotclear/admin/images/pagination/no-last.png
-share/dotclear/admin/images/pagination/no-next.png
-share/dotclear/admin/images/pagination/no-previous.png
-share/dotclear/admin/images/pagination/previous.png
+share/dotclear/admin/images/pagination/first.svg
+share/dotclear/admin/images/pagination/last.svg
+share/dotclear/admin/images/pagination/next.svg
+share/dotclear/admin/images/pagination/no-first.svg
+share/dotclear/admin/images/pagination/no-last.svg
+share/dotclear/admin/images/pagination/no-next.svg
+share/dotclear/admin/images/pagination/no-previous.svg
+share/dotclear/admin/images/pagination/previous.svg
 share/dotclear/admin/images/palette-traviata.png
-share/dotclear/admin/images/picker.png
-share/dotclear/admin/images/plus-theme.png
 share/dotclear/admin/images/plus.png
 share/dotclear/admin/images/scheduled.png
 share/dotclear/admin/images/selected.png
@@ -233,7 +225,6 @@
 share/dotclear/admin/js/codemirror/theme/zenburn.css
 share/dotclear/admin/js/common.js
 share/dotclear/admin/js/confirm-close.js
-share/dotclear/admin/js/date-picker.js
 share/dotclear/admin/js/file-upload.js
 share/dotclear/admin/js/filter-controls.js
 share/dotclear/admin/js/jquery-mute.js
@@ -277,9 +268,10 @@
 share/dotclear/admin/services.php
 share/dotclear/admin/style/cancel.png
 share/dotclear/admin/style/config.rb
-share/dotclear/admin/style/dashboard-alt.png
-share/dotclear/admin/style/dashboard.png
-share/dotclear/admin/style/date-picker.css
+share/dotclear/admin/style/dashboard-alt-dark.svg
+share/dotclear/admin/style/dashboard-alt.svg
+share/dotclear/admin/style/dashboard-dark.svg
+share/dotclear/admin/style/dashboard.svg
 share/dotclear/admin/style/dc_logos/b-dotclear120.png
 share/dotclear/admin/style/dc_logos/dc_logo_footer.png
 share/dotclear/admin/style/dc_logos/sq-logo-32.png
@@ -290,8 +282,7 @@
 share/dotclear/admin/style/default.css
 share/dotclear/admin/style/drag.png
 share/dotclear/admin/style/grid.png
-share/dotclear/admin/style/help-mini.png
-share/dotclear/admin/style/help12.png
+share/dotclear/admin/style/help.svg
 share/dotclear/admin/style/install.css
 share/dotclear/admin/style/install/important.png
 share/dotclear/admin/style/install/note.png
@@ -366,6 +357,7 @@
 share/dotclear/inc/admin/lib.dc.adminurl.php
 share/dotclear/inc/admin/lib.dc.notices.php
 share/dotclear/inc/admin/lib.dc.page.php
+share/dotclear/inc/admin/lib.helper.php
 share/dotclear/inc/admin/lib.moduleslist.php
 share/dotclear/inc/admin/lib.pager.php
 share/dotclear/inc/admin/lib.themeconfig.php
@@ -630,8 +622,7 @@
 share/dotclear/plugins/.htaccess
 share/dotclear/plugins/aboutConfig/_admin.php
 share/dotclear/plugins/aboutConfig/_define.php
-share/dotclear/plugins/aboutConfig/icon-big.png
-share/dotclear/plugins/aboutConfig/icon.png
+share/dotclear/plugins/aboutConfig/icon.svg
 share/dotclear/plugins/aboutConfig/index.php
 share/dotclear/plugins/aboutConfig/js/index.js
 share/dotclear/plugins/aboutConfig/locales/en/help/help.html
@@ -657,8 +648,8 @@
 share/dotclear/plugins/antispam/filters/class.dc.filter.ipv6.php
 share/dotclear/plugins/antispam/filters/class.dc.filter.linkslookup.php
 share/dotclear/plugins/antispam/filters/class.dc.filter.words.php
-share/dotclear/plugins/antispam/icon-big.png
-share/dotclear/plugins/antispam/icon.png
+share/dotclear/plugins/antispam/icon-dark.svg
+share/dotclear/plugins/antispam/icon.svg
 share/dotclear/plugins/antispam/inc/class.dc.spamfilter.php
 share/dotclear/plugins/antispam/inc/class.dc.spamfilters.php
 share/dotclear/plugins/antispam/inc/lib.dc.antispam.php
@@ -698,8 +689,8 @@
 share/dotclear/plugins/blogroll/class.dc.blogroll.php
 share/dotclear/plugins/blogroll/class.dc.importblogroll.php
 share/dotclear/plugins/blogroll/edit.php
-share/dotclear/plugins/blogroll/icon-small.png
-share/dotclear/plugins/blogroll/icon.png
+share/dotclear/plugins/blogroll/icon-dark.svg
+share/dotclear/plugins/blogroll/icon.svg
 share/dotclear/plugins/blogroll/index.php
 share/dotclear/plugins/blogroll/js/_users_actions.js
 share/dotclear/plugins/blogroll/js/blogroll.js
@@ -760,7 +751,8 @@
 share/dotclear/plugins/dcCKEditor/_install.php
 share/dotclear/plugins/dcCKEditor/_post_config.php
 share/dotclear/plugins/dcCKEditor/_prepend.php
-share/dotclear/plugins/dcCKEditor/imgs/icon.png
+share/dotclear/plugins/dcCKEditor/icon-dark.svg
+share/dotclear/plugins/dcCKEditor/icon.svg
 share/dotclear/plugins/dcCKEditor/inc/_config.php
 share/dotclear/plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php
 share/dotclear/plugins/dcCKEditor/index.php
@@ -794,6 +786,7 @@
 share/dotclear/plugins/dcCKEditor/js/ckeditor/.nvmrc
 share/dotclear/plugins/dcCKEditor/js/ckeditor/CHANGES.md
 share/dotclear/plugins/dcCKEditor/js/ckeditor/LICENSE.md
+share/dotclear/plugins/dcCKEditor/js/ckeditor/SECURITY.md
 share/dotclear/plugins/dcCKEditor/js/ckeditor/adapters/jquery.js
 share/dotclear/plugins/dcCKEditor/js/ckeditor/bender-runner.config.json
 share/dotclear/plugins/dcCKEditor/js/ckeditor/ckeditor.js
@@ -1030,6 +1023,7 @@
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/dialogs/templates.css
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/dialogs/templates.js
+share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templatedefinition.js
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/default.js
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/images/template1.gif
 share/dotclear/plugins/dcCKEditor/js/ckeditor/plugins/templates/templates/images/template2.gif
@@ -1074,26 +1068,28 @@
 share/dotclear/plugins/dcLegacyEditor/_define.php
 share/dotclear/plugins/dcLegacyEditor/_install.php
 share/dotclear/plugins/dcLegacyEditor/_prepend.php
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_bquote.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_br.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_clean.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_code.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_del.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_em.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img_select.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ins.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_link.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_mark.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ol.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_paragraph.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_post.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_pre.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_quote.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_strong.png
-share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ul.png
+share/dotclear/plugins/dcLegacyEditor/_services.php
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_bquote.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_br.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_clean.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_code.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_del.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_em.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_img_select.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ins.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_link.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_mark.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ol.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_post.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_pre.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_preview.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_quote.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_strong.svg
+share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/bt_ul.svg
 share/dotclear/plugins/dcLegacyEditor/css/jsToolBar/jsToolBar.css
-share/dotclear/plugins/dcLegacyEditor/icon.png
+share/dotclear/plugins/dcLegacyEditor/icon-dark.svg
+share/dotclear/plugins/dcLegacyEditor/icon.svg
 share/dotclear/plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php
 share/dotclear/plugins/dcLegacyEditor/index.php
 share/dotclear/plugins/dcLegacyEditor/js/_post_editor.js
@@ -1118,8 +1114,8 @@
 share/dotclear/plugins/importExport/_admin.php
 share/dotclear/plugins/importExport/_define.php
 share/dotclear/plugins/importExport/_prepend.php