[pkgsrc/trunk]: pkgsrc/www/php-glpi Upgrade GLPI to 9.4.1.1

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e338aa239617
branches:  trunk
changeset: 321053:e338aa239617
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Fri Mar 15 16:32:13 2019 +0000

description:
Upgrade GLPI to 9.4.1.1

The full changelog is available at:
<https://github.com/glpi-project/glpi/milestone/30?closed=1>
<https://github.com/glpi-project/glpi/milestone/33?closed=1>

De-support apache 2.2 config in httpd-glpi.conf sample
Re-work the way we hook in pkgsrc specific etc and var paths

diffstat:

 www/php-glpi/MESSAGE                |     4 +-
 www/php-glpi/Makefile               |    16 +-
 www/php-glpi/PLIST                  |  1413 ++++++++++++++++++++++++----------
 www/php-glpi/distinfo               |    10 +-
 www/php-glpi/files/config_path.php  |    37 -
 www/php-glpi/files/downstream.php   |    13 +
 www/php-glpi/files/httpd-glpi.conf  |    66 +-
 www/php-glpi/files/local_define.php |    26 +
 8 files changed, 1045 insertions(+), 540 deletions(-)

diffs (truncated from 2326 to 300 lines):

diff -r 4922a75bbf46 -r e338aa239617 www/php-glpi/MESSAGE
--- a/www/php-glpi/MESSAGE      Fri Mar 15 15:03:34 2019 +0000
+++ b/www/php-glpi/MESSAGE      Fri Mar 15 16:32:13 2019 +0000
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2017/07/21 10:11:27 hauke Exp $
+$NetBSD: MESSAGE,v 1.5 2019/03/15 16:32:13 hauke Exp $
 
 GLPI requires a web server set up to run PHP scripts;
 ${PREFIX}/share/examples/glpi/http-glpi.conf is a sample
 configuration for Apache.
 
-In addition, you need access to a MySQL server. Create a MySQL gpli user,
+In addition, you need access to a MySQL server. Create a MySQL glpi user,
 and as that user create a database:
 
 # mysql -u root -p
diff -r 4922a75bbf46 -r e338aa239617 www/php-glpi/Makefile
--- a/www/php-glpi/Makefile     Fri Mar 15 15:03:34 2019 +0000
+++ b/www/php-glpi/Makefile     Fri Mar 15 16:32:13 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2018/04/27 14:19:29 hauke Exp $
+# $NetBSD: Makefile,v 1.6 2019/03/15 16:32:13 hauke Exp $
 
 DISTNAME=      glpi-${GLPI_VERSION}
-GLPI_VERSION=  9.2.3
+GLPI_VERSION=  9.4.1.1
 CATEGORIES=    www
 
 MASTER_SITES=  https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/
@@ -17,6 +17,7 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-ldap>=5.4:../../databases/php-ldap
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.4:../../databases/php-mysqli
 DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=5.4:../../devel/php-opcache
+DEPENDS+=      ${PHP_PKG_PREFIX}-exif>=5.4:../../graphics/php-exif
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.4:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-imap>=5.4:../../mail/php-imap
 DEPENDS+=      ${PHP_PKG_PREFIX}-xmlrpc>=5.4:../../net/php-xmlrpc
@@ -45,7 +46,7 @@
 EGDIR=         share/examples/glpi
 GLPI_DIR=      share/glpi
 
-.for ddd in config_path.php
+.for ddd in local_define.php
 CONF_FILES+=   ${EGDIR}/${ddd} ${PKG_SYSCONFDIR}/${ddd}
 .endfor
 
@@ -62,7 +63,8 @@
 SUBST_STAGE.path=      post-configure
 SUBST_MESSAGE.path=    Fixing paths.
 SUBST_VARS.path=       PREFIX VARBASE PKG_SYSCONFDIR APACHE_USER
-SUBST_FILES.path=      config/config_path.php
+SUBST_FILES.path=      config/local_define.php
+SUBST_FILES.path+=     inc/downstream.php
 SUBST_FILES.path+=     config/crontab.sample
 SUBST_FILES.path+=     config/httpd-glpi.conf
 
