Date: Sun, 13 Nov 2005 11:56:03 GMT From: Yamashiro@FreeBSD.org, Jun <yamajun@ofug.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/88920: japanese/anthy: Fix for optional dictionary Message-ID: <200511131156.jADBu37u059713@www.freebsd.org> Resent-Message-ID: <200511131200.jADC0TSR059615@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88920
>Category: ports
>Synopsis: japanese/anthy: Fix for optional dictionary
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Nov 13 12:00:29 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Yamashiro, Jun
>Release: FreeBSD 5.4-STABLE #4
>Organization:
Okinawa FreeBSD Users Group
>Environment:
FreeBSD base.mydomain 5.4-STABLE FreeBSD 5.4-STABLE #4: Thu Oct 13 07:42:58 JST 2005 yamajun@base.mydomain:/usr/obj/usr/src/sys/THUNDER i386
>Description:
Changelog:
1. Fix optional dictionary patch in Makefile.
2. Update Okinawa dictionary to 20051104 (optional dictionary)
3. Add SHA256 to distinfo
japanese/anthy-7100b works well in normal usage.
But, this version can't use with optional kana-kanji dictionaries.
I changed dictionary configuration patch in Makefile.
Cause:
Change dictionary management code between anthy-6xxx and anthy-7100.
>How-To-Repeat:
# cvsup -g /path/to/ports-supfile (update ports tree)
# cd /usr/ports/japanese/anthy
# grep PORTVERSION Makefile
PORTVERSION= 7100b
# make WITH_2chDIC=yes WITH_OKIDIC=yes WITH_GSKKDIC=yes
# make install
Type some Japanese words like a "kita-", "itteyoshi",
"inbubi-chi", "nishinjyou", "dakujyaku"
(these words only in optional dictionaries)
with anthy.el/uim/scim. You get not correct Japanese text.
>Fix:
Apply this patch to /usr/ports/japanese/anthy
diff -ru anthy.orig/Makefile anthy/Makefile
--- anthy.orig/Makefile Sat Nov 5 10:40:37 2005
+++ anthy/Makefile Sun Nov 13 19:21:03 2005
@@ -12,6 +12,7 @@
MASTER_SITE_SUBDIR= ${PORTNAME}/17231
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= anthy
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Another kana-kanji conversion system
@@ -28,41 +29,41 @@
.if defined(WITH_2CHDIC)
MASTER_SITES+= http://omaemona.sourceforge.net/packages/Zisyo/:2chdic
DISTFILES+= 2ch.t:2chdic
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
.endif
.if defined(WITH_ODIC)
MASTER_SITES+= http://www.ofug.net/~yamajun/files/:odic
-DISTFILES+= okinawa-20050410.t:odic
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY+= ${ODIC_SRCS}
+DISTFILES+= ${ODIC_SRCS}:odic
+ODIC_SRCS= ${ODIC_VERS}.tar.gz
+ODIC_VERS= okinawa-20051104
.endif
.if defined(WITH_GSKKDIC)
MASTER_SITES+= http://www.ohnolab.org/~kimoto/:gskk
-DISTFILES+= gskk-20041208.t.gz:gskk
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= ${GSKK_SRCS}:gskk
+GSKK_SRCS= ${GSKK_VERS}.t.gz
+GSKK_VERS= gskk-20041208
.endif
post-extract:
.if defined(WITH_2CHDIC)
${CP} ${DISTDIR}/${DIST_SUBDIR}/2ch.t ${WRKSRC}/mkanthydic
- ${REINPLACE_CMD} -e 's/base.t extra.t/base.t extra.t 2ch.t/' \
- ${WRKSRC}/mkanthydic/Makefile.in
+ ${PRINTF} "/mkanthydic\\\\/placename.t/a\\\\\\nread @top_srcdir@/mkanthydic/2ch.t\\n" | \
+ ${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkanthydic/dict.args.in
.endif
.if defined(WITH_ODIC)
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/okinawa-20050410.t ${WRKSRC}/mkanthydic
- ${REINPLACE_CMD} -e \
- 's/base.t extra.t/base.t extra.t okinawa-20050410.t/' \
- ${WRKSRC}/mkanthydic/Makefile.in
+ ${CP} ${WRKDIR}/${ODIC_VERS}/okinawa.t ${WRKSRC}/mkanthydic
+ ${PRINTF} "/mkanthydic\\\\/placename.t/a\\\\\\nread @top_srcdir@/mkanthydic/okinawa.t\\n" | \
+ ${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkanthydic/dict.args.in
.endif
.if defined(WITH_GSKKDIC)
- ${CP} ${DISTDIR}/${DIST_SUBDIR}/gskk-20041208.t.gz ${WRKSRC}/mkanthydic
- ${GUNZIP_CMD} ${WRKSRC}/mkanthydic/gskk-20041208.t.gz
- ${REINPLACE_CMD} \
- -e 's/base.t extra.t/base.t extra.t gskk-20041208.t/' \
- ${WRKSRC}/mkanthydic/Makefile.in
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/${GSKK_SRCS} ${WRKSRC}/mkanthydic
+ ${GUNZIP_CMD} ${WRKSRC}/mkanthydic/${GSKK_SRCS}
+ ${PRINTF} "/mkanthydic\\\\/placename.t/a\\\\\\nread @top_srcdir@/mkanthydic/${GSKK_VERS}.t\\n" | \
+ ${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkanthydic/dict.args.in
.endif
post-patch:
diff -ru anthy.orig/distinfo anthy/distinfo
--- anthy.orig/distinfo Sat Nov 5 10:40:37 2005
+++ anthy/distinfo Sun Nov 13 17:52:43 2005
@@ -1,8 +1,12 @@
MD5 (anthy/anthy-7100b.tar.gz) = 099514a261b1c3757f95de034a4fbc0d
+SHA256 (anthy/anthy-7100b.tar.gz) = 9cd9b89da84c405c6695ef7824f74ec75a242cd08ae51f2a303cb729062bff6e
SIZE (anthy/anthy-7100b.tar.gz) = 3359606
MD5 (anthy/2ch.t) = d253bec53045cec3ba40f69a63f76612
+SHA256 (anthy/2ch.t) = 643a80d1f305e6b3cd7e3cf42afbe4c0328233416f6185172d6c6c2c76e28ec6
SIZE (anthy/2ch.t) = 142157
-MD5 (anthy/okinawa-20050410.t) = 8f0490e2ea847fc40cd59ea5fcad132b
-SIZE (anthy/okinawa-20050410.t) = 150102
+MD5 (anthy/okinawa-20051104.tar.gz) = 0b1fd1c8655e72599d03c30fa78ed7d2
+SHA256 (anthy/okinawa-20051104.tar.gz) = fa33212805fc62351146f107f908bde413389b43c1b190e9af277da0f3692268
+SIZE (anthy/okinawa-20051104.tar.gz) = 52191
MD5 (anthy/gskk-20041208.t.gz) = c7d1a20e54b862c8bf99a3eee8c8293b
+SHA256 (anthy/gskk-20041208.t.gz) = d366b0b76d8b39c33244aa289c758663c260ef4402eaf49f0f53d14d55efbad7
SIZE (anthy/gskk-20041208.t.gz) = 760867
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511131156.jADBu37u059713>