www/piwik: Update from 3.2.1 to 3.4.0

Changelogs:
- https://matomo.org/changelog/matomo-3-3-0/
- https://matomo.org/changelog/matomo-3-4-0/

Also:
- Rename the port to match renaming of the project itself
- Flavorize port

Reported by: Nicola Tiling <nti@w4w.net>
Reviewed by: Nicola Tiling <nti@w4w.net>

6 files changed, 101 insertions, 49 deletions

diff --git a/www/piwik/Makefile b/www/matomo/Makefile
index adb05571ee6b..de74801c3851 100644
--- a/www/piwik/Makefile
+++ b/www/matomo/Makefile
@@ -1,10 +1,11 @@
-# Created by: Wen heping <wenheping@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	piwik
-PORTVERSION=	3.2.1
+PORTNAME=	matomo
+DISTVERSION=	3.4.0
 CATEGORIES=	www
-MASTER_SITES=	http://builds.piwik.org/
+MASTER_SITES=	http://builds.matomo.org/
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
+DISTNAME=	piwik-${DISTVERSION}
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Open Source Web Analytics Software Program
@@ -13,9 +14,13 @@ LICENSE=	GPLv3
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-USE_PHP=	ctype dom gd filter hash iconv json session xml zlib \
-		mbstring simplexml
-WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USES=		cpe shebangfix php:flavors
+USE_PHP=	bcmath bz2 ctype curl dom fileinfo filter gd hash iconv intl json \
+		mbstring mcrypt memcache mysqli openssl pcre pdo posix readline session \
+		simplexml soap sockets sqlite3 tidy tokenizer xml opcache zip zlib
+
+WRKSRC=		${WRKDIR}/piwik
 
 OPTIONS_DEFINE=	PHPPDOMYSQL PHPMYSQLI
 OPTIONS_DEFAULT=	PHPPDOMYSQL
@@ -26,7 +31,6 @@ PHPMYSQLI_USE=	PHP=mysqli
 
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-USES=		cpe shebangfix php
 SHEBANG_FILES=	misc/log-analytics/import_logs.py
 
 pre-install:
diff --git a/www/matomo/distinfo b/www/matomo/distinfo
new file mode 100644
index 000000000000..1328791ed9b7
--- /dev/null
+++ b/www/matomo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1522752090
+SHA256 (piwik-3.4.0.tar.gz) = 8ca334e455b508e7b2e709bf57da79bdc3d23a3547a97af8c38b6eb92b52d2c2
+SIZE (piwik-3.4.0.tar.gz) = 14772848
diff --git a/www/piwik/files/pkg-message.in b/www/matomo/files/pkg-message.in
index ff85ddb16e2d..ff85ddb16e2d 100644
--- a/www/piwik/files/pkg-message.in
+++ b/www/matomo/files/pkg-message.in
diff --git a/www/piwik/pkg-descr b/www/matomo/pkg-descr
index 259534ac9d8a..259534ac9d8a 100644
--- a/www/piwik/pkg-descr
+++ b/www/matomo/pkg-descr
diff --git a/www/piwik/pkg-plist b/www/matomo/pkg-plist
index 367b6adec392..c0b4492ef71b 100644
--- a/www/piwik/pkg-plist
+++ b/www/matomo/pkg-plist
@@ -3,7 +3,6 @@
 %%WWWDIR%%/LEGALNOTICE
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/PRIVACY.md
-%%WWWDIR%%/PULL_REQUEST_TEMPLATE
 %%WWWDIR%%/README.md
 %%WWWDIR%%/SECURITY.md
 %%WWWDIR%%/bower.json
@@ -101,6 +100,7 @@
 %%WWWDIR%%/core/Container/ContainerFactory.php
 %%WWWDIR%%/core/Container/IniConfigDefinitionSource.php
 %%WWWDIR%%/core/Container/StaticContainer.php