@@ -70,6 +72,7 @@
 REPLACE.php.old=       .*php
 REPLACE.php.new=       ${PREFIX}/bin/php
 REPLACE_FILES.php=     vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
+REPLACE_FILES.php+=    bin/console
 .for ddd in  bench.php fetch_windows_zones.php generate_vcards \
             generateicalendardata.php vobject
 REPLACE_FILES.php+=      vendor/sabre/vobject/bin/${ddd}
@@ -86,10 +89,11 @@
 .endif
 
 post-extract:
-       for ddd in config_path.php crontab.sample httpd-glpi.conf ; do \
+       for ddd in local_define.php crontab.sample httpd-glpi.conf ; do \
                ${CP} ${FILESDIR}/$${ddd} ${WRKSRC}/config ; \
        done
-       for ddd in ajax front lib locales pics vendor ; do \
+       ${CP} ${FILESDIR}/downstream.php ${WRKSRC}/inc
+       for ddd in ajax css front inc lib locales pics vendor ; do \
                find ${WRKSRC}/$${ddd} -type f -exec ${CHMOD} ugo-x \{\} \; ; \
        done
        cd ${WRKSRC}/install && ${MV} install.php install.php.disabled
diff -r 4922a75bbf46 -r e338aa239617 www/php-glpi/PLIST
--- a/www/php-glpi/PLIST        Fri Mar 15 15:03:34 2019 +0000
+++ b/www/php-glpi/PLIST        Fri Mar 15 16:32:13 2019 +0000
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 2018/04/27 14:19:29 hauke Exp $
-share/examples/glpi/config_path.php
+@comment $NetBSD: PLIST,v 1.4 2019/03/15 16:32:13 hauke Exp $
 share/examples/glpi/crontab.sample
 share/examples/glpi/httpd-glpi.conf
+share/examples/glpi/local_define.php
+share/glpi/.github/ISSUE_TEMPLATE/bug_report.md
+share/glpi/.github/ISSUE_TEMPLATE/feature_request.md
 share/glpi/.htaccess
-share/glpi/AUTHORS.txt
 share/glpi/CHANGELOG.md
+share/glpi/CONTRIBUTING.md
 share/glpi/COPYING.txt
-share/glpi/LISEZMOI.txt
 share/glpi/README.md
+share/glpi/SUPPORT.md
 share/glpi/ajax/autocompletion.php
 share/glpi/ajax/comments.php
 share/glpi/ajax/common.tabs.php
 share/glpi/ajax/compareKbRevisions.php
+share/glpi/ajax/dcroom_size.php
 share/glpi/ajax/displayMessageAfterRedirect.php
 share/glpi/ajax/dropdownAllItems.php
 share/glpi/ajax/dropdownConnect.php
@@ -21,6 +24,7 @@
 share/glpi/ajax/dropdownFieldsBlacklist.php
 share/glpi/ajax/dropdownInstallVersion.php
 share/glpi/ajax/dropdownItilActors.php
+share/glpi/ajax/dropdownLocation.php
 share/glpi/ajax/dropdownMassiveAction.php
 share/glpi/ajax/dropdownMassiveActionAddActor.php
 share/glpi/ajax/dropdownMassiveActionAddValidator.php
@@ -55,12 +59,17 @@
 share/glpi/ajax/getKbComment.php
 share/glpi/ajax/getKbRevision.php
 share/glpi/ajax/getKnowbaseItemAnswer.php
+share/glpi/ajax/getMapPoint.php
 share/glpi/ajax/helpdesk_observer.php
 share/glpi/ajax/index.php
 share/glpi/ajax/inputtext.php
 share/glpi/ajax/itemTicket.php
+share/glpi/ajax/item_rack.php
 share/glpi/ajax/kblink.php
+share/glpi/ajax/knowbase.php
 share/glpi/ajax/ldapdaterestriction.php
