Date: Sun, 5 May 2013 05:23:30 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317394 - in head/editors/tamago: . files Message-ID: <201305050523.r455NUmv022774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun May 5 05:23:29 2013 New Revision: 317394 URL: http://svnweb.freebsd.org/changeset/ports/317394 Log: - Improve compatibility with older Emacsen. - Mark MAKE_JOBS_SAFE=yes. - Respect CC and CFLAGS for egg-helper. Added: head/editors/tamago/files/patch-egg-Makefile (contents, props changed) Modified: head/editors/tamago/Makefile head/editors/tamago/files/patch-egg.el Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Sun May 5 02:52:35 2013 (r317393) +++ head/editors/tamago/Makefile Sun May 5 05:23:29 2013 (r317394) @@ -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} Added: head/editors/tamago/files/patch-egg-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-egg-Makefile Sun May 5 05:23:29 2013 (r317394) @@ -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> Modified: head/editors/tamago/files/patch-egg.el ============================================================================== --- head/editors/tamago/files/patch-egg.el Sun May 5 02:52:35 2013 (r317393) +++ head/editors/tamago/files/patch-egg.el Sun May 5 05:23:29 2013 (r317394) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305050523.r455NUmv022774>