www/ilias: Update to 7.10

Update pkg-message
Update DEPENDS
Add missing PHP modules
Add a config.json file

4 files changed, 90 insertions, 23 deletions

diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index be676e7ffa14..30cd61209629 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bartlomiej Rutkowski <r@robakdesign.com>
 
 PORTNAME=	ilias
-PORTVERSION=	7.7
+PORTVERSION=	7.10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www education
 
@@ -16,25 +16,28 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAV
 		${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \
 		${UNZIP_CMD}:archivers/unzip \
-		composer:devel/php-composer \
+		composer:devel/php-composer2 \
+		sudo:security/sudo \
 		zip:archivers/zip
 
 USES=		cpe jpeg magick:6,run php
 USE_GITHUB=	yes
 GH_ACCOUNT=	ILIAS-eLearning
 GH_PROJECT=	ILIAS
-USE_PHP=	curl dom gd ldap pcre pdf pdo_mysql session simplexml soap \
-		xmlrpc xmlwriter xsl zlib
+USE_PHP=	curl dom gd ldap fileinfo pcre pdf \
+		pdo_mysql session simplexml soap \
+		tokenizer xmlrpc xmlwriter xsl zlib
+
 IGNORE_WITH_PHP=	80 81
 
 CONFLICTS=	ilias6
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-SUB_LIST=	ILIASDATADIR=${ILIASDATADIR}
+SUB_LIST=	ILIASFILESDIR=${ILIASFILESDIR}
 
 PLIST=		${WRKDIR}/plist
-PLIST_SUB=	ILIASDATADIR=${ILIASDATADIR}
+PLIST_SUB=	ILIASFILESDIR=${ILIASFILESDIR}
 
 OPTIONS_DEFINE=	CHECKER MAIL SCORM2004
 
@@ -43,28 +46,58 @@ MAIL_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
 SCORM2004_USE=		PHP=json
 
 ILIASDIR=	www/ilias
-ILIASDATADIR=	www/iliasdata
+ILIASFILESDIR=	www/iliasfiles
 
 EXTRA_FILES=	%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/mime \
 		%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/uuid \
-		%%WWWDIR%%/Modules/Chatroom/chat/node_modules/send/node_modules/.bin/mime
+		%%WWWDIR%%/node_modules/.bin/_mocha \
+		%%WWWDIR%%/node_modules/.bin/atob \
+		%%WWWDIR%%/node_modules/.bin/errno \
+		%%WWWDIR%%/node_modules/.bin/flat \
+		%%WWWDIR%%/node_modules/.bin/gl-style-composite \
+		%%WWWDIR%%/node_modules/.bin/gl-style-format \
+		%%WWWDIR%%/node_modules/.bin/gl-style-migrate \
+		%%WWWDIR%%/node_modules/.bin/gl-style-validate \
+		%%WWWDIR%%/node_modules/.bin/he \
+		%%WWWDIR%%/node_modules/.bin/image-size \
+		%%WWWDIR%%/node_modules/.bin/js-yaml \
+		%%WWWDIR%%/node_modules/.bin/lessc \
+		%%WWWDIR%%/node_modules/.bin/loose-envify \
+		%%WWWDIR%%/node_modules/.bin/mime \
+		%%WWWDIR%%/node_modules/.bin/mocha \
+		%%WWWDIR%%/node_modules/.bin/nanoid \
+		%%WWWDIR%%/node_modules/.bin/needle \
+		%%WWWDIR%%/node_modules/.bin/node-gyp-build \
+		%%WWWDIR%%/node_modules/.bin/node-gyp-build-optional \
+		%%WWWDIR%%/node_modules/.bin/node-gyp-build-test \
+		%%WWWDIR%%/node_modules/.bin/node-which \
+		%%WWWDIR%%/node_modules/.bin/opencollective-postinstall \
+		%%WWWDIR%%/node_modules/.bin/pbf \
+		%%WWWDIR%%/node_modules/.bin/rollup \
+		%%WWWDIR%%/node_modules/.bin/semver \
+		%%WWWDIR%%/node_modules/.bin/terser \
+		%%WWWDIR%%/node_modules/.bin/uuid \
+		%%WWWDIR%%/test/filter.test.js \
+		%%WWWDIR%%/test/mainbar.test.js
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ILIASDIR}?g" >> ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${ILIASDIR}?g" >> ${PLIST}
 .for i in ${EXTRA_FILES}
 	@${ECHO_CMD} ${i} >> ${PLIST}
 .endfor