+share/glpi/ajax/mailcollector.php
+share/glpi/ajax/map.php
 share/glpi/ajax/massiveaction.php
 share/glpi/ajax/notifications_ajax.php
 share/glpi/ajax/planning.php
@@ -69,16 +78,15 @@
 share/glpi/ajax/priority.php
 share/glpi/ajax/private_public.php
 share/glpi/ajax/projecttask.php
+share/glpi/ajax/rack.php
 share/glpi/ajax/resaperiod.php
 share/glpi/ajax/ruleaction.php
 share/glpi/ajax/ruleactionvalue.php
 share/glpi/ajax/rulecriteria.php
 share/glpi/ajax/rulecriteriavalue.php
 share/glpi/ajax/savedsearch.php
-share/glpi/ajax/searchmetarow.php
-share/glpi/ajax/searchoption.php
+share/glpi/ajax/search.php
 share/glpi/ajax/searchoptionvalue.php
-share/glpi/ajax/searchrow.php
 share/glpi/ajax/selectUnaffectedOrNewItem_Device.php
 share/glpi/ajax/solution.php
 share/glpi/ajax/subvisibility.php
@@ -94,7 +102,6 @@
 share/glpi/ajax/transfers.php
 share/glpi/ajax/uemailUpdate.php
 share/glpi/ajax/unlockobject.php
-share/glpi/ajax/updateMetaSearch.php
 share/glpi/ajax/updateTrackingDeviceType.php
 share/glpi/ajax/updateTranslationFields.php
 share/glpi/ajax/updatecurrenttab.php
@@ -103,42 +110,33 @@
 share/glpi/apirest.md
 share/glpi/apirest.php
 share/glpi/apixmlrpc.php
+share/glpi/bin/console
 share/glpi/config/.htaccess
-share/glpi/config/config_path.php
 share/glpi/config/crontab.sample
 share/glpi/config/httpd-glpi.conf
+share/glpi/config/local_define.php
+share/glpi/css/_highcontrast.scss
 share/glpi/css/chartists-glpi.css
 share/glpi/css/chartists-glpi.min.css
-share/glpi/css/highcontrast.css
-share/glpi/css/highcontrast.min.css
 share/glpi/css/jquery-glpi.css
 share/glpi/css/jquery-glpi.min.css
 share/glpi/css/jstree-glpi.css
 share/glpi/css/jstree-glpi.min.css
-share/glpi/css/palettes/aerialgreen.css
-share/glpi/css/palettes/aerialgreen.min.css
-share/glpi/css/palettes/auror.css
-share/glpi/css/palettes/auror.min.css
-share/glpi/css/palettes/automn.css
-share/glpi/css/palettes/automn.min.css
-share/glpi/css/palettes/classic.css
-share/glpi/css/palettes/classic.min.css
-share/glpi/css/palettes/clockworkorange.css
-share/glpi/css/palettes/clockworkorange.min.css
-share/glpi/css/palettes/dark.css
-share/glpi/css/palettes/dark.min.css
-share/glpi/css/palettes/flood.css
-share/glpi/css/palettes/flood.min.css
-share/glpi/css/palettes/greenflat.css
-share/glpi/css/palettes/greenflat.min.css
-share/glpi/css/palettes/hipster.css
-share/glpi/css/palettes/hipster.min.css
-share/glpi/css/palettes/icecream.css
-share/glpi/css/palettes/icecream.min.css
-share/glpi/css/palettes/lightblue.css
-share/glpi/css/palettes/lightblue.min.css
-share/glpi/css/palettes/premiumred.css
-share/glpi/css/palettes/premiumred.min.css
+share/glpi/css/palettes/_aerialgreen.scss
+share/glpi/css/palettes/_auror.scss
+share/glpi/css/palettes/_automn.scss
+share/glpi/css/palettes/_classic.scss
+share/glpi/css/palettes/_clockworkorange.scss
+share/glpi/css/palettes/_dark.scss
+share/glpi/css/palettes/_flood.scss
+share/glpi/css/palettes/_greenflat.scss
+share/glpi/css/palettes/_hipster.scss
+share/glpi/css/palettes/_icecream.scss
+share/glpi/css/palettes/_lightblue.scss
+share/glpi/css/palettes/_premiumred.scss
+share/glpi/css/palettes/_purplehaze.scss
+share/glpi/css/palettes/_teclib.scss
+share/glpi/css/palettes/_vintage.scss
 share/glpi/css/palettes/previews/aerialgreen.png
 share/glpi/css/palettes/previews/auror.png
 share/glpi/css/palettes/previews/automn.png
