3 files changed, 119 insertions, 6 deletions

diff --git a/www/piwik/Makefile b/www/piwik/Makefile
index 253e775fcfb7..53b82cdb5320 100644
--- a/www/piwik/Makefile
+++ b/www/piwik/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	piwik
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	www
 MASTER_SITES=	http://builds.piwik.org/
 
diff --git a/www/piwik/distinfo b/www/piwik/distinfo
index 4bb3f577baa7..58cb2696d801 100644
--- a/www/piwik/distinfo
+++ b/www/piwik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (piwik-2.2.0.tar.gz) = 463aa65b37cc486e349600cbc860611eb461a6ad039e04c7d9ea8b958f2dd950
-SIZE (piwik-2.2.0.tar.gz) = 8123543
+SHA256 (piwik-2.2.1.tar.gz) = f25482fa4f3ecb8d6a8fa7320f3ccb546a383fadb656ff66f351782de34ce1b5
+SIZE (piwik-2.2.1.tar.gz) = 8195203
diff --git a/www/piwik/pkg-plist b/www/piwik/pkg-plist
index 243fbfa62c3b..aa7faa4dab54 100644
--- a/www/piwik/pkg-plist
+++ b/www/piwik/pkg-plist
@@ -145,6 +145,7 @@
 %%WWWDIR%%/core/Option.php
 %%WWWDIR%%/core/Period.php
 %%WWWDIR%%/core/Period/Day.php
+%%WWWDIR%%/core/Period/Factory.php
 %%WWWDIR%%/core/Period/Month.php
 %%WWWDIR%%/core/Period/Range.php
 %%WWWDIR%%/core/Period/Week.php
@@ -828,6 +829,7 @@
 %%WWWDIR%%/libs/upgradephp/README
 %%WWWDIR%%/libs/upgradephp/upgrade.php
 %%WWWDIR%%/misc/How to install Piwik.html
+%%WWWDIR%%/misc/cron/.htaccess
 %%WWWDIR%%/misc/cron/archive.php
 %%WWWDIR%%/misc/cron/archive.sh
 %%WWWDIR%%/misc/cron/updatetoken.php
@@ -1348,6 +1350,7 @@
 %%WWWDIR%%/plugins/Events/lang/nl.json
 %%WWWDIR%%/plugins/Events/lang/pt-br.json
 %%WWWDIR%%/plugins/Events/lang/ro.json
+%%WWWDIR%%/plugins/Events/lang/sl.json
 %%WWWDIR%%/plugins/Events/lang/sr.json
 %%WWWDIR%%/plugins/Events/lang/sv.json
 %%WWWDIR%%/plugins/Events/lang/ta.json
@@ -1477,9 +1480,10 @@
 %%WWWDIR%%/plugins/Installation/Controller.php
 %%WWWDIR%%/plugins/Installation/FormDatabaseSetup.php
 %%WWWDIR%%/plugins/Installation/FormFirstWebsiteSetup.php
-%%WWWDIR%%/plugins/Installation/FormGeneralSetup.php
+%%WWWDIR%%/plugins/Installation/FormSuperUser.php
 %%WWWDIR%%/plugins/Installation/Installation.php
 %%WWWDIR%%/plugins/Installation/ServerFilesGenerator.php
+%%WWWDIR%%/plugins/Installation/SystemCheck.php
 %%WWWDIR%%/plugins/Installation/View.php
 %%WWWDIR%%/plugins/Installation/javascripts/installation.js
 %%WWWDIR%%/plugins/Installation/stylesheets/installation.css
@@ -1488,19 +1492,19 @@
 %%WWWDIR%%/plugins/Installation/templates/_integrityDetails.twig
 %%WWWDIR%%/plugins/Installation/templates/_systemCheckLegend.twig
 %%WWWDIR%%/plugins/Installation/templates/_systemCheckSection.twig
-%%WWWDIR%%/plugins/Installation/templates/databaseCheck.twig
 %%WWWDIR%%/plugins/Installation/templates/databaseSetup.twig
 %%WWWDIR%%/plugins/Installation/templates/finished.twig
 %%WWWDIR%%/plugins/Installation/templates/firstWebsiteSetup.twig
-%%WWWDIR%%/plugins/Installation/templates/generalSetup.twig
 %%WWWDIR%%/plugins/Installation/templates/layout.twig
 %%WWWDIR%%/plugins/Installation/templates/reuseTables.twig
+%%WWWDIR%%/plugins/Installation/templates/setupSuperUser.twig
 %%WWWDIR%%/plugins/Installation/templates/systemCheck.twig
 %%WWWDIR%%/plugins/Installation/templates/systemCheckPage.twig
 %%WWWDIR%%/plugins/Installation/templates/tablesCreation.twig
 %%WWWDIR%%/plugins/Installation/templates/trackingCode.twig
 %%WWWDIR%%/plugins/Installation/templates/welcome.twig
 %%WWWDIR%%/plugins/LanguagesManager/API.php
