From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 5 01:19:08 2007 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C5CA16A419; Sun, 5 Aug 2007 01:19:08 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from utahime.as.wakwak.ne.jp (utahime.as.wakwak.ne.jp [61.205.238.40]) by mx1.freebsd.org (Postfix) with ESMTP id D1C0913C45A; Sun, 5 Aug 2007 01:19:07 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by utahime.as.wakwak.ne.jp (Postfix) with ESMTP id B9A0017028; Sun, 5 Aug 2007 10:19:06 +0900 (JST) Received: from eastasia.home.utahime.org (localhost.home.utahime.org [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 58C9AC2; Sun, 5 Aug 2007 10:19:06 +0900 (JST) Received: from localhost (fight.home.utahime.org [192.168.174.7]) by eastasia.home.utahime.org (Postfix) with ESMTP id 0AD9368; Sun, 5 Aug 2007 10:19:06 +0900 (JST) Date: Sun, 05 Aug 2007 10:18:31 +0900 (JST) Message-Id: <20070805.101831.153922357.yasu@utahime.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, sem@FreeBSD.org From: KIMURA Yasuhiro In-Reply-To: <200707171800.l6HI0AjK012235@freefall.freebsd.org> References: <20070717175655.BCA0E26@eastasia.home.utahime.org> <200707171800.l6HI0AjK012235@freefall.freebsd.org> X-Mailer: Mew version 5.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP Cc: Subject: Re: ports/114671: [REPOCOPY] editors/tamago -> editors/tamago-emacs21 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Aug 2007 01:19:08 -0000 Please apply following patch. Regards. Index: editors/Makefile =================================================================== RCS file: /usr1/freebsd/cvsroot/ports/editors/Makefile,v retrieving revision 1.378 diff -u -r1.378 Makefile --- editors/Makefile 4 Aug 2007 08:49:52 -0000 1.378 +++ editors/Makefile 4 Aug 2007 23:42:00 -0000 @@ -157,6 +157,7 @@ SUBDIR += sted SUBDIR += tamago SUBDIR += tamago-emacs20 + SUBDIR += tamago-emacs21 SUBDIR += tea SUBDIR += teco SUBDIR += ted Index: editors/tamago-emacs21/Makefile =================================================================== RCS file: /usr1/freebsd/cvsroot/ports/editors/tamago-emacs21/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- editors/tamago-emacs21/Makefile 21 Jul 2007 15:29:19 -0000 1.33 +++ editors/tamago-emacs21/Makefile 4 Aug 2007 23:32:47 -0000 @@ -5,58 +5,9 @@ # $FreeBSD: ports/editors/tamago-emacs21/Makefile,v 1.33 2007/07/21 15:29:19 ume Exp $ # -PORTNAME= tamago -PORTVERSION= ${EGG_DEBIAN_VER} -PORTREVISION= 2 -CATEGORIES= editors elisp -MASTER_SITES= ${MASTER_SITE_DEBIAN} -MASTER_SITE_SUBDIR= pool/main/e/egg -PKGNAMESUFFIX= -${EMACS_PORT_NAME} -DISTFILES= egg_4.0.6+0.20041122cvs.orig.tar.gz - -PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \ - ${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,} -PATCHFILES= egg_4.0.6+0.20041122cvs-11.diff.gz -PATCH_DIST_STRIP= -p1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Multilingual Input Method - Egg V4 - -EGG_DEBIAN_VER= 4.0.6.0.20041122.11 - -USE_GMAKE= yes -GNU_CONFIGURE= yes +MASTERDIR= ${.CURDIR}/../tamago USE_EMACS= yes +EMACS_PORT_NAME= emacs21 -WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs -ELISPDIR= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp -PLIST_SUB= ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp" - -.include - -.if ${EMACS_PORT_NAME} == emacs21 || ${EMACS_PORT_NAME} == emacs22 -PLIST_SUB+= HAS_JISX0213="" -.else -PLIST_SUB+= HAS_JISX0213="@comment " -.endif - -pre-configure: - @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ - ${WRKSRC}/configure - -post-build: - (cd ${WRKSRC}/helper && ${MAKE} egg-helper) - -post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper ${PREFIX}/bin/egg-helper -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in AUTHORS ChangeLog ChangeLog.1997-1998 ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO debian/README.Debian - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}/changelog.Debian -.endif - @${CAT} ${PKGMESSAGE} - -.include +.include "${MASTERDIR}/Makefile" Index: editors/tamago-emacs21/distinfo =================================================================== RCS file: editors/tamago-emacs21/distinfo diff -N editors/tamago-emacs21/distinfo --- editors/tamago-emacs21/distinfo 27 May 2007 17:54:55 -0000 1.18 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ -MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae -SHA256 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 722413515f2d60418d98250c8aed2b811e6b5363cdb69899193d454afe425115 -SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308 -MD5 (egg_4.0.6+0.20041122cvs-11.diff.gz) = 5c45cde2aed743cfc9c9e194c6b411c7 -SHA256 (egg_4.0.6+0.20041122cvs-11.diff.gz) = 31c9d1e161cbebb13412a90374d538792f257047de0b3569d5c3632c2a0860b4 -SIZE (egg_4.0.6+0.20041122cvs-11.diff.gz) = 28295 Index: editors/tamago-emacs21/pkg-descr =================================================================== RCS file: editors/tamago-emacs21/pkg-descr diff -N editors/tamago-emacs21/pkg-descr --- editors/tamago-emacs21/pkg-descr 10 Apr 2005 21:09:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -The Multilingual Input Method - Egg V4 - -This enables you to input Multilingual Characters. - -Tamago is only coded by emacs lisp. - -This input method is working with various translation servers -(i.e. jserver, cserver, tserver, Wnn6, SJ3 ver 1 and ver 2, - cannaserver and wxgserver). - -This package also includes enhancements from Debian, some of which are: - -- Partial support for Wnn7/Wnn8. -- Support connection to cannaserver using UNIX domain socket. - -WWW: http://www.m17n.org/tamago/ Index: editors/tamago-emacs21/pkg-message =================================================================== RCS file: editors/tamago-emacs21/pkg-message diff -N editors/tamago-emacs21/pkg-message --- editors/tamago-emacs21/pkg-message 2 Mar 2005 14:59:04 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ -Enabling Tamago -================= - -You can now enable Tamago by adding one of following lines to your -.emacs file depending on the language you use: - -Japanese: (set-language-environment "Japanese") -Korean: (set-language-environment "Korean") -Chinese-GB: (set-language-environment "Chinese-GB") -Chinese-CNS: (set-language-environment "Chinese-CNS") Index: editors/tamago-emacs21/pkg-plist =================================================================== RCS file: editors/tamago-emacs21/pkg-plist diff -N editors/tamago-emacs21/pkg-plist --- editors/tamago-emacs21/pkg-plist 27 May 2007 17:54:55 -0000 1.11 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,85 +0,0 @@ -bin/egg-helper -%%ELISPDIR%%/egg/egg-cnv.el -%%ELISPDIR%%/egg/egg-cnv.elc -%%ELISPDIR%%/egg/egg-com.el -%%ELISPDIR%%/egg/egg-com.elc -%%ELISPDIR%%/egg/egg-edep.el -%%ELISPDIR%%/egg/egg-edep.elc -%%ELISPDIR%%/egg/egg-mlh.el -%%ELISPDIR%%/egg/egg-mlh.elc -%%ELISPDIR%%/egg/egg-sim.el -%%ELISPDIR%%/egg/egg-sim.elc -%%ELISPDIR%%/egg/egg.el -%%ELISPDIR%%/egg/egg.elc -%%ELISPDIR%%/egg/egg/.nosearch -%%ELISPDIR%%/egg/egg/anthy.el -%%ELISPDIR%%/egg/egg/anthy.elc -%%ELISPDIR%%/egg/egg/anthyipc.el -%%ELISPDIR%%/egg/egg/anthyipc.elc -%%ELISPDIR%%/egg/egg/canna.el -%%ELISPDIR%%/egg/egg/canna.elc -%%ELISPDIR%%/egg/egg/cannarpc.el -%%ELISPDIR%%/egg/egg/cannarpc.elc -%%ELISPDIR%%/egg/egg/sj3.el -%%ELISPDIR%%/egg/egg/sj3.elc -%%ELISPDIR%%/egg/egg/sj3rpc.el -%%ELISPDIR%%/egg/egg/sj3rpc.elc -%%ELISPDIR%%/egg/egg/wnn.el -%%ELISPDIR%%/egg/egg/wnn.elc -%%ELISPDIR%%/egg/egg/wnnrpc.el -%%ELISPDIR%%/egg/egg/wnnrpc.elc -%%ELISPDIR%%/egg/eggrc -%%ELISPDIR%%/egg/its-keydef.el -%%ELISPDIR%%/egg/its-keydef.elc -%%ELISPDIR%%/egg/its.el -%%ELISPDIR%%/egg/its.elc -%%ELISPDIR%%/egg/its/.nosearch -%%ELISPDIR%%/egg/its/ascii.el -%%ELISPDIR%%/egg/its/ascii.elc -%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el -%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc -%%ELISPDIR%%/egg/its/bixing.el -%%ELISPDIR%%/egg/its/bixing.elc -%%ELISPDIR%%/egg/its/erpin.el -%%ELISPDIR%%/egg/its/erpin.elc -%%ELISPDIR%%/egg/its/greek.el -%%ELISPDIR%%/egg/its/greek.elc -%%ELISPDIR%%/egg/its/hangul.el -%%ELISPDIR%%/egg/its/hangul.elc -%%ELISPDIR%%/egg/its/hankata.el -%%ELISPDIR%%/egg/its/hankata.elc -%%ELISPDIR%%/egg/its/hira.el -%%ELISPDIR%%/egg/its/hira.elc -%%ELISPDIR%%/egg/its/jeonkak.el -%%ELISPDIR%%/egg/its/jeonkak.elc -%%ELISPDIR%%/egg/its/jiskana.el -%%ELISPDIR%%/egg/its/jiskana.elc -%%ELISPDIR%%/egg/its/kata.el -%%ELISPDIR%%/egg/its/kata.elc -%%ELISPDIR%%/egg/its/pinyin.el -%%ELISPDIR%%/egg/its/pinyin.elc -%%ELISPDIR%%/egg/its/quanjiao.el -%%ELISPDIR%%/egg/its/quanjiao.elc -%%ELISPDIR%%/egg/its/thai.el -%%ELISPDIR%%/egg/its/thai.elc -%%ELISPDIR%%/egg/its/zenkaku.el -%%ELISPDIR%%/egg/its/zenkaku.elc -%%ELISPDIR%%/egg/its/zhuyin.el -%%ELISPDIR%%/egg/its/zhuyin.elc -%%ELISPDIR%%/egg/leim-list.el -%%ELISPDIR%%/egg/leim-list.elc -%%ELISPDIR%%/egg/menudiag.el -%%ELISPDIR%%/egg/menudiag.elc -@dirrm %%ELISPDIR%%/egg/egg -@dirrm %%ELISPDIR%%/egg/its -@dirrm %%ELISPDIR%%/egg -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.1997-1998 -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2000-2001 -%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS -%%PORTDOCS%%%%DOCSDIR%%/README.Debian -%%PORTDOCS%%%%DOCSDIR%%/README.ja.txt -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/changelog.Debian -%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: editors/tamago-emacs21/files/patch-wnnrpc.el =================================================================== RCS file: editors/tamago-emacs21/files/patch-wnnrpc.el diff -N editors/tamago-emacs21/files/patch-wnnrpc.el --- editors/tamago-emacs21/files/patch-wnnrpc.el 22 Jun 2007 18:43:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- egg/wnnrpc.el Sat Jun 16 23:30:29 2007 -+++ egg/wnnrpc.el Sat Jun 16 23:29:00 2007 -@@ -714,8 +714,14 @@ - ,send-expr ,@rcv-exprs)) - - (defmacro wnnrpc-get-result (&rest body) -- `(let (result) -- (comm-unpack (u) result) -+ `(let (result resulth) -+ (comm-unpack (w w) resulth result) -+ (cond ((and (= result 65535) (= resulth 65535)) -+ (setq result -1)) -+ ((= resulth (lsh (lsh resulth 16) -16)) -+ (setq result (+ (lsh resulth 16) result))) -+ (t -+ (error "overflow"))) - (if (< result 0) - (progn - (comm-unpack (u) result) - -