Skip to content

Commit

Permalink
www/matomo: the port had been updated to version 4.12.3
Browse files Browse the repository at this point in the history
Remove vestiges of the old project name and fix couple of
noticed typos in the installation instructions while here.

PR:		266843
Submitted by:	Oleg Ginzburg
Approved by:	maintainer (joneum: timeout)
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed Nov 14, 2022
1 parent 9b8077f commit 9c97a6d
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 23 deletions.
27 changes: 12 additions & 15 deletions www/matomo/Makefile
@@ -1,9 +1,8 @@
PORTNAME= matomo
DISTVERSION= 4.11.0
PORTVERSION= 4.12.3
CATEGORIES= www
MASTER_SITES= http://builds.matomo.org/
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= piwik-${DISTVERSION}

MAINTAINER= joneum@FreeBSD.org
COMMENT= Open Source Web Analytics Software Program
Expand All @@ -13,16 +12,18 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

USES= cpe shebangfix php:flavors
USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json \
mbstring mcrypt memcache mysqli opcache openssl pcre pdo \
pdo_mysql posix readline session simplexml soap sockets \
sqlite3 tidy tokenizer xml zlib

NO_ARCH= yes
NO_BUILD= yes
SHEBANG_FILES= misc/log-analytics/import_logs.py
SUB_FILES= pkg-message
PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}

USE_PHP= 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 zlib
NO_ARCH=yes

WRKSRC= ${WRKDIR}/piwik
WRKSRC= ${WRKDIR}/${PORTNAME}

OPTIONS_DEFINE= PHPPDOMYSQL PHPMYSQLI
OPTIONS_DEFAULT= PHPPDOMYSQL
Expand All @@ -31,16 +32,12 @@ PHPPDOMYSQL_USE= PHP=pdo_mysql
PHPMYSQLI_DESC= Use mysqli php module
PHPMYSQLI_USE= PHP=mysqli

PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}

SHEBANG_FILES= misc/log-analytics/import_logs.py

pre-install:
@if [ ! -f ${LOCALBASE}/bin/php ]; then \
echo " It seems you installed php without CLI enabled. "; \
echo " This will cause problems when using piwik. "; \
echo " It seems you installed PHP without CLI enabled. "; \
echo " This will cause problems when using Matomo. "; \
echo " If you want to reconsider, press Ctrl-C now to cancel. "; \
echo " Then reinstall php with CLI enabled. "; \
echo " Then reinstall PHP with CLI enabled. "; \
sleep 3; \
fi

Expand Down
6 changes: 3 additions & 3 deletions www/matomo/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1663588110
SHA256 (piwik-4.11.0.tar.gz) = af548a0f3a890427446c506f804be3b390c01774ffccea921fc4a0237a02a745
SIZE (piwik-4.11.0.tar.gz) = 16961843
TIMESTAMP = 1666842304
SHA256 (matomo-4.12.3.tar.gz) = 00efe4335c9cee9f269b5e8a337026af7f115c05cde1e9ae47485592372b37ee
SIZE (matomo-4.12.3.tar.gz) = 17194133
4 changes: 2 additions & 2 deletions www/matomo/files/pkg-message.in
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
1) Create a user and a empty database for Matomo to store all
1) Create a user and an empty database for Matomo to store all
its tables in (or choose an existing database).