+%%WWWDIR%%/core/Context.php
 %%WWWDIR%%/core/Cookie.php
 %%WWWDIR%%/core/CronArchive.php
 %%WWWDIR%%/core/CronArchive/FixedSiteIds.php
@@ -1375,7 +1375,7 @@
 %%WWWDIR%%/libs/sparkline/lib/Sparkline_Line.php
 %%WWWDIR%%/libs/upgradephp/README
 %%WWWDIR%%/libs/upgradephp/upgrade.php
-%%WWWDIR%%/misc/How to install Piwik.html
+%%WWWDIR%%/misc/How to install Matomo.html
 %%WWWDIR%%/misc/composer/build-xhprof.sh
 %%WWWDIR%%/misc/composer/clean-xhprof.sh
 %%WWWDIR%%/misc/cron/.htaccess
@@ -1843,8 +1843,17 @@
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitGoalConverted.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitId.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitIp.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionDate.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionDayOfMonth.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionDayOfWeek.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionDayOfYear.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionMinute.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionMonth.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionQuarter.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionSecond.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionTime.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionWeekOfYear.php
+%%WWWDIR%%/plugins/CoreHome/Columns/VisitLastActionYear.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitTotalTime.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php
 %%WWWDIR%%/plugins/CoreHome/Columns/VisitorDaysSinceOrder.php
@@ -1890,6 +1899,7 @@
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/directives/select-on-focus.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/directives/side-nav.js
+%%WWWDIR%%/plugins/CoreHome/angularjs/common/directives/string-to-number.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/directives/translate.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/filters/escape.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/common/filters/evolution.js
@@ -1954,6 +1964,9 @@
 %%WWWDIR%%/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
 %%WWWDIR%%/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
+%%WWWDIR%%/plugins/CoreHome/angularjs/report-export/reportexport.directive.js
+%%WWWDIR%%/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
+%%WWWDIR%%/plugins/CoreHome/angularjs/report-export/reportexport.popover.less
 %%WWWDIR%%/plugins/CoreHome/angularjs/reporting-menu/reportingmenu-model.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
 %%WWWDIR%%/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html
@@ -2145,6 +2158,7 @@
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-file.html
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-hidden.html
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html
+%%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html
 %%WWWDIR%%/plugins/CorePluginsAdmin/angularjs/form-field/field-site.html
@@ -2366,6 +2380,7 @@
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/el.json
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/en.json
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/es.json
+%%WWWDIR%%/plugins/CustomPiwikJs/lang/fi.json
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/fr.json
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/id.json
 %%WWWDIR%%/plugins/CustomPiwikJs/lang/it.json
@@ -3344,6 +3359,7 @@
 %%WWWDIR%%/plugins/Installation/lang/gl.json
 %%WWWDIR%%/plugins/Installation/lang/he.json
 %%WWWDIR%%/plugins/Installation/lang/hi.json
+%%WWWDIR%%/plugins/Installation/lang/hr.json
 %%WWWDIR%%/plugins/Installation/lang/hu.json
 %%WWWDIR%%/plugins/Installation/lang/id.json
 %%WWWDIR%%/plugins/Installation/lang/is.json
@@ -3547,6 +3563,7 @@
 %%WWWDIR%%/plugins/Live/ProfileSummary/ImportantVisits.php
 %%WWWDIR%%/plugins/Live/ProfileSummary/ProfileSummaryAbstract.php
 %%WWWDIR%%/plugins/Live/ProfileSummary/Summary.php
+%%WWWDIR%%/plugins/Live/ProfileSummaryProvider.php
 %%WWWDIR%%/plugins/Live/Reports/Base.php
 %%WWWDIR%%/plugins/Live/Reports/GetLastVisits.php
 %%WWWDIR%%/plugins/Live/Reports/GetLastVisitsDetails.php
@@ -3581,6 +3598,7 @@
 %%WWWDIR%%/plugins/Live/javascripts/SegmentedVisitorLog.js
 %%WWWDIR%%/plugins/Live/javascripts/live.js
 %%WWWDIR%%/plugins/Live/javascripts/rowaction.js
