From owner-ports-jp@jp.freebsd.org  Wed Nov 28 21:26:06 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id VAA71558;
	Wed, 28 Nov 2001 21:26:06 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from eken2.eken.phys.nagoya-u.ac.jp (eken2.eken.phys.nagoya-u.ac.jp [133.6.121.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id VAA71553
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 21:26:06 +0900 (JST)
	(envelope-from yoichi@eken.phys.nagoya-u.ac.jp)
Received: from eken3.eken.phys.nagoya-u.ac.jp (eken3 [133.6.121.3])
	by eken2.eken.phys.nagoya-u.ac.jp (8.11.6+3.4W/3.7W-E) with ESMTP id fASCQ5B09741
	for <ports-jp@jp.freebsd.org>; Wed, 28 Nov 2001 21:26:06 +0900 (JST)
Date: Wed, 28 Nov 2001 21:26:05 +0900
Message-ID: <wybshnqdya.wl@eken3.eken.phys.nagoya-u.ac.jp>
From: Yoichi NAKAYAMA <yoichi@eken.phys.nagoya-u.ac.jp>
To: ports-jp@jp.freebsd.org
In-Reply-To: <87g06z5f5r.fsf@boggy.acest.tutrp.tut.ac.jp>
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>
	<87g06z5f5r.fsf@boggy.acest.tutrp.tut.ac.jp>
User-Agent: Wanderlust/2.7.6 (Too Funky) EMIKO/1.14.1 (Choanoflagellata)
 LIMIT/1.14.7 (=?ISO-2022-JP?B?GyRCRiMwZjt7GyhC?=) APEL/10.3 Emacs/20.7
 (i686-pc-linux-gnu) MULE/4.0 (=?ISO-2022-JP?B?GyRCMlYxYxsoQg==?=)
Organization: E-ken, Dept. of Physics, Nagoya University, JAPAN
X-Face: wLZki+KbGjgKe0,<&3g*rA|R**vj[a8L%[v]ecJh1L(Uqm|LBx;v7<b$x~FKiI]Sv>Nq7n%?0d.aS]F#[~C\!{m?m,C&#U5}$_pZvBR>5VmX1Ol0`P\M-U8`sUF<5Quj'z&zzW8r|Zl9#W7Wut3duYzpKrP{n+AbarKtJ!i"Al7]P;-?[=iBZa*]r=>C':0~JECx]IH+RXq=/hUX}MB9e]oQKBxsDd/
MIME-Version: 1.0 (generated by EMIKO 1.14.1 - "Choanoflagellata")
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Nov_28_21:26:05_2001-1"
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 11871
Subject: [ports-jp 11871] 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: yoichi@eken.phys.nagoya-u.ac.jp

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

$BCf<#$5$s(B wrote:
> $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

$BA0=R$N$h$&$K(B help.el $B$bJQ99$7$F$&$^$/$$$/$N$r3NG'$7$^$7$?!#(B
files/patch-db $B$rDI2C$7!"(Bfns-emcws.el $B$H$$$&L>A0$K$7$F$"$j$^$9!#(B
$BCm0U$H$7$F!"(Bmule-4.1 $B$K$9$k$N$HF1MM$K!"(Bemacs $B$r(B dump $B$9$kA0$K(B help.el
$B$r%P%$%H%3%s%Q%$%k$7$F$*$/I,MW$,$"$k$H;W$$$^$9!#(B

$B$U$/$7$^$5$s(B wrote:
> ports/packages $BE*$K$O!"(B
> emacs $B%S%k%IHV9f$r(B PORTREVISION $B$J$I$K;HMQ$7$J$$$h$&$K$9$k(B
> $B$N$,$h$$$H;W$$$^$9$N$G!"(Bports $B$GIaDL$K(B make $B$r9T$&$H!">o$K(B
> x.y.1 $B$J%P%$%J%j$,$G$-$k$h$&$K$9$k$N$,$h$$$+$H;W$$$^$9$,(B...

$B$H$$$&$N$K$D$$$F$O:#$5$C$-Mh$?$H$3$m$J$N$G!"$=$NJQ99$O4^$^$l$F$$$^$;$s!#(B
--
yoichi nakayama

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

diff -ruN emacs20-emcws.orig/Makefile emacs20-emcws/Makefile
--- emacs20-emcws.orig/Makefile	Wed Jun 27 23:33:27 2001
+++ emacs20-emcws/Makefile	Wed Nov 28 21:01:45 2001
@@ -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
@@ -97,7 +98,18 @@
 		sj3-egg.el \
 		wnn-client.el \
 		wnn-egg.el \
-		wnn-egg.elc
+		wnn-egg.elc \
+		help.el \
+		help.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 help.el
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET} \
 		DOC_FILE=${DOC_FILE}
@@ -121,6 +133,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 +152,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-emcws.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:
diff -ruN emacs20-emcws.orig/distinfo emacs20-emcws/distinfo
--- emacs20-emcws.orig/distinfo	Wed Jun 27 23:33:27 2001
+++ emacs20-emcws/distinfo	Wed Nov 28 18:54:58 2001
@@ -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
diff -ruN emacs20-emcws.orig/files/patch-da emacs20-emcws/files/patch-da
--- emacs20-emcws.orig/files/patch-da	Wed Jun 27 23:33:36 2001
+++ emacs20-emcws/files/patch-da	Wed Nov 28 18:54:58 2001
@@ -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}'
diff -ruN emacs20-emcws.orig/files/patch-db emacs20-emcws/files/patch-db
--- emacs20-emcws.orig/files/patch-db	Thu Jan  1 09:00:00 1970
+++ emacs20-emcws/files/patch-db	Wed Nov 28 20:50:44 2001
@@ -0,0 +1,11 @@
+--- lisp/help.el.orig	Fri Oct 22 06:32:34 1999
++++ lisp/help.el	Wed Nov 28 20:49:58 2001
+@@ -562,7 +562,7 @@
+ 	   ;; 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))
++	     (format "fns-emcws.el" emacs-version))
+ 	   exec-directory)
+ 	  ;; The file name fns-%s.el already has a .el extension.
+ 	  nil nil t)
diff -ruN emacs20-emcws.orig/pkg-plist emacs20-emcws/pkg-plist
--- emacs20-emcws.orig/pkg-plist	Wed Jun 27 23:33:27 2001
+++ emacs20-emcws/pkg-plist	Wed Nov 28 20:54:12 2001
@@ -1,6 +1,11 @@
 bin/emcws-%%EMACS_VER%%
 bin/emcws
+libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-emcws.el
 share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
+share/emacs/%%EMACS_VER%%-emcws/lisp/help.el
+share/emacs/%%EMACS_VER%%-emcws/lisp/help.elc
+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 +19,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 +42,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

--Multipart_Wed_Nov_28_21:26:05_2001-1--
