Index: head/net-mgmt/ocsinventory-server/Makefile
===================================================================
--- head/net-mgmt/ocsinventory-server/Makefile	(revision 528637)
+++ head/net-mgmt/ocsinventory-server/Makefile	(revision 528638)
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	ocsinventory-server
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Open Computer and Software Inventory Next Generation
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-XML-Simple>=2.12:textproc/p5-XML-Simple \
 		p5-DBI>=1.40:databases/p5-DBI \
 		p5-DBD-mysql>=2.9004:databases/p5-DBD-mysql \
 		p5-Apache-DBI>=0.93:www/p5-Apache-DBI \
 		p5-Net-IP>=1.21:net-mgmt/p5-Net-IP \
 		p5-SOAP-Lite>=0.66:net/p5-SOAP-Lite \
 		p5-XML-Entities>=0.02:textproc/p5-XML-Entities \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple \
 		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
 		p5-Apache2-SOAP>=0:net/p5-Apache2-SOAP \
 		p5-Mojolicious>=0:www/p5-Mojolicious \
+		p5-Switch>=0:lang/p5-Switch \
 		p5-Plack>=0:www/p5-Plack
 
 USES=		apache:run,2.2+ mysql perl5
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_GITHUB=	YES
 GH_ACCOUNT=	OCSInventory-NG
 GH_PROJECT=	OCSInventory-Server
 
 OPTIONS_DEFINE=	DOCS OCSREPORTS
 OPTIONS_DEFAULT=	OCSREPORTS
 OCSREPORTS_DESC=	Install ocsreports admin console
 OCSREPORTS_RUN_DEPENDS=	ocsinventory-ocsreports>=0:net-mgmt/ocsinventory-ocsreports
 
 ETCDIR=	${PREFIX}/etc/ocsinventory-server
 
 post-patch:
 	${REINPLACE_CMD} -e 's|REST_API_LOADER_PATH|${SHAREDIR}/Api/Ocsinventory/Restapi/Loader.pm|g' ${WRKSRC}/etc/ocsinventory/ocsinventory-restapi.conf
 	${REINPLACE_CMD} -e 's|REST_API_PATH|${SHAREDIR}|g;' ${WRKSRC}/etc/ocsinventory/ocsinventory-restapi.conf
 	${REINPLACE_CMD} -e 's|LOCALBASE|${LOCALBASE}|g;' ${WRKSRC}/etc/ocsinventory/ocsinventory-server.conf
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "Apache Api binutils dtd" ${STAGEDIR}${DATADIR}/)
 	${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${STAGEDIR}${DATADIR}/
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for F in restapi server
 	${INSTALL_DATA} ${WRKSRC}/etc/ocsinventory/ocsinventory-${F}.conf ${STAGEDIR}${ETCDIR}/ocsinventory-${F}.conf.sample
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/net-mgmt/ocsinventory-server/distinfo
===================================================================
--- head/net-mgmt/ocsinventory-server/distinfo	(revision 528637)
+++ head/net-mgmt/ocsinventory-server/distinfo	(revision 528638)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535377403
-SHA256 (OCSInventory-NG-OCSInventory-Server-2.5_GH0.tar.gz) = 00f3b5b1ca4a78383d38217a5c8a69ddd9cfa9d794d92d0fb46613f4ebeef42d
-SIZE (OCSInventory-NG-OCSInventory-Server-2.5_GH0.tar.gz) = 117868
+TIMESTAMP = 1583417380
+SHA256 (OCSInventory-NG-OCSInventory-Server-2.6_GH0.tar.gz) = 64390033c490a68abc856fc18e443d650cd1b36addda67f34790cb19cba1d240
+SIZE (OCSInventory-NG-OCSInventory-Server-2.6_GH0.tar.gz) = 119037
Index: head/net-mgmt/ocsinventory-server/files/pkg-message.in
===================================================================
--- head/net-mgmt/ocsinventory-server/files/pkg-message.in	(revision 528637)
+++ head/net-mgmt/ocsinventory-server/files/pkg-message.in	(revision 528638)
@@ -1,12 +1,11 @@
 [
 { type: install
   message: <<EOM
 ocsinventory-ng server is installed
 
 You still need to (pick one):
-* cd to %%DATADIR%% and run ./setup.sh there
-* edit files in %%ETCDIR%% and link thew to apache's
+* edit files in %%ETCDIR%% and link them to apache's
   Includes/ directory
 EOM
 }
 ]
Index: head/net-mgmt/ocsinventory-server/pkg-plist
===================================================================
--- head/net-mgmt/ocsinventory-server/pkg-plist	(revision 528637)
+++ head/net-mgmt/ocsinventory-server/pkg-plist	(revision 528638)
@@ -1,95 +1,96 @@
 @sample %%ETCDIR%%/ocsinventory-restapi.conf.sample
 @sample %%ETCDIR%%/ocsinventory-server.conf.sample
 %%DATADIR%%/Apache/Changes
 %%DATADIR%%/Apache/INSTALL
 %%DATADIR%%/Apache/LICENSE
 %%DATADIR%%/Apache/MANIFEST
 %%DATADIR%%/Apache/Makefile.PL
 %%DATADIR%%/Apache/Ocsinventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/AssetCategory.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Config.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Database.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Extensions.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/History.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Internals.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Inventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Ipdiscover.pm
+%%DATADIR%%/Apache/Ocsinventory/Interface/Saas.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Snmp.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/SoftwareCategory.pm
 %%DATADIR%%/Apache/Ocsinventory/Interface/Updates.pm
 %%DATADIR%%/Apache/Ocsinventory/Map.pm
 %%DATADIR%%/Apache/Ocsinventory/Plugins.pm
 %%DATADIR%%/Apache/Ocsinventory/Plugins/Apache.pm
 %%DATADIR%%/Apache/Ocsinventory/Plugins/Modules.pm
 %%DATADIR%%/Apache/Ocsinventory/SOAP.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Datafilter.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Download.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Download/Inventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Example.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Filter.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Notify.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Registry.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Snmp.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Snmp/Data.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Snmp/Inventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Capacities/Update.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Communication.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Communication/Session.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Constants.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Duplicate.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Groups.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Cache.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Capacities.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Data.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Export.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Filter.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update/AccountInfos.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Inventory/Update/Hardware.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Modperl1.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Modperl2.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/System.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/System/Config.pm
 %%DATADIR%%/Apache/Ocsinventory/Server/Useragent.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/ApiCommon.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputerId.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputerIdField.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/Computers.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersListId.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Computer/Get/ComputersSearch.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Ipdiscover/Get/Ipdiscover.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverNetwork.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Loader.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/README.md
 %%DATADIR%%/Api/Ocsinventory/Restapi/References/api.json
 %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/Snmp.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpId.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpIdField.pm
 %%DATADIR%%/Api/Ocsinventory/Restapi/Snmp/Get/SnmpListId.pm
 %%DATADIR%%/binutils/create-release-tarball.sh
 %%DATADIR%%/binutils/docker-download.sh
 %%DATADIR%%/binutils/ipdiscover-util.README
 %%DATADIR%%/binutils/ipdiscover-util.pl
 %%DATADIR%%/binutils/ocs-errors
 %%DATADIR%%/binutils/ocsinventory-injector.README
 %%DATADIR%%/binutils/ocsinventory-injector.pl
 %%DATADIR%%/binutils/ocsinventory-log.README
 %%DATADIR%%/binutils/ocsinventory-log.pl
 %%DATADIR%%/binutils/soap-client.README
 %%DATADIR%%/binutils/soap-client.pl
 %%DATADIR%%/dtd/Interface/get_computers_V1-request.dtd
 %%DATADIR%%/dtd/download_request.dtd
 %%DATADIR%%/dtd/file_request.dtd
 %%DATADIR%%/dtd/inventory_reply.dtd
 %%DATADIR%%/dtd/inventory_request.dtd
 %%DATADIR%%/dtd/prolog_reply.dtd
 %%DATADIR%%/dtd/prolog_request.dtd
 %%DATADIR%%/dtd/snmp_request.dtd
 %%DATADIR%%/dtd/update_reply.dtd
 %%DATADIR%%/dtd/update_request.dtd
 %%DATADIR%%/setup.sh
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README.md