Index: Makefile =================================================================== --- Makefile (revision 384330) +++ Makefile (working copy) @@ -3,7 +3,6 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 6 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -24,7 +23,7 @@ xemacs-devel-mule-[0-9]* \ emacs-devel-[0-9]* -EMACS_VER= 24.4 +EMACS_VER= 24.5 GNU_CONFIGURE= yes USES= cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include Index: distinfo =================================================================== --- distinfo (revision 384330) +++ distinfo (working copy) @@ -1,4 +1,2 @@ -SHA256 (emacs-24.4.tar.xz) = 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd -SIZE (emacs-24.4.tar.xz) = 39733124 -SHA256 (emacs24.4canna-20141030.diff.gz) = 3c49cbdf9bf822c8d682568b63328c959a79edafa2ac73aa4e5c2d27059fcfa0 -SIZE (emacs24.4canna-20141030.diff.gz) = 31687 +SHA256 (emacs-24.5.tar.xz) = dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e +SIZE (emacs-24.5.tar.xz) = 39759804 Index: files/patch-c117653.diff =================================================================== --- files/patch-c117653.diff (revision 384330) +++ files/patch-c117653.diff (working copy) @@ -1,39 +0,0 @@ -$FreeBSD$ - -From the commit r117653, bug #18858 - -=== modified file 'lisp/ChangeLog' ---- lisp/ChangeLog 2014-11-01 13:34:45 +0000 -+++ lisp/ChangeLog 2014-11-01 14:08:00 +0000 -@@ -1,3 +1,8 @@ -+2014-11-01 Wolfgang Jenkner -+ -+ * net/tramp-sh.el (tramp-send-command): Fix the case where the -+ remote-echo connection property is non-nil (bug#18858). -+ - 2014-11-01 Michael Albinus - - Backport Tramp changes from trunk. - -=== modified file 'lisp/net/tramp-sh.el' ---- lisp/net/tramp-sh.el 2014-11-01 13:34:45 +0000 -+++ lisp/net/tramp-sh.el 2014-11-01 14:08:00 +0000 -@@ -4769,6 +4769,17 @@ - (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) - Index: pkg-plist =================================================================== --- pkg-plist (revision 384330) +++ pkg-plist (working copy) @@ -1646,8 +1646,6 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/warnings.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lock.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/crisp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-base.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/cua-gmrk.el.gz @@ -1666,16 +1664,6 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/edt.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/keypad.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-edt.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-extras.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/tpu-mapper.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vi.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/vip.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-cmd.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-ex.el.gz @@ -1692,8 +1680,6 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper-util.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emulation/viper.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emulation/ws-mode.elc %%DATADIR%%/%%EMACS_VER%%/lisp/env.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/env.elc %%DATADIR%%/%%EMACS_VER%%/lisp/epa-dired.el.gz @@ -2268,6 +2254,7 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/international/ucs-normalize.elc %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-bidi.el +%%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-brackets.el %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-category.el %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-combining.el %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-comment.el @@ -2848,10 +2835,14 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cl-compat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/complete.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/crisp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cust-print.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/erc-hecomplete.el.gz @@ -2930,8 +2921,20 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-extras.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-mapper.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vc-mcvs.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vi.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/vip.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/ws-mode.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/xesam.elc %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/yow.el.gz @@ -3251,8 +3254,6 @@ %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-bytecomp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-cmds.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-compat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-defs.elc %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/cc-engine.el.gz @@ -4041,3 +4042,4 @@ share/icons/hicolor/48x48/apps/emacs.png share/icons/hicolor/scalable/apps/emacs.svg share/icons/hicolor/scalable/mimetypes/emacs-document.svg +@dir %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-parallel