+%%WWWDIR%%/plugins/LanguagesManager/Commands/CompareKeys.php
 %%WWWDIR%%/plugins/LanguagesManager/Commands/CreatePull.php
 %%WWWDIR%%/plugins/LanguagesManager/Commands/FetchFromOTrance.php
 %%WWWDIR%%/plugins/LanguagesManager/Commands/LanguageCodes.php
@@ -2058,7 +2062,11 @@
 %%WWWDIR%%/plugins/SitesManager/stylesheets/SitesManager.less
 %%WWWDIR%%/plugins/SitesManager/templates/_displayJavascriptCode.twig
 %%WWWDIR%%/plugins/SitesManager/templates/displayJavascriptCode.twig
+%%WWWDIR%%/plugins/SitesManager/templates/global-settings.twig
 %%WWWDIR%%/plugins/SitesManager/templates/index.twig
+%%WWWDIR%%/plugins/SitesManager/templates/init-script.twig
+%%WWWDIR%%/plugins/SitesManager/templates/sites-management.twig
+%%WWWDIR%%/plugins/SitesManager/templates/sites-manager-heading.twig
 %%WWWDIR%%/plugins/Transitions/API.php
 %%WWWDIR%%/plugins/Transitions/Controller.php
 %%WWWDIR%%/plugins/Transitions/Transitions.php
@@ -2917,12 +2925,14 @@
 %%WWWDIR%%/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl
 %%WWWDIR%%/tests/README.md
 %%WWWDIR%%/vendor/autoload.php
+%%WWWDIR%%/vendor/bin/phpunit
 %%WWWDIR%%/vendor/composer/ClassLoader.php
 %%WWWDIR%%/vendor/composer/autoload_classmap.php
 %%WWWDIR%%/vendor/composer/autoload_files.php
 %%WWWDIR%%/vendor/composer/autoload_namespaces.php
 %%WWWDIR%%/vendor/composer/autoload_psr4.php
 %%WWWDIR%%/vendor/composer/autoload_real.php
+%%WWWDIR%%/vendor/composer/include_paths.php
 %%WWWDIR%%/vendor/composer/installed.json
 %%WWWDIR%%/vendor/leafo/lessphp/.gitignore
 %%WWWDIR%%/vendor/leafo/lessphp/.travis.yml
@@ -2955,6 +2965,49 @@
 %%WWWDIR%%/vendor/piwik/device-detector/regexes/mobiles.yml
 %%WWWDIR%%/vendor/piwik/device-detector/regexes/oss.yml
 %%WWWDIR%%/vendor/piwik/device-detector/regexes/televisions.yml