@@ -154,22 +152,28 @@
 share/glpi/css/palettes/previews/purplehaze.png
 share/glpi/css/palettes/previews/teclib.png
 share/glpi/css/palettes/previews/vintage.png
-share/glpi/css/palettes/purplehaze.css
-share/glpi/css/palettes/purplehaze.min.css
-share/glpi/css/palettes/teclib.css
-share/glpi/css/palettes/teclib.min.css
-share/glpi/css/palettes/vintage.css
-share/glpi/css/palettes/vintage.min.css
 share/glpi/css/print.css
 share/glpi/css/print.min.css
 share/glpi/css/style_install.css
 share/glpi/css/style_install.min.css
-share/glpi/css/styles.css
-share/glpi/css/styles.min.css
-share/glpi/css/styles_ie.css
-share/glpi/css/styles_ie.min.css
+share/glpi/css/styles.scss
 share/glpi/css/tab-scroller-menu.css
 share/glpi/css/tab-scroller-menu.min.css
+share/glpi/css/tiny_mce/skins/light/content.inline.min.css
+share/glpi/css/tiny_mce/skins/light/content.min.css
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce-small.eot
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce-small.svg
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce-small.ttf
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce-small.woff
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce.eot
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce.svg
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce.ttf
+share/glpi/css/tiny_mce/skins/light/fonts/tinymce.woff
+share/glpi/css/tiny_mce/skins/light/img/anchor.gif
+share/glpi/css/tiny_mce/skins/light/img/loader.gif
+share/glpi/css/tiny_mce/skins/light/img/object.gif
+share/glpi/css/tiny_mce/skins/light/img/trans.gif
+share/glpi/css/tiny_mce/skins/light/skin.min.css
 share/glpi/css/win_png.htc
 share/glpi/files/.htaccess
 share/glpi/files/_cache/remove.txt
@@ -226,7 +230,6 @@
 share/glpi/front/change_group.form.php
 share/glpi/front/change_item.form.php
 share/glpi/front/change_problem.form.php
-share/glpi/front/change_project.form.php
 share/glpi/front/change_supplier.form.php
 share/glpi/front/change_ticket.form.php
 share/glpi/front/change_user.form.php
@@ -242,7 +245,6 @@
 share/glpi/front/computer_softwarelicense.form.php
 share/glpi/front/computer_softwareversion.form.php
 share/glpi/front/computerantivirus.form.php
-share/glpi/front/computerdisk.form.php
 share/glpi/front/computermodel.form.php
 share/glpi/front/computermodel.php
 share/glpi/front/computertype.form.php
@@ -266,10 +268,14 @@
 share/glpi/front/contractcost.form.php
 share/glpi/front/contracttype.form.php
 share/glpi/front/contracttype.php
-share/glpi/front/control.php
 share/glpi/front/cron.php
 share/glpi/front/crontask.form.php
 share/glpi/front/crontask.php
+share/glpi/front/css.php
+share/glpi/front/datacenter.form.php
+share/glpi/front/datacenter.php
+share/glpi/front/dcroom.form.php
+share/glpi/front/dcroom.php
 share/glpi/front/device.form.php
 share/glpi/front/device.php
 share/glpi/front/devicemodel.form.php
@@ -295,6 +301,10 @@
 share/glpi/front/dropdown.common.php
 share/glpi/front/dropdown.php
 share/glpi/front/dropdowntranslation.form.php
+share/glpi/front/enclosure.form.php
+share/glpi/front/enclosure.php
+share/glpi/front/enclosuremodel.form.php
+share/glpi/front/enclosuremodel.php