[97157] trunk/dports/aqua/emacs-app

[hum at macports.org]

Revision: 97157
          https://trac.macports.org/changeset/97157
Author:   hum at macports.org
Date:     2012-08-28 06:58:13 -0700 (Tue, 28 Aug 2012)
Log Message:
-----------
emacs-app: update to 24.2; remove patch-src_nsterm.m.diff, which was integrated into the upstream; add conflicts.

Modified Paths:
--------------
    trunk/dports/aqua/emacs-app/Portfile

Removed Paths:
-------------
    trunk/dports/aqua/emacs-app/files/patch-src_nsterm.m.diff

Modified: trunk/dports/aqua/emacs-app/Portfile
===================================================================
--- trunk/dports/aqua/emacs-app/Portfile	2012-08-28 13:45:03 UTC (rev 97156)
+++ trunk/dports/aqua/emacs-app/Portfile	2012-08-28 13:58:13 UTC (rev 97157)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                emacs-app
-version             24.1
-revision            2
+version             24.2
 categories          aqua editors
 maintainers         css hum openmaintainer
 
@@ -28,15 +27,14 @@
 master_sites        gnu:emacs
 distname            emacs-${version}
 dist_subdir         emacs
-checksums           rmd160  0fed00042339f46b29449bd561d2f881d13d8d38 \
-                    sha256  60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab
+checksums           rmd160  26f6c2b671ed7f160875d62e47c89afec085110f \
+                    sha256  6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357
 
+conflicts           emacs-app-devel
+
 depends_lib         port:ncurses
 
-# patch-src_nsterm.m.diff
-# https://lists.libreplanet.org/archive/html/emacs-diffs/2012-07/msg00287.html (#35797)
-patchfiles          patch-src_emacs.c.diff \
-                    patch-src_nsterm.m.diff
+patchfiles          patch-src_emacs.c.diff
 
 post-patch {
     reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/emacs.c

Deleted: trunk/dports/aqua/emacs-app/files/patch-src_nsterm.m.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-src_nsterm.m.diff	2012-08-28 13:45:03 UTC (rev 97156)
+++ trunk/dports/aqua/emacs-app/files/patch-src_nsterm.m.diff	2012-08-28 13:58:13 UTC (rev 97157)
@@ -1,80 +0,0 @@
---- src/nsterm.m.orig      2012-07-13 18:03:10 +0000
-+++ src/nsterm.m      2012-07-16 11:02:09 +0000
-@@ -4720,8 +4720,13 @@
- 
-   if (!processingCompose)
-     {
-+      /* When using screen sharing, no left or right information is sent,
-+         so use Left key in those cases.  */
-+      int is_left_key, is_right_key;
-+
-       code = ([[theEvent charactersIgnoringModifiers] length] == 0) ?
-         0 : [[theEvent charactersIgnoringModifiers] characterAtIndex: 0];
-+
-       /* (Carbon way: [theEvent keyCode]) */
- 
-       /* is it a "function key"? */
-@@ -4746,13 +4751,17 @@
-       if (flags & NSShiftKeyMask)
-         emacs_event->modifiers |= shift_modifier;
- 
--      if ((flags & NSRightCommandKeyMask) == NSRightCommandKeyMask)
-+      is_right_key = (flags & NSRightCommandKeyMask) == NSRightCommandKeyMask;
-+      is_left_key = (flags & NSLeftCommandKeyMask) == NSLeftCommandKeyMask
-+        || (! is_right_key && (flags & NSCommandKeyMask) == NSCommandKeyMask);
-+      
-+      if (is_right_key)
-         emacs_event->modifiers |= parse_solitary_modifier
-           (EQ (ns_right_command_modifier, Qleft)
-            ? ns_command_modifier
-            : ns_right_command_modifier);
- 
--      if ((flags & NSLeftCommandKeyMask) == NSLeftCommandKeyMask)
-+      if (is_left_key)
-         {
-           emacs_event->modifiers |= parse_solitary_modifier
-             (ns_command_modifier);
-@@ -4789,13 +4798,17 @@
-             }
-         }
- 
--      if ((flags & NSRightControlKeyMask) == NSRightControlKeyMask)
-+      is_right_key = (flags & NSRightControlKeyMask) == NSRightControlKeyMask;
-+      is_left_key = (flags & NSLeftControlKeyMask) == NSLeftControlKeyMask
-+        || (! is_right_key && (flags & NSControlKeyMask) == NSControlKeyMask);
-+
-+      if (is_right_key)
-           emacs_event->modifiers |= parse_solitary_modifier
-               (EQ (ns_right_control_modifier, Qleft)
-                ? ns_control_modifier
-                : ns_right_control_modifier);
- 
--      if ((flags & NSLeftControlKeyMask) == NSLeftControlKeyMask)
-+      if (is_left_key)
-         emacs_event->modifiers |= parse_solitary_modifier
-           (ns_control_modifier);
- 
-@@ -4806,7 +4819,13 @@
-       left_is_none = NILP (ns_alternate_modifier)
-         || EQ (ns_alternate_modifier, Qnone);
- 
--      if ((flags & NSRightAlternateKeyMask) == NSRightAlternateKeyMask)
-+      is_right_key = (flags & NSRightAlternateKeyMask)
-+        == NSRightAlternateKeyMask;
-+      is_left_key = (flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask
-+        || (! is_right_key
-+            && (flags & NSAlternateKeyMask) == NSAlternateKeyMask);
-+
-+      if (is_right_key)
-         {
-           if ((NILP (ns_right_alternate_modifier)
-                || EQ (ns_right_alternate_modifier, Qnone)
-@@ -4826,7 +4845,7 @@
-                : ns_right_alternate_modifier);
-         }
- 
--      if ((flags & NSLeftAlternateKeyMask) == NSLeftAlternateKeyMask) /* default = meta */
-+      if (is_left_key) /* default = meta */
-         {
-           if (left_is_none && !fnKeysym)
-             {   /* accept pre-interp alt comb */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120828/7ff3dd4a/attachment-0001.html>