cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to emacs-24.5

Browse Source 
Lots of test reports on amd64, sparc64, loongson, and hppa by
Alf Schlichting, bcallah@ and juanfra@.  Many thanks!

ok juanfra@, "looks good to me" jasper@
This commit is contained in:
jca 2015-04-15 11:35:06 +00:00
parent 84d9aa303a
commit f1cb1cc758
5 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/emacs/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.52 2015/04/04 09:21:01 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.53 2015/04/15 11:35:06 jca Exp $
COMMENT= GNU editor: extensible, customizable, self-documenting
VERSION= 24.4
REVISION= 2
VERSION= 24.5
DISTNAME= emacs-${VERSION}
CATEGORIES= editors

4
editors/emacs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (emacs-24.4.tar.gz) = qTxPGvpa3mWgyXI5dfCl/fZkHMRjj9r7PtmULCPDLMY=
SIZE (emacs-24.4.tar.gz) = 59020082
SHA256 (emacs-24.5.tar.gz) = JzemYi+y2ZgunEf7by+yl72kJnTgnbQPybzA20KXw7Y=
SIZE (emacs-24.5.tar.gz) = 59216034

10
editors/emacs/patches/patch-Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.1 2014/12/12 12:43:34 jca Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2015/04/15 11:35:06 jca Exp $
- don't compress man and info pages.
--- Makefile.in.orig Sat Jul 12 19:46:56 2014
+++ Makefile.in Tue Dec 2 19:33:41 2014
@@ -665,7 +665,7 @@ install-info: info
--- Makefile.in.orig Fri Mar 27 09:01:11 2015
+++ Makefile.in Mon Mar 30 23:12:00 2015
@@ -670,7 +670,7 @@ install-info: info
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
(cd "$${thisdir}"; \
${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2014/12/12 12:43:34 jca Exp $
rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
done; \
@@ -688,7 +688,7 @@ install-man:
@@ -693,7 +693,7 @@ install-man:
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
(cd "$${thisdir}"; \
${INSTALL_DATA} ${mansrcdir}/$${page} "$(DESTDIR)${man1dir}/$${dest}"); \

33
editors/emacs/patches/patch-lisp_net_tramp-sh_el
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-lisp_net_tramp-sh_el,v 1.1 2014/12/12 12:43:34 jca Exp $
- fix a hang in tramp-mode.
commit b14b7f431fe9cfcdcb23eecf105992d1c276dc69
Author: Wolfgang Jenkner <wjenkner@inode.at>
Date: Sat Nov 1 15:08:00 2014 +0100
* net/tramp-sh.el (tramp-send-command): Fix the case where the
remote-echo connection property is non-nil.
Fixes: debbugs:18858
--- lisp/net/tramp-sh.el.orig Mon Jun 23 02:47:02 2014
+++ lisp/net/tramp-sh.el Tue Dec 2 19:39:16 2014
@@ -4657,6 +4657,17 @@ function waits for output unless NOOUTPUT is set."
(when (tramp-get-connection-property p "remote-echo" nil)
;; We mark the command string that it can be erased in the output buffer.
(tramp-set-connection-property p "check-remote-echo" t)
+ ;; If we put `tramp-echo-mark' after a trailing newline (which
+ ;; is assumed to be unquoted) `tramp-send-string' doesn't see
+ ;; that newline and adds `tramp-rsh-end-of-line' right after
+ ;; `tramp-echo-mark', so the remote shell sees two consecutive
+ ;; trailing line endings and sends two prompts after executing
+ ;; the command, which confuses `tramp-wait-for-output'.
+ (when (and (not (string= command ""))
+ (string-equal (substring command -1) "\n"))
+ (setq command (substring command 0 -1)))
+ ;; No need to restore a trailing newline here since `tramp-send-string'
+ ;; makes sure that the string ends in `tramp-rsh-end-of-line', anyway.
(setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
;; Send the command.
(tramp-message vec 6 "%s" command)

36
editors/emacs/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2014/12/12 12:43:34 jca Exp $
@comment $OpenBSD: PLIST,v 1.16 2015/04/15 11:35:06 jca Exp $
@pkgpath editors/emacs22,-main
@pkgpath editors/emacs22,-el
@pkgpath editors/emacs23,-main
@ -1777,9 +1777,8 @@ share/emacs/${VERSION}/lisp/emacs-lisp/warnings.el.gz
share/emacs/${VERSION}/lisp/emacs-lisp/warnings.elc
share/emacs/${VERSION}/lisp/emacs-lock.el.gz
share/emacs/${VERSION}/lisp/emacs-lock.elc
share/emacs/${VERSION}/lisp/emacs-parallel/
share/emacs/${VERSION}/lisp/emulation/
share/emacs/${VERSION}/lisp/emulation/crisp.el.gz
share/emacs/${VERSION}/lisp/emulation/crisp.elc
share/emacs/${VERSION}/lisp/emulation/cua-base.el.gz
share/emacs/${VERSION}/lisp/emulation/cua-base.elc
share/emacs/${VERSION}/lisp/emulation/cua-gmrk.el.gz
@ -1798,16 +1797,6 @@ share/emacs/${VERSION}/lisp/emulation/edt.el.gz
share/emacs/${VERSION}/lisp/emulation/edt.elc
share/emacs/${VERSION}/lisp/emulation/keypad.el.gz
share/emacs/${VERSION}/lisp/emulation/keypad.elc
share/emacs/${VERSION}/lisp/emulation/tpu-edt.el.gz
share/emacs/${VERSION}/lisp/emulation/tpu-edt.elc
share/emacs/${VERSION}/lisp/emulation/tpu-extras.el.gz
share/emacs/${VERSION}/lisp/emulation/tpu-extras.elc
share/emacs/${VERSION}/lisp/emulation/tpu-mapper.el.gz
share/emacs/${VERSION}/lisp/emulation/tpu-mapper.elc
share/emacs/${VERSION}/lisp/emulation/vi.el.gz
share/emacs/${VERSION}/lisp/emulation/vi.elc
share/emacs/${VERSION}/lisp/emulation/vip.el.gz
share/emacs/${VERSION}/lisp/emulation/vip.elc
share/emacs/${VERSION}/lisp/emulation/viper-cmd.el.gz
share/emacs/${VERSION}/lisp/emulation/viper-cmd.elc
share/emacs/${VERSION}/lisp/emulation/viper-ex.el.gz
@ -1824,8 +1813,6 @@ share/emacs/${VERSION}/lisp/emulation/viper-util.el.gz
share/emacs/${VERSION}/lisp/emulation/viper-util.elc
share/emacs/${VERSION}/lisp/emulation/viper.el.gz
share/emacs/${VERSION}/lisp/emulation/viper.elc
share/emacs/${VERSION}/lisp/emulation/ws-mode.el.gz
share/emacs/${VERSION}/lisp/emulation/ws-mode.elc
share/emacs/${VERSION}/lisp/env.el.gz
share/emacs/${VERSION}/lisp/env.elc
share/emacs/${VERSION}/lisp/epa-dired.el.gz
@ -2404,6 +2391,7 @@ share/emacs/${VERSION}/lisp/international/titdic-cnv.elc
share/emacs/${VERSION}/lisp/international/ucs-normalize.el.gz
share/emacs/${VERSION}/lisp/international/ucs-normalize.elc
share/emacs/${VERSION}/lisp/international/uni-bidi.el
share/emacs/${VERSION}/lisp/international/uni-brackets.el
share/emacs/${VERSION}/lisp/international/uni-category.el
share/emacs/${VERSION}/lisp/international/uni-combining.el
share/emacs/${VERSION}/lisp/international/uni-comment.el
@ -2991,10 +2979,14 @@ share/emacs/${VERSION}/lisp/obsolete/assoc.elc
share/emacs/${VERSION}/lisp/obsolete/awk-mode.el.gz
share/emacs/${VERSION}/lisp/obsolete/awk-mode.elc
share/emacs/${VERSION}/lisp/obsolete/bruce.el
share/emacs/${VERSION}/lisp/obsolete/cc-compat.el.gz
share/emacs/${VERSION}/lisp/obsolete/cc-compat.elc
share/emacs/${VERSION}/lisp/obsolete/cl-compat.el.gz
share/emacs/${VERSION}/lisp/obsolete/cl-compat.elc
share/emacs/${VERSION}/lisp/obsolete/complete.el.gz
share/emacs/${VERSION}/lisp/obsolete/complete.elc
share/emacs/${VERSION}/lisp/obsolete/crisp.el.gz
share/emacs/${VERSION}/lisp/obsolete/crisp.elc
share/emacs/${VERSION}/lisp/obsolete/cust-print.el.gz
share/emacs/${VERSION}/lisp/obsolete/cust-print.elc
share/emacs/${VERSION}/lisp/obsolete/erc-hecomplete.el.gz
@ -3073,8 +3065,20 @@ share/emacs/${VERSION}/lisp/obsolete/sym-comp.el.gz
share/emacs/${VERSION}/lisp/obsolete/sym-comp.elc
share/emacs/${VERSION}/lisp/obsolete/terminal.el.gz
share/emacs/${VERSION}/lisp/obsolete/terminal.elc
share/emacs/${VERSION}/lisp/obsolete/tpu-edt.el.gz
share/emacs/${VERSION}/lisp/obsolete/tpu-edt.elc
share/emacs/${VERSION}/lisp/obsolete/tpu-extras.el.gz
share/emacs/${VERSION}/lisp/obsolete/tpu-extras.elc
share/emacs/${VERSION}/lisp/obsolete/tpu-mapper.el.gz
share/emacs/${VERSION}/lisp/obsolete/tpu-mapper.elc
share/emacs/${VERSION}/lisp/obsolete/vc-mcvs.el.gz
share/emacs/${VERSION}/lisp/obsolete/vc-mcvs.elc
share/emacs/${VERSION}/lisp/obsolete/vi.el.gz
share/emacs/${VERSION}/lisp/obsolete/vi.elc
share/emacs/${VERSION}/lisp/obsolete/vip.el.gz
share/emacs/${VERSION}/lisp/obsolete/vip.elc
share/emacs/${VERSION}/lisp/obsolete/ws-mode.el.gz
share/emacs/${VERSION}/lisp/obsolete/ws-mode.elc
share/emacs/${VERSION}/lisp/obsolete/xesam.el.gz
share/emacs/${VERSION}/lisp/obsolete/xesam.elc
share/emacs/${VERSION}/lisp/obsolete/yow.el.gz
@ -3397,8 +3401,6 @@ share/emacs/${VERSION}/lisp/progmodes/cc-bytecomp.el.gz
share/emacs/${VERSION}/lisp/progmodes/cc-bytecomp.elc
share/emacs/${VERSION}/lisp/progmodes/cc-cmds.el.gz
share/emacs/${VERSION}/lisp/progmodes/cc-cmds.elc
share/emacs/${VERSION}/lisp/progmodes/cc-compat.el.gz
share/emacs/${VERSION}/lisp/progmodes/cc-compat.elc
share/emacs/${VERSION}/lisp/progmodes/cc-defs.el.gz
share/emacs/${VERSION}/lisp/progmodes/cc-defs.elc
share/emacs/${VERSION}/lisp/progmodes/cc-engine.el.gz