3 files changed, 29 insertions, 38 deletions

diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile
index 92bc2059158f..181ec08d83f1 100644
--- a/www/zenphoto/Makefile
+++ b/www/zenphoto/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zenphoto
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.8
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	www
 
@@ -12,16 +12,17 @@ COMMENT=	Simpler web photo gallery
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USES=		cpe
 NO_BUILD=	yes
 USE_PHP=	gd gettext json mbstring mysql pcre session
+USES=		cpe
 WANT_PHP_WEB=	yes
-USE_GITHUB=	yes
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-deinstall pkg-message
 
+USE_GITHUB=	yes
+
 post-extract:
 	@${MKDIR} ${WRKSRC}/cache/
 	@${FIND} ${WRKSRC} -name .gitignore -delete
diff --git a/www/zenphoto/distinfo b/www/zenphoto/distinfo
index 9f8708f64fbe..4b9527716ee1 100644
--- a/www/zenphoto/distinfo
+++ b/www/zenphoto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zenphoto-zenphoto-zenphoto-1.4.6_GH0.tar.gz) = 2240514feec63d75f6b40d2b419ff2eb4d022c3ed7777c33bf32190099d937d2
-SIZE (zenphoto-zenphoto-zenphoto-1.4.6_GH0.tar.gz) = 9285209
+SHA256 (zenphoto-zenphoto-zenphoto-1.4.8_GH0.tar.gz) = c14bf8eec8f794d08d4bf2d6bb6500f32d7a5167911e69e3e7528d19381691b6
+SIZE (zenphoto-zenphoto-zenphoto-1.4.8_GH0.tar.gz) = 9213827
diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist
index cc67afd0c971..734067047bed 100644
--- a/www/zenphoto/pkg-plist
+++ b/www/zenphoto/pkg-plist
@@ -1,9 +1,10 @@
 @owner www
 @group www
-%%WWWDIR%%/CHANGELOG.md
+%%WWWDIR%%/LICENSE
 %%WWWDIR%%/README.md
 %%WWWDIR%%/albums/.keepme
 %%WWWDIR%%/cache/.keepme
+%%WWWDIR%%/contributing.md
 %%WWWDIR%%/index.php
 %%WWWDIR%%/plugins/gd_fonts/.keepme
 %%WWWDIR%%/plugins/imagick_fonts/.keepme
@@ -24,6 +25,7 @@
 %%WWWDIR%%/themes/basic/password.php
 %%WWWDIR%%/themes/basic/register.php
 %%WWWDIR%%/themes/basic/search.php
+%%WWWDIR%%/themes/basic/slideshow-controls-light.png
 %%WWWDIR%%/themes/basic/slideshow-controls.png
 %%WWWDIR%%/themes/basic/slideshow.css
 %%WWWDIR%%/themes/basic/slideshow.php
@@ -368,14 +370,15 @@
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-svg/user-white.svg
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-svg/video-black.svg
 %%WWWDIR%%/themes/zpmobile/jquerymobile/images/icons-svg/video-white.svg
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.css
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.js
-%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.2.min.map
+%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.css
+%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.js
+%%WWWDIR%%/themes/zpmobile/jquerymobile/jquery.mobile-1.4.5.min.map
 %%WWWDIR%%/themes/zpmobile/news.php
 %%WWWDIR%%/themes/zpmobile/pages.php
 %%WWWDIR%%/themes/zpmobile/password.php
 %%WWWDIR%%/themes/zpmobile/register.php
 %%WWWDIR%%/themes/zpmobile/search.php
+%%WWWDIR%%/themes/zpmobile/slideshow.php
 %%WWWDIR%%/themes/zpmobile/style.css
 %%WWWDIR%%/themes/zpmobile/theme.png
 %%WWWDIR%%/themes/zpmobile/theme_description.php
@@ -401,6 +404,7 @@
 %%WWWDIR%%/zp-core/admin-users.php
 %%WWWDIR%%/zp-core/admin.css
 %%WWWDIR%%/zp-core/admin.php
+%%WWWDIR%%/zp-core/admintoolbox.css
 %%WWWDIR%%/zp-core/auth_zp.php
 %%WWWDIR%%/zp-core/cacheprotect
 %%WWWDIR%%/zp-core/class-album.php
@@ -680,73 +684,56 @@
 %%WWWDIR%%/zp-core/locale/da_DK/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/da_DK/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/da_DK/flag.png
-%%WWWDIR%%/zp-core/locale/da_DK/select_files_button.png
 %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/de_DE/flag.png
-%%WWWDIR%%/zp-core/locale/de_DE/select_files_button.png
 %%WWWDIR%%/zp-core/locale/en_US/flag.png
-%%WWWDIR%%/zp-core/locale/en_US/select_files_button.png
 %%WWWDIR%%/zp-core/locale/es_ES/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/es_ES/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/es_ES/flag.png
-%%WWWDIR%%/zp-core/locale/es_ES/select_files_button.png
 %%WWWDIR%%/zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/fr_FR/flag.png
