NetBSD Problem Report #34651

From www@NetBSD.org  Thu Sep 28 15:07:20 2006
Return-Path: <www@NetBSD.org>
Received: by narn.NetBSD.org (Postfix, from userid 31301)
	id 17BEC63B90C; Thu, 28 Sep 2006 15:07:20 +0000 (UTC)
Message-Id: <20060928150720.17BEC63B90C@narn.NetBSD.org>
Date: Thu, 28 Sep 2006 15:07:20 +0000 (UTC)
From: yamajun@ofug.net
Reply-To: yamajun@ofug.net
To: gnats-bugs@NetBSD.org
Subject: update inputmethod/anthy and fix for dictionary option
X-Send-Pr-Version: www-1.0

>Number:         34651
>Category:       pkg
>Synopsis:       update inputmethod/anthy and fix for dictionary option
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    taya
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 28 15:10:00 +0000 2006
>Closed-Date:    Sat Jan 20 17:12:42 +0000 2007
>Last-Modified:  Sat Jan 20 17:15:01 +0000 2007
>Originator:     Yamashiro, Jun
>Release:        NetBSD 4.99.1
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 4.99.1 NetBSD 4.99.1 (YAMAJUN) #9: Sun Aug 27 16:42:01 JST 2006  yamajun@yamajun.mydomain:/usr/src/sys/arch/i386/compile/YAMAJUN i386
>Description:
This patch update anthy to anthy-7900.  And fix bug for dictionary option. 
It cause change Makefile to revision 1.12.

Changelog in anthy(7100 to 7900):
* Fix Japanese convert algorithm
* Update main Japanese Kana-Kanji dictionary

Changelog in pkgsrc:
* Fix option for additional Kana-Kanji dictionary.
* Update Okinawa dicrectory(optional).


>How-To-Repeat:

>Fix:
Apply this patch:

diff -Nru anthy.orig/Makefile anthy/Makefile
--- anthy.orig/Makefile	2006-09-27 01:54:13.000000000 +0900
+++ anthy/Makefile	2006-09-28 23:22:11.000000000 +0900
@@ -4,14 +4,12 @@

 EXTRACT_ONLY=	${DISTNAME}.tar.gz

-PKGREVISION=	1
-
 MAINTAINER=	taya@NetBSD.org
 COMMENT=	Kana Kanji conversion system

 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake printf
 GNU_CONFIGURE=		yes

 CONFIGURE_ENV+=		EMACS=no
@@ -32,22 +30,23 @@
 .endif

 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-OKIDIC_VERSION=			okinawa-20051104
-DISTFILES+=			${OKIDIC_VERSION}.tar.gz
-EXTRACT_ONLY+=			${OKIDIC_VERSION}.tar.gz
-SITES.${OKIDIC_VERSION}.tar.gz+=	http://www.ofug.net/~yamajun/files/
+OKIDIC_VERSION=			okinawa-20060917
+DISTFILES+=			${OKIDIC_VERSION}.t
+SITES.${OKIDIC_VERSION}.t+=	http://www.ofug.net/~yamajun/files/
 .endif

 post-patch:
 .if !empty(PKG_OPTIONS:M2ch_dict)
-	${CP} ${DISTDIR}/2ch.t ${WRKSRC}/mkanthydic
-	@${PRINTF} "/read @top_srcdir@\\\\/mkanthydic\\\\/placename.t\\na\\nread @top_srcdir@/mkanthydic/2ch.t\\n.\\nw\\n" | \
-	ed -s ${WRKSRC}/mkanthydic/dict.args.in
+	${CP} ${DISTDIR}/2ch.t ${WRKSRC}/mkworddic
+	# Don't change "\n".
+	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/placename.t\na\nread @top_srcdir@/mkworddic/2ch.t\n.\nw\n" | \
+	ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-	${CP} ${WRKDIR}/${OKIDIC_VERSION}/okinawa.t ${WRKSRC}/mkanthydic
-	@${PRINTF} "/read @top_srcdir@\\\\/mkanthydic\\\\/placename.t\\na\\nread @top_srcdir@/mkanthydic/okinawa.t\\n.\\nw\\n" | \
-	ed -s ${WRKSRC}/mkanthydic/dict.args.in
+	${CP} ${DISTDIR}/${OKIDIC_VERSION}.t ${WRKSRC}/mkworddic/okinawa.t
+	# Don't change "\n".
+	@${PRINTF} "/read @top_srcdir@\\\\/mkworddic\\\\/placename.t\na\nread @top_srcdir@/mkworddic/okinawa.t\n.\nw\n" | \
+	ed -s ${WRKSRC}/mkworddic/dict.args.in
 .endif

 post-install:
diff -Nru anthy.orig/Makefile.common anthy/Makefile.common
--- anthy.orig/Makefile.common	2006-09-27 01:54:13.000000000 +0900
+++ anthy/Makefile.common	2006-09-28 23:08:45.000000000 +0900
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.common,v 1.5 2006/01/23 23:08:47 wiz Exp $

-ANTHY_VERSION=	7100b
+ANTHY_VERSION=	7900
 DISTNAME=	anthy-${ANTHY_VERSION}
 CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/17231/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=anthy/20887/}
 DISTFILES=	${DISTNAME}.tar.gz

 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/anthy/distinfo
