Refactor localized versions support, prepare for "russian" version.

Feature safe:	yes

4 files changed, 45 insertions, 22 deletions

diff --git a/japanese/MT/Makefile b/japanese/MT/Makefile
index 9d85808945d9..0908eb779be6 100644
--- a/japanese/MT/Makefile
+++ b/japanese/MT/Makefile
@@ -6,14 +6,18 @@
 
 PORTNAME=	MT
 CATEGORIES=	japanese www
-DISTNAME=	MTOS-${PORTVERSION}-ja
 PKGNAMEPREFIX=	ja-
+DISTNAME=	MTOS-${PORTVERSION}-ja
 
 COMMENT=	Japanese localization of the MovableType publishing system
 
 MASTERDIR=	${.CURDIR}/../../www/${PORTNAME}
 
-JAPANESE=	yes
-CONFLICTS=	MT-[2-5].* fr-MT-[2-5].* de-MT-[2-5].* es-MT-[2-5].* nl-MT-[2-5].*
+MT_LANG=	ja
+CONFLICTS=	MT-[2-5].* fr-MT-[2-5].* de-MT-[2-5].* es-MT-[2-5].* \
+		nl-MT-[2-5].* ru-MT-[2-5].*
+
+MT_DOCS_URL=	http://movabletype.jp/documentation/
+MT_UPGRADE_URL=	http://movabletype.jp/documentation/upgrade/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/MT/Makefile b/www/MT/Makefile
index 57a89f79059f..b9953b645844 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	MT
-PORTVERSION=	5.02
+PORTVERSION?=	5.02
 CATEGORIES?=	www
-MASTER_SITES=	http://www.movabletype.org/downloads/stable/
+MASTER_SITES?=	http://www.movabletype.org/downloads/stable/
 DISTNAME?=	MTOS-${PORTVERSION}-en
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	A web-based personal publishing system for weblogs
 
-CONFLICTS?=	ja-MT-[2-5].* fr-MT-[2-5].* de-MT-[2-5].* es-MT-[2-5].* nl-MT-[2-5].*
+CONFLICTS?=	ja-MT-[2-5].* fr-MT-[2-5].* de-MT-[2-5].* es-MT-[2-5].* \
+		nl-MT-[2-5].* ru-MT-[2-5].*
 
 RUN_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
 		${SITE_PERL}/Image/Size.pm:${PORTSDIR}/graphics/p5-Image-Size \
@@ -64,13 +65,19 @@ SUB_LIST+=	DATADIR=${PREFIX}/${DATADIR} CGIDIR=${PREFIX}/${CGIDIR} \
 PLIST_FILES+=	${APACHEETCDIR}/Includes/MT.conf
 .endif
 
-.if defined(JAPANESE)
-PLIST_SUB+=	LANG_EN="@comment " \
-		LANG_JA=""
+MT_LANGUAGES=	en ja ru
+MT_LANG?=	en
+
+.for _L in ${MT_LANGUAGES}
+.if ${MT_LANG} == ${_L}
+PLIST_SUB+=	LANG_${_L:U}=""
 .else
-PLIST_SUB+=	LANG_EN="" \
-		LANG_JA="@comment "
+PLIST_SUB+=	LANG_${_L:U}="@comment "
 .endif
+.endfor
+
+MT_DOCS_URL?=	http://movabletype.org/documentation/
+MT_UPGRADE_URL?=http://movabletype.org/documentation/upgrade/
 
 .include <bsd.port.pre.mk>
 
@@ -88,12 +95,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 pre-everything::
 	@${ECHO_CMD} "ATTENTION:"
 	@${ECHO_CMD} "If you are upgrading from an older version of MT"
-.if defined(JAPANESE)
-	@${ECHO_CMD} "please read http://movabletype.jp/documentation/upgrade/"
-.else
-	@${ECHO_CMD} "please read http://movabletype.org/documentation/upgrade/"
-.endif
-
+	@${ECHO_CMD} "please read ${MT_UPGRADE_URL}"
 	@${ECHO_CMD} "BEFORE installing this port"
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Available switches:"
@@ -140,10 +142,6 @@ post-install:
 .else
 	@${ECHO_CMD} ""
 .endif
-.if defined(JAPANESE)
-	@${ECHO_MSG} "Please read the documentation: http://movabletype.jp/documentation/"
-.else
-	@${ECHO_MSG} "Please read the documentation: http://movabletype.org/documentation/"
-.endif
+	@${ECHO_MSG} "Please read the documentation: ${MT_DOCS_URL}"
 
 .include <bsd.port.post.mk>
diff --git a/www/MT/distinfo b/www/MT/distinfo
index 4d2055ee5455..9219e9ec6000 100644
--- a/www/MT/distinfo
+++ b/www/MT/distinfo
@@ -4,3 +4,6 @@ SIZE (MTOS-5.02-en.tar.gz) = 5873136
 MD5 (MTOS-5.02-ja.tar.gz) = 1e832ca971fa633ed19c72a69432fea3
 SHA256 (MTOS-5.02-ja.tar.gz) = 64e33e2fd86a9f2ecacd0b0f2a51ffd2baa17fba92f47c243206e1d110b4763d
 SIZE (MTOS-5.02-ja.tar.gz) = 5866069
