3 files changed, 79 insertions, 76 deletions

diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile
index 56c0458d534b..98d1d5023117 100644
--- a/www/zenphoto/Makefile
+++ b/www/zenphoto/Makefile
@@ -4,14 +4,14 @@
 # $FreeBSD$
 
 PORTNAME=	zenphoto
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.zenphoto.org/files/
 
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	A simpler web photo gallery
 
-USE_PHP=	mysql gd session
+USE_PHP=	mysql gd session mbstring
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
@@ -29,6 +29,8 @@ do-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${WWWDIR} \
 		"! -name README.html ! -name License.txt")
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHMOD} 644 ${WWWDIR}/albums/*.png
+	${CHMOD} 644 ${WWWDIR}/albums/*.jpg
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/zenphoto/distinfo b/www/zenphoto/distinfo
index 5e2a5068a5be..b08735ca4e5a 100644
--- a/www/zenphoto/distinfo
+++ b/www/zenphoto/distinfo
@@ -1,3 +1,3 @@
-MD5 (zenphoto-1.1.5.tar.gz) = 97ae7ec2cde4e9f157af6103fc13e3de
-SHA256 (zenphoto-1.1.5.tar.gz) = 4848ede68bff4ad05103fd446b9d5240dc23185ea732f07993a42e5f27018954
-SIZE (zenphoto-1.1.5.tar.gz) = 770444
+MD5 (zenphoto-1.1.6.tar.gz) = 8986ceb00e2328e218c68d3ff9de04d2
+SHA256 (zenphoto-1.1.6.tar.gz) = 45bda7a07a392e2b865631f929f4246333953f84923e2e02664ce1eaaa7f3b10
+SIZE (zenphoto-1.1.6.tar.gz) = 1216823
diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist
index adc6eef9bf05..7a90107bb7ae 100644
--- a/www/zenphoto/pkg-plist
+++ b/www/zenphoto/pkg-plist
@@ -1,19 +1,8 @@
 %%WWWDIR%%/example_robots.txt
 %%WWWDIR%%/index.php
-%%WWWDIR%%/lighttpd-rewrite.txt
+%%WWWDIR%%/lighttpd_rules.conf
 %%WWWDIR%%/rss-comments.php
 %%WWWDIR%%/rss.php
-%%WWWDIR%%/themes/default supergallery/images/img-bg.gif
-%%WWWDIR%%/themes/default supergallery/images/tag.png
-%%WWWDIR%%/themes/default supergallery/index.php
-%%WWWDIR%%/themes/default supergallery/readme.txt
-%%WWWDIR%%/themes/default supergallery/styles/dark.css
-%%WWWDIR%%/themes/default supergallery/styles/light.css
-%%WWWDIR%%/themes/default supergallery/styles/sterile-dark.css
-%%WWWDIR%%/themes/default supergallery/styles/sterile-light.css
-%%WWWDIR%%/themes/default supergallery/theme.png
-%%WWWDIR%%/themes/default supergallery/theme.txt
-%%WWWDIR%%/themes/default supergallery/themeoptions.php
 %%WWWDIR%%/themes/default/album.php
 %%WWWDIR%%/themes/default/archive.php
 %%WWWDIR%%/themes/default/image.php
@@ -21,51 +10,23 @@
 %%WWWDIR%%/themes/default/images/tag.png
 %%WWWDIR%%/themes/default/index.php
 %%WWWDIR%%/themes/default/search.php
+%%WWWDIR%%/themes/default/slideshow-controls-old.png
+%%WWWDIR%%/themes/default/slideshow-controls.png
+%%WWWDIR%%/themes/default/slideshow.css
+%%WWWDIR%%/themes/default/slideshow.php
 %%WWWDIR%%/themes/default/styles/dark.css
 %%WWWDIR%%/themes/default/styles/light.css
 %%WWWDIR%%/themes/default/styles/sterile-dark.css
 %%WWWDIR%%/themes/default/styles/sterile-light.css
 %%WWWDIR%%/themes/default/theme.png
-%%WWWDIR%%/themes/default/theme.txt
+%%WWWDIR%%/themes/default/theme_description.php
 %%WWWDIR%%/themes/default/themeoptions.php
-%%WWWDIR%%/themes/effervescence_plus supergallery/customfunctions.php
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/slimbox/closelabel.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/slimbox/loading.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/slimbox/nextlabel.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/slimbox/prevlabel.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/carrow1.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/carrow2.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/fleche1.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/fleche1.png
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/fleche2.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/fleche2.png
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/loading-bar-black.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/open.gif
-%%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth/open.png
-%%WWWDIR%%/themes/effervescence_plus supergallery/index.php
-%%WWWDIR%%/themes/effervescence_plus supergallery/readme.txt
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/bluranchors.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/jd.gallery.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/jd.gallery.set.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/jd.gallery.transitions.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/mootools.v1.11.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/slimbox.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/scripts/swfobject.js
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/blue and green play.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/effervescence.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/free chocolates.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/kish-my father.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/machu picchu.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/oktoberfest.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/poolside.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/styles/see you again.css
-%%WWWDIR%%/themes/effervescence_plus supergallery/theme.jpg
-%%WWWDIR%%/themes/effervescence_plus supergallery/theme.txt
-%%WWWDIR%%/themes/effervescence_plus supergallery/themeoptions.php
 %%WWWDIR%%/themes/effervescence_plus/album.php
 %%WWWDIR%%/themes/effervescence_plus/archive.php
 %%WWWDIR%%/themes/effervescence_plus/customfunctions.php
 %%WWWDIR%%/themes/effervescence_plus/image.php
+%%WWWDIR%%/themes/effervescence_plus/images/logo.png
+%%WWWDIR%%/themes/effervescence_plus/images/search.png
 %%WWWDIR%%/themes/effervescence_plus/images/slimbox/closelabel.gif
 %%WWWDIR%%/themes/effervescence_plus/images/slimbox/loading.gif
 %%WWWDIR%%/themes/effervescence_plus/images/slimbox/nextlabel.gif
@@ -90,6 +51,10 @@
 %%WWWDIR%%/themes/effervescence_plus/scripts/swfobject.js
 %%WWWDIR%%/themes/effervescence_plus/search.php
 %%WWWDIR%%/themes/effervescence_plus/simpleviewer.swf
+%%WWWDIR%%/themes/effervescence_plus/slideshow-controls-old.png
+%%WWWDIR%%/themes/effervescence_plus/slideshow-controls.png
+%%WWWDIR%%/themes/effervescence_plus/slideshow.css
+%%WWWDIR%%/themes/effervescence_plus/slideshow.php
 %%WWWDIR%%/themes/effervescence_plus/slimbox.css
 %%WWWDIR%%/themes/effervescence_plus/styles/blue and green play.css
 %%WWWDIR%%/themes/effervescence_plus/styles/effervescence.css
@@ -100,16 +65,20 @@
 %%WWWDIR%%/themes/effervescence_plus/styles/poolside.css
 %%WWWDIR%%/themes/effervescence_plus/styles/see you again.css
 %%WWWDIR%%/themes/effervescence_plus/theme.jpg
-%%WWWDIR%%/themes/effervescence_plus/theme.txt
+%%WWWDIR%%/themes/effervescence_plus/theme_description.php
 %%WWWDIR%%/themes/effervescence_plus/themeoptions.php
 %%WWWDIR%%/themes/example/album.php
 %%WWWDIR%%/themes/example/archive.php
 %%WWWDIR%%/themes/example/image.php
 %%WWWDIR%%/themes/example/index.php
 %%WWWDIR%%/themes/example/search.php
+%%WWWDIR%%/themes/example/slideshow-controls-old.png
+%%WWWDIR%%/themes/example/slideshow-controls.png
+%%WWWDIR%%/themes/example/slideshow.css
+%%WWWDIR%%/themes/example/slideshow.php
 %%WWWDIR%%/themes/example/tag.png
 %%WWWDIR%%/themes/example/theme.png
-%%WWWDIR%%/themes/example/theme.txt
+%%WWWDIR%%/themes/example/theme_description.php
 %%WWWDIR%%/themes/example/themeoptions.php
 %%WWWDIR%%/themes/example/zen.css
 %%WWWDIR%%/themes/stopdesign/album.php
@@ -160,8 +129,12 @@
 %%WWWDIR%%/themes/stopdesign/js/comments.js
 %%WWWDIR%%/themes/stopdesign/js/rememberMe.js
 %%WWWDIR%%/themes/stopdesign/search.php
+%%WWWDIR%%/themes/stopdesign/slideshow-controls-old.png
+%%WWWDIR%%/themes/stopdesign/slideshow-controls.png
+%%WWWDIR%%/themes/stopdesign/slideshow.css
+%%WWWDIR%%/themes/stopdesign/slideshow.php
 %%WWWDIR%%/themes/stopdesign/theme.png
-%%WWWDIR%%/themes/stopdesign/theme.txt
+%%WWWDIR%%/themes/stopdesign/theme_description.php
 %%WWWDIR%%/themes/stopdesign/themeoptions.php
 %%WWWDIR%%/zp-core/admin-functions.php
 %%WWWDIR%%/zp-core/admin.css
@@ -187,7 +160,6 @@
 %%WWWDIR%%/zp-core/exif/makers/olympus.php
 %%WWWDIR%%/zp-core/exif/makers/panasonic.php
 %%WWWDIR%%/zp-core/exif/makers/sanyo.php
-%%WWWDIR%%/zp-core/flvplayer.swf
 %%WWWDIR%%/zp-core/full-image.php
 %%WWWDIR%%/zp-core/functions-controller.php
 %%WWWDIR%%/zp-core/functions-db.php
@@ -197,34 +169,39 @@
 %%WWWDIR%%/zp-core/images/action.png
 %%WWWDIR%%/zp-core/images/burst.png
 %%WWWDIR%%/zp-core/images/cache.png
+%%WWWDIR%%/zp-core/images/captcha_background.png
 %%WWWDIR%%/zp-core/images/drag_handle.png
 %%WWWDIR%%/zp-core/images/envelope.png
 %%WWWDIR%%/zp-core/images/err-cachewrite.gif
 %%WWWDIR%%/zp-core/images/err-imagegeneral.gif
 %%WWWDIR%%/zp-core/images/err-imagenotfound.gif
+%%WWWDIR%%/zp-core/images/err-noflashplayer.gif
 %%WWWDIR%%/zp-core/images/err-nogd.gif
 %%WWWDIR%%/zp-core/images/err-passwordprotected.gif
 %%WWWDIR%%/zp-core/images/fail.png
 %%WWWDIR%%/zp-core/images/lock.png
 %%WWWDIR%%/zp-core/images/lock_open.png
 %%WWWDIR%%/zp-core/images/movie.jpg
+%%WWWDIR%%/zp-core/images/multimediaDefault.png
 %%WWWDIR%%/zp-core/images/pass.png
 %%WWWDIR%%/zp-core/images/pencil.png
 %%WWWDIR%%/zp-core/images/refresh.png
 %%WWWDIR%%/zp-core/images/reset.png
 %%WWWDIR%%/zp-core/images/rss.gif
-%%WWWDIR%%/zp-core/images/videoDefault.png
+%%WWWDIR%%/zp-core/images/thickbox_macFFBg.png
 %%WWWDIR%%/zp-core/images/warn.png
-%%WWWDIR%%/zp-core/images/zen-logo.jpg
 %%WWWDIR%%/zp-core/images/zen-logo.gif
+%%WWWDIR%%/zp-core/images/zen-logo.jpg
 %%WWWDIR%%/zp-core/images/zenphoto.gif
 %%WWWDIR%%/zp-core/index.php
 %%WWWDIR%%/zp-core/js/admin.js
 %%WWWDIR%%/zp-core/js/ajax.js
-%%WWWDIR%%/zp-core/js/flvplayer.js
+%%WWWDIR%%/zp-core/js/jquery.dimensions.js
+%%WWWDIR%%/zp-core/js/jquery.flashembed.pack.js
 %%WWWDIR%%/zp-core/js/jquery.js
+%%WWWDIR%%/zp-core/js/jquery.tabs.js
+%%WWWDIR%%/zp-core/js/jquery.tooltip.js
 %%WWWDIR%%/zp-core/js/prototype.js
-%%WWWDIR%%/zp-core/js/prototype.tooltip.js
 %%WWWDIR%%/zp-core/js/scriptaculous/builder.js
 %%WWWDIR%%/zp-core/js/scriptaculous/controls.js
 %%WWWDIR%%/zp-core/js/scriptaculous/dragdrop.js
@@ -236,28 +213,50 @@
 %%WWWDIR%%/zp-core/js/scripts-common.js
 %%WWWDIR%%/zp-core/js/thickbox.css
 %%WWWDIR%%/zp-core/js/thickbox.js
-%%WWWDIR%%/zp-core/lib-kses.php
 %%WWWDIR%%/zp-core/lib-encryption.php
+%%WWWDIR%%/zp-core/lib-gettext/gettext.inc
+%%WWWDIR%%/zp-core/lib-gettext/gettext.php
+%%WWWDIR%%/zp-core/lib-gettext/streams.php
+%%WWWDIR%%/zp-core/lib-kses.php
 %%WWWDIR%%/zp-core/lib-pclzip.php
 %%WWWDIR%%/zp-core/lib-sajax.php
 %%WWWDIR%%/zp-core/lib-seo.php
 %%WWWDIR%%/zp-core/lib-utf8.php
+%%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.mo
+%%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES/zenphoto.po
 %%WWWDIR%%/zp-core/option-defaults.php
-%%WWWDIR%%/zp-core/plugins/exifimagerotate.php
-%%WWWDIR%%/zp-core/plugins/flip_image.php
-%%WWWDIR%%/zp-core/plugins/image_mirror.php
-%%WWWDIR%%/zp-core/plugins/image_rotate.php
-%%WWWDIR%%/zp-core/plugins/phooglelite.php
+%%WWWDIR%%/zp-core/plugins/GoogleCheckout.php
+%%WWWDIR%%/zp-core/plugins/GoogleCheckout/GoogleCheckout.css
+%%WWWDIR%%/zp-core/plugins/flowplayer.php
+%%WWWDIR%%/zp-core/plugins/flowplayer/FlowPlayerDark.swf
+%%WWWDIR%%/zp-core/plugins/flowplayer/FlowPlayerLight.swf
+%%WWWDIR%%/zp-core/plugins/flowplayer/flowplayer_license.txt
+%%WWWDIR%%/zp-core/plugins/flowplayer/jquery.flashembed.pack.js
+%%WWWDIR%%/zp-core/plugins/flvplayer.php
+%%WWWDIR%%/zp-core/plugins/flvplayer/flvplayer.js
+%%WWWDIR%%/zp-core/plugins/flvplayer/flvplayer.swf
+%%WWWDIR%%/zp-core/plugins/google_maps.php
+%%WWWDIR%%/zp-core/plugins/google_maps/phooglelite.php
+%%WWWDIR%%/zp-core/plugins/image_album_statistics.php
 %%WWWDIR%%/zp-core/plugins/print_album_menu.php
+%%WWWDIR%%/zp-core/plugins/rating.php
 %%WWWDIR%%/zp-core/plugins/rating/alt_star.png
 %%WWWDIR%%/zp-core/plugins/rating/rating.css
 %%WWWDIR%%/zp-core/plugins/rating/rating.js
 %%WWWDIR%%/zp-core/plugins/rating/update.php
+%%WWWDIR%%/zp-core/plugins/shutterfly.php
+%%WWWDIR%%/zp-core/plugins/shutterfly/shutterfly.css
+%%WWWDIR%%/zp-core/plugins/shutterfly/shutterfly_smlogo.png
+%%WWWDIR%%/zp-core/plugins/shutterfly/zp-shutterfly.readme
+%%WWWDIR%%/zp-core/plugins/slideshow.php
+%%WWWDIR%%/zp-core/plugins/slideshow/controls.png
+%%WWWDIR%%/zp-core/plugins/slideshow/jquery.cycle.all.pack.js
 %%WWWDIR%%/zp-core/plugins/spamfilters/akismet.php
 %%WWWDIR%%/zp-core/plugins/spamfilters/none.php
 %%WWWDIR%%/zp-core/plugins/spamfilters/simple.php
 %%WWWDIR%%/zp-core/plugins/spamfilters/spamassassin.php
-%%WWWDIR%%/zp-core/plugins/supergallery-functions.php
+%%WWWDIR%%/zp-core/plugins/zenPaypal.php
+%%WWWDIR%%/zp-core/plugins/zenPaypal/zenPaypal.css
 %%WWWDIR%%/zp-core/refresh-metadata.php
 %%WWWDIR%%/zp-core/setup.php
 %%WWWDIR%%/zp-core/sortable.php
@@ -268,9 +267,20 @@
 %%WWWDIR%%/zp-core/watermarks/watermark.png
 %%WWWDIR%%/zp-core/zp-config.php.example
 @dirrm %%WWWDIR%%/zp-core/watermarks
+@dirrm %%WWWDIR%%/zp-core/plugins/zenPaypal
 @dirrm %%WWWDIR%%/zp-core/plugins/spamfilters
+@dirrm %%WWWDIR%%/zp-core/plugins/slideshow
+@dirrm %%WWWDIR%%/zp-core/plugins/shutterfly
 @dirrm %%WWWDIR%%/zp-core/plugins/rating
+@dirrm %%WWWDIR%%/zp-core/plugins/google_maps
+@dirrm %%WWWDIR%%/zp-core/plugins/flvplayer
+@dirrm %%WWWDIR%%/zp-core/plugins/flowplayer
+@dirrm %%WWWDIR%%/zp-core/plugins/GoogleCheckout
 @dirrm %%WWWDIR%%/zp-core/plugins
+@dirrm %%WWWDIR%%/zp-core/locale/de_DE/LC_MESSAGES
+@dirrm %%WWWDIR%%/zp-core/locale/de_DE
+@dirrm %%WWWDIR%%/zp-core/locale
+@dirrm %%WWWDIR%%/zp-core/lib-gettext
 @dirrm %%WWWDIR%%/zp-core/js/scriptaculous
 @dirrm %%WWWDIR%%/zp-core/js
 @dirrm %%WWWDIR%%/zp-core/images
@@ -287,18 +297,9 @@
 @dirrm %%WWWDIR%%/themes/effervescence_plus/images/smooth
 @dirrm %%WWWDIR%%/themes/effervescence_plus/images/slimbox
 @dirrm %%WWWDIR%%/themes/effervescence_plus/images
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery/styles
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery/scripts
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery/images/smooth
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery/images/slimbox
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery/images
-@dirrm %%WWWDIR%%/themes/effervescence_plus supergallery
 @dirrm %%WWWDIR%%/themes/effervescence_plus
 @dirrm %%WWWDIR%%/themes/default/styles
 @dirrm %%WWWDIR%%/themes/default/images
-@dirrm %%WWWDIR%%/themes/default supergallery/styles
-@dirrm %%WWWDIR%%/themes/default supergallery/images
-@dirrm %%WWWDIR%%/themes/default supergallery
 @dirrm %%WWWDIR%%/themes/default
 @dirrmtry %%WWWDIR%%/themes
 @dirrmtry %%WWWDIR%%/cache