Ticket #29232: emacs-app.patch

Portfile

@@ -4 +4 @@
 PortSystem 1.0
 
 name            emacs-app
-version         23.2
-revision        3
+version         23.3
+revision        0
 categories      aqua editors
 maintainers     css
 description     The GNU Emacs text editor (Cocoa version)
@@ -21 +21 @@
 # configuration is untested at this time.
 
 platforms       darwin
-homepage        http://emacs-app.sourceforge.net/
+homepage        http://www.gnu.org/software/emacs/
 master_sites    gnu:emacs
 distname        emacs-${version}
 use_bzip2       yes
-checksums           md5     057a0379f2f6b85fb114d8c723c79ce2 \
-                    sha1    b46e6b33e1f5e24ede0ecd0d8703b64847c83946 \
-                    rmd160  b7441be0a32e78e02f108dcb3b09b531c6849d95
+checksums           md5     a673c163b4714362b94ff6096e4d784a \
+                    sha1    de2c924655f0f4e012cc119840cd341a1d40e32c \
+                    rmd160  bddaba77f543b41a91d133c6700078a9b41b0bf8
 
 depends_lib     port:ncurses
 use_parallel_build      yes
 
 configure.args  --with-ns --without-x --without-dbus
 
-patchfiles      patch-ns-win.el.diff \
-                patch-src_unexmacosx.c.diff
+patchfiles      patch-src_unexmacosx.c.diff
 
 variant fullscreen description {Add fullscreen patch from http://gist.github.com/291150 as mentioned in http://www.sanityinc.com/full-screen-support-for-cocoa-emacs-on-osx} {
     patchfiles-append patch-fullscreen.diff

files/patch-ns-win.el.diff

@@ -1 @@
---- lisp/term/ns-win.el.orig    2010-12-12 23:31:04.000000000 -0500
-+++ lisp/term/ns-win.el 2010-12-12 23:32:00.000000000 -0500
-@@ -785,7 +785,7 @@
-   "Do a `find-file' with the `ns-input-file' as argument."
-   (interactive)
-   (let ((f) (file) (bufwin1) (bufwin2))
--    (setq f (file-truename (car ns-input-file)))
-+    (setq f (file-truename (expand-file-name (car ns-input-file) command-line-default-directory)))
-     (setq ns-input-file (cdr ns-input-file))
-     (setq file (find-file-noselect f))
-     (setq bufwin1 (get-buffer-window file 'visible))

files/site-start.el

@@ -1 +1 @@
 (setq load-path (cons "__PREFIX__/share/emacs/site-lisp" load-path))
+(if (file-readable-p "__PREFIX__/share/emacs/site-lisp/subdirs.el")
+    (let ((default-directory "__PREFIX__/share/emacs/site-lisp"))
+      (load "__PREFIX__/share/emacs/site-lisp/subdirs.el")))