+MD5 (MTOS-5.02-ru.tar.gz) = 2d2fcc4814c9796a51fff7ce53a22ee3
+SHA256 (MTOS-5.02-ru.tar.gz) = d29096159dc5f9aa49eac4cd41748b334b6de80414f46383838d926ee1a3deff
+SIZE (MTOS-5.02-ru.tar.gz) = 6053417
diff --git a/www/MT/pkg-plist b/www/MT/pkg-plist
index 17e2c18e4641..259bc8dc625e 100644
--- a/www/MT/pkg-plist
+++ b/www/MT/pkg-plist
@@ -481,6 +481,10 @@
 %%CGIDIR%%/plugins/Markdown/Readme.text
 %%CGIDIR%%/plugins/Markdown/Markdown.pl
 %%CGIDIR%%/plugins/Markdown/License.text
+%%LANG_RU%%%%CGIDIR%%/plugins/YandexOpenId/tmpl/auth_yandex.tmpl
+%%LANG_RU%%%%CGIDIR%%/plugins/YandexOpenId/lib/MT/Auth/Yandex.pm
+%%LANG_RU%%%%CGIDIR%%/plugins/YandexOpenId/config.yaml
+%%LANG_RU%%%%CGIDIR%%/plugins/UpdatePingsRU/config.yaml
 %%CGIDIR%%/php/tmpl/missing.tpl
 %%CGIDIR%%/php/tmpl/header-popup.tpl
 %%CGIDIR%%/php/tmpl/footer-popup.tpl
@@ -1370,6 +1374,7 @@
 %%DATADIR%%/mt-static/styles_fr.css
 %%DATADIR%%/mt-static/styles_es.css
 %%DATADIR%%/mt-static/styles_de.css
+%%LANG_RU%%%%DATADIR%%/mt-static/styles_ru.css
 %%DATADIR%%/mt-static/styles.css
 %%DATADIR%%/mt-static/readme/mt4-logo.png
 %%DATADIR%%/mt-static/readme/mt-logo.png
@@ -1394,6 +1399,10 @@
 %%DATADIR%%/mt-static/plugins/StyleCatcher/images/down.gif
 %%DATADIR%%/mt-static/plugins/StyleCatcher/images/designer.gif
 %%DATADIR%%/mt-static/plugins/StyleCatcher/images/classic.gif
+%%LANG_RU%%%%DATADIR%%/mt-static/plugins/YandexOpenId/images/yandex-openid.gif
+%%LANG_RU%%%%DATADIR%%/mt-static/plugins/YandexOpenId/images/yandex.png
+%%LANG_RU%%%%DATADIR%%/mt-static/plugins/YandexOpenId/images/yandex_logo.png
+%%LANG_RU%%%%DATADIR%%/mt-static/mt_ru.js
 %%DATADIR%%/mt-static/mt_nl.js
 %%DATADIR%%/mt-static/mt_ja.js
 %%DATADIR%%/mt-static/mt_fr.js
@@ -2149,6 +2158,7 @@
 %%CGIDIR%%/lib/MT/L10N/es.pm
 %%CGIDIR%%/lib/MT/L10N/en_us.pm
 %%CGIDIR%%/lib/MT/L10N/de.pm
+%%LANG_RU%%%%CGIDIR%%/lib/MT/L10N/ru.pm
 %%CGIDIR%%/lib/MT/L10N.pm
 %%CGIDIR%%/lib/MT/JunkFilter.pm
 %%CGIDIR%%/lib/MT/ImportExport.pm
@@ -2759,6 +2769,12 @@
 @dirrm %%CGIDIR%%/plugins/MultiBlog
 @dirrm %%CGIDIR%%/plugins/Markdown/php
 @dirrm %%CGIDIR%%/plugins/Markdown
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/YandexOpenId/tmpl
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/YandexOpenId/lib/MT/Auth
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/YandexOpenId/lib/MT
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/YandexOpenId/lib
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/YandexOpenId
+%%LANG_RU%%@dirrm %%CGIDIR%%/plugins/UpdatePingsRU
 @dirrm %%CGIDIR%%/plugins
 @dirrm %%CGIDIR%%/php/tmpl
 @dirrm %%CGIDIR%%/php/lib
@@ -2800,6 +2816,8 @@
 @dirrm %%DATADIR%%/mt-static/themes
 @dirrm %%DATADIR%%/mt-static/support
 @dirrm %%DATADIR%%/mt-static/readme
+%%LANG_RU%%@dirrm %%DATADIR%%/mt-static/plugins/YandexOpenId/images
+%%LANG_RU%%@dirrm %%DATADIR%%/mt-static/plugins/YandexOpenId
 @dirrm %%DATADIR%%/mt-static/plugins/WidgetManager/styles
 @dirrm %%DATADIR%%/mt-static/plugins/WidgetManager/js
 @dirrm %%DATADIR%%/mt-static/plugins/WidgetManager/images