From owner-ports-jp@jp.freebsd.org  Wed Nov 28 20:05:47 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id UAA67431;
	Wed, 28 Nov 2001 20:05:47 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from boggy.acest.tutrp.tut.ac.jp (boggy.acest.tutrp.tut.ac.jp [133.15.67.40])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id UAA67426
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 20:05:45 +0900 (JST)
	(envelope-from nakaji@tutrp.tut.ac.jp)
Received: (from root@localhost)
	by boggy.acest.tutrp.tut.ac.jp (8.11.6+3.4W/8.11.6) id fASB5en19980
	for ports-jp@jp.freebsd.org; Wed, 28 Nov 2001 20:05:40 +0900 (JST)
Received: from boggy.acest.tutrp.tut.ac.jp (localhost [127.0.0.1])
	by boggy.acest.tutrp.tut.ac.jp (8.11.6+3.4W/8.11.6av) with ESMTP id fASB5ae19973
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 20:05:36 +0900 (JST)
To: ports-jp@jp.freebsd.org
References: <200111270151.fAR1ptr57796@boggy.acest.tutrp.tut.ac.jp>
 <200111270310.fAR3A1A19140@freefall.freebsd.org>
 <87ofln5izx.fsf@boggy.acest.tutrp.tut.ac.jp>
 <wywv0bmc9m.wl@eken3.eken.phys.nagoya-u.ac.jp>
 <87k7wb5gxh.fsf@boggy.acest.tutrp.tut.ac.jp>
 <wyvgfvmaxm.wl@eken3.eken.phys.nagoya-u.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: text/plain; charset=ISO-2022-JP