2) Add the following to your Apache configuration, and
Expand Down Expand Up @@ -36,7 +36,7 @@ EOM
{
type: upgrade
message: <<EOM
Console upgrade recommended on medium and hight traffic sites:
Console upgrade recommended on medium and high traffic sites:

1) Disable Matomo Tracking
In config/config.ini.php, add the following
Expand Down
26 changes: 23 additions & 3 deletions www/matomo/pkg-plist
Expand Up @@ -620,6 +620,10 @@
%%WWWDIR%%/core/Updates/4.10.0-b1.php
%%WWWDIR%%/core/Updates/4.11.0-b1.php
%%WWWDIR%%/core/Updates/4.11.0-rc2.php
%%WWWDIR%%/core/Updates/4.12.0-b1.php
%%WWWDIR%%/core/Updates/4.12.0-b2.php
%%WWWDIR%%/core/Updates/4.12.0-b3.php
%%WWWDIR%%/core/Updates/4.12.0-b4.php
%%WWWDIR%%/core/Updates/4.3.0-b3.php
%%WWWDIR%%/core/Updates/4.3.0-b4.php
%%WWWDIR%%/core/Updates/4.3.0-rc2.php
Expand Down Expand Up @@ -901,6 +905,7 @@
%%WWWDIR%%/libs/jqplot/plugins/jqplot.canvasTextRenderer.js
%%WWWDIR%%/libs/jqplot/plugins/jqplot.categoryAxisRenderer.js
%%WWWDIR%%/libs/upgradephp/README
%%WWWDIR%%/libs/upgradephp/dev.php
%%WWWDIR%%/libs/upgradephp/upgrade.php
%%WWWDIR%%/matomo.php
%%WWWDIR%%/misc/How to install Matomo.html
Expand Down Expand Up @@ -2077,6 +2082,8 @@
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/FormField/utilities.ts
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/GroupedSettings/GroupedSetting.vue
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/GroupedSettings/GroupedSettings.vue
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/PasswordConfirmation/PasswordConfirmation.less
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/PasswordConfirmation/PasswordConfirmation.vue
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/PluginSettings/PluginSettings.adapter.ts
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/PluginSettings/PluginSettings.less
%%WWWDIR%%/plugins/CorePluginsAdmin/vue/src/PluginSettings/PluginSettings.vue
Expand Down Expand Up @@ -5672,6 +5679,7 @@
%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/studivz.net.png
%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/stumbleupon.com.png
%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/taringa.net.png
%%WWWDIR%%/plugins/Morpheus/icons/dist/socials/tiktok.com.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
Expand Down Expand Up @@ -6132,6 +6140,7 @@
%%WWWDIR%%/plugins/PrivacyManager/Tasks.php
%%WWWDIR%%/plugins/PrivacyManager/Tracker/RequestProcessor.php
%%WWWDIR%%/plugins/PrivacyManager/Validators/VisitsDataSubject.php
%%WWWDIR%%/plugins/PrivacyManager/changes.json
%%WWWDIR%%/plugins/PrivacyManager/config/config.php
%%WWWDIR%%/plugins/PrivacyManager/config/tracker.php
%%WWWDIR%%/plugins/PrivacyManager/lang/am.json
Expand Down Expand Up @@ -7119,7 +7128,12 @@
%%WWWDIR%%/plugins/TagManager/Template/Variable/UrlVariable.php
%%WWWDIR%%/plugins/TagManager/Template/Variable/UrlVariable.web.js
%%WWWDIR%%/plugins/TagManager/Template/Variable/VariablesProvider.php
%%WWWDIR%%/plugins/TagManager/Updates/4.12.3-b1.php
%%WWWDIR%%/plugins/TagManager/Updates/5.0.0-b1.php
%%WWWDIR%%/plugins/TagManager/Updates/NewTagParameterMigrator.php
%%WWWDIR%%/plugins/TagManager/Updates/NewVariableParameterMigrator.php
%%WWWDIR%%/plugins/TagManager/Validators/LookupTable.php
%%WWWDIR%%/plugins/TagManager/Validators/Numeric.php
%%WWWDIR%%/plugins/TagManager/Validators/TriggerConditions.php
%%WWWDIR%%/plugins/TagManager/Validators/TriggerIds.php
%%WWWDIR%%/plugins/TagManager/angularjs/form-field/field-textarea-variable-template.html
Expand Down Expand Up @@ -7241,6 +7255,7 @@
%%WWWDIR%%/plugins/TagManager/templates/dashboard.twig
%%WWWDIR%%/plugins/TagManager/templates/debug.twig
%%WWWDIR%%/plugins/TagManager/templates/gettingStarted.twig
%%WWWDIR%%/plugins/TagManager/templates/helpContent.twig
%%WWWDIR%%/plugins/TagManager/templates/manageContainers.twig
%%WWWDIR%%/plugins/TagManager/templates/manageTags.twig
%%WWWDIR%%/plugins/TagManager/templates/manageTriggers.twig
Expand All @@ -7266,6 +7281,7 @@
%%WWWDIR%%/plugins/TagManager/vue/src/Container/ContainerManage.vue
%%WWWDIR%%/plugins/TagManager/vue/src/Container/Containers.store.ts
%%WWWDIR%%/plugins/TagManager/vue/src/ContainerDashboard/ContainerDashboard.adapter.ts
%%WWWDIR%%/plugins/TagManager/vue/src/ContainerDashboard/ContainerDashboard.less
%%WWWDIR%%/plugins/TagManager/vue/src/ContainerDashboard/ContainerDashboard.vue
%%WWWDIR%%/plugins/TagManager/vue/src/ContainerSelector/ContainerSelector.adapter.ts
%%WWWDIR%%/plugins/TagManager/vue/src/ContainerSelector/ContainerSelector.less
Expand Down Expand Up @@ -8683,7 +8699,6 @@
%%WWWDIR%%/vendor/davaxi/sparkline/src/Sparkline/PointTrait.php
%%WWWDIR%%/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php
%%WWWDIR%%/vendor/davaxi/sparkline/src/autoload.php
%%WWWDIR%%/vendor/geoip2/geoip2/.php-cs-fixer.php
%%WWWDIR%%/vendor/geoip2/geoip2/CHANGELOG.md
%%WWWDIR%%/vendor/geoip2/geoip2/LICENSE
%%WWWDIR%%/vendor/geoip2/geoip2/README.md
Expand Down Expand Up @@ -8766,6 +8781,7 @@
%%WWWDIR%%/vendor/matomo/device-detector/Cache/PSR16Bridge.php
%%WWWDIR%%/vendor/matomo/device-detector/Cache/PSR6Bridge.php
%%WWWDIR%%/vendor/matomo/device-detector/Cache/StaticCache.php
%%WWWDIR%%/vendor/matomo/device-detector/ClientHints.php
%%WWWDIR%%/vendor/matomo/device-detector/DeviceDetector.php
%%WWWDIR%%/vendor/matomo/device-detector/LICENSE
%%WWWDIR%%/vendor/matomo/device-detector/Parser/AbstractBotParser.php
Expand All @@ -8776,6 +8792,8 @@
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/Browser/Engine.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/Browser/Engine/Version.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/FeedReader.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/Hints/AppHints.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/Hints/BrowserHints.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/Library.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/MediaPlayer.php
%%WWWDIR%%/vendor/matomo/device-detector/Parser/Client/MobileApp.php
Expand All @@ -8801,6 +8819,8 @@
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/browser_engine.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/browsers.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/feed_readers.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/hints/apps.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/hints/browsers.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/libraries.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/mediaplayers.yml
%%WWWDIR%%/vendor/matomo/device-detector/regexes/client/mobile_apps.yml
Expand Down Expand Up @@ -8860,7 +8880,6 @@
%%WWWDIR%%/vendor/matomo/matomo-php-tracker/MatomoTracker.php
%%WWWDIR%%/vendor/matomo/matomo-php-tracker/PiwikTracker.php
%%WWWDIR%%/vendor/matomo/matomo-php-tracker/README.md
%%WWWDIR%%/vendor/matomo/matomo-php-tracker/run_tests.sh
%%WWWDIR%%/vendor/matomo/network/LICENSE
%%WWWDIR%%/vendor/matomo/network/README.md
%%WWWDIR%%/vendor/matomo/network/src/IP.php
Expand Down Expand Up @@ -9136,7 +9155,6 @@
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ch.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
Expand All @@ -9162,6 +9180,7 @@
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
%%WWWDIR%%/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
Expand Down Expand Up @@ -9372,6 +9391,7 @@
%%WWWDIR%%/vendor/szymach/c-pchart/LICENSE
%%WWWDIR%%/vendor/szymach/c-pchart/README.md
%%WWWDIR%%/vendor/szymach/c-pchart/constants.php
%%WWWDIR%%/vendor/szymach/c-pchart/docker-compose.yml
%%WWWDIR%%/vendor/szymach/c-pchart/resources/barcode/128B.db
%%WWWDIR%%/vendor/szymach/c-pchart/resources/barcode/39.db
%%WWWDIR%%/vendor/szymach/c-pchart/resources/fonts/GeosansLight.ttf
Expand Down

0 comments on commit 9c97a6d

Please sign in to comment.