===> Updating from CVS M Makefile M distinfo R pkg-message A files/patch-enamdict.euc-jp ===> Generating patch ===> Viewing diff with more Index: Makefile =================================================================== RCS file: /usr/src/cvs-repo/ports/japanese/edict-utf-8/Makefile,v retrieving revision 1.30 diff -u -u -r1.30 Makefile --- Makefile 15 Nov 2005 04:45:45 -0000 1.30 +++ Makefile 7 Jun 2006 16:19:28 -0000 @@ -6,8 +6,7 @@ # PORTNAME= edict-utf-8 -PORTVERSION= 20050310 -PORTREVISION= 1 +PORTVERSION= 20060608 CATEGORIES= japanese MASTER_SITES= ftp://ftp.cc.monash.edu.au/pub/nihongo/ \ http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \ @@ -19,19 +18,15 @@ ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \ ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ DISTFILES= ${DICTFILES} -EXTRACT_ONLY= # intentionally left blank MAINTAINER= ports@FreeBSD.org COMMENT= Japanese-English edict UTF-8 dictionaries BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -BROKEN= Size mismatch - USE_ICONV= yes ICONV?= iconv CONVERT_CMD= ${ICONV} -c -f EUC-JP -t UTF-8 -NO_BUILD= yes DIST_SUBDIR= edict @@ -40,8 +35,8 @@ kanjidic.gz kanjd212.gz lawgledt.zip \ lingdic.zip geodic.gz pandpdic.zip \ aviation.zip findic.zip mktdic.zip \ - compverb.gz 4jwords.gz concrete.zip -BROKENDICTFILES= enamdict.gz + compverb.gz 4jwords.gz concrete.zip \ + enamdict.gz NODOCFILES= edict_doc.txt edict_doc.html edicth.doc \ enamdict_doc.txt enamdict_doc.html jddict.doc \ @@ -60,46 +55,44 @@ .include -do-install: - @if [ ! -d ${DATADIR} ] ; \ - then \ - ${MKDIR} ${DATADIR} ; \ - fi +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} @for file in ${DICTFILES}; do \ - echo $$file; \ + ${ECHO} "Extracting $$file"; \ case $$file in \ *.gz) \ instfile=`${BASENAME} $$file .gz` ; \ - if ${GZIP_CMD} -cd ${_DISTDIR}/$$file | ${CONVERT_CMD} \ - > ${DATADIR}/$$instfile ; \ - then \ - ${TRUE} ; \ - else \ - exit 1; \ - fi \ + ${GZIP_CMD} -dc ${_DISTDIR}/$$file > ${WRKSRC}/$$instfile.euc-jp \ ;; \ *.zip) \ instfile=`${BASENAME} $$file .zip` ; \ - if ${UNZIP_CMD} -c ${_DISTDIR}/$$file -x ${NODOCFILES} 2>/dev/null \ - | ${CONVERT_CMD} > ${DATADIR}/$$instfile ; \ - then \ - ${TRUE} ; \ - else \ - exit 1; \ - fi \ + ${UNZIP_CMD} -c ${_DISTDIR}/$$file -x ${NODOCFILES} 2>/dev/null \ + > ${WRKSRC}/$$instfile.euc-jp \ ;; \ *) \ - instfile=`${BASENAME} $$file` ; \ - ${CONVERT_CMD} ${_DISTDIR}/$$file >${DATADIR}/$$instfile \ + instfile=$$file ; \ + ${CP} ${_DISTDIR}/$$file ${WRKSRC}/$$file.euc-jp \ ;; \ esac ; \ - ( \ - cd ${DATADIR} ; \ - ${CHOWN} ${SHAREOWN}:${SHAREGRP} $$instfile ; \ - ${CHMOD} ${SHAREMODE} $$instfile ; \ - ) ; \ + ${ECHO} $$instfile >> ${WRKSRC}/filelist; \ + done + +do-build: + @for file in `cat ${WRKSRC}/filelist`; do \ + ${ECHO} "Converting $$file"; \ + ${CONVERT_CMD} ${WRKSRC}/$$file.euc-jp > ${WRKSRC}/$$file; \ + done + +do-install: + @if [ ! -d ${DATADIR} ] ; \ + then \ + ${MKDIR} ${DATADIR} ; \ + fi + @for file in `cat ${WRKSRC}/filelist`; do \ + ${ECHO} "Installing $$file"; \ + ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ + ${WRKSRC}/$$file ${DATADIR}/$$file; \ done -post-install: - ${CAT} ${PKGMESSAGE} .include Index: distinfo =================================================================== RCS file: /usr/src/cvs-repo/ports/japanese/edict-utf-8/distinfo,v retrieving revision 1.11 diff -u -u -r1.11 distinfo --- distinfo 11 Mar 2005 02:49:04 -0000 1.11 +++ distinfo 7 Jun 2006 13:56:29 -0000 @@ -1,38 +1,57 @@ -MD5 (edict/edict.gz) = f5c447af4eaf1e073804f0d935d84435 -SIZE (edict/edict.gz) = 1995732 +MD5 (edict/edict.gz) = badb450cfd6558bf57db7f50f7de8e2e +SHA256 (edict/edict.gz) = 4c4f4065341c235215a25e677b22034f91b8fb66329842bba0782b6c711fdcb8 +SIZE (edict/edict.gz) = 2194317 MD5 (edict/edicth) = 522c9d10d8f1fa3e7ff0824c8f3a3eb7 +SHA256 (edict/edicth) = b1e50500cdff7005bb1155e82ed920e2f8e6648fbda10bf05d23242840621b1d SIZE (edict/edicth) = 3965 -MD5 (edict/enamdict.gz) = 83b56fc76b3027f26bcacf695cf7d027 -SIZE (edict/enamdict.gz) = 3898517 MD5 (edict/compdic.gz) = 5e44bfbf35f976c6053eaaf70d960447 +SHA256 (edict/compdic.gz) = 9c33ceb7ef3c8a0ff30e58b138aa8f116ba99b5d65a8282fe8d758810471f0f5 SIZE (edict/compdic.gz) = 225252 MD5 (edict/jddict.v02.gz) = 54feca633fc2f1e29b673cb70f85b276 +SHA256 (edict/jddict.v02.gz) = 064687764f97fc344fcdaf8370d5c1792b08b5e48ed0ce78b9e817d504690e66 SIZE (edict/jddict.v02.gz) = 201223 MD5 (edict/j_places.gz) = a5241530ecfa6b415358cf0f472edfb1 +SHA256 (edict/j_places.gz) = 6fab609585c71bbd41de5832fb726090722c1309e40dbcb0043145755f2107fd SIZE (edict/j_places.gz) = 964036 MD5 (edict/ediclsd3.zip) = f5619e83d73f3aab768c3483ca9be346 +SHA256 (edict/ediclsd3.zip) = 1812c90b4e373631a936921a538bd0b0eaccf250e1200c9ff730d3f0848863cf SIZE (edict/ediclsd3.zip) = 991369 -MD5 (edict/kanjidic.gz) = 19e69f226a1108ea3bd9a5657163465c -SIZE (edict/kanjidic.gz) = 499608 -MD5 (edict/kanjd212.gz) = 04e9c0afb90c7f925a395c21354bd28d -SIZE (edict/kanjd212.gz) = 198415 +MD5 (edict/kanjidic.gz) = c8f179fcd7cefed2da8b020bea052cdd +SHA256 (edict/kanjidic.gz) = 4936c5b573e186bd4510d437d4a3876e1bc6d9507355db2301bcfe5f0507bbd2 +SIZE (edict/kanjidic.gz) = 503309 +MD5 (edict/kanjd212.gz) = 4ecbfbf9794720c9f67c32d3f25f783b +SHA256 (edict/kanjd212.gz) = fafe47cd9e99eb63ab222d78a1b52e23f79e096e1a8a89cc1151abfbcdb00b68 +SIZE (edict/kanjd212.gz) = 198401 MD5 (edict/lawgledt.zip) = 5d55da32d03bdaf9ad92ee3b096ff320 +SHA256 (edict/lawgledt.zip) = b70584156499980dcaca540284c2f8bb24dbb476a57e6d7f6a644260bd3cff6a SIZE (edict/lawgledt.zip) = 133100 MD5 (edict/lingdic.zip) = 1de53397af823ace8e296d3d8883a558 +SHA256 (edict/lingdic.zip) = c6ebb6567df6b841d6120f2de866881bd102b489215a52398f39f26058cfba37 SIZE (edict/lingdic.zip) = 50837 MD5 (edict/geodic.gz) = a0477c4f6fe10209e46ad433e85ea902 +SHA256 (edict/geodic.gz) = 48cf59a75366c35b1628d13994da9b23e091c9b66619ea0031b4cb5dfc665829 SIZE (edict/geodic.gz) = 20982 MD5 (edict/pandpdic.zip) = 22f73642e22aa90af9e0f5400100db5c +SHA256 (edict/pandpdic.zip) = 183d8e05fc53cfbc02d09dee2cd6cf509aa11572ebe35421a8606ba4acb23ef6 SIZE (edict/pandpdic.zip) = 14800 MD5 (edict/aviation.zip) = 5092ece80ff75a087a7f3beb2a45ef96 +SHA256 (edict/aviation.zip) = 99cc61fee51ae963d6eb52c34fa8f52f2d966de6348efe208bbae2fdced318e9 SIZE (edict/aviation.zip) = 27432 MD5 (edict/findic.zip) = 0e8aedecf217eb696801b0528b04a63e +SHA256 (edict/findic.zip) = ccded1ac5894089fb65a13dda0e09bdf8e38b1f7b9712d10a6478bd61282715d SIZE (edict/findic.zip) = 25093 MD5 (edict/mktdic.zip) = e7719d9cd89b4dfe6efa57d43475d908 +SHA256 (edict/mktdic.zip) = 0c36e4c73354b9c5c184d41c578401757be25471407459002f58687d1dbbc096 SIZE (edict/mktdic.zip) = 18560 MD5 (edict/compverb.gz) = ae795bec98d24738c4279a8bfad6498b +SHA256 (edict/compverb.gz) = 5c9be9a2cda979e394b5ba02d6ea598463c630d9caacd5ff960c007761bfdd91 SIZE (edict/compverb.gz) = 28727 MD5 (edict/4jwords.gz) = b6d3fb814a9df2e26aa7462b71633d7b +SHA256 (edict/4jwords.gz) = 8c6d079ec7f2bd7a18d32859a93ecf1fae287da3de81e00cbd85d59ad5a680f1 SIZE (edict/4jwords.gz) = 13608 MD5 (edict/concrete.zip) = d70fec1ded1a93362940725abb10b8e5 +SHA256 (edict/concrete.zip) = 9691d1d6219747d656f6f778b554ad89be879e131d151c7d1b8089632b74b2cb SIZE (edict/concrete.zip) = 37491 +MD5 (edict/enamdict.gz) = 8dd740eae9238dc97b978d238ba56e82 +SHA256 (edict/enamdict.gz) = 5e1f4925d8aa9b7f62ca59e8e3a37efa84a3845c9396c4e8630d94fe1278166a +SIZE (edict/enamdict.gz) = 5255033 Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 3 Nov 2005 00:17:55 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -Plesae note that the words in the dictionary `enamdict.gz' have -been removed because iconv wasn't able to process them. If you have -the skills, please see if you can find what is causing this. Index: files/patch-enamdict.euc-jp =================================================================== RCS file: files/patch-enamdict.euc-jp diff -N files/patch-enamdict.euc-jp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-enamdict.euc-jp 7 Jun 2006 16:04:12 -0000 @@ -0,0 +1,130 @@ +--- enamdict.euc-jp~ Thu Jun 8 00:36:35 2006 ++++ enamdict.euc-jp Thu Jun 8 00:36:28 2006 +@@ -98208,7 +98208,6 @@ + °ëÉôÊ¡¾± [¤¤¤½¤Ù¤Õ¤¯¤·¤ç¤¦] /Isobefukushou (p)/ + °ëÉôÊÙ [¤¤¤½¤Ù¤Ä¤È¤à] /Isobe Tsutomu (h) (1950.10.13-)/ + °ëÉôÎÏ [¤¤¤½¤Ù¤Ä¤È¤à] /Isobe Tsutomu (1944-) (h)/ +-°ëÉôø¡»° [¤¤¤½¤Ù¤·¤å¤¦¤¾¤¦] /Isobe Shuuzou (h)/ + °ëÉ÷ [¤¤¤½¤«¤¼] /Isokaze (s)/ + °ëÊ¡ [¤¤¤½¤Õ¤¯] /Isofuku (s)/ + °ëÊ¥ [¤¤¤½¤Ö¤Á] /Isobuchi (s)/ +@@ -98271,7 +98270,6 @@ + °ëϺ [¤¤¤½¤ª] /Isoo (u)/ + °ëÏ [¤¤¤½¤«¤º] /Isokazu (u)/ + °ëÏ [¤¤¤½¤ï] /Isowa (s,g)/ +-°ëÏÂø¸»Ò [¤¤¤½¤ï¤ì¤ó¤³] /Isowa Renko (h)/ + °ëÏÆ [¤¤¤µ¤ï¤­] /Isawaki (s)/ + °ëÏÆ [¤¤¤½¤ï¤­] /Isowaki (s)/ + °ëÔü [¤¤¤½¤ª¤¯] /Isooku (s)/ +@@ -116957,7 +116955,6 @@ + ±ü»°Ã« [¤ª¤¯¤ß¤ä] /Okumiya (p)/ + ±ü»°Ïº [¤ª¤¯¤µ¤Ö¤í¤¦] /Okusaburou (m)/ + ±ü»³ [¤ª¤¯¤ä¤Þ] /Okuyama (p,s)/ +-±ü»³®µ¿­ [¤ª¤¯¤ä¤Þ¤³¤¦¤·¤ó] /Okuyama Koushin (h)/ + ±ü»³°ìÆÁ [¤ª¤¯¤ä¤Þ¤«¤º¤Î¤ê] /Okuyama Kazunori (h)/ + ±ü»³±×Èþ [¤ª¤¯¤ä¤Þ¤Þ¤¹¤ß] /Okuyama Masumi (?-1940.3.11) (h)/ + ±ü»³²Â·Ã [¤ª¤¯¤ä¤Þ¤è¤·¤¨] /Okuyama Yoshie (1974.3-) (h)/ +@@ -151949,7 +151946,6 @@ + ´ÜÔ¢ [¤¿¤Æ¤¯¤Ë] /Tatekuni (s)/ + ´ÜÖÞ [¤¿¤Æ¤¤¤ï] /Tateiwa (s)/ + ´Üß· [¤¿¤Æ¤¶¤ï] /Tatezawa (s)/ +-´ÜõÅ [¤¿¤Á¤¹¤¹¤à] /Tachi Susumu (h)/ + ´Ý [¤¬¤ó] /Gan (s)/ + ´Ý [¤Þ¤ë] /Maru (s)/ + ´Ý [¤Þ¤ë¤¤] /Marui (s)/ +@@ -180173,7 +180169,6 @@ + ¶ÜÂôÂÀËã¼ù [¤»¤ê¤¶¤ï¤¿¤Þ¤­] /Serizawa Tamaki (h)/ + ¶ÜÂô̾¿Í [¤»¤ê¤¶¤ï¤á¤¤¤¸¤ó] /Serizawameijin (u)/ + ¶ÜÂô͵Æó [¤»¤ê¤¶¤ï¤æ¤¦¤¸] /Serizawa Yuuji (h) (1968.4.12-)/ +-¶ÜÂôý®²ð [¤»¤ê¤¶¤ï¤±¤¤¤¹¤±] /Serizawa Keisuke (h)/ + ¶Üë [¤»¤ê¤À¤Ë] /Seridani (p)/ + ¶ÜÃæ [¤»¤ê¤Ê¤«] /Serinaka (p)/ + ¶ÜÄ® [¤»¤ê¤Þ¤Á] /Serimachi (p)/ +@@ -200718,7 +200713,6 @@ + ¸¶Ï»Ï¯ [¤Ï¤é¤í¤¯¤í¤¦] /Hara Rokurou (h) (1915.1.6-2001.11.6)/ + ¸¶Ï [¤Ï¤é¤ï] /Harawa (s)/ + ¸¶ÏÆ [¤Ï¤é¤ï¤­] /Harawaki (s)/ +-¸¶ÏÜ [¤Ï¤é¤ê¤ç¤¦] /Hara Ryou (h)/ + ¸¶Ñ» [¤²¤ó¤¸] /Genji (g)/ + ¸¶Óü [¤Ï¤é¤¾¤Î] /Harazono (s)/ + ¸¶Ô¢ [¤Ï¤é¤¯¤Ë] /Harakuni (s)/ +@@ -219817,7 +219811,6 @@ + ¹±±ä [¤Ò¤µ¤Î¤Ö] /Hisanobu (u)/ + ¹±±ó [¤Ä¤Í¤È¤¦] /Tsunetou (s)/ + ¹±±ó [¤Ä¤Í¤È¤ª] /Tsunetoo (s)/ +-¹±±óþ¥ [¤Ä¤Í¤È¤¦¤¢¤­¤é] /Tsunetou Akira (h)/ + ¹±±û [¤Ä¤Í¤ª] /Tsuneo (g)/ + ¹±±û [¤Ò¤µ¤ª] /Hisao (u)/ + ¹±±þ [¤Ä¤Í¤ª] /Tsuneo (g)/ +@@ -221835,7 +221828,6 @@ + ¹¾ÅÄÅç [¤¨¤¿¤¸¤Þ] /Etajima (p)/ + ¹¾ÅÄÅç [¤¨¤À¤¸¤Þ] /Edajima (u)/ + ¹¾ÅÄÅçÏÑ [¤¨¤¿¤¸¤Þ¤ï¤ó] /Etajimawan (u)/ +-¹¾ÅÄû¸ [¤¨¤À¤±¤¤] /Eda Kei (h)/ + ¹¾ÅÏ [¤¨¤È] /Eto (s)/ + ¹¾ÅÏ [¤¨¤È¤¦] /Etou (s)/ + ¹¾ÅÏ [¤¨¤É] /Edo (s)/ +@@ -225277,7 +225269,6 @@ + ¹Ó°æÉÍ [¤¢¤é¤¤¤Ï¤Þ] /Araihama (p)/ + ¹Ó°æÉÒͳµª [¤¢¤é¤¤¤È¤·¤æ¤­] /Arai Toshiyuki (h) (1949.3.17-)/ + ¹Ó°æÕò·É [¤¢¤é¤¤¤·¤ç¤¦¤±¤¤] /Arai Shoukei (h)/ +-¹Ó°æü¢Ìé [¤¢¤é¤¤¤Î¤Ö¤ä] /Arai Nobuya (h)/ + ¹Ó°ë [¤¢¤é¤¤¤½] /Araiso (s)/ + ¹Ó°ë³Ù [¤¢¤é¤¤¤½¤À¤±] /Araisodake (u)/ + ¹Ó°ë»³ [¤¢¤é¤¤¤½¤¶¤ó] /Araisozan (u)/ +@@ -251799,7 +251790,6 @@ + »°ÅļÆеû [¤ß¤¿¤à¤é¤¨¤ó¤®¤ç] /Mitamuraengyo (u)/ + »°ÅļÇî»Ë [¤ß¤¿¤à¤é¤Ò¤í¤·] /Mitamura Hiroshi (h)/ + »°Åļˮɧ [¤ß¤¿¤à¤é¤¯¤Ë¤Ò¤³] /Mitamura Kunihiko (1953.10-) (h)/ +-»°Åļøʱ¦ [¤ß¤¿¤à¤é¤·¤å¤ó¤æ¤¦] /Mitamura Shun'yuu (h)/ + »°ÅÄë [¤µ¤ó¤À¤ä] /Sandaya (s)/ + »°ÅÄë [¤Ó¤¿¤À¤Ë] /Bitadani (u)/ + »°ÅÄÃÏ [¤ß¤¿¤¸] /Mitaji (s)/ +@@ -254702,7 +254692,6 @@ + »³ÃæÌмù [¤ä¤Þ¤Ê¤«¤·¤²¤­] /Yamanaka Shigeki (h)/ + »³ÃæÌî [¤ä¤Þ¤Ê¤«¤Î] /Yamanakano (p)/ + »³ÃæÏÂ»Ò [¤ä¤Þ¤Ê¤«¤«¤º¤³] /Yamanaka Kazuko (h)/ +-»³Ãæ÷Þ»Ò [¤ä¤Þ¤Ê¤«¤¢¤­¤³] /Yamanaka Akiko (h)/ + »³Ãç [¤ä¤Þ¤Ê¤«] /Yamanaka (s)/ + »³Ä¥ [¤ä¤Þ¤Ï¤ê] /Yamahari (s)/ + »³Ä® [¤ä¤Þ¤Á¤ç¤¦] /Yamachou (p)/ +@@ -295617,7 +295606,6 @@ + ¾®À¥Ï¯ [¤ª¤»¤í¤¦] /Ose Rou (h) (1935.11.27-)/ + ¾®À¥ÞÝÈþ [¤³¤»¤Ò¤í¤ß] /Kose Hiromi (h)/ + ¾®À¥ß· [¤ª¤»¤¶¤ï] /Osezawa (s)/ +-¾®À¥õ­ [¤ª¤¼¤¢¤­¤é] /Oze Akira (h)/ + ¾®À« [¤³¤·¤ç¤¦] /Koshou (p)/ + ¾®À«Àî [¤ª¤Ê¤¬¤ï] /Onagawa (s)/ + ¾®À«Åç [¤³¤·¤ç¤¦¤¸¤Þ] /Koshoujima (u)/ +@@ -331585,7 +331573,6 @@ + ¿áÅÄ [¤Õ¤­¤À] /Fukida (p,s)/ + ¿áÅÄ [¤Õ¤±¤À] /Fukeda (p)/ + ¿áÅÄÌÀÆü¹á [¤¹¤¤¤¿¤¢¤¹¤«] /Suita Asuka (h) (1964.3.13-)/ +-¿áÅÄôÚ [¤Õ¤­¤À¤¢¤­¤é] /Fukida Akira (h)/ + ¿áÅì [¤¹¤¤¤È¤¦] /Suitou (p)/ + ¿áÆ£ [¤Õ¤­¤Õ¤¸] /Fukifuji (s)/ + ¿áÆͳ٠[¤Õ¤Ã¤Ä¤­¤À¤±] /Futtsukidake (u)/ +@@ -374125,7 +374112,6 @@ + ÁðÞä [¤¯¤µ¤¿¤Ë] /Kusatani (s)/ + Áðß· [¤¯¤µ¤¶¤ï] /Kusazawa (s)/ + Áðè½ [¤·¤²¤ê] /Shigeri (f)/ +-Áðôº¹ä [¤¯¤µ¤Ê¤®¤Ä¤è¤·] /Kusanagi Tsuyoshi (h)/ + Áñ [¤«¤¬¤ê] /Kagari (s)/ + Áñ [¤«¤¶¤ê] /Kazari (s)/ + Áñ [¤·¤ç¤¦] /Shou (g)/ +@@ -384750,7 +384736,6 @@ + ÂçÀÐ¥±ºî [¤ª¤ª¤¤¤·¤¬¤µ¤¯] /Ooishigasaku (p)/ + ÂçÀÐ¥±Êö [¤ª¤ª¤¤¤·¤¬¤ß¤Í] /Ooishigamine (u)/ + ÂçÀÐ¥öÊö [¤ª¤ª¤¤¤·¤¬¤ß¤Í] /Ooishigamine (u)/ +-ÂçÀЮµ¹° [¤ª¤ª¤¤¤·¤ß¤Ä¤Ò¤í] /Ooishi Mitsuhiro (h)/ + ÂçÀÐ±Ñ»Ê [¤ª¤ª¤¤¤·¤¨¤¤¤¸] /Ooishi Eiji (1961-) (h)/ + ÂçÀÐ±Ù»Ò [¤ª¤ª¤¤¤·¤¨¤Ä¤³] /Ooishi Etsuko (h)/ + ÂçÀÐ±ß [¤ª¤ª¤¤¤·¤Þ¤É¤«] /Ooishi Madoka (h) (1972.9.8-)/ +@@ -385909,7 +385894,6 @@ + ÂçÄÍϪÆá [¤ª¤ª¤Ä¤«¤Ä¤æ¤Ê] /Ootsuka Tsuyuna (h) (1986.6.21-)/ + ÂçÄÍÏÂÉ× [¤ª¤ª¤Ä¤«¤«¤º¤ª] /Ootsuka Kazuo (h)/ + ÂçÄÍèÓ¥±Ã« [¤ª¤ª¤Ä¤«¤è¤·¤¬¤¿¤Ë] /Ootsukayoshigatani (p)/ +-ÂçÄÍý¸»Ò [¤ª¤ª¤Ä¤«¤¤¤¯¤³] /Ootsuka Ikuko (h)/ + ÂçÄλ³ [¤ª¤ª¤Ä¤¬¤ä¤Þ] /Ootsugayama (u)/ + ÂçÄÐ [¤ª¤ª¤­] /Ooki (s)/ + ÂçÄÐ [¤ª¤ª¤Ä¤«] /Ootsuka (s)/ ===> Done