+%%WWWDIR%%/plugins/Live/javascripts/visitorActions.js
 %%WWWDIR%%/plugins/Live/javascripts/visitorLog.js
 %%WWWDIR%%/plugins/Live/javascripts/visitorProfile.js
 %%WWWDIR%%/plugins/Live/lang/ar.json
@@ -3753,6 +3771,7 @@
 %%WWWDIR%%/plugins/Marketplace/lang/ca.json
 %%WWWDIR%%/plugins/Marketplace/lang/cs.json
 %%WWWDIR%%/plugins/Marketplace/lang/da.json
+%%WWWDIR%%/plugins/Marketplace/lang/de.json
 %%WWWDIR%%/plugins/Marketplace/lang/el.json
 %%WWWDIR%%/plugins/Marketplace/lang/en.json
 %%WWWDIR%%/plugins/Marketplace/lang/es.json
@@ -3926,6 +3945,9 @@
 %%WWWDIR%%/plugins/Morpheus/Controller.php
 %%WWWDIR%%/plugins/Morpheus/Menu.php
 %%WWWDIR%%/plugins/Morpheus/fonts/README.md
+%%WWWDIR%%/plugins/Morpheus/fonts/matomo.svg
+%%WWWDIR%%/plugins/Morpheus/fonts/matomo.ttf
+%%WWWDIR%%/plugins/Morpheus/fonts/matomo.woff
 %%WWWDIR%%/plugins/Morpheus/fonts/piwik.svg
 %%WWWDIR%%/plugins/Morpheus/fonts/piwik.ttf
 %%WWWDIR%%/plugins/Morpheus/fonts/piwik.woff
