- update to 1.8.3

while here:
- remove LICENSE_FILE
- replace patch-file with reinplace

PR:		170696
Submitted by:	Hans F. Nordhaug <Hans.F.Nordhaug at hiMolde dot no> (maintainer, another email)

4 files changed, 67 insertions, 14 deletions

diff --git a/www/piwik/Makefile b/www/piwik/Makefile
index 17dfc5b19705..78ed099d32d6 100644
--- a/www/piwik/Makefile
+++ b/www/piwik/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	piwik
-PORTVERSION=	1.8.2
+PORTVERSION=	1.8.3
 CATEGORIES=	www
 MASTER_SITES=	http://builds.piwik.org/
 
@@ -14,7 +14,6 @@ MAINTAINER=	hans@nordhaug.priv.no
 COMMENT=	A Open Source Web Analytics Software Program
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/misc/gpl-3.0.txt
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
@@ -37,7 +36,9 @@ USE_PHP+=	pdo_mysql
 .endif
 
 post-patch:
-	@cd ${WRKSRC}/misc/log-analytics && ${RM} -rf import_logs.py.orig
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \
+		${WRKSRC}/misc/log-analytics/import_logs.py
+	@${RM} ${WRKSRC}/misc/log-analytics/import_logs.py.bak
 
 pre-install:
 	@if [ ! -f ${LOCALBASE}/bin/php ]; then \
diff --git a/www/piwik/distinfo b/www/piwik/distinfo
index c02d55adc605..4869d8dafced 100644
--- a/www/piwik/distinfo
+++ b/www/piwik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (piwik-1.8.2.tar.gz) = 613337ec2558f2b056fd75e8062edcc3b3743581919cd4539210592f3d727152
-SIZE (piwik-1.8.2.tar.gz) = 4753349
+SHA256 (piwik-1.8.3.tar.gz) = db8ea4a41351b1df94ac72c2d863522dffe9196e9ffb9dd4146456e2676f5be9
+SIZE (piwik-1.8.3.tar.gz) = 4870162
diff --git a/www/piwik/files/patch-misc_log-analytics_import_logs.py b/www/piwik/files/patch-misc_log-analytics_import_logs.py
deleted file mode 100644
index adf0683dca1a..000000000000
--- a/www/piwik/files/patch-misc_log-analytics_import_logs.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- misc/log-analytics/import_logs.py.orig	2012-06-03 11:52:22.000000000 +0200
-+++ misc/log-analytics/import_logs.py	2012-06-03 11:52:29.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/local/bin/python
- # -*- coding: utf-8 -*-
- #
- # Piwik - Open source web analytics
diff --git a/www/piwik/pkg-plist b/www/piwik/pkg-plist
index fb19bd573993..ae217878736f 100644
--- a/www/piwik/pkg-plist
+++ b/www/piwik/pkg-plist
@@ -1,5 +1,6 @@
 %%WWWDIR%%/LEGALNOTICE
 %%WWWDIR%%/README
+%%WWWDIR%%/composer.json
 %%WWWDIR%%/config/config.ini.sample.php
 %%WWWDIR%%/config/global.ini.php
 %%WWWDIR%%/config/manifest.inc.php
@@ -166,6 +167,7 @@
 %%WWWDIR%%/core/Tracker/Action.php
 %%WWWDIR%%/core/Tracker/Config.php
 %%WWWDIR%%/core/Tracker/Db.php
+%%WWWDIR%%/core/Tracker/Db/Exception.php
 %%WWWDIR%%/core/Tracker/Db/Mysqli.php
 %%WWWDIR%%/core/Tracker/Db/Pdo/Mysql.php
 %%WWWDIR%%/core/Tracker/Db/Pdo/Pgsql.php
@@ -223,6 +225,7 @@
 %%WWWDIR%%/core/Updates/1.7-b1.php
 %%WWWDIR%%/core/Updates/1.7.2-rc5.php
 %%WWWDIR%%/core/Updates/1.7.2-rc7.php
+%%WWWDIR%%/core/Updates/1.8.3-b1.php
 %%WWWDIR%%/core/Url.php
 %%WWWDIR%%/core/Version.php
 %%WWWDIR%%/core/View.php
@@ -967,6 +970,8 @@
 %%WWWDIR%%/libs/tcpdf/fonts/helveticabi.php
 %%WWWDIR%%/libs/tcpdf/fonts/helveticai.php
 %%WWWDIR%%/libs/tcpdf/fonts/hysmyeongjostdmedium.php
+%%WWWDIR%%/libs/tcpdf/fonts/kozminproregular.php
+%%WWWDIR%%/libs/tcpdf/fonts/kozgopromedium.php
 %%WWWDIR%%/libs/tcpdf/fonts/msungstdlight.php
 %%WWWDIR%%/libs/tcpdf/fonts/stsongstdlight.php
 %%WWWDIR%%/libs/tcpdf/fonts/symbol.php
@@ -995,6 +1000,24 @@
 %%WWWDIR%%/misc/cron/archive.sh
 %%WWWDIR%%/misc/cron/archive.windows.ps1
 %%WWWDIR%%/misc/crossdomain.xml
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/CHANGELOG
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/LICENSE
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/Modulefile
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/README.md
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc/php5/conf.d/mysqli.ini
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc/php5/conf.d/pdo.ini
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc/php5/conf.d/pdo_mysql.ini
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/apache.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/base.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/db.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/init.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/loganalytics.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/nginx.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/params.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/php.pp
+%%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests/repo.pp
+%%WWWDIR%%/misc/deploy/puppet/site.pp
+%%WWWDIR%%/misc/deploy/vagrant/precise64/Vagrantfile
 %%WWWDIR%%/misc/download-count.txt
 %%WWWDIR%%/misc/generateDoc.bat
 %%WWWDIR%%/misc/generateDoc.sh
@@ -1247,6 +1270,23 @@
 %%WWWDIR%%/plugins/Login/templates/lostPassword.tpl
 %%WWWDIR%%/plugins/Login/templates/passwordchanged.tpl
 %%WWWDIR%%/plugins/Login/templates/passwordsent.tpl
+%%WWWDIR%%/plugins/MobileMessaging/API.php
+%%WWWDIR%%/plugins/MobileMessaging/APIException.php
+%%WWWDIR%%/plugins/MobileMessaging/Controller.php
+%%WWWDIR%%/plugins/MobileMessaging/CountryCallingCodes.php
+%%WWWDIR%%/plugins/MobileMessaging/GSMCharset.php
+%%WWWDIR%%/plugins/MobileMessaging/MobileMessaging.php
+%%WWWDIR%%/plugins/MobileMessaging/ReportRenderer/Exception.php
+%%WWWDIR%%/plugins/MobileMessaging/ReportRenderer/Sms.php
+%%WWWDIR%%/plugins/MobileMessaging/SMSProvider/Clockwork.php
+%%WWWDIR%%/plugins/MobileMessaging/SMSProvider.php
+%%WWWDIR%%/plugins/MobileMessaging/images/Clockwork.png
+%%WWWDIR%%/plugins/MobileMessaging/images/phone.png
+%%WWWDIR%%/plugins/MobileMessaging/lang/en.php
+%%WWWDIR%%/plugins/MobileMessaging/scripts/MobileMessagingSettings.js
+%%WWWDIR%%/plugins/MobileMessaging/templates/ReportParameters.tpl
+%%WWWDIR%%/plugins/MobileMessaging/templates/SMSReport.tpl
+%%WWWDIR%%/plugins/MobileMessaging/templates/Settings.tpl
 %%WWWDIR%%/plugins/Login/templates/resetPassword.tpl
 %%WWWDIR%%/plugins/MultiSites/API.php
 %%WWWDIR%%/plugins/MultiSites/CalculateEvolutionFilter.php
@@ -1275,6 +1315,7 @@
 %%WWWDIR%%/plugins/PDFReports/templates/index.tpl
 %%WWWDIR%%/plugins/PDFReports/templates/list.tpl
 %%WWWDIR%%/plugins/PDFReports/templates/pdf.js
+%%WWWDIR%%/plugins/PDFReports/templates/report_parameters.tpl
 %%WWWDIR%%/plugins/PrivacyManager/Controller.php
 %%WWWDIR%%/plugins/PrivacyManager/PrivacyManager.php
 %%WWWDIR%%/plugins/PrivacyManager/LogDataPurger.php
@@ -2057,6 +2098,7 @@
 %%WWWDIR%%/themes/default/images/ok.png
 %%WWWDIR%%/themes/default/images/page_border_grad.png
 %%WWWDIR%%/themes/default/images/plus.png
+%%WWWDIR%%/themes/default/images/refresh.png
 %%WWWDIR%%/themes/default/images/row_evolution.png
 %%WWWDIR%%/themes/default/images/search_bg.png
 %%WWWDIR%%/themes/default/images/search_ico.png
@@ -2142,6 +2184,13 @@
 @dirrm %%WWWDIR%%/plugins/MultiSites/templates
 @dirrm %%WWWDIR%%/plugins/MultiSites/images
 @dirrm %%WWWDIR%%/plugins/MultiSites
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/templates
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/scripts
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/lang
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/images
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/SMSProvider
+@dirrm %%WWWDIR%%/plugins/MobileMessaging/ReportRenderer
+@dirrm %%WWWDIR%%/plugins/MobileMessaging
 @dirrm %%WWWDIR%%/plugins/Login/templates
 @dirrm %%WWWDIR%%/plugins/Login
 @dirrm %%WWWDIR%%/plugins/Live/templates/scripts
@@ -2197,8 +2246,19 @@
 @dirrm %%WWWDIR%%/plugins/API
 @dirrm %%WWWDIR%%/plugins
 @dirrm %%WWWDIR%%/misc/proxy-hide-piwik-url
-@dirrm %%WWWDIR%%/misc/cron
 @dirrm %%WWWDIR%%/misc/log-analytics
+@dirrm %%WWWDIR%%/misc/deploy/vagrant/precise64
+@dirrm %%WWWDIR%%/misc/deploy/vagrant
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik/manifests
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc/php5/conf.d
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc/php5
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik/files/etc
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik/files
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules/piwik
+@dirrm %%WWWDIR%%/misc/deploy/puppet/modules
+@dirrm %%WWWDIR%%/misc/deploy/puppet
+@dirrm %%WWWDIR%%/misc/deploy
+@dirrm %%WWWDIR%%/misc/cron
 @dirrm %%WWWDIR%%/misc
 @dirrm %%WWWDIR%%/libs/upgradephp
 @dirrm %%WWWDIR%%/libs/tcpdf/fonts