Bug 135257

Summary: [PATCH] russian/ru-mueller-dic: add more russian locales, take maintainership
Product: Ports & Packages Reporter: Denis Barov <dindin>
Component: Individual Port(s)Assignee: Dennis Herrmann <dhn>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
ru-mueller-dic-1.2_2.patch none

Description Denis Barov 2009-06-04 15:30:02 UTC 
- 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
Comment 1 Dennis Herrmann freebsd_committer freebsd_triage 2009-06-04 16:29:26 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->dhn

I'll take it.
Comment 2 Denis Barov 2009-06-04 18:51:09 UTC 
missed files/mueller.in file in previous patch 


diff -urN --exclude=CVS mueller-dic/Makefile mueller-dic/Makefile
--- mueller-dic/Makefile	2006-07-22 08:28:27.000000000 +0400
+++ mueller-dic/Makefile	2009-06-04 21:37:39.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 -urN --exclude=CVS mueller-dic/files/mueller.in mueller-dic/files/mueller.in
--- mueller-dic/files/mueller.in	1970-01-01 03:00:00.000000000 +0300
+++ mueller-dic/files/mueller.in	2009-06-04 21:37:39.000000000 +0400
@@ -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 -urN --exclude=CVS mueller-dic/pkg-plist mueller-dic/pkg-plist
--- mueller-dic/pkg-plist	2004-01-17 11:53:03.000000000 +0300
+++ mueller-dic/pkg-plist	2009-06-04 21:37:39.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%%


-- 
Cheers
Denis Barov
Comment 3 dfilter service freebsd_committer freebsd_triage 2009-06-05 16:11:15 UTC 
dhn         2009-06-05 15:11:06 UTC

  FreeBSD ports repository

  Modified files:
    russian/mueller-dic  Makefile pkg-plist 
  Added files:
    russian/mueller-dic/files mueller.in 
  Log:
  - 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>
  
  Revision  Changes    Path
  1.5       +27 -14    ports/russian/mueller-dic/Makefile
  1.1       +7 -0      ports/russian/mueller-dic/files/mueller.in (new)
  1.2       +7 -3      ports/russian/mueller-dic/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 4 Dennis Herrmann freebsd_committer freebsd_triage 2009-06-05 16:11:19 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!