[104043] trunk/dports/editors/emacs

[dports at macports.org]

Revision: 104043
          https://trac.macports.org/changeset/104043
Author:   dports at macports.org
Date:     2013-03-13 17:41:34 -0700 (Wed, 13 Mar 2013)
Log Message:
-----------
emacs: update to v24.3
 * disable (newly-introduced) check that dbus is running, since our dbus is
   autolaunched by launchd.

Modified Paths:
--------------
    trunk/dports/editors/emacs/Portfile

Added Paths:
-----------
    trunk/dports/editors/emacs/files/patch-src_dbusbind.c.diff

Removed Paths:
-------------
    trunk/dports/editors/emacs/files/patch-configure.diff

Modified: trunk/dports/editors/emacs/Portfile
===================================================================
--- trunk/dports/editors/emacs/Portfile	2013-03-14 00:31:51 UTC (rev 104042)
+++ trunk/dports/editors/emacs/Portfile	2013-03-14 00:41:34 UTC (rev 104043)
@@ -6,8 +6,7 @@
 
 name            emacs
 conflicts       xemacs
-version         24.2
-revision        4
+version         24.3
 
 categories      editors
 license         GPL-3+
@@ -25,10 +24,11 @@
 homepage        http://www.gnu.org/software/emacs/emacs.html
 master_sites    gnu
 
-checksums       rmd160  26f6c2b671ed7f160875d62e47c89afec085110f \
-                sha256  6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357
+checksums       rmd160  b67e847861002bbb76ae6588ff659408763313cf \
+                sha256  0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
 
-patchfiles      patch-configure.diff
+# our dbus is autolaunched by launchd, so disable the check that it's running
+patchfiles      patch-src_dbusbind.c.diff
 
 configure.args  --without-x \
                 --without-dbus \
@@ -84,11 +84,8 @@
     post-patch {
         # Leopard's XCode 3.1.x ld(1) man page claims -no_pie is supported, but it's not
         if {${os.major} < 9} {
-            reinplace "s:-fno-pie::" ${worksrcpath}/src/s/darwin.h
+            reinplace "s:-fno-pie::" ${worksrcpath}/configure
         } elseif {${os.major} > 10} {
-            reinplace "s:-fno-pie:-fno-pie -Wl,-no_pie:" ${worksrcpath}/src/s/darwin.h
-
-            # I believe the above reinplace is sufficient, but I'm leaving this to be safe --jeremyhu
             configure.ldflags-append -Wl,-no_pie
         }
     }
@@ -104,7 +101,7 @@
     configure.args-delete   --with-x-toolkit=lucid
     configure.args-delete   --without-gconf
     configure.args-delete   --without-rsvg
-    configure.args-append   --with-x-toolkit=gtk
+    configure.args-append   --with-x-toolkit=gtk2
     configure.args-append   --with-gconf
     configure.args-append   --with-rsvg
     depends_lib-append      port:gtk2 \

Deleted: trunk/dports/editors/emacs/files/patch-configure.diff
===================================================================
--- trunk/dports/editors/emacs/files/patch-configure.diff	2013-03-14 00:31:51 UTC (rev 104042)
+++ trunk/dports/editors/emacs/files/patch-configure.diff	2013-03-14 00:41:34 UTC (rev 104043)
@@ -1,15 +0,0 @@
---- configure.orig	2011-08-03 15:04:38.000000000 -0400
-+++ configure	2011-08-03 15:05:10.000000000 -0400
-@@ -3165,12 +3165,6 @@
-     opsys=darwin
-     # Define CPP as follows to make autoconf work correctly.
-     CPP="${CC-cc} -E -no-cpp-precomp"
--    # Use fink packages if available.
--    if test -d /sw/include && test -d /sw/lib; then
--      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
--      CPP="${CPP} ${GCC_TEST_OPTIONS}"
--      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
--    fi
-   ;;
- 
-   ## HP 9000 series 700 and 800, running HP/UX

Added: trunk/dports/editors/emacs/files/patch-src_dbusbind.c.diff
===================================================================
--- trunk/dports/editors/emacs/files/patch-src_dbusbind.c.diff	                        (rev 0)
+++ trunk/dports/editors/emacs/files/patch-src_dbusbind.c.diff	2013-03-14 00:41:34 UTC (rev 104043)
@@ -0,0 +1,11 @@
+--- src/dbusbind.c.orig	2013-03-13 16:52:59.000000000 -0700
++++ src/dbusbind.c	2013-03-13 16:53:29.000000000 -0700
+@@ -294,8 +294,6 @@
+ 	if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus))) \
+ 	  XD_SIGNAL2 (build_string ("Wrong bus name"), bus);		\
+ 	/* We do not want to have an autolaunch for the session bus.  */ \
+-	if (EQ (bus, QCdbus_session_bus) && session_bus_address == NULL) \
+-	  XD_SIGNAL2 (build_string ("No connection to bus"), bus);	\
+       }									\
+   } while (0)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130313/19cb3ab5/attachment.html>