From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
Date: 28 Nov 2001 20:05:36 +0900
In-Reply-To: <wyvgfvmaxm.wl@eken3.eken.phys.nagoya-u.ac.jp>
 (Yoichi NAKAYAMA's message of "Wed, 28 Nov 2001 19:44:53 +0900")
Message-ID: <87g06z5f5r.fsf@boggy.acest.tutrp.tut.ac.jp>
Lines: 223
User-Agent: T-gnus/6.15.3 (based on Oort Gnus v0.03) (revision 06)
 SEMI/1.14.3 (Ushinoya) FLIM/1.14.3 (=?ISO-8859-4?Q?Unebigory=F2mae?=)
 APEL/10.3 Emacs/20.7 (i386--freebsd) MULE/4.1 (AOI)
X-Virus-Scanned: by AMaViS perl-11
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 11867
Subject: [ports-jp 11867] Re: ports/32320: Update by maintainer: japanese/emacs20-emcws
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: nakaji@boggy.acest.tutrp.tut.ac.jp

$BCf<#$G$9!#(B

>>>>> In <wyvgfvmaxm.wl@eken3.eken.phys.nagoya-u.ac.jp> 
>>>>>	Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp> wrote:

YN> $B>/$78+$F$_$?$H$3$m!"(B
YN> emcws $B$,Ev$?$C$F$$$k$?$a$K!"IaDL$K(B(ports $B;H$o$:$K(B)$B%$%s%9%H!<%k$7$?>l9g$N(B
YN> fns-20.7.2.el $B$NFbMF$O(B $B$b$H$N(B fns-20.7.2.el $B$H7k9=0c$C$F$$$^$9!#(B
YN> $B$=$&$$$&$o$1$G$3$$$D$b%$%s%9%H!<%k$7$F$d$k$Y$-$@$H;W$$$^$9!#(B
YN> $B!t(B $B$3$N>l9g$O!"(Bemacs20-mule-devel $B$HF1$8J}K!$r$H$k!J4{B8$N(B emacs-20.7 $B$G(B
YN> $B!t(B $B@h$K(B el $B$r%3%s%Q%$%k$7$F$*$/!K$h$j$b$=$NJ}$,$h$$$H;W$$$^$9!#(B

YN> $B8=>u$G$OB>$K(B fns-20.7.2.el $B$rFM$C9~$`!J(Bemacs $B$r#22s%3%s%Q%$%k$9$k!K(B ports
YN> $B$OB8:_$7$J$$$N$G(B /usr/local/libexec/emacs/20.7/i386--freebsd $B$KF~$l$F(B
YN> $B$7$^$C$F$bNI$$5$$,$7$^$9!#$$$+$,$G$7$g$&$+!)(B

$B!V$I$&$7$^$7$g$&!)!W$H8@$C$F$*$/$@$1$G$O?=$7Lu$J$$$N$G!"L5$$CN7C$r9J$C$?7k(B
$B2L!"F1$8$h$&$J7kO@$K;j$j$^$7$?!#(B

$B$G!"$=$N$h$&$K(BMakefile$B$H(Bpkg-plist$B$r=$@5$7$^$7$?!#(BCVS head $B$+$i$N:9J,$r8e$m(B
$B$KIU$1$^$9!#$3$l$G(B make install $B$7$?$b$N$@$H!"(BC-h v emacs-version RET $B$G(B

emacs-version's value is 
"20.7.2"

Documentation:
Version numbers of this version of Emacs.

Defined in `version.el'.

$B$H$J$j$^$9!#$?$@!"$=$N$h$&$J(B port $B$,:#8e=P$F$3$J$$J]>Z$b$J$$$N$G!"$3$l$GK|(B
$BA4$+$I$&$+5?Ld$G$9!#(B

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	27 Jun 2001 14:33:27 -0000	1.1
+++ Makefile	28 Nov 2001 10:41:34 -0000
@@ -8,6 +8,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	20.7
+PORTREVISION=	1
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -15,7 +16,7 @@
 
 PATCH_SITES=	ftp://ftp.ki.nu/pub/emcws/ \
 		ftp://ftp.jpl.org/pub/misc/
-PATCHFILES=	emcws-${EMACS_VER}-20010622.gz
+PATCHFILES=	emcws-${EMACS_VER}-20011002.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	nakaji@jp.freebsd.org
@@ -99,6 +100,15 @@
 		wnn-egg.el \
 		wnn-egg.elc
 
+MULE_PATCHED_ELS=	ange-ftp.el ange-ftp.elc \
+			international/ccl.el international/mule-cmds.el \
+			international/mule-conf.el international/mule.el \
+			international/titdic-cnv.el \
+			international/ccl.elc international/mule-cmds.elc \
+			international/mule.elc \
+			international/titdic-cnv.elc \
+			loaddefs.el
+
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
 		DOC_FILE=${DOC_FILE}
 
@@ -121,6 +131,11 @@
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
 	${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
+	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
+	@(cd ${WRKSRC}/src/../lisp; ${WRKSRC}/src/emacs -batch -q \
+	-f batch-byte-compile \
+	ange-ftp.el international/ccl.el international/mule-cmds.el \
+	international/mule.el international/titdic-cnv.el)
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/emacs ${PREFIX}/bin/emcws-${EMACS_VER}
@@ -135,12 +150,25 @@
 		${CP} -p ${WRKSRC}/lisp/$$i \
 		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
 	done
+	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international || \
+		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/international
+	@for i in ${MULE_PATCHED_ELS}; do \
+		${CP} -p ${WRKSRC}/lisp/$$i \
+		${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \
+	done
+	@${CP} -p ${WRKSRC}/lib-src/fns-${EMACS_VER}.2.el \
+		${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-${EMACS_VER}.2.el
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp
 	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \
 	  (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
 	   ${ECHO} "    (normal-top-level-add-subdirs-to-load-path))") \
 	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \
+	fi
+	@if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \
+	  (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+	   ${ECHO} "    (normal-top-level-add-subdirs-to-load-path))") \
+	  > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \
 	fi
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	27 Jun 2001 14:33:27 -0000	1.1
+++ distinfo	27 Nov 2001 01:18:16 -0000
@@ -1,2 +1,2 @@
 MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5
-MD5 (emcws-20.7-20010622.gz) = e46d6785ecb03974680d67515c750740
+MD5 (emcws-20.7-20011002.gz) = 05c64fd467fbd7942b5cb9af32a2e907
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	27 Jun 2001 14:33:27 -0000	1.1
+++ pkg-plist	28 Nov 2001 10:57:36 -0000
@@ -1,6 +1,9 @@
 bin/emcws-%%EMACS_VER%%
 bin/emcws
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-${EMACS_VER}.2.el
 share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
+share/emacs/%%EMACS_VER%%-emcws/lisp/ange-ftp.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/ange-ftp.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
@@ -14,12 +17,22 @@
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
 share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/isearch-ext.elc
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/ccl.elc
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-cmds.elc
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule-conf.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/mule.elc
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/international/titdic-cnv.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/han-kata.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/hankaku.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/hira.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/kanainput.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/kata.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/its/zenkaku.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/loaddefs.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
@@ -27,7 +40,9 @@
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
 share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
 @dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its
+@dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/international
 @dirrm share/emacs/%%EMACS_VER%%-emcws/lisp
 @dirrm share/emacs/%%EMACS_VER%%-emcws/site-lisp
 @dirrm share/emacs/%%EMACS_VER%%-emcws/etc
Index: files/patch-da
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/files/patch-da,v
retrieving revision 1.1
diff -u -r1.1 patch-da
--- files/patch-da	27 Jun 2001 14:33:36 -0000	1.1
+++ files/patch-da	28 Nov 2001 06:27:01 -0000
@@ -1,6 +1,16 @@
---- configure.in.orig	Tue Jun 26 11:38:25 2001
-+++ configure.in	Tue Jun 26 11:39:29 2001
-@@ -35,7 +35,11 @@
+--- configure.in.orig	Wed Nov 28 15:25:17 2001
++++ configure.in	Wed Nov 28 15:26:42 2001
+@@ -35,13 +35,21 @@
+ dnl A case that the LEIM package does not exist.
+ dnl
+   locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
+-'${datadir}/emacs/site-lisp'
++'${datadir}/emacs/site-lisp:'\
++'${datadir}/emacs/${version}/site-lisp:'\
++'${datadir}/emacs/${version}-emcws/lisp:'\
++'${datadir}/emacs/${version}/lisp'
+ else
+ dnl
  dnl A case that the LEIM package exists.
  dnl
    locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
@@ -9,18 +19,12 @@
 +'${datadir}/emacs/${version}-emcws/leim:'\
 +'${datadir}/emacs/${version}/site-lisp:'\
 +'${datadir}/emacs/${version}/leim:'\
++'${datadir}/emacs/${version}-emcws/lisp:'\
 +'${datadir}/emacs/${version}/lisp'\
    echo
    echo modifying leim/Makefile.in for emcws
-   mv leim/Makefile.in leim/Makefile.in.orig
-@@ -49,12 +53,14 @@
- dnl A case that the LEIM package does not exist.
- dnl
-   locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\
--'${datadir}/emacs/site-lisp'
-+'${datadir}/emacs/site-lisp:'\
-+'${datadir}/emacs/${version}/site-lisp:'\
-+'${datadir}/emacs/${version}/lisp'
+   mv ${srcdir}/leim/Makefile.in ${srcdir}/leim/Makefile.in.orig
+@@ -53,8 +61,8 @@
  fi
  
  lisppath='${locallisppath}:${lispdir}'
-- 
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)
