diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2013-05-05 05:23:29 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2013-05-05 05:23:29 +0000 |
| commit | d1ab137a468d2bc41ede407c54ea4a4f331cfdfd (patch) | |
| tree | 7d659557e9b3695935fb39342b1593e5f70532e8 /editors/tamago | |
| parent | 577b3c138a473e03ae3a8ff0099f250074ed8c5d (diff) | |
| download | freebsd-ports-d1ab137a468d2bc41ede407c54ea4a4f331cfdfd.zip | |
- Improve compatibility with older Emacsen.
- Mark MAKE_JOBS_SAFE=yes.
- Respect CC and CFLAGS for egg-helper.
Diffstat (limited to 'editors/tamago')
| -rw-r--r-- | editors/tamago/Makefile | 7 | ||||
| -rw-r--r-- | editors/tamago/files/patch-egg-Makefile | 11 | ||||
| -rw-r--r-- | editors/tamago/files/patch-egg.el | 22 |
3 files changed, 31 insertions, 9 deletions
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 133e908a9b6f..3ff3a457ba02 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -3,7 +3,7 @@ PORTNAME= tamago PORTVERSION= 4.0.6.0.20041122.19 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors elisp MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/e/egg @@ -24,6 +24,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_EMACS= yes WRKSRC= ${WRKDIR}/egg-4.0.6+0.20041122cvs +MAKE_JOBS_SAFE= yes PLIST_SUB= ELISPDIR="${EMACS_VERSION_SITE_LISPDIR}" PORTDOCS= AUTHORS ChangeLog ChangeLog.1997-1998 \ ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO \ @@ -46,7 +47,9 @@ pre-configure: ${WRKSRC}/configure post-build: - cd ${WRKSRC}/helper && ${MAKE} egg-helper + cd ${WRKSRC}/helper && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS} egg-helper ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${WRKSRC}/changelog.Debian ${INSTALL_DATA} ${WRKSRC}/debian/README.Debian ${WRKSRC} diff --git a/editors/tamago/files/patch-egg-Makefile b/editors/tamago/files/patch-egg-Makefile new file mode 100644 index 000000000000..268740e6722c --- /dev/null +++ b/editors/tamago/files/patch-egg-Makefile @@ -0,0 +1,11 @@ +--- /dev/null 2013-05-05 14:11:00.000000000 +0900 ++++ helper/Makefile 2013-05-05 14:14:52.000000000 +0900 +@@ -0,0 +1,8 @@ ++# $FreeBSD$ ++ ++PROG= egg-helper ++SRCS= egg-helper.c ++ ++MAN= ++ ++.include <bsd.prog.mk> diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el index ffe4f225f018..7243a34ecced 100644 --- a/editors/tamago/files/patch-egg.el +++ b/editors/tamago/files/patch-egg.el @@ -1,11 +1,14 @@ ---- egg.el.orig 2013-04-23 16:13:43.000000000 +0900 -+++ egg.el 2013-04-23 16:15:26.000000000 +0900 -@@ -167,16 +167,17 @@ +--- egg.el.orig 2013-05-05 14:02:05.000000000 +0900 ++++ egg.el 2013-05-05 14:02:05.000000000 +0900 +@@ -167,16 +167,22 @@ (setq egg-modefull-mode t) (its-define-select-keys egg-modefull-map)) (setq egg-modeless-mode t)) - (setq inactivate-current-input-method-function 'egg-mode) -+ (setq deactivate-current-input-method-function 'egg-mode) ++ (set (if (boundp 'deactivate-current-input-method-function) ++ 'deactivate-current-input-method-function ++ 'inactivate-current-input-method-function) ++ 'egg-mode) (setq describe-current-input-method-function 'egg-help) - (make-local-hook 'input-method-activate-hook) + (if (fboundp 'make-local-hook) @@ -17,16 +20,21 @@ (defun egg-exit-from-minibuffer () - (inactivate-input-method) -+ (deactivate-input-method) ++ (if (boundp 'deactivate-input-method) ++ deactivate-input-method ++ inactivate-input-method) (if (<= (minibuffer-depth) 1) (remove-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))) -@@ -184,7 +185,7 @@ +@@ -184,7 +190,10 @@ (defun egg-self-insert-char () (interactive) - (its-start last-command-char (and (eq last-command 'egg-use-context) -+ (its-start last-command-event (and (eq last-command 'egg-use-context) ++ (its-start (if (boundp 'last-command-event) ++ last-command-event ++ last-command-char) ++ (and (eq last-command 'egg-use-context) egg-context))) (defun egg-remove-all-text-properties (from to &optional object) |