Date: 28 Nov 2001 18:36:50 +0900 From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> To: freebsd-ports@freebsd.org Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: ports/32320: Update by maintainer: japanese/emacs20-emcws Message-ID: <87snaz5j9p.fsf@boggy.acest.tutrp.tut.ac.jp> In-Reply-To: <87y9kr5k43.fsf@boggy.acest.tutrp.tut.ac.jp> (NAKAJI Hiroyuki's message of "28 Nov 2001 18:18:36 %2B0900") References: <200111270151.fAR1ptr57796@boggy.acest.tutrp.tut.ac.jp> <87y9kr5k43.fsf@boggy.acest.tutrp.tut.ac.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
nakaji> This patch is not good. I'm making better one. Please apply this one. 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 09:23:22 -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,23 @@ ${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 @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 09:23:53 -0000 @@ -1,6 +1,8 @@ bin/emcws-%%EMACS_VER%% bin/emcws 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 +16,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 +39,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}' To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87snaz5j9p.fsf>