diff options
| -rw-r--r-- | japanese/emacs20-dl-canna/Makefile | 36 | ||||
| -rw-r--r-- | japanese/emacs20-dl-canna/distinfo | 2 | ||||
| -rw-r--r-- | japanese/emacs20-dl-canna/files/patch-ab | 10 | ||||
| -rw-r--r-- | japanese/emacs20-dl-canna/files/patch-ac | 11 | ||||
| -rw-r--r-- | japanese/emacs20-dl-canna/pkg-descr | 9 | ||||
| -rw-r--r-- | japanese/emacs20-dl-canna/pkg-plist | 4 |
6 files changed, 55 insertions, 17 deletions
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile index 95a88420805e..7125dbe77dce 100644 --- a/japanese/emacs20-dl-canna/Makefile +++ b/japanese/emacs20-dl-canna/Makefile @@ -1,38 +1,42 @@ # New ports collection makefile for: emacs20-dl-canna -# Version required: 1.0 +# Version required: 1.2 # Date created: 10 October 1998 # Whom: shige # -# $Id: Makefile,v 1.2 1999/01/15 10:57:06 asami Exp $ +# $Id: Makefile,v 1.3 1999/03/01 09:37:59 shige Exp $ # -DISTNAME= emacs-canna-1.0 -PKGNAME= ja-emacs20-dl-canna-1.0 +DISTNAME= emacs-canna-${DLCANNA_VER} +PKGNAME= ja-emacs20-dl-canna-${DLCANNA_VER} CATEGORIES= japanese editors -MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/ +MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/ \ + ftp://ftp.ring.gr.jp/pub/text/elisp/jaist/emacs-20-dl/ MAINTAINER= shige@FreeBSD.ORG LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \ - /nonexistent:${EMACSDL_DIR}:configure + /nonexistent:${EMACSDL_DIR}:configure \ + ${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20 RUN_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \ - ${LOCALBASE}/share/emacs/20.3/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-emacs20 + ${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20 -WRKSRC= ${WRKDIR}/dl-canna-1.0 -MAKE_ENV= PREFIX=${PREFIX} -MAKE_ARGS= EMACS_SRC_DIR=${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER} -PLIST_SUB= EMACS_VER=${EMACS_VER} LISPDIR=${LISPDIR} DOCDIR=${DOCDIR} +GNU_CONFIGURE= YES +CONFIGURE_ARGS= --with-canna-includes=${PREFIX}/include \ + --with-canna-libraries=${PREFIX}/lib \ + --with-emacs-srcdir=${EMACSDL_SRCDIR} +CONFIGURE_ENV= EMACS="emacs-dl-${EMACS_VER}" +PLIST_SUB= EMACS_VER=${EMACS_VER} DLCANNA_VER=${DLCANNA_VER} \ + LISPDIR=${LISPDIR} DOCDIR=${DOCDIR} +# ports variables EMACS_VER= 20.3 EMACSDL_DIR= ${PORTSDIR}/editors/emacs20-dl -MODULEDIR= ${LOCALBASE}/libexec/emacs/${EMACS_VER}/i386--freebsd/ +EMACSDL_SRCDIR= ${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}/src +APEL_DEPENDS= ${PREFIX}/share/emacs/${EMACS_VER}/site-lisp/emu/emu.el LISPDIR= share/emacs/site-lisp DOCDIR= share/doc/emacs20-dl-canna - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/canna.so ${MODULEDIR}/canna.so - @${INSTALL_DATA} ${WRKSRC}/canna.el ${PREFIX}/${LISPDIR}/canna.el +DLCANNA_VER= 1.2 post-install: .if !defined(NOPORTDOCS) diff --git a/japanese/emacs20-dl-canna/distinfo b/japanese/emacs20-dl-canna/distinfo index d489790f6a68..a96021c1e948 100644 --- a/japanese/emacs20-dl-canna/distinfo +++ b/japanese/emacs20-dl-canna/distinfo @@ -1 +1 @@ -MD5 (emacs-canna-1.0.tar.gz) = 6d02c75e31b7df94607770b03fbe3875 +MD5 (emacs-canna-1.2.tar.gz) = fcacd270bdecb806bc70e262f8e6579d diff --git a/japanese/emacs20-dl-canna/files/patch-ab b/japanese/emacs20-dl-canna/files/patch-ab new file mode 100644 index 000000000000..4371c9220e23 --- /dev/null +++ b/japanese/emacs20-dl-canna/files/patch-ab @@ -0,0 +1,10 @@ +--- configure.orig Wed Mar 3 04:11:42 1999 ++++ configure Tue Mar 16 15:06:02 1999 +@@ -1,5 +1,5 @@ + #!/bin/sh + +-EMACS=emacs ++[ "X${EMACS}" = "X" ] && EMACS=emacs + +-eval $EMACS -batch -q -no-site-file -l CANNA-CONFIG -f config-canna ++eval $EMACS -batch -q -no-site-file -l CANNA-CONFIG -f config-canna $* diff --git a/japanese/emacs20-dl-canna/files/patch-ac b/japanese/emacs20-dl-canna/files/patch-ac new file mode 100644 index 000000000000..628af28907b9 --- /dev/null +++ b/japanese/emacs20-dl-canna/files/patch-ac @@ -0,0 +1,11 @@ +--- CANNA-CONFIG.orig Wed Mar 3 04:11:40 1999 ++++ CANNA-CONFIG Tue Mar 16 15:38:55 1999 +@@ -17,6 +17,8 @@ + (setq canna-includes (substring arg (match-end 0)))) + ((string-match "^--with-canna-libraries=" arg) + (setq canna-libraries (substring arg (match-end 0)))) ++ ((string-match "^--with-emacs-srcdir=" arg) ++ (setq srcdir (substring arg (match-end 0)))) + ) + (setq command-line-args-left (cdr command-line-args-left)) + ) diff --git a/japanese/emacs20-dl-canna/pkg-descr b/japanese/emacs20-dl-canna/pkg-descr index b6e21d925d00..924610daaaba 100644 --- a/japanese/emacs20-dl-canna/pkg-descr +++ b/japanese/emacs20-dl-canna/pkg-descr @@ -27,6 +27,15 @@ To use Canna, put in your $HOME/.emacs as follows: (load "canna") (canna) +This input-method toggle key-binding is C-o. + +or if you want to use canna-leim, as follows: + + (require 'canna-leim) + (set-input-method "japanese-canna") + +This input-method toggle key-binding is C-\. + And you must use emacs-dl-20.3 (not emacs-20.3!). This dynamic loading module sources and emacs20 dynamic loading patch diff --git a/japanese/emacs20-dl-canna/pkg-plist b/japanese/emacs20-dl-canna/pkg-plist index 57ba65c15caa..734247ecdf62 100644 --- a/japanese/emacs20-dl-canna/pkg-plist +++ b/japanese/emacs20-dl-canna/pkg-plist @@ -1,5 +1,9 @@ +libexec/emacs/%%EMACS_VER%%/i386--freebsd/canna.so.%%DLCANNA_VER%% libexec/emacs/%%EMACS_VER%%/i386--freebsd/canna.so %%LISPDIR%%/canna.el +%%LISPDIR%%/canna.elc +%%LISPDIR%%/canna-leim.el +%%LISPDIR%%/canna-leim.elc %%DOCDIR%%/README.ja %%DOCDIR%%/ChangeLog @dirrm %%DOCDIR%% |