@@ -3945,12 +3967,15 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Asus.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Audiovox.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Avvio.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Azumi_Mobile.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/BBK.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/BGH.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/BangOlufsen.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Barnes_Noble.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Becker.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Beetel.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/BenQ.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Bitel.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Blaupunkt.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Cat.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Celkon.png
@@ -3960,6 +3985,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Compal.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Compaq.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/ConCorde.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Condor.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Coolpad.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/CreNova.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Cricket.png
@@ -3973,6 +3999,8 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Denver.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Digma.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/DoCoMo.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Doro.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/EKO.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Easypix.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Ericsson.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Evertek.png
@@ -3992,6 +4020,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Haier.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Huawei.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Humax.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Hyrican.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Hyundai.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/INQ.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/IconBIT.png
@@ -4007,7 +4036,6 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Konrow.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Kyocera.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/LG.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/LGUPlus.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/LYF.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Landvo.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Lanix.png
@@ -4019,6 +4047,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Manta_Multimedia.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/MediaTek.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Medion.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Meizu.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Metz.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/MicroMax.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Microsoft.png
@@ -4032,6 +4061,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Nexian.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Nikon.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Nintendo.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Noblex.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Nokia.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Nvidia.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/O2.png
@@ -4041,14 +4071,17 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/OnePlus.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Orange.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/PEAQ.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Palm.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Panasonic.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Pantech.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Philips.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Polaroid.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/PolyPad.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/QMobile.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Quechua.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/RIM.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/SFR.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/STK.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Sagem.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Samsung.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Sanyo.png
@@ -4067,6 +4100,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/TCL.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/TechniSat.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/TechnoTrend.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Teclast.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Tecno_Mobile.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Telefunken.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Telit.png
@@ -4078,11 +4112,15 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/TrekStor.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Tunisie_Telecom.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/UMIDIGI.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Ulefone.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Vertu.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Verykool.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Vestel.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Videocon.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Videoweb.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/ViewSonic.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Vivo.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Vodafone.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Voxtel.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Wiko.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Wileyfox.png
@@ -4093,6 +4131,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Yarvik.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Yuandao.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/ZTE.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Zen.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Zonda.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/Zopo.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/bq.png
@@ -4101,7 +4140,6 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/iBerry.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/teXet.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/brand/unk.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/brand/zen.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/36.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/3B.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/AA.png
@@ -4137,7 +4175,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/CO.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/CP.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/CR.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/Cyberfox.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/CY.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/DE.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/DF.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/DI.png
@@ -4150,6 +4188,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FD.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FE.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FF.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FK.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FL.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FM.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/FN.png
@@ -4190,6 +4229,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/MU.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/MX.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/NB.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/NE.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/NF.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/NL.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/NO.png
@@ -4243,7 +4283,6 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/WF.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/WO.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/YA.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/browsers/focus.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/devices/camera.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/devices/car_browser.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/devices/console.png
@@ -4568,6 +4607,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/PS3.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/PSP.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/QNX.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/os/REM.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/RHT.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/ROS.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/SAB.png
@@ -4588,9 +4628,11 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WCE.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WII.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WIN.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/os/WIO.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WMO.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WOS.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/WPH.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/os/WRT.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/XBT.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/XBX.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/os/YNS.png
@@ -4625,14 +4667,12 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/cgi.search.biglobe.ne.jp.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/chercherfr.aguea.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/claro-search.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/cse.google.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/daemon-search.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/digg.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/dir.gigablast.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/dmoz.org.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/duckduckgo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/ecosia.org.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/encrypted.google.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/eo.st.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/extern.peoplecheck.de.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/forestle.org.png
@@ -4651,7 +4691,6 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/images.search.yahoo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/images.yandex.ru.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/infospace.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/iwon.ask.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/ixquick.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/junglekey.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/jyxo.1188.cz.png
@@ -4743,6 +4782,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/surfcanyon.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/szukaj.onet.pl.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/szukaj.wp.pl.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/tarmot.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/technorati.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/translate.google.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/searchEngines/videa.seznam.cz.png
@@ -4876,7 +4916,7 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/douban.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/dribbble.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/facebook.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/fb.me.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/fetlife.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/flickr.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/flixster.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/fotolog.com.png
@@ -4886,27 +4926,17 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/gaiaonline.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/geni.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/github.com.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/global.cyworld.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/gree.jp.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/habbo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/hi5.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/hyves.nl.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/identi.ca.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/instagram.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lang-8.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/last.fm.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.com.br.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.com.tr.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.de.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.es.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.fr.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.it.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.jp.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.pl.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.ru.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lastfm.se.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/linkedin.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/livejournal.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/livejournal.ru.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/lnkd.in.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/login.live.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/login.tagged.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/meinvz.net.png
@@ -4929,33 +4959,28 @@
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/qzone.qq.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/reddit.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/renren.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/ru.netlog.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/skyrock.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/sonico.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/sourceforge.net.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/stackoverflow.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/studivz.net.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/stumbleupon.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/t.co.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/tagged.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/taringa.net.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/tuenti.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/tumblr.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/twitter.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/url.google.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/v2ex.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/viadeo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/vimeo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/vk.com.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/vkontakte.ru.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/vkrugudruzei.ru.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/wayn.com.png
+%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/web.telegram.org.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/weeworld.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/weibo.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/xanga.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/xing.com.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/xx.png
-%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/youtu.be.png
 %%WWWDIR%%/plugins/Morpheus/icons/dist/socials/youtube.com.png
 %%WWWDIR%%/plugins/Morpheus/images/add.png
 %%WWWDIR%%/plugins/Morpheus/images/affix-arrow.png
@@ -5273,6 +5298,10 @@
 %%WWWDIR%%/plugins/PrivacyManager/angularjs/delete-old-logs/delete-old-logs.controller.js
 %%WWWDIR%%/plugins/PrivacyManager/angularjs/delete-old-reports/delete-old-reports.controller.js
 %%WWWDIR%%/plugins/PrivacyManager/angularjs/do-not-track-preference/do-not-track-preference.controller.js
