- Update to 1.5.6

- Update various language packs to the latest versions
- Change default install directory from www/data/gallery to www/gallery
- Use WWWDIR

PR:		ports/111568
Submitted by:	Alex Varju <freebsd-ports AT varju.ca> (maintainer)

1 files changed, 47 insertions, 48 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index d42394b4b441..cb0b46e185f4 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.5.5.1
+PORTVERSION=	1.5.6
 CATEGORIES=	www
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]*)$/-pl\1/}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
@@ -26,40 +25,43 @@ WANT_PHP_WEB=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_PHP+=	gettext
-LANGVERSION=	1.5.1
 
-LANGPACKS=	af_ZA-${LANGVERSION}${EXTRACT_SUFX} \
-		bg_BG-${LANGVERSION}${EXTRACT_SUFX} \
+LANGPACKS=	af_ZA-1.5.2${EXTRACT_SUFX} \
+		ar_EG-1.5.1-cvs${EXTRACT_SUFX} \
+		bg_BG-1.5.1${EXTRACT_SUFX} \
 		ca_ES-1.5${EXTRACT_SUFX} \
-		cs_CZ.iso-8859-2-${LANGVERSION}${EXTRACT_SUFX} \
-		da_DK-${LANGVERSION}${EXTRACT_SUFX} \
-		de_DE-${LANGVERSION}${EXTRACT_SUFX} \
+		cs_CZ.cp1250-1.5.1${EXTRACT_SUFX} \
+		cs_CZ.iso-8859-2-1.5.1${EXTRACT_SUFX} \
+		da_DK-1.5.1${EXTRACT_SUFX} \
+		de_DE-1.5.6${EXTRACT_SUFX} \
 		en_GB-1.5-RC2${EXTRACT_SUFX} \
-		es_ES-${LANGVERSION}${EXTRACT_SUFX} \
-		fi_FI-${LANGVERSION}${EXTRACT_SUFX} \
-		fr_FR-${LANGVERSION}${EXTRACT_SUFX} \
-		gl_ES-${LANGVERSION}${EXTRACT_SUFX} \
-		hu_HU-${LANGVERSION}${EXTRACT_SUFX} \
-		is_IS-${LANGVERSION}${EXTRACT_SUFX} \
-		it_IT-${LANGVERSION}${EXTRACT_SUFX} \
-		ja_JP-${LANGVERSION}${EXTRACT_SUFX} \
-		ko_KR-${LANGVERSION}${EXTRACT_SUFX} \
-		lt_LT-${LANGVERSION}${EXTRACT_SUFX} \
-		nl_NL-${LANGVERSION}${EXTRACT_SUFX} \
-		no_NO-${LANGVERSION}${EXTRACT_SUFX} \
-		pl_PL-${LANGVERSION}${EXTRACT_SUFX} \
-		pt_BR-${LANGVERSION}${EXTRACT_SUFX} \
-		pt_PT-${LANGVERSION}${EXTRACT_SUFX} \
-		ru_RU.cp1251-${LANGVERSION}${EXTRACT_SUFX} \
-		ru_RU.koi8r-${LANGVERSION}${EXTRACT_SUFX} \
-		sk_SK-${LANGVERSION}${EXTRACT_SUFX} \
-		sl_SI-${LANGVERSION}${EXTRACT_SUFX} \
-		sv_SE-${LANGVERSION}${EXTRACT_SUFX} \
-		tr_TR-${LANGVERSION}${EXTRACT_SUFX} \
-		vi_VN-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_HK-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_HK.utf8-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW-${LANGVERSION}${EXTRACT_SUFX}
+		es_ES-1.5.2${EXTRACT_SUFX} \
+		fi_FI-1.5.2${EXTRACT_SUFX} \
+		fr_FR-1.5.2${EXTRACT_SUFX} \
+		gl_ES-1.5.1${EXTRACT_SUFX} \
+		hu_HU-1.5.1${EXTRACT_SUFX} \
+		is_IS-1.5.1${EXTRACT_SUFX} \
+		it_IT-1.5.2${EXTRACT_SUFX} \
+		ja_JP-1.5.2${EXTRACT_SUFX} \
+		ja_JP.utf8-1.5.1${EXTRACT_SUFX} \
+		ko_KR-1.5.1${EXTRACT_SUFX} \
+		lt_LT-1.5.1${EXTRACT_SUFX} \
+		nl_NL-1.5.2${EXTRACT_SUFX} \
+		no_NO-1.5.2${EXTRACT_SUFX} \
+		pl_PL-1.5.2${EXTRACT_SUFX} \
+		pt_BR-1.5.2${EXTRACT_SUFX} \
+		pt_PT-1.5.1${EXTRACT_SUFX} \
+		ru_RU.cp1251-1.5.2${EXTRACT_SUFX} \
+		ru_RU.koi8r-1.5.1${EXTRACT_SUFX} \
+		sk_SK-1.5.1${EXTRACT_SUFX} \
+		sl_SI-1.5.1${EXTRACT_SUFX} \
+		sv_SE-1.5.6${EXTRACT_SUFX} \
+		tr_TR-1.5.1-u1${EXTRACT_SUFX} \
+		vi_VN-1.5.1${EXTRACT_SUFX} \
+		zh_HK-1.5.2${EXTRACT_SUFX} \
+		zh_HK.utf8-1.5.2${EXTRACT_SUFX} \
+		zh_TW-1.5.2${EXTRACT_SUFX} \
+		zh_TW.utf8-1.5.2${EXTRACT_SUFX}
 PLIST_SUB=		NLS=""
 .else
 PLIST_SUB=		NLS="@comment "
@@ -67,39 +69,36 @@ PLIST_SUB=		NLS="@comment "
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDOCS=	AUTHORS ChangeLog README
 EXCEPTFILES=	${PORTDOCS} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
-PLIST_SUB+=	GALLERYDIR=${GALLERYDIR}
 
-pre-fetch:
-.if !defined(GALLERYDIR)
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+
+pre-everything::
+.if defined(GALLERYDIR)
+WWWDIR=	${GALLERYDIR}
+.else
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define GALLERYDIR to override default of 'www/data/gallery'."
+	@${ECHO_MSG} "Define GALLERYDIR to override default of ${WWWDIR}."
 	@${ECHO_MSG} ""
 .endif
 
-GALLERYDIR?=	www/data/gallery
-
-post-configure:
-	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
-	  -e 's#%%GALLERYDIR%%#${GALLERYDIR}#g' pkg-message > ${PKGMESSAGE}
-
 do-extract:
 	@ ${MKDIR} ${WRKDIR}
-	@ cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
+	@ cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}
 	@ for i in ${LANGPACKS}; do \
-		if ! (cd ${WRKDIR}/gallery/locale && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$i ${EXTRACT_AFTER_ARGS});\
+		if ! (cd ${WRKDIR}/gallery/locale && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS});\
 		then \
 			exit 1; \
 		fi \
 	done
 
 do-install:
-	@ ${MKDIR} -m 0755 ${PREFIX}/${GALLERYDIR}
+	@ ${MKDIR} -m 0755 ${WWWDIR}
 	@ cd ${WRKSRC} && ${FIND} * -name \*.bat -o -name \*.orig -o -name \*Changelog ${EXCEPTFILES:S/^/-o -name /} \
-	  -o -print | ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${PREFIX}/${GALLERYDIR}
+	  -o -print | ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)