3 files changed, 21 insertions, 11 deletions

diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index f8c2d2add7e9..5109ce963ee5 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gallery2
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gallery
-DISTNAME=	gallery-2.2.1-full
+DISTNAME=	gallery-2.2.2-full
 DIST_SUBDIR=	gallery2
 
 MAINTAINER=	freebsd-ports@varju.ca
@@ -24,9 +23,6 @@ WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 CPIOARGS=	--quiet -pdum -R
-PLIST_SUB+=	GALLERY2DIR=${GALLERY2DIR}
-
-GALLERY2DIR?=	www/gallery2
 
 # Note that USE_PHP must be set before bsd.port.pre.mk is included, so
 # OPTIONS can't be used right now without making portlint angry
@@ -73,13 +69,16 @@ LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
 .endif
 
-pre-fetch:
+pre-everything::
 .if !defined(GALLERY2DIR)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define GALLERY2DIR to override default of '${GALLERY2DIR}'."
+	@${ECHO_MSG} "Define GALLERY2DIR to override default of 'www/gallery2'."
 	@${ECHO_MSG} ""
 .endif
 
+GALLERY2DIR?=	www/gallery2
+PLIST_SUB+=	GALLERY2DIR=${GALLERY2DIR}
+
 post-configure:
 	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
 	  -e 's#%%GALLERY2DIR%%#${GALLERY2DIR}#g' pkg-message > ${PKGMESSAGE}
diff --git a/www/gallery3/distinfo b/www/gallery3/distinfo
index ca4b3b9f6d3a..de803f3b35e2 100644
--- a/www/gallery3/distinfo
+++ b/www/gallery3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gallery2/gallery-2.2.1-full.tar.gz) = e4501a9cec700f238bddc5791fec0f8c
-SHA256 (gallery2/gallery-2.2.1-full.tar.gz) = eea17a716cb29406ed32549ee59899ad97bbcc57401aaaf476e5d04eb7b341ff
-SIZE (gallery2/gallery-2.2.1-full.tar.gz) = 11849887
+MD5 (gallery2/gallery-2.2.2-full.tar.gz) = 488d7837d531e99d4b5f420150b792d9
+SHA256 (gallery2/gallery-2.2.2-full.tar.gz) = 521b4d77e6ad21591229c8bd2769a9889052835cbcbe720e0b9abd2820431ac2
+SIZE (gallery2/gallery-2.2.2-full.tar.gz) = 11900129
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index 2d2b37432d4b..a585ea858e52 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -962,8 +962,11 @@
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GalleryPluginParameterMap_1.0.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GalleryPluginParameterMap_1.1.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GalleryPluginParameterMap_1.2.xml
+%%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GallerySessionMap_1.0.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GalleryUser_1.0.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_GalleryUser_1.1.xml
+%%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_Schema_1.0.xml
+%%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/A_Schema_1.1.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/Lock.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/R_GalleryCache_1.0.xml
 %%GALLERY2DIR%%/modules/core/classes/GalleryStorage/xml-src/R_GalleryItemPropertiesMap_1.0.xml
@@ -5437,6 +5440,7 @@
 %%GALLERY2DIR%%/modules/shutterfly/classes/ShutterflyCartPlugin.class
 %%GALLERY2DIR%%/modules/shutterfly/locale/af/LC_MESSAGES/modules_shutterfly.mo
 %%GALLERY2DIR%%/modules/shutterfly/locale/cs/LC_MESSAGES/modules_shutterfly.mo
+%%GALLERY2DIR%%/modules/shutterfly/locale/da/LC_MESSAGES/modules_shutterfly.mo
 %%GALLERY2DIR%%/modules/shutterfly/locale/de/LC_MESSAGES/modules_shutterfly.mo
 %%GALLERY2DIR%%/modules/shutterfly/locale/en_GB/LC_MESSAGES/modules_shutterfly.mo
 %%GALLERY2DIR%%/modules/shutterfly/locale/es/LC_MESSAGES/modules_shutterfly.mo
@@ -5460,6 +5464,7 @@
 %%GALLERY2DIR%%/modules/shutterfly/po/GNUmakefile
 %%GALLERY2DIR%%/modules/shutterfly/po/af.po
 %%GALLERY2DIR%%/modules/shutterfly/po/cs.po
+%%GALLERY2DIR%%/modules/shutterfly/po/da.po
 %%GALLERY2DIR%%/modules/shutterfly/po/de.po
 %%GALLERY2DIR%%/modules/shutterfly/po/en_GB.po
 %%GALLERY2DIR%%/modules/shutterfly/po/es.po
@@ -6309,6 +6314,7 @@
 %%GALLERY2DIR%%/modules/webdav/locale/ja/LC_MESSAGES/modules_webdav.mo
 %%GALLERY2DIR%%/modules/webdav/locale/no/LC_MESSAGES/modules_webdav.mo
 %%GALLERY2DIR%%/modules/webdav/locale/pl/LC_MESSAGES/modules_webdav.mo
+%%GALLERY2DIR%%/modules/webdav/locale/sr/LC_MESSAGES/modules_webdav.mo
 %%GALLERY2DIR%%/modules/webdav/locale/sv/LC_MESSAGES/modules_webdav.mo
 %%GALLERY2DIR%%/modules/webdav/locale/zh_TW/LC_MESSAGES/modules_webdav.mo
 %%GALLERY2DIR%%/modules/webdav/module.inc
@@ -6324,6 +6330,7 @@
 %%GALLERY2DIR%%/modules/webdav/po/ja.po
 %%GALLERY2DIR%%/modules/webdav/po/no.po
 %%GALLERY2DIR%%/modules/webdav/po/pl.po
+%%GALLERY2DIR%%/modules/webdav/po/sr.po
 %%GALLERY2DIR%%/modules/webdav/po/strings.raw
 %%GALLERY2DIR%%/modules/webdav/po/sv.po
 %%GALLERY2DIR%%/modules/webdav/po/zh_TW.po
@@ -8255,6 +8262,8 @@
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/zh_TW
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/sv/LC_MESSAGES
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/sv
+@dirrm %%GALLERY2DIR%%/modules/webdav/locale/sr/LC_MESSAGES
+@dirrm %%GALLERY2DIR%%/modules/webdav/locale/sr
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/pl/LC_MESSAGES
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/pl
 @dirrm %%GALLERY2DIR%%/modules/webdav/locale/no/LC_MESSAGES
@@ -9052,6 +9061,8 @@
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/en_GB
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/de/LC_MESSAGES
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/de
+@dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/da/LC_MESSAGES
+@dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/da
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/cs/LC_MESSAGES
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/cs
 @dirrm %%GALLERY2DIR%%/modules/shutterfly/locale/af/LC_MESSAGES