Received: by mail.netbsd.org (Postfix, from userid 605) id B488884EB9; Thu, 26 May 2022 21:07:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ECDA884EAB for ; Thu, 26 May 2022 21:07:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FdjiZRdX0gRz for ; Thu, 26 May 2022 21:07:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 90E9B84D3D for ; Thu, 26 May 2022 21:07:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 50296FAEB; Thu, 26 May 2022 21:08:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165359931853570" MIME-Version: 1.0 Date: Thu, 26 May 2022 21:08:38 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/www/php-dotclear To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20220526210838.50296FAEB@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165359931853570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Thu May 26 21:08:38 UTC 2022 Modified Files: pkgsrc/www/php-dotclear: Makefile PLIST distinfo pkgsrc/www/php-dotclear/patches: patch-admin_install_index.php patch-admin_install_wizard.php patch-inc_config.php.in patch-inc_core_class.dc.core.php patch-inc_load__plugin__file.php patch-inc_prepend.php Log Message: dotclear: Update to 2.22 upstream changes: ----------------- * PHP 7.4+ is required, PHP 8.0/8.1 compliance * Bug fixes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/php-dotclear/Makefile \ pkgsrc/www/php-dotclear/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/php-dotclear/PLIST cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php \ pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php \ pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in \ pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php \ pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php \ pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165359931853570 Content-Disposition: inline Content-Length: 31971 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/php-dotclear/Makefile diff -u pkgsrc/www/php-dotclear/Makefile:1.4 pkgsrc/www/php-dotclear/Makefile:1.5 --- pkgsrc/www/php-dotclear/Makefile:1.4 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/Makefile Thu May 26 21:08:37 2022 @@ -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/ \ Index: pkgsrc/www/php-dotclear/distinfo diff -u pkgsrc/www/php-dotclear/distinfo:1.4 pkgsrc/www/php-dotclear/distinfo:1.5 --- pkgsrc/www/php-dotclear/distinfo:1.4 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/distinfo Thu May 26 21:08:38 2022 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.4 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: distinfo,v 1.5 2022/05/26 21:08:38 triaxx Exp $ -BLAKE2s (dotclear-2.20.1.tar.gz) = df9561e307ddf3f6e7a9aed768f0d500c406d78cf214e731cae36f2ef5f4e361 -SHA512 (dotclear-2.20.1.tar.gz) = c637d464ebbf3e1ca213286f157c63136c6dfb33e710d592f4ebfc0863f2aecc9df7f5db21261e4d6d8af7b323e6791f1ff6ab7b798811e14c111da708864b1c -Size (dotclear-2.20.1.tar.gz) = 2966383 bytes -SHA1 (patch-admin_install_index.php) = b44e0fd0aefa908f70d64692ce7fcdecd710bb38 -SHA1 (patch-admin_install_wizard.php) = 3709e12ee79cee399091aff0a6b0218f25554217 -SHA1 (patch-inc_config.php.in) = 674dbbe66f534c3e0e5d6c21aa24e4c1eb9285ae -SHA1 (patch-inc_core_class.dc.core.php) = 045d6a2d9a629a9f9bcc098223df0f999a521f30 -SHA1 (patch-inc_load__plugin__file.php) = d6fea3a2a5c1243a3d220e6813ffdfb8d1092aaa -SHA1 (patch-inc_prepend.php) = 0261d9ea250190a7bb63e0790ff1d4fb46877313 +BLAKE2s (dotclear-2.22.tar.gz) = fa449f18fdd2614b6c0c7c99b203aaf33ad635fd80094b548ba156c7f020998e +SHA512 (dotclear-2.22.tar.gz) = c3a77d284b9df0e78669c349ae5765de57ec1224bf6edfc7e4c119301bfd0e824044357a2d83de710adf872aa38bcdfcf04f7ac98cfc3eaf74424069a1142011 +Size (dotclear-2.22.tar.gz) = 3035079 bytes +SHA1 (patch-admin_install_index.php) = 038d7aed4ca4384fc6902b18a31db92fe3746be1 +SHA1 (patch-admin_install_wizard.php) = 5847ec3f7b3d5407a90194479a1a1d5819ab9f24 +SHA1 (patch-inc_config.php.in) = 14010e990adf5825b7611c1c76fa64cf233c41df +SHA1 (patch-inc_core_class.dc.core.php) = 6811b81f4bad1ec46e55a894387d7dca29a8d7ad +SHA1 (patch-inc_load__plugin__file.php) = c1822604516bd13e905572c8cbe0ac2a09fc956a +SHA1 (patch-inc_prepend.php) = 89e75b5e5d659c3b6365fcb2e392106f6d4e66b3 Index: pkgsrc/www/php-dotclear/PLIST diff -u pkgsrc/www/php-dotclear/PLIST:1.2 pkgsrc/www/php-dotclear/PLIST:1.3 --- pkgsrc/www/php-dotclear/PLIST:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/PLIST Thu May 26 21:08:37 2022 @@ -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/close.png 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/favicon96-lo 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/presen 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 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/search.php 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-rtl.c 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.adminuserpr 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/locales/fr/resources.php 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/ 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/_widgets 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/_defin 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/cke 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/cke 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/_a 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/fairTrackbacks/cl share/dotclear/plugins/importExport/_admin.php share/dotclear/plugins/importExport/_define.php share/dotclear/plugins/importExport/_prepend.php -share/dotclear/plugins/importExport/icon-big.png -share/dotclear/plugins/importExport/icon.png +share/dotclear/plugins/importExport/icon-dark.svg +share/dotclear/plugins/importExport/icon.svg share/dotclear/plugins/importExport/inc/class.dc.export.flat.php share/dotclear/plugins/importExport/inc/class.dc.ieModule.php share/dotclear/plugins/importExport/inc/class.dc.import.dc1.php @@ -1143,10 +1139,10 @@ share/dotclear/plugins/maintenance/_admi share/dotclear/plugins/maintenance/_define.php share/dotclear/plugins/maintenance/_prepend.php share/dotclear/plugins/maintenance/_services.php -share/dotclear/plugins/maintenance/icon-big-update.png -share/dotclear/plugins/maintenance/icon-big.png -share/dotclear/plugins/maintenance/icon-small.png -share/dotclear/plugins/maintenance/icon.png +share/dotclear/plugins/maintenance/icon-dark-update.svg +share/dotclear/plugins/maintenance/icon-dark.svg +share/dotclear/plugins/maintenance/icon-update.svg +share/dotclear/plugins/maintenance/icon.svg share/dotclear/plugins/maintenance/inc/class.dc.maintenance.descriptor.php share/dotclear/plugins/maintenance/inc/class.dc.maintenance.php share/dotclear/plugins/maintenance/inc/class.dc.maintenance.task.php @@ -1175,13 +1171,12 @@ share/dotclear/plugins/pages/_public.php share/dotclear/plugins/pages/_widgets.php share/dotclear/plugins/pages/class.actionpage.php share/dotclear/plugins/pages/class.listpage.php -share/dotclear/plugins/pages/default-templates/currywurst/page.html share/dotclear/plugins/pages/default-templates/dotty/page.html share/dotclear/plugins/pages/default-templates/mustek/page.html -share/dotclear/plugins/pages/icon-big.png -share/dotclear/plugins/pages/icon-np-big.png -share/dotclear/plugins/pages/icon-np.png -share/dotclear/plugins/pages/icon.png +share/dotclear/plugins/pages/icon-dark.svg +share/dotclear/plugins/pages/icon-np-dark.svg +share/dotclear/plugins/pages/icon-np.svg +share/dotclear/plugins/pages/icon.svg share/dotclear/plugins/pages/index.php share/dotclear/plugins/pages/js/_users_actions.js share/dotclear/plugins/pages/js/list.js @@ -1198,8 +1193,8 @@ share/dotclear/plugins/pings/_admin.php share/dotclear/plugins/pings/_define.php share/dotclear/plugins/pings/_install.php share/dotclear/plugins/pings/_prepend.php -share/dotclear/plugins/pings/icon-big.png -share/dotclear/plugins/pings/icon.png +share/dotclear/plugins/pings/icon-dark.svg +share/dotclear/plugins/pings/icon.svg share/dotclear/plugins/pings/index.php share/dotclear/plugins/pings/js/post.js share/dotclear/plugins/pings/lib.pings.php @@ -1214,8 +1209,7 @@ share/dotclear/plugins/simpleMenu/_defin share/dotclear/plugins/simpleMenu/_install.php share/dotclear/plugins/simpleMenu/_public.php share/dotclear/plugins/simpleMenu/_widgets.php -share/dotclear/plugins/simpleMenu/icon-small.png -share/dotclear/plugins/simpleMenu/icon.png +share/dotclear/plugins/simpleMenu/icon.svg share/dotclear/plugins/simpleMenu/index.php share/dotclear/plugins/simpleMenu/js/simplemenu.js share/dotclear/plugins/simpleMenu/locales/en/help/help.html @@ -1228,16 +1222,13 @@ share/dotclear/plugins/tags/_prepend.php share/dotclear/plugins/tags/_public.php share/dotclear/plugins/tags/_widgets.php share/dotclear/plugins/tags/_xmlrpc.php -share/dotclear/plugins/tags/default-templates/currywurst/tag.html -share/dotclear/plugins/tags/default-templates/currywurst/tags.html share/dotclear/plugins/tags/default-templates/dotty/tag.html share/dotclear/plugins/tags/default-templates/dotty/tags.html share/dotclear/plugins/tags/default-templates/mustek/tag.html share/dotclear/plugins/tags/default-templates/mustek/tags.html -share/dotclear/plugins/tags/icon-big.png -share/dotclear/plugins/tags/icon.png -share/dotclear/plugins/tags/img/loader.gif -share/dotclear/plugins/tags/img/tag-add.png +share/dotclear/plugins/tags/icon-dark.svg +share/dotclear/plugins/tags/icon.svg +share/dotclear/plugins/tags/img/tag-add.svg share/dotclear/plugins/tags/inc/tags.behaviors.php share/dotclear/plugins/tags/index.php share/dotclear/plugins/tags/js/ckeditor-tags-plugin.js @@ -1260,6 +1251,7 @@ share/dotclear/plugins/tags/tags.php share/dotclear/plugins/themeEditor/_admin.php share/dotclear/plugins/themeEditor/_define.php share/dotclear/plugins/themeEditor/class.themeEditor.php +share/dotclear/plugins/themeEditor/icon.svg share/dotclear/plugins/themeEditor/index.php share/dotclear/plugins/themeEditor/js/mode.js share/dotclear/plugins/themeEditor/js/script.js @@ -1283,8 +1275,7 @@ share/dotclear/plugins/themeEditor/local share/dotclear/plugins/themeEditor/style.css share/dotclear/plugins/userPref/_admin.php share/dotclear/plugins/userPref/_define.php -share/dotclear/plugins/userPref/icon-big.png -share/dotclear/plugins/userPref/icon.png +share/dotclear/plugins/userPref/icon.svg share/dotclear/plugins/userPref/index.php share/dotclear/plugins/userPref/js/index.js share/dotclear/plugins/userPref/locales/en/help/help.html @@ -1298,8 +1289,8 @@ share/dotclear/plugins/widgets/_install. share/dotclear/plugins/widgets/_public.php share/dotclear/plugins/widgets/_widgets_functions.php share/dotclear/plugins/widgets/class.widgets.php -share/dotclear/plugins/widgets/icon-big.png -share/dotclear/plugins/widgets/icon.png +share/dotclear/plugins/widgets/icon-dark.svg +share/dotclear/plugins/widgets/icon.svg share/dotclear/plugins/widgets/index.php share/dotclear/plugins/widgets/js/dragdrop.js share/dotclear/plugins/widgets/js/widgets.js @@ -1416,6 +1407,7 @@ share/dotclear/themes/berlin/scss/partia share/dotclear/themes/berlin/scss/style.scss share/dotclear/themes/berlin/style.css share/dotclear/themes/berlin/tpl/user_footer.html +share/dotclear/themes/berlin/tpl/user_head.html share/dotclear/themes/blueSilence/_define.php share/dotclear/themes/blueSilence/img/attach.png share/dotclear/themes/blueSilence/img/background.png Index: pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php diff -u pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php:1.2 pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php:1.3 --- pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-admin_install_index.php Thu May 26 21:08:38 2022 @@ -1,15 +1,15 @@ -$NetBSD: patch-admin_install_index.php,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-admin_install_index.php,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Honor PKG_SYSCONFDIR. ---- admin/install/index.php.orig 2021-02-13 10:31:06.000000000 +0000 +--- admin/install/index.php.orig 2022-05-13 06:25:40.000000000 +0000 +++ admin/install/index.php @@ -11,7 +11,7 @@ if (isset($_SERVER['DC_RC_PATH'])) { } elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) { $rc_path = $_SERVER['REDIRECT_DC_RC_PATH']; } else { -- $rc_path = dirname(__FILE__) . '/../../inc/config.php'; +- $rc_path = __DIR__ . '/../../inc/config.php'; + $rc_path = '@PKG_SYSCONFDIR@/config.php'; } - require dirname(__FILE__) . '/../../inc/prepend.php'; + require __DIR__ . '/../../inc/prepend.php'; Index: pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php diff -u pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php:1.2 pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php:1.3 --- pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-admin_install_wizard.php Thu May 26 21:08:38 2022 @@ -1,19 +1,10 @@ -$NetBSD: patch-admin_install_wizard.php,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-admin_install_wizard.php,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Honor PKG_SYSCONFDIR. Set pkgsrc compliant directories for SQLite database. ---- admin/install/wizard.php.orig 2021-11-19 12:51:15.000000000 +0000 +--- admin/install/wizard.php.orig 2022-05-13 06:25:40.000000000 +0000 +++ admin/install/wizard.php -@@ -11,7 +11,7 @@ if (isset($_SERVER['DC_RC_PATH'])) { - } elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) { - define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']); - } else { -- define('DC_RC_PATH', dirname(__FILE__) . '/../../inc/config.php'); -+ define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php'); - } - - # ClearBricks and DotClear classes auto-loader @@ -61,7 +61,7 @@ if (!empty($_POST)) { try { if ($DBDRIVER == 'sqlite') { @@ -23,12 +14,3 @@ Set pkgsrc compliant directories for SQL files::makeDir($sqlite_db_directory, true); # Can we write sqlite_db_directory ? -@@ -98,7 +98,7 @@ if (!empty($_POST)) { - } - - # Does config.php.in exist? -- $config_in = dirname(__FILE__) . '/../../inc/config.php.in'; -+ $config_in = '@PKG_SYSCONFDIR@/config.php.in'; - if (!is_file($config_in)) { - throw new Exception(sprintf(__('File %s does not exist.'), $config_in)); - } Index: pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in diff -u pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in:1.2 pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in:1.3 --- pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-inc_config.php.in Thu May 26 21:08:38 2022 @@ -1,27 +1,10 @@ -$NetBSD: patch-inc_config.php.in,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-inc_config.php.in,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Set pkgsrc compliant directories for plugins, cache, var and logs. Disable update checking. ---- inc/config.php.in.orig 2021-02-13 10:31:06.000000000 +0000 +--- inc/config.php.in.orig 2022-05-13 06:25:40.000000000 +0000 +++ inc/config.php.in -@@ -47,13 +47,13 @@ define('DC_SESSION_NAME', 'dcxd'); - //define('DC_SESSION_TTL','120 seconds'); - - // Plugins root --define('DC_PLUGINS_ROOT', dirname(__FILE__) . '/../plugins'); -+define('DC_PLUGINS_ROOT', '@DOTCLEAR_SHAREDIR@/plugins' . PATH_SEPARATOR . '@DOTCLEAR_PLUGDIR@'); - - // Template cache directory --define('DC_TPL_CACHE', path::real(dirname(__FILE__) . '/..') . '/cache'); -+define('DC_TPL_CACHE', '@DOTCLEAR_CACHEDIR@'); - - // Var directory --define('DC_VAR', path::real(dirname(__FILE__) . '/..') . '/var'); -+define('DC_VAR', '@DOTCLEAR_DBDIR@'); - - // Cryptographic algorithm - define('DC_CRYPT_ALGO', 'sha512'); @@ -62,7 +62,7 @@ define('DC_CRYPT_ALGO', 'sha512'); //define('DC_VENDOR_NAME', 'Dotclear'); Index: pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php diff -u pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php:1.2 pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php:1.3 --- pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-inc_core_class.dc.core.php Thu May 26 21:08:38 2022 @@ -1,15 +1,15 @@ -$NetBSD: patch-inc_core_class.dc.core.php,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-inc_core_class.dc.core.php,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Set pkgsrc compliant directory for /public. ---- inc/core/class.dc.core.php.orig 2021-02-13 10:31:06.000000000 +0000 +--- inc/core/class.dc.core.php.orig 2022-05-13 06:25:40.000000000 +0000 +++ inc/core/class.dc.core.php -@@ -1564,7 +1564,7 @@ class dcCore - 'Number of comments on feeds'], +@@ -1570,7 +1570,7 @@ class dcCore + 'Number of comments on feeds', ], ['post_url_format', 'string', '{y}/{m}/{d}/{t}', - 'Post URL format. {y}: year, {m}: month, {d}: day, {id}: post id, {t}: entry title'], + 'Post URL format. {y}: year, {m}: month, {d}: day, {id}: post id, {t}: entry title', ], - ['public_path', 'string', 'public', + ['public_path', 'string', '@DOTCLEAR_PUBDIR@', - 'Path to public directory, begins with a / for a full system path'], + 'Path to public directory, begins with a / for a full system path', ], ['public_url', 'string', '/public', - 'URL to public directory'], + 'URL to public directory', ], Index: pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php diff -u pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php:1.2 pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php:1.3 --- pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-inc_load__plugin__file.php Thu May 26 21:08:38 2022 @@ -1,15 +1,15 @@ -$NetBSD: patch-inc_load__plugin__file.php,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-inc_load__plugin__file.php,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Honor PKG_SYSCONFDIR. ---- inc/load_plugin_file.php.orig 2021-02-13 10:31:06.000000000 +0000 +--- inc/load_plugin_file.php.orig 2022-05-13 06:25:40.000000000 +0000 +++ inc/load_plugin_file.php @@ -25,7 +25,7 @@ if (isset($_SERVER['DC_RC_PATH'])) { } elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) { define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']); } else { -- define('DC_RC_PATH', dirname(__FILE__) . '/config.php'); -+ define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php'); +- define('DC_RC_PATH', __DIR__ . '/config.php'); ++ define('DC_RC_PATH', __DIR__ . '@PKG_SYSCONFDIR@/config.php'); } if (!is_file(DC_RC_PATH)) { Index: pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php diff -u pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php:1.2 pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php:1.3 --- pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php:1.2 Tue Jan 25 08:31:38 2022 +++ pkgsrc/www/php-dotclear/patches/patch-inc_prepend.php Thu May 26 21:08:38 2022 @@ -1,14 +1,14 @@ -$NetBSD: patch-inc_prepend.php,v 1.2 2022/01/25 08:31:38 triaxx Exp $ +$NetBSD: patch-inc_prepend.php,v 1.3 2022/05/26 21:08:38 triaxx Exp $ Honor PKG_SYSCONFDIR. ---- inc/prepend.php.orig 2021-02-13 10:32:13.000000000 +0000 +--- inc/prepend.php.orig 2022-05-13 06:26:03.000000000 +0000 +++ inc/prepend.php -@@ -127,7 +127,7 @@ if (isset($_SERVER['DC_RC_PATH'])) { +@@ -128,7 +128,7 @@ if (isset($_SERVER['DC_RC_PATH'])) { } elseif (isset($_SERVER['REDIRECT_DC_RC_PATH'])) { define('DC_RC_PATH', $_SERVER['REDIRECT_DC_RC_PATH']); } else { -- define('DC_RC_PATH', dirname(__FILE__) . '/config.php'); +- define('DC_RC_PATH', __DIR__ . '/config.php'); + define('DC_RC_PATH', '@PKG_SYSCONFDIR@/config.php'); } --_----------=_165359931853570--