Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jun 2009 18:22:10 +0400 (MSD)
From:      Denis Barov <dindin@dindin.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/135257: [PATCH] russian/ru-mueller-dic: add more russian locales, take maintainership
Message-ID:  <200906041422.n54EMAqB093082@sepulca.yandex.ru>
Resent-Message-ID: <200906041430.n54EU2U8096620@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         135257
>Category:       ports
>Synopsis:       [PATCH] russian/ru-mueller-dic: add more russian locales, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 04 14:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Denis Barov
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
Yandex
>Environment:
System: FreeBSD sepulca.yandex.ru 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Tue Jun  2 19:57:10 MSD
>Description:
- add ru_RU.CP1251 and ru_RU.UTF-8 locales
- add new (faster) mirror for distfiles
- Take maintainership

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ru-mueller-dic-1.2_2.patch begins here ---
diff -ruN --exclude=CVS mueller-dic/Makefile mueller-dic/Makefile
--- mueller-dic/Makefile	2009-06-04 18:15:59.000000000 +0400
+++ mueller-dic/Makefile	2009-06-04 17:42:15.000000000 +0400
@@ -7,35 +7,48 @@
 
 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_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)
 	@${MKDIR} ${DOCSDIR}
diff -ruN --exclude=CVS mueller-dic/pkg-plist mueller-dic/pkg-plist
--- mueller-dic/pkg-plist	2009-06-04 18:15:59.000000000 +0400
+++ mueller-dic/pkg-plist	2009-06-04 18:17:24.000000000 +0400
@@ -1,7 +1,11 @@
 bin/mueller
 bin/muellerfind
-%%DATADIR%%/Mueller7accentGPL.koi
-%%DATADIR%%/Mueller7accentGPL.koi.h
-@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Mueller7.txt
+%%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%%
--- ru-mueller-dic-1.2_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906041422.n54EMAqB093082>