+%%WWWDIR%%/vendor/sebastian/diff/.gitignore
+%%WWWDIR%%/vendor/sebastian/diff/.travis.yml
+%%WWWDIR%%/vendor/sebastian/diff/LICENSE
+%%WWWDIR%%/vendor/sebastian/diff/README.md
+%%WWWDIR%%/vendor/sebastian/diff/build.xml
+%%WWWDIR%%/vendor/sebastian/diff/build/package.xml
+%%WWWDIR%%/vendor/sebastian/diff/composer.json
+%%WWWDIR%%/vendor/sebastian/diff/phpunit.xml.dist
+%%WWWDIR%%/vendor/sebastian/diff/src/Chunk.php
+%%WWWDIR%%/vendor/sebastian/diff/src/Diff.php
+%%WWWDIR%%/vendor/sebastian/diff/src/Differ.php
+%%WWWDIR%%/vendor/sebastian/diff/src/Line.php
+%%WWWDIR%%/vendor/sebastian/diff/src/Parser.php
+%%WWWDIR%%/vendor/sebastian/diff/src/autoload.php
+%%WWWDIR%%/vendor/sebastian/environment/.gitignore
+%%WWWDIR%%/vendor/sebastian/environment/.travis.yml
+%%WWWDIR%%/vendor/sebastian/environment/LICENSE
+%%WWWDIR%%/vendor/sebastian/environment/README.md
+%%WWWDIR%%/vendor/sebastian/environment/build.xml
+%%WWWDIR%%/vendor/sebastian/environment/composer.json
+%%WWWDIR%%/vendor/sebastian/environment/phpunit.xml.dist
+%%WWWDIR%%/vendor/sebastian/environment/src/Runtime.php
+%%WWWDIR%%/vendor/sebastian/exporter/.gitignore
+%%WWWDIR%%/vendor/sebastian/exporter/.travis.yml
+%%WWWDIR%%/vendor/sebastian/exporter/LICENSE
+%%WWWDIR%%/vendor/sebastian/exporter/README.md
+%%WWWDIR%%/vendor/sebastian/exporter/build.xml
+%%WWWDIR%%/vendor/sebastian/exporter/composer.json
+%%WWWDIR%%/vendor/sebastian/exporter/phpunit.xml.dist
+%%WWWDIR%%/vendor/sebastian/exporter/src/Context.php
+%%WWWDIR%%/vendor/sebastian/exporter/src/Exception.php
+%%WWWDIR%%/vendor/sebastian/exporter/src/Exporter.php
+%%WWWDIR%%/vendor/sebastian/version/.gitattributes
+%%WWWDIR%%/vendor/sebastian/version/.gitignore
+%%WWWDIR%%/vendor/sebastian/version/ChangeLog.md
+%%WWWDIR%%/vendor/sebastian/version/LICENSE
+%%WWWDIR%%/vendor/sebastian/version/README.md
+%%WWWDIR%%/vendor/sebastian/version/build.xml
+%%WWWDIR%%/vendor/sebastian/version/build/package.xml
+%%WWWDIR%%/vendor/sebastian/version/build/phpunit.xml
+%%WWWDIR%%/vendor/sebastian/version/composer.json
+%%WWWDIR%%/vendor/sebastian/version/src/Version.php
+%%WWWDIR%%/vendor/sebastian/version/src/autoload.php
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/.gitignore
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/Application.php
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/CHANGELOG.md
@@ -3010,6 +3063,47 @@
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/Tester/CommandTester.php
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/composer.json
 %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/phpunit.xml.dist
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/.gitignore
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/CHANGELOG.md
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/DumpException.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/README.md
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/DumperTest.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsAnchorAlias.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsBasicTests.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsBlockMapping.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsDocumentSeparator.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsErrorTests.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsFlowCollections.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsFoldedScalars.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/embededPhp.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/escapedCharacters.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/index.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfComments.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfCompact.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfObjects.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfQuotes.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures/unindentedCollections.yml
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParseExceptionTest.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/ParserTest.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/YamlTest.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
+%%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/phpunit.xml.dist
 %%WWWDIR%%/vendor/tedivm/jshrink/.gitignore
 %%WWWDIR%%/vendor/tedivm/jshrink/.travis.yml
 %%WWWDIR%%/vendor/tedivm/jshrink/LICENSE
@@ -3220,6 +3314,13 @@
 @dirrm %%WWWDIR%%/vendor/tedivm/jshrink/src
 @dirrm %%WWWDIR%%/vendor/tedivm/jshrink
 @dirrm %%WWWDIR%%/vendor/tedivm
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/Fixtures
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Tests
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml/Exception
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony/Component/Yaml
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony/Component
+@dirrm %%WWWDIR%%/vendor/symfony/yaml/Symfony
+@dirrm %%WWWDIR%%/vendor/symfony/yaml
 @dirrm %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/Tester
 @dirrm %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/Resources
 @dirrm %%WWWDIR%%/vendor/symfony/console/Symfony/Component/Console/Output
@@ -3234,6 +3335,17 @@
 @dirrm %%WWWDIR%%/vendor/symfony/console/Symfony
 @dirrm %%WWWDIR%%/vendor/symfony/console
 @dirrm %%WWWDIR%%/vendor/symfony
+@dirrm %%WWWDIR%%/vendor/sebastian/version/src
+@dirrm %%WWWDIR%%/vendor/sebastian/version/build
+@dirrm %%WWWDIR%%/vendor/sebastian/version
+@dirrm %%WWWDIR%%/vendor/sebastian/exporter/src
+@dirrm %%WWWDIR%%/vendor/sebastian/exporter
+@dirrm %%WWWDIR%%/vendor/sebastian/environment/src
+@dirrm %%WWWDIR%%/vendor/sebastian/environment
+@dirrm %%WWWDIR%%/vendor/sebastian/diff/src
+@dirrm %%WWWDIR%%/vendor/sebastian/diff/build
+@dirrm %%WWWDIR%%/vendor/sebastian/diff
+@dirrm %%WWWDIR%%/vendor/sebastian
 @dirrm %%WWWDIR%%/vendor/piwik/device-detector/regexes
 @dirrm %%WWWDIR%%/vendor/piwik/device-detector
 @dirrm %%WWWDIR%%/vendor/piwik
@@ -3245,6 +3357,7 @@
 @dirrm %%WWWDIR%%/vendor/leafo/lessphp
 @dirrm %%WWWDIR%%/vendor/leafo
 @dirrm %%WWWDIR%%/vendor/composer
+@dirrm %%WWWDIR%%/vendor/bin
 @dirrm %%WWWDIR%%/vendor
 @dirrm %%WWWDIR%%/tmp
 @dirrm %%WWWDIR%%/tests