+%%WWWDIR%%/plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.controller.js
+%%WWWDIR%%/plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.directive.html
+%%WWWDIR%%/plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.directive.js
+%%WWWDIR%%/plugins/PrivacyManager/angularjs/opt-out-customizer/opt-out-customizer.directive.less
 %%WWWDIR%%/plugins/PrivacyManager/angularjs/report-deletion.model.js
 %%WWWDIR%%/plugins/PrivacyManager/angularjs/schedule-report-deletion/schedule-report-deletion.controller.js
 %%WWWDIR%%/plugins/PrivacyManager/lang/ar.json
@@ -5335,6 +5364,8 @@
 %%WWWDIR%%/plugins/ProfessionalServices/stylesheets/widget.less
 %%WWWDIR%%/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
 %%WWWDIR%%/plugins/ProfessionalServices/templates/promoBelowEvents.twig
+%%WWWDIR%%/plugins/ProfessionalServices/templates/promoBelowReferrerTypes.twig
+%%WWWDIR%%/plugins/ProfessionalServices/templates/promoCustomVariables.twig
 %%WWWDIR%%/plugins/ProfessionalServices/templates/promoExperiments.twig
 %%WWWDIR%%/plugins/ProfessionalServices/templates/promoFunnel.twig
 %%WWWDIR%%/plugins/ProfessionalServices/templates/promoHeatmaps.twig
@@ -5447,8 +5478,6 @@
 %%WWWDIR%%/plugins/Referrers/VisitorDetails.php
 %%WWWDIR%%/plugins/Referrers/Widgets/GetKeywordsForPage.php
 %%WWWDIR%%/plugins/Referrers/functions.php
-%%WWWDIR%%/plugins/Referrers/images/searchEngines/laban.vn.png
-%%WWWDIR%%/plugins/Referrers/images/searchEngines/search.lilo.org.png
 %%WWWDIR%%/plugins/Referrers/lang/am.json
 %%WWWDIR%%/plugins/Referrers/lang/ar.json
 %%WWWDIR%%/plugins/Referrers/lang/be.json
@@ -6502,8 +6531,11 @@
 %%WWWDIR%%/plugins/VisitTime/lang/ar.json
 %%WWWDIR%%/plugins/VisitTime/lang/be.json
 %%WWWDIR%%/plugins/VisitTime/lang/bg.json
+%%WWWDIR%%/plugins/VisitTime/lang/bn.json
+%%WWWDIR%%/plugins/VisitTime/lang/bs.json
 %%WWWDIR%%/plugins/VisitTime/lang/ca.json
 %%WWWDIR%%/plugins/VisitTime/lang/cs.json
+%%WWWDIR%%/plugins/VisitTime/lang/cy.json
 %%WWWDIR%%/plugins/VisitTime/lang/da.json
 %%WWWDIR%%/plugins/VisitTime/lang/de.json
 %%WWWDIR%%/plugins/VisitTime/lang/el.json
@@ -6540,6 +6572,7 @@
 %%WWWDIR%%/plugins/VisitTime/lang/sq.json
 %%WWWDIR%%/plugins/VisitTime/lang/sr.json
 %%WWWDIR%%/plugins/VisitTime/lang/sv.json
+%%WWWDIR%%/plugins/VisitTime/lang/ta.json
 %%WWWDIR%%/plugins/VisitTime/lang/te.json
 %%WWWDIR%%/plugins/VisitTime/lang/th.json
 %%WWWDIR%%/plugins/VisitTime/lang/tl.json
@@ -6673,7 +6706,13 @@
 %%WWWDIR%%/plugins/WebsiteMeasurable/Settings/Urls.php
 %%WWWDIR%%/plugins/WebsiteMeasurable/Type.php
 %%WWWDIR%%/plugins/WebsiteMeasurable/WebsiteMeasurable.php
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/am.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/ar.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/be.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/bg.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/bn.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/bs.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/ca.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/cs.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/da.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/de.json
@@ -6681,12 +6720,19 @@
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/en.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/es.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/et.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/eu.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/fi.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/fr.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/gl.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/he.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/hi.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/hr.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/hu.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/id.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/is.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/it.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/ja.json
+%%WWWDIR%%/plugins/WebsiteMeasurable/lang/ka.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/ko.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/lt.json
 %%WWWDIR%%/plugins/WebsiteMeasurable/lang/nb.json