-	@${ECHO} @dir ${ILIASDIR} >> ${PLIST}
-	@${ECHO} @dir ${ILIASDATADIR} >> ${PLIST}
+	@${ECHO_CMD} "${ILIASFILESDIR}/config.json" >> ${PLIST}
+	@${ECHO_CMD} @dir ${ILIASFILESDIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASDATADIR}
+	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASFILESDIR}
+	@${CP} ${FILESDIR}/config.json ${STAGEDIR}${PREFIX}/${ILIASFILESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/ilias/distinfo b/www/ilias/distinfo
index a8fcc7e37621..ae60bb0f0f3b 100644
--- a/www/ilias/distinfo
+++ b/www/ilias/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648485881
-SHA256 (ILIAS-eLearning-ILIAS-v7.7_GH0.tar.gz) = ef2a03d2d9749770e668420c76bb8fa5fb761043cafc6f0b8f45fe3f456d4000
-SIZE (ILIAS-eLearning-ILIAS-v7.7_GH0.tar.gz) = 185629427
+TIMESTAMP = 1651737286
+SHA256 (ILIAS-eLearning-ILIAS-v7.10_GH0.tar.gz) = d774978925da1aaf07d335d64d6cc6f0745a3845cf81f9158863da301a35e624
+SIZE (ILIAS-eLearning-ILIAS-v7.10_GH0.tar.gz) = 185576672
diff --git a/www/ilias/files/config.json b/www/ilias/files/config.json
new file mode 100644
index 000000000000..59cfcb6f19e8
--- /dev/null
+++ b/www/ilias/files/config.json
@@ -0,0 +1,36 @@
+{
+    "common" : {
+        "client_id" : "myilias"
+    },
+    "database" : {
+        "user" : "xxx",
+        "password" : "xxx"
+    },
+    "filesystem" : {
+        "data_dir" : "/usr/local/www/iliasfiles"
+    },
+    "http" : {
+        "path" : "http://www.xxx.com"
+    },
+    "language" : {
+        "default_language" : "en",
+        "install_languages" : ["en"]
+    },
+    "logging" : {
+        "enable" : true,
+        "path_to_logfile" : "/var/www/logs/ilias.log",
+        "errorlog_dir" : "/var/www/logs/"
+    },
+    "systemfolder" : {
+        "contact" : {
+            "firstname" : "Richard",
+            "lastname" : "Klees",
+            "email" : "richard.klees@concepts-and-training.de"
+        }
+    },
+    "utilities" : {
+        "path_to_convert" : "/usr/local/bin/convert",
+        "path_to_zip" : "/usr/local/bin/zip",
+        "path_to_unzip" : "/usr/local/bin/unzip"
+    }
+}
diff --git a/www/ilias/files/pkg-message.in b/www/ilias/files/pkg-message.in
index 6ae9c41a872c..4ebd6ea0baf2 100644
--- a/www/ilias/files/pkg-message.in
+++ b/www/ilias/files/pkg-message.in
@@ -22,20 +22,18 @@ some virus scanner by yourself.
       Require all granted
    </Directory>
 
-4 If you use MySQL, Strict SQL Mode MUST be disabled.
-
-5 After installation, you should use 'composer install'
+4 After installation, you should use 'composer install'
 in the directory %%WWWDIR%%/libs/composer.
 
-6 Then feel free to proceed to ILIAS web setup proccess.
-  When input Ilias data directory, please use
-  %%PREFIX%%/%%ILIASDATADIR%% and uncheck the create option.
+5 Edit the config.json file and run ilias Setup on the commang-line
+in directory %%WWWDIR%%:
+  $ sudo -u www -g www php setup/setup.php install ../iliasfiles/config.json
 
-7 If all is OK, you can login into the system with
+6 If all is OK, you can login into the system with
 username/root and password/homer as the administrator.
 
-For more information, see the INSTALL DOCUMENTATION:
-http://www.ilias.de/docu/goto.php?target=lm_367&client_id=docu
+7 More information please visit :
+https://docu.ilias.de/goto_docu_lm_367.html,
 EOM
 }
 ]