diff -Nru anthy.orig/PLIST anthy/PLIST
--- anthy.orig/PLIST	2006-09-27 01:54:13.000000000 +0900
+++ anthy/PLIST	2006-09-28 23:08:45.000000000 +0900
@@ -1,7 +1,7 @@
 @comment $NetBSD: PLIST,v 1.4 2006/01/23 23:08:47 wiz Exp $
 bin/anthy-agent
 bin/anthy-dic-tool
-etc/anthy-conf
+bin/anthy-morphological-analyzer
 include/anthy/anthy.h
 include/anthy/dicutil.h
 include/anthy/input.h
@@ -9,7 +9,6 @@
 lib/libanthydic.la
 lib/libanthyinput.la
 lib/pkgconfig/anthy.pc
-share/anthy/anthy.dep
 share/anthy/anthy.dic
 share/anthy/dic-tool-usage.txt
 share/anthy/typetab
diff -Nru anthy.orig/buildlink3.mk anthy/buildlink3.mk
--- anthy.orig/buildlink3.mk	2006-09-27 01:54:13.000000000 +0900
+++ anthy/buildlink3.mk	2006-09-28 23:08:45.000000000 +0900
@@ -13,7 +13,7 @@

 .if !empty(ANTHY_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.anthy+=	anthy>=6300
-BUILDLINK_ABI_DEPENDS.anthy?=	anthy>=7100bnb1
+BUILDLINK_ABI_DEPENDS.anthy?=	anthy>=7900
 BUILDLINK_PKGSRCDIR.anthy?=	../../inputmethod/anthy
 .endif  # ANTHY_BUILDLINK3_MK

diff -Nru anthy.orig/distinfo anthy/distinfo
--- anthy.orig/distinfo	2006-09-27 01:54:13.000000000 +0900
+++ anthy/distinfo	2006-09-28 23:08:45.000000000 +0900
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2006/01/23 23:08:47 wiz Exp $
+$NetBSD$

-SHA1 (anthy-7100b.tar.gz) = c7aad6ea0e6dc462be3926052a538b88ac2e4aee
-RMD160 (anthy-7100b.tar.gz) = 62de300bf50f727672f63109fd409b7cbdbb5572
-Size (anthy-7100b.tar.gz) = 3359606 bytes
 SHA1 (2ch.t) = 2160d7b0079e2c1a14093da968f34e7f8dbc07c2
 RMD160 (2ch.t) = b05902485829eebb4e09c554f095275f5278dd8b
 Size (2ch.t) = 142157 bytes
-SHA1 (okinawa-20051104.tar.gz) = cb42ef43b36680661cd90cb39c1ccde13ec0a115
-RMD160 (okinawa-20051104.tar.gz) = 6abaea3d0508d376d09628b483a609f32bf694eb
-Size (okinawa-20051104.tar.gz) = 52191 bytes
+SHA1 (anthy-7900.tar.gz) = 9b3ae54ebf81e7aedb095f7c4a3b97027557c258
+RMD160 (anthy-7900.tar.gz) = fd28f5925fa981fe173f115f5e1919899fa92037
+Size (anthy-7900.tar.gz) = 3604440 bytes
+SHA1 (okinawa-20060917.t) = d6497f2fd152331f82e967974022333462d4b9e9
+RMD160 (okinawa-20060917.t) = 801df2a7d597c05aa106bcfdec1e609bdb23909d
+Size (okinawa-20060917.t) = 153341 bytes
 SHA1 (patch-aa) = 79816563a3d1ff853bc1edcbfee7e22ae2e26991

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->taya
Responsible-Changed-By: reed@netbsd.org
Responsible-Changed-When: Thu, 28 Sep 2006 15:13:18 +0000
Responsible-Changed-Why:
Assigned to maintainer.


State-Changed-From-To: open->closed
State-Changed-By: wiz@netbsd.org
State-Changed-When: Sat, 20 Jan 2007 17:12:42 +0000
State-Changed-Why:
Committed, thank you!


From: Thomas Klausner <wiz@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: PR/34651 CVS commit: pkgsrc/inputmethod/anthy
Date: Sat, 20 Jan 2007 17:11:52 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Sat Jan 20 17:11:52 UTC 2007

 Modified Files:
 	pkgsrc/inputmethod/anthy: Makefile Makefile.common PLIST buildlink3.mk
 	    distinfo
 Added Files:
 	pkgsrc/inputmethod/anthy: options.mk

 Log Message:
 Update to 7900, based on patches provided by Yamashiro, Jun in PR 34651.
 Additionally, split option handling into options.mk and properly handle
 the configuration file.

 Changelog in anthy(7100 to 7900):
 * Fix Japanese convert algorithm
 * Update main Japanese Kana-Kanji dictionary

 Changelog in pkgsrc:
 * Fix option for additional Kana-Kanji dictionary.
 * Update Okinawa dicrectory(optional).


 To generate a diff of this commit:
 cvs rdiff -r1.12 -r1.13 pkgsrc/inputmethod/anthy/Makefile
 cvs rdiff -r1.5 -r1.6 pkgsrc/inputmethod/anthy/Makefile.common \
     pkgsrc/inputmethod/anthy/buildlink3.mk
 cvs rdiff -r1.4 -r1.5 pkgsrc/inputmethod/anthy/PLIST
 cvs rdiff -r1.8 -r1.9 pkgsrc/inputmethod/anthy/distinfo
 cvs rdiff -r0 -r1.1 pkgsrc/inputmethod/anthy/options.mk

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.