-%%WWWDIR%%/zp-core/locale/fr_FR/select_files_button.png
 %%WWWDIR%%/zp-core/locale/gl_ES/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/gl_ES/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/gl_ES/flag.png
-%%WWWDIR%%/zp-core/locale/gl_ES/select_files_button.png
 %%WWWDIR%%/zp-core/locale/he_IL/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/he_IL/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/he_IL/flag.png
-%%WWWDIR%%/zp-core/locale/he_IL/select_files_button.png
 %%WWWDIR%%/zp-core/locale/is_IS/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/is_IS/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/is_IS/flag.png
 %%WWWDIR%%/zp-core/locale/it_IT/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/it_IT/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/it_IT/flag.png
-%%WWWDIR%%/zp-core/locale/it_IT/select_files_button.png
 %%WWWDIR%%/zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/ja_JP/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/ja_JP/flag.png
-%%WWWDIR%%/zp-core/locale/ja_JP/select_files_button.png
 %%WWWDIR%%/zp-core/locale/missing_flag.png
 %%WWWDIR%%/zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/nl_NL/flag.png
-%%WWWDIR%%/zp-core/locale/nl_NL/select_files_button.png
 %%WWWDIR%%/zp-core/locale/pl_PL/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/pl_PL/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/pl_PL/flag.png
-%%WWWDIR%%/zp-core/locale/pl_PL/select_files_button.png
 %%WWWDIR%%/zp-core/locale/ru_RU/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/ru_RU/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/ru_RU/flag.png
-%%WWWDIR%%/zp-core/locale/ru_RU/select_files_button.png
 %%WWWDIR%%/zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/sk_SK/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/sk_SK/flag.png
-%%WWWDIR%%/zp-core/locale/sk_SK/select_files_button.png
 %%WWWDIR%%/zp-core/locale/sv_SE/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/sv_SE/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/sv_SE/flag.png
-%%WWWDIR%%/zp-core/locale/sv_SE/select_files_button.png
 %%WWWDIR%%/zp-core/locale/tr_TR/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/tr_TR/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/tr_TR/flag.png
-%%WWWDIR%%/zp-core/locale/tr_TR/select_files_button.png
 %%WWWDIR%%/zp-core/locale/zh_CN/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/zh_CN/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/zh_CN/flag.png
-%%WWWDIR%%/zp-core/locale/zh_CN/select_files_button.png
 %%WWWDIR%%/zp-core/locale/zh_TW/LC_MESSAGES/zenphoto.mo
 %%WWWDIR%%/zp-core/locale/zh_TW/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/locale/zh_TW/flag.png
-%%WWWDIR%%/zp-core/locale/zh_TW/select_files_button.png
 %%WWWDIR%%/zp-core/no_uploader.php
 %%WWWDIR%%/zp-core/oldhtaccess
 %%WWWDIR%%/zp-core/password.php
@@ -1110,25 +1097,29 @@
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jquery.jcarousel.css
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav/jquery.jcarousel.pack.js
 %%WWWDIR%%/zp-core/zp-extensions/jcarousel_thumb_nav.php
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/Jplayer.swf
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jplayer.playlist.min.js
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jquery.jplayer.inspector.js
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jquery.jplayer.inspector.min.js
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jquery.jplayer.min.js
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/popcorn.jplayer.js
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/jquery.jplayer.swf
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/js/popcorn.jplayer.min.js
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.css
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.jpg
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.seeking.gif
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/jplayer.blue.monday.video.play.png
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/bgr.jpg
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/buffer.png
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/circle.player.css
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/controls.jpg
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/progress.png
-%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/circle.skin/progress_sprite.jpg
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.playlist.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.single.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.audio.stream.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.video.playlist.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/blue.monday/mustache/jplayer.blue.monday.video.single.html
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.css
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.jpg
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.seeking.gif
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/jplayer.pink.flag.video.play.png
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.playlist.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.single.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.audio.stream.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.video.playlist.html
+%%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/pink.flag/mustache/jplayer.pink.flag.video.single.html
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotodark/jplayer.zenphoto.css
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotodark/jplayer.zenphoto.play.png
 %%WWWDIR%%/zp-core/zp-extensions/jplayer/skin/zenphotodark/jplayer.zenphoto.png
@@ -1319,6 +1310,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/bbcode/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/charmap/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/code/plugin.min.js
+%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/colorpicker/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/editable_selects.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/form_utils.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/mctabs.js
@@ -1371,6 +1363,7 @@
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/table/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/template/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/textcolor/plugin.min.js
+%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/textpattern/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/License.txt
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/css/thickbox.css
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/css/tinyzenpage.css
@@ -1391,13 +1384,10 @@
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/wordcount/plugin.min.js
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.inline.min.css
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/readme.md
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.dev.svg
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.eot
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.svg
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.ttf
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.dev.svg
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.eot
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.svg
 %%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.ttf