- Add Backup mirror

- Add ru_RU.CP1251 and ru_RU.UTF-8 locales
- Pass maintainership to submitter

PR:		ports/135257
Submitted by:	Denis Barov <dindin@dindin.ru>

3 files changed, 41 insertions, 17 deletions

diff --git a/russian/mueller-dic/Makefile b/russian/mueller-dic/Makefile
index a4aacd7e9a2c..84513c5a5908 100644
--- a/russian/mueller-dic/Makefile
+++ b/russian/mueller-dic/Makefile
@@ -7,39 +7,52 @@
 
 PORTNAME=	mueller-dic
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	russian
-MASTER_SITES=	http://mueller-dic.chat.ru/
+MASTER_SITES=	http://www.dindin.ru/download/ \
+		http://mueller-dic.chat.ru/
 DISTFILES=	Mueller7accentGPL.tgz yusupov_mf.tgz
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dindin@dindin.ru
 COMMENT=	Mueller English-Russian dictionary
 
 USE_GMAKE=	yes
+USE_ICONV=	yes
+SUB_FILES=	mueller
 
-WRKSRC=		${WRKDIR}/mf
+WRKSRC=	${WRKDIR}/mf
 WRKSRC_DIC=	${WRKDIR}/usr/local/share/dict
 WRKSRC_DOC=	${WRKDIR}/usr/local/share/mova
 
-pre-install:
-	# rebuild dictionary hash
-	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.koi -hash
+post-build:
+# convert dictionary to other charsets
+	${MV} ${WRKSRC_DIC}/Mueller7accentGPL.koi ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R
+	iconv -f koi8-r -t cp1251 -c ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R > \
+			${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251 || ${TRUE}
+	iconv -f koi8-r -t utf-8 -c ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R > \
+			${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8 || ${TRUE}
+# rebuild dictionary hash
+	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R -hash
+	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251 -hash
+	${WRKSRC}/mf -d ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8 -hash
 
 do-install:
 	# install program with different name (it conflicts with teTeX)
 	${INSTALL_PROGRAM} ${WRKSRC}/mf ${PREFIX}/bin/muellerfind
-	@(${ECHO_CMD} "#!/bin/sh"; ${ECHO_CMD} "${PREFIX}/bin/muellerfind \
-		-d ${DATADIR}/Mueller7accentGPL.koi \$$@") >${PREFIX}/bin/mueller
-	@${CHMOD} ugo+x ${PREFIX}/bin/mueller
+	${INSTALL_SCRIPT} ${WRKDIR}/mueller ${PREFIX}/bin/
 
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.koi ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.koi.h ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.KOI8-R.h ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251 ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.CP1251.h ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8 ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC_DIC}/Mueller7accentGPL.ru_RU.UTF-8.h ${DATADIR}
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC_DOC}/Mueller7.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC_DOC}/Mueller7.txt ${DOCSDIR}/Mueller7.txt
 .endif
 
 post-install:
diff --git a/russian/mueller-dic/files/mueller.in b/russian/mueller-dic/files/mueller.in
new file mode 100644
index 000000000000..c5871500d54b
--- /dev/null
+++ b/russian/mueller-dic/files/mueller.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "${LANG}" -o "${LANG##ru_RU.}" = "${LANG}" ]; then
+    LANG="ru_RU.KOI8-R"
+fi
+
+%%PREFIX%%/bin/muellerfind -d %%DATADIR%%/Mueller7accentGPL.${LANG}
diff --git a/russian/mueller-dic/pkg-plist b/russian/mueller-dic/pkg-plist
index 7549a1f6c1b1..57e7d189b93e 100644
--- a/russian/mueller-dic/pkg-plist
+++ b/russian/mueller-dic/pkg-plist
@@ -1,7 +1,11 @@
 bin/mueller
 bin/muellerfind
-%%DATADIR%%/Mueller7accentGPL.koi
-%%DATADIR%%/Mueller7accentGPL.koi.h
-@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/Mueller7.txt
+%%DATADIR%%/Mueller7accentGPL.ru_RU.CP1251
+%%DATADIR%%/Mueller7accentGPL.ru_RU.CP1251.h
+%%DATADIR%%/Mueller7accentGPL.ru_RU.KOI8-R
+%%DATADIR%%/Mueller7accentGPL.ru_RU.KOI8-R.h
+%%DATADIR%%/Mueller7accentGPL.ru_RU.UTF-8
+%%DATADIR%%/Mueller7accentGPL.ru_RU.UTF-8.h
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%