Hi,

for those interested in the next Emacs update.

  Pretest announce:
  https://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00184.html

  emacs-24.5 schedule:
  https://lists.gnu.org/archive/html/emacs-devel/2015-03/msg00601.html

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile    2 Jan 2015 14:26:12 -0000       1.50
+++ Makefile    9 Mar 2015 12:49:51 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=               GNU editor: extensible, customizable, self-documenting
 
-VERSION=               24.4
-REVISION=              0
+VERSION=               24.4.91
 DISTNAME=              emacs-${VERSION}
 
 CATEGORIES=            editors
@@ -17,7 +16,8 @@ PERMIT_PACKAGE_CDROM= Yes
 
 WANTLIB=               c m ncurses pthread execinfo gnutls xml2 z
 
-MASTER_SITES=          ${MASTER_SITE_GNU:=emacs/}
+MASTER_SITES=          ftp://alpha.gnu.org/gnu/emacs/pretest/
+EXTRACT_SUFX=          .tar.xz
 
 USE_GMAKE=             Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/emacs/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    12 Dec 2014 12:43:34 -0000      1.6
+++ distinfo    9 Mar 2015 12:53:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (emacs-24.4.tar.gz) = qTxPGvpa3mWgyXI5dfCl/fZkHMRjj9r7PtmULCPDLMY=
-SIZE (emacs-24.4.tar.gz) = 59020082
+SHA256 (emacs-24.4.91.tar.xz) = SXYxqvxHC6S0wan0BzGaMUTY3BHrJLe3VaZtnx87Wt0=
+SIZE (emacs-24.4.91.tar.xz) = 39755240
Index: patches/patch-lisp_net_tramp-sh_el
===================================================================
RCS file: patches/patch-lisp_net_tramp-sh_el
diff -N patches/patch-lisp_net_tramp-sh_el
--- patches/patch-lisp_net_tramp-sh_el  12 Dec 2014 12:43:34 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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 <wjenk...@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)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST   12 Dec 2014 12:43:34 -0000      1.15
+++ pkg/PLIST   23 Feb 2015 08:54:27 -0000
@@ -1778,8 +1778,6 @@ share/emacs/${VERSION}/lisp/emacs-lisp/w
 share/emacs/${VERSION}/lisp/emacs-lock.el.gz
 share/emacs/${VERSION}/lisp/emacs-lock.elc
 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 +1796,6 @@ share/emacs/${VERSION}/lisp/emulation/ed
 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 +1812,6 @@ share/emacs/${VERSION}/lisp/emulation/vi
 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
@@ -2991,10 +2977,14 @@ share/emacs/${VERSION}/lisp/obsolete/ass
 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 +3063,20 @@ share/emacs/${VERSION}/lisp/obsolete/sym
 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 +3399,6 @@ share/emacs/${VERSION}/lisp/progmodes/cc
 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


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE


Reply via email to