From a946692b010c06ef9eaddf035621bdec99e3cf41 Mon Sep 17 00:00:00 2001 From: Yoichi NAKAYAMA Date: Sat, 1 Dec 2001 09:09:12 +0000 Subject: Update to emcws-20.7-20011002.gz and add mule-4.1 feature. PR: ports/32320 Submitted by: MAINTAINER Reviewed by: ports-jp@jp.freebsd.org,knu(mentor) --- japanese/emacs-emcws/Makefile | 38 +++++++++++++++++++++++++++++++++++--- japanese/emacs-emcws/distinfo | 2 +- japanese/emacs-emcws/pkg-plist | 18 ++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) (limited to 'japanese/emacs-emcws') diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 370e99aaafb0..fc34f06ef33c 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -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,14 +16,14 @@ DISTNAME= emacs-${PORTVERSION} 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 Y2K= http://www.gnu.org/software/year2000.html -RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 +BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20 WRKSRC= ${WRKDIR}/emacs-${EMACS_VER} @@ -99,6 +100,16 @@ EMCWS_ELCS= busyu.el \ 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,14 @@ pre-build: 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) + ${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1 + ${RM} -f ${WRKSRC}/etc/DOC-${EMACS_VER}.1 + ${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/emacs ${PREFIX}/bin/emcws-${EMACS_VER} @@ -132,9 +151,17 @@ do-install: @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \ ${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its @for i in ${EMCWS_ELCS}; do \ - ${CP} -p ${WRKSRC}/lisp/$$i \ + ${INSTALL_DATA} ${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 \ + ${INSTALL_DATA} ${WRKSRC}/lisp/$$i \ ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \ done + @${INSTALL_DATA} ${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 \ @@ -142,6 +169,11 @@ do-install: ${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: @${CAT} ${PKGMESSAGE} diff --git a/japanese/emacs-emcws/distinfo b/japanese/emacs-emcws/distinfo index 8f70ec2e5f6b..d46a0d934c63 100644 --- a/japanese/emacs-emcws/distinfo +++ b/japanese/emacs-emcws/distinfo @@ -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 --git a/japanese/emacs-emcws/pkg-plist b/japanese/emacs-emcws/pkg-plist index 6f1a75c640d7..be3cbe1c9e09 100644 --- a/japanese/emacs-emcws/pkg-plist +++ b/japanese/emacs-emcws/pkg-plist @@ -1,6 +1,9 @@ bin/emcws-%%EMACS_VER%% bin/emcws +libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%/fns-emcws-%%EMACS_VER%%.1.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/egg.elc 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-client.el 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 -- cgit v1.2.3