From owner-ports-jp@jp.freebsd.org  Wed Nov 28 21:26:54 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id VAA71626;
	Wed, 28 Nov 2001 21:26:54 +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 VAA71621
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 21:26:53 +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 fASCQlv40369
	for ports-jp@jp.freebsd.org; Wed, 28 Nov 2001 21:26:47 +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 fASCQee40358
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 21:26:40 +0900 (JST)
To: ports-jp@jp.freebsd.org
References: <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>
 <20011128.195906.30307173.shige@FreeBSD.org>
 <wyelmjqh7a.wl@eken3.eken.phys.nagoya-u.ac.jp>
 <wyd723qgtx.wl@eken3.eken.phys.nagoya-u.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Nov_28_21:26:40_2001-1"
From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
Date: 28 Nov 2001 21:26:40 +0900
In-Reply-To: <wyd723qgtx.wl@eken3.eken.phys.nagoya-u.ac.jp>
 (Yoichi NAKAYAMA's message of "Wed, 28 Nov 2001 20:23:54 +0900")
Message-ID: <87herf84jj.fsf@boggy.acest.tutrp.tut.ac.jp>
Lines: 332
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 MULE XEmacs/21.5 (beta3) (asparagus) (i386--freebsd)
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 11872
Subject: [ports-jp 11872] 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

--Multipart_Wed_Nov_28_21:26:40_2001-1
Content-Type: text/plain; charset=ISO-2022-JP

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

$B<B:]$N:n6H$r9T$$$J$,$i=q$-B-$7$F$$$C$?$N$G!"$o$1$N$o$+$i$J$$J8>O$K$J$C(B
$B$F$$$^$9$,!"7k2LE*$K$O!"Cf;3$5$s$HJ!Eg$5$s$N;XE&$K$D$$$F!"%/%j%"!<$G$O(B
$B$"$j$^$;$s$,!"2?$i$+$N2r$K;j$C$?$H;W$$$^$9!#(B

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

YN> lisp/help.el $B$N(B defun symbol-file $B$NItJ,$r=q$-49$($?J*$r(B
YN> share/emacs/%%EMACS_VER%%-emcws/lisp/ $B$KF~$l$F!"(B
YN> $B$3$A$i$NJ}$,(B /usr/local/share/emacs/20.7/lisp $B$h$jA0$K(B
YN> load-path $B$K8=$l$k$h$&$K$9$k$H$$$$5$$,$7$^$9!#(B

$B$H$3$m$,!"(B(format "fns-%s.el" emacsversion) $B$N%U%!%$%k$O!"(Bload-path $B$G(B
$B$O$J$/!"(Bexec-directory 
${PREFIX}/libexec/emacs/${EMACS_VER}/$CONFIGURE_TARGET}
$B$K$"$k$3$H$,2>Dj$5$l$F$$$^$9!#(B

exec-directory $B$r(B
${PREFIX}/libexec/emacs/${EMACS_VER}-emcws/$CONFIGURE_TARGET}
$B$K$9$k$3$H$OFq$7$/$J$$$N$G$9$,!":#EY$O!"(Bmovemail $B$J$I$N(B
${PREFIX}/libexec/emacs/${EMACS_VER}/$CONFIGURE_TARGET}
$B$K%$%s%9%H!<%k$5$l$F$$$k$b$N$,(B
${PREFIX}/libexec/emacs/${EMACS_VER}-emcws/$CONFIGURE_TARGET}
$B$K$O$J$$$3$H$K$h$kJ@32$,@8$^$l$^$9!#(B

YN> $BJQ998e$NL>A0$O(B fns-emcws-20.7.2.el $B$H$+$G$7$g$&$+!)(B

$B$=$l$J$i!"(B
${PREFIX}/libexec/emacs/${EMACS_VER}/$CONFIGURE_TARGET}/fns-20.7.2.el
$B$G$b$h$$$+$b!D!#(B

$B$5$F!"$3$l$i$N%-!<%o!<%I$r85$K!";n9T:x8m$r$7$F$$$^$9!#(B

1. help.el $B$O(B exec-directory $B$K(B fns-(emacs-version).el $B$,$"$k$3$H$r4|(B
   $BBT$7$F$$$k(B
2. mule-4.1 patch $B$H(B emcws patch $B$rN>N)$5$;$h$&$H$9$k$H!"(Bemacs $B$r(B2$B2s%3(B
   $B%s%Q%$%k$9$k$3$H$K$J$j!"(Bemacs-version $B$,(B 20.7.2 $B$K$J$C$F$7$^$$!"$3(B
   $B$l$O$h$m$7$/$J$$(B
3. make emacs $B$N$"$H(B make clean $B$r<B9T$7$F$+$i!"(Bmake all $B$9$k$H!"(B
   emacs-version $B$O(B 20.7.1 $B$K$J$k$i$7$$!#(B
4. $B$7$+$7!"$3$N$^$^$G$O(B fns-20.7.1.el $B$r(B Emacs-20.7 $B$N$b$N$K>e=q$-$9$k(B
   $B$3$H$K$J$j!"$3$l$b$h$m$7$/$J$$(B
5. fns-20.7.1.el $B$H$$$&%U%!%$%k$r:n$C$F$$$k$N$O!"(Bloadup.el $B$i$7$$(B
6. $B$H$$$&$3$H$O!"(Bloadup.el $B$H(B help.el $B$G(B "fns-%s.el" $B$H$J$C$F$$$kItJ,(B
   $B$r(B "fns-emcws-%s.el" $B$K$9$l$P(B(*)$B$h$$$N$G$O$J$+$m$&$+!)(B

$B$H$$$&;n9T2aDx$r7P$F!"8=:_!":F%3%s%Q%$%kCf$G$9!#"*$&$^$/9T$C$?LOMM!#(B

(*)$B$N:9J,$r<j85$G$O(B files/patch-e[ab] $B$H$7$F$_$^$7$?!#(B
emacs20-emcws.diff $B$rEv$F$F$+$i!"(Bpatch-e[ab]$B$r(Bfiles$B$K%3%T!<$7$F$/$@$5(B
$B$$!#(B

--Multipart_Wed_Nov_28_21:26:40_2001-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="emacs20-emcws.diff"
Content-Transfer-Encoding: 7bit

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/emacs20-emcws/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	27 Jun 2001 14:33:27 -0000	1.1
+++ Makefile	28 Nov 2001 12:10:03 -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,16 @@
 		wnn-egg.el \
 		wnn-egg.elc
 
+MULE_PATCHED_ELS=	ange-ftp.el ange-ftp.elc \
+			help.el help.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 loadup.el
+
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
 		DOC_FILE=${DOC_FILE}
 
@@ -121,6 +132,13 @@
 	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 help.el international/ccl.el international/mule-cmds.el \
+	international/mule.el international/titdic-cnv.el)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean)
+	${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/emacs ${PREFIX}/bin/emcws-${EMACS_VER}
@@ -135,12 +153,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-emcws-${EMACS_VER}.1.el \
+		${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.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 -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 -u -r1.1 pkg-plist
--- pkg-plist	27 Jun 2001 14:33:27 -0000	1.1
+++ pkg-plist	28 Nov 2001 12:10:15 -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
@@ -12,14 +15,27 @@
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
+share/emacs/%%EMACS_VER%%-emcws/lisp/help.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/help.elc
 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/loadup.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 +43,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 -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}'

--Multipart_Wed_Nov_28_21:26:40_2001-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="patch-ea"
Content-Transfer-Encoding: 7bit

--- lisp/help.el.orig	Wed Nov 28 20:55:37 2001
+++ lisp/help.el	Wed Nov 28 20:56:04 2001
@@ -561,8 +561,8 @@
     (load (expand-file-name
 	   ;; fns-XX.YY.ZZ.el does not work on DOS filesystem.
 	   (if (eq system-type 'ms-dos)
-	       "fns.el"
-	     (format "fns-%s.el" emacs-version))
+	       "fnsemcws.el"
+	     (format "fns-emcws-%s.el" emacs-version))
 	   exec-directory)
 	  ;; The file name fns-%s.el already has a .el extension.
 	  nil nil t)

--Multipart_Wed_Nov_28_21:26:40_2001-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="patch-eb"
Content-Transfer-Encoding: 7bit

--- lisp/loadup.el.orig	Wed Nov 28 20:54:00 2001
+++ lisp/loadup.el	Wed Nov 28 20:55:24 2001
@@ -280,11 +280,11 @@
 		    (expand-file-name
 		     (cond 
 		      ((eq system-type 'ms-dos)
-		       "../lib-src/fns.el")
+		       "../lib-src/fnsemcws.el")
 		      ((eq system-type 'windows-nt)
-		       (format "../../../lib-src/fns-%s.el" emacs-version))
+		       (format "../../../lib-src/fns-emcws-%s.el" emacs-version))
 		      (t
-		       (format "../lib-src/fns-%s.el" emacs-version)))
+		       (format "../lib-src/fns-emcws-%s.el" emacs-version)))
 		     invocation-directory))
       (erase-buffer)
       (setq load-history nil))

--Multipart_Wed_Nov_28_21:26:40_2001-1
Content-Type: text/plain; charset=ISO-2022-JP

$B$J$s$G$O$^$C$F$$$k$+$H$$$&$H!"(Bmule-ucs/emacs-20.7-mule-4.1.patch.txt
$B$K(B

How to apply:
        % tar xzvf emacs-20.7.tar.gz
        % tar xzvf leim-20.7.tar.gz
        % cd emacs-20.7
        % patch -p1 < somewhere/emacs-20.7-mule-4.1.patch
        % sh configure
        % cd src
        % make emacs
        % cd ../lisp
        % ../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
        % cd ..
        % make

$B$C$F=q$$$F$"$C$F!"$=$NDL$j$K$d$m$&$H$7$?$+$i$J$N$G$9!#(B^^;

Mule patch $B$NEv$?$C$?(B .el $B$rAG$N(B emacs-20.7 $B$G(B byte-compile $B$7$?$b$N$O!"(B
Mule patch $B$NEv$?$C$?(B AOI $B$G$bLdBj$J$/F0$/$N$J$i!"OC$O4JC1$J$N$G$9$,!"(B
$B$o$6$o$6$3$s$JIw$K=q$$$F$$$k$H$$$&$3$H$O!D!"$H4*7+$C$F!"FM$CAv$C$F$7$^(B
$B$$$^$7$?!#(B
-- 
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)

--Multipart_Wed_Nov_28_21:26:40_2001-1--