@@ -6843,6 +6889,15 @@
 %%WWWDIR%%/vendor/leafo/lessphp/lessify.inc.php
 %%WWWDIR%%/vendor/leafo/lessphp/package.sh
 %%WWWDIR%%/vendor/leafo/lessphp/plessc
+%%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/CONTRIBUTING.md
+%%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/README.md
+%%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/composer.json
+%%WWWDIR%%/vendor/matomo/referrer-spam-blacklist/spammers.txt
+%%WWWDIR%%/vendor/matomo/searchengine-and-social-list/README.md
+%%WWWDIR%%/vendor/matomo/searchengine-and-social-list/SearchEngines.yml
+%%WWWDIR%%/vendor/matomo/searchengine-and-social-list/Socials.yml
+%%WWWDIR%%/vendor/matomo/searchengine-and-social-list/composer.json
+%%WWWDIR%%/vendor/matomo/searchengine-and-social-list/package.json
 %%WWWDIR%%/vendor/monolog/monolog/CHANGELOG.md
 %%WWWDIR%%/vendor/monolog/monolog/LICENSE
 %%WWWDIR%%/vendor/monolog/monolog/README.md
@@ -7106,6 +7161,7 @@
 %%WWWDIR%%/vendor/piwik/device-detector/Cache/StaticCache.php
 %%WWWDIR%%/vendor/piwik/device-detector/DeviceDetector.php
 %%WWWDIR%%/vendor/piwik/device-detector/Parser/Bot.php
+%%WWWDIR%%/vendor/piwik/device-detector/Parser/BotParserAbstract.php
 %%WWWDIR%%/vendor/piwik/device-detector/Parser/Client/Browser.php
 %%WWWDIR%%/vendor/piwik/device-detector/Parser/Client/Browser/Engine.php
 %%WWWDIR%%/vendor/piwik/device-detector/Parser/Client/Browser/Engine/Version.php
@@ -7164,14 +7220,6 @@
 %%WWWDIR%%/vendor/piwik/piwik-php-tracker/PiwikTracker.php
 %%WWWDIR%%/vendor/piwik/piwik-php-tracker/README.md
 %%WWWDIR%%/vendor/piwik/piwik-php-tracker/composer.json
-%%WWWDIR%%/vendor/piwik/referrer-spam-blacklist/CONTRIBUTING.md
-%%WWWDIR%%/vendor/piwik/referrer-spam-blacklist/README.md
-%%WWWDIR%%/vendor/piwik/referrer-spam-blacklist/composer.json
-%%WWWDIR%%/vendor/piwik/referrer-spam-blacklist/spammers.txt
-%%WWWDIR%%/vendor/piwik/searchengine-and-social-list/README.md
-%%WWWDIR%%/vendor/piwik/searchengine-and-social-list/SearchEngines.yml
-%%WWWDIR%%/vendor/piwik/searchengine-and-social-list/Socials.yml
-%%WWWDIR%%/vendor/piwik/searchengine-and-social-list/composer.json
 %%WWWDIR%%/vendor/psr/container/LICENSE
 %%WWWDIR%%/vendor/psr/container/README.md
 %%WWWDIR%%/vendor/psr/container/composer.json
diff --git a/www/piwik/distinfo b/www/piwik/distinfo
deleted file mode 100644
index 5d36af822e3f..000000000000
--- a/www/piwik/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1513868667
-SHA256 (piwik-3.2.1.tar.gz) = ed3ae8aafa135a240b0b053a780c261e82f7a5abe0f70a4a909120a6525f12ef
-SIZE (piwik-3.2.1.tar.gz) = 14653126