6 files changed, 17 insertions, 47 deletions

diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index 030c603b82ab..180b05c7c187 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	piwigo
-DISTVERSION=	2.9.4
-PORTREVISION=	2
+DISTVERSION=	2.9.5
 CATEGORIES=	www
 MASTER_SITES=	https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/
 
diff --git a/www/piwigo/distinfo b/www/piwigo/distinfo
index 13cb5e596697..68f93a3783ef 100644
--- a/www/piwigo/distinfo
+++ b/www/piwigo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531854993
-SHA256 (piwigo-2.9.4.zip) = 00fafe6887af62e34ee97dc9b8e4be0720af9f27ea1cdb16ab6217f462574a3c
-SIZE (piwigo-2.9.4.zip) = 7846445
+TIMESTAMP = 1554896975
+SHA256 (piwigo-2.9.5.zip) = 3adce7bfe04b78dc807c532649f4737cbc3f0f83fdf203b80664c1780599b6b8
+SIZE (piwigo-2.9.5.zip) = 7870527
diff --git a/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php b/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php
deleted file mode 100644
index be2ae9eb7b1d..000000000000
--- a/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/AdminTools/include/MultiView.class.php.orig	2018-07-13 13:24:00 UTC
-+++ plugins/AdminTools/include/MultiView.class.php
-@@ -38,7 +38,7 @@ class MultiView
-       );
- 
-     $this->data_url_params = array_keys($this->data);
--    $this->data_url_params = array_map(create_function('$d', 'return "ato_".$d;'), $this->data_url_params);
-+    $this->data_url_params = array_map(function($d) { return 'ato_'.$d; }, $this->data_url_params);
-   }
- 
-   /**
-@@ -226,7 +226,7 @@ class MultiView
-       }
-       if ($this->data['no_history'])
-       {
--        $ret_false = create_function('', 'return false;');
-+        $ret_false = function() {return false;};
-         add_event_handler('pwg_log_allowed', $ret_false);
-         add_event_handler('pwg_log_update_last_visit', $ret_false);
-       }
diff --git a/www/piwigo/files/patch-plugins_AdminTools_main.inc.php b/www/piwigo/files/patch-plugins_AdminTools_main.inc.php
deleted file mode 100644
index e625b4a5f681..000000000000
--- a/www/piwigo/files/patch-plugins_AdminTools_main.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/AdminTools/main.inc.php.orig	2018-07-13 13:24:01 UTC
-+++ plugins/AdminTools/main.inc.php
-@@ -1,7 +1,7 @@
- <?php
- /*
- Plugin Name: Admin Tools
--Version: 2.9.4
-+Version: 2.9.4.1
- Description: Do some admin task from the public pages
- Plugin URI: http://piwigo.org/ext/extension_view.php?eid=720
- Author: Piwigo team
diff --git a/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt b/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt
deleted file mode 100644
index bc1e8cab5681..000000000000
--- a/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/AdminTools/pem_metadata.txt.orig	2018-07-13 13:24:01 UTC
-+++ plugins/AdminTools/pem_metadata.txt
-@@ -1,2 +1,4 @@
--https://github.com/Piwigo/AdminTools.git
--4161bc7f94819af01fea8631ad2b4258d00e5151 2017-12-11 18:11:36 +0100
-\ No newline at end of file
-+File automatically created from SVN or Git repository.
-+
-+URL: https://github.com/Piwigo/AdminTools 
-+Revision: d99a1378f9e05b087c9d590665e52ad5ccf2a41b (Mon Jul 16 17:38:42 2018 +0200)
-\ No newline at end of file
diff --git a/www/piwigo/pkg-plist b/www/piwigo/pkg-plist
index 76bde92567a3..259403cb217d 100644
--- a/www/piwigo/pkg-plist
+++ b/www/piwigo/pkg-plist
@@ -980,6 +980,7 @@
 %%WWWDIR%%/language/en_GB/admin.lang.php
 %%WWWDIR%%/language/en_GB/common.lang.php
 %%WWWDIR%%/language/en_GB/en_GB.jpg
+%%WWWDIR%%/language/en_GB/help/quick_search.html
 %%WWWDIR%%/language/en_GB/index.php
 %%WWWDIR%%/language/en_GB/install.lang.php
 %%WWWDIR%%/language/en_GB/iso.txt
@@ -1627,6 +1628,7 @@
 %%WWWDIR%%/language/ro_RO/about.html
 %%WWWDIR%%/language/ro_RO/admin.lang.php
 %%WWWDIR%%/language/ro_RO/common.lang.php
+%%WWWDIR%%/language/ro_RO/help/cat_modify.html
 %%WWWDIR%%/language/ro_RO/help/cat_move.html
 %%WWWDIR%%/language/ro_RO/help/cat_options.html
 %%WWWDIR%%/language/ro_RO/help/help_add_photos.html
@@ -1711,6 +1713,7 @@
 %%WWWDIR%%/language/sl_SI/about.html
 %%WWWDIR%%/language/sl_SI/admin.lang.php
 %%WWWDIR%%/language/sl_SI/common.lang.php
+%%WWWDIR%%/language/sl_SI/help/cat_modify.html
 %%WWWDIR%%/language/sl_SI/help/cat_move.html
 %%WWWDIR%%/language/sl_SI/help/cat_options.html
 %%WWWDIR%%/language/sl_SI/help/cat_perm.html
@@ -1958,6 +1961,7 @@
 %%WWWDIR%%/plugins/AdminTools/language/el_GR/description.txt
 %%WWWDIR%%/plugins/AdminTools/language/el_GR/index.php
 %%WWWDIR%%/plugins/AdminTools/language/el_GR/plugin.lang.php
+%%WWWDIR%%/plugins/AdminTools/language/en_GB/description.txt
 %%WWWDIR%%/plugins/AdminTools/language/en_GB/plugin.lang.php
 %%WWWDIR%%/plugins/AdminTools/language/en_UK/description.txt
 %%WWWDIR%%/plugins/AdminTools/language/en_UK/index.php
@@ -2336,7 +2340,12 @@
 %%WWWDIR%%/plugins/TakeATour/language/el_GR/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/el_GR/tour_first_contact.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/el_GR/tour_privacy.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/en_GB/description.txt
+%%WWWDIR%%/plugins/TakeATour/language/en_GB/plugin.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/en_GB/tour_2_7_0.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/en_GB/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/en_GB/tour_first_contact.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/en_GB/tour_privacy.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/en_UK/description.txt
 %%WWWDIR%%/plugins/TakeATour/language/en_UK/index.php
 %%WWWDIR%%/plugins/TakeATour/language/en_UK/plugin.lang.php
@@ -2375,6 +2384,8 @@
 %%WWWDIR%%/plugins/TakeATour/language/fr_CA/index.php
 %%WWWDIR%%/plugins/TakeATour/language/fr_CA/plugin.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/fr_CA/tour_2_7_0.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/fr_CA/tour_2_8_0.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/fr_CA/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/fr_FR/description.txt
 %%WWWDIR%%/plugins/TakeATour/language/fr_FR/index.php
 %%WWWDIR%%/plugins/TakeATour/language/fr_FR/plugin.lang.php
@@ -2484,6 +2495,7 @@
 %%WWWDIR%%/plugins/TakeATour/language/sr_RS/plugin.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/sr_RS/tour_2_7_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/sr_RS/tour_2_8_0.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/sr_RS/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/sv_SE/description.txt
 %%WWWDIR%%/plugins/TakeATour/language/sv_SE/index.php
 %%WWWDIR%%/plugins/TakeATour/language/sv_SE/plugin.lang.php
@@ -2521,6 +2533,7 @@
 %%WWWDIR%%/plugins/TakeATour/language/zh_CN/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/zh_CN/tour_first_contact.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/zh_CN/tour_privacy.lang.php
+%%WWWDIR%%/plugins/TakeATour/language/zh_HK/plugin.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/zh_HK/tour_2_8_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/zh_HK/tour_2_9_0.lang.php
 %%WWWDIR%%/plugins/TakeATour/language/zh_TW/index.php