Ticket #16518: Portfile-slime.diff

Portfile

@@ -37 +37 @@
 variant app description "Build SLIME against editors/emacs-app" {
     depends_run-append port:emacs-app
     depends_run-delete port:emacs
+    depends_lib-append port:emacs-app
+    depends_lib-delete port:emacs
 }
 
 default_variants +sbcl
@@ -69 +71 @@
         set slime_site_lisp_dest ${destroot}/Applications/MacPorts/Emacs.app/Contents/Resources/site-lisp
         set slime_site_lisp_contrib /Applications/MacPorts/Emacs.app/Contents/Resources/site-lisp
     } else {
-        set slime_emacs_binary ${prefix}/bin/emacs
+        # kludge if 'emacs+carbon' is installed
+        if {[regexp carbon [join [registry_installed emacs]]]} {
+            set slime_emacs_binary /Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs
+        } else {
+            set slime_emacs_binary ${prefix}/bin/emacs
+        }
         set slime_site_lisp_dest ${destroot}${prefix}/share/emacs/site-lisp/slime
         set slime_site_lisp_contrib ${prefix}/share/emacs/site-lisp/contrib
     }
 
     set slime_site_lisp_dest_contrib ${slime_site_lisp_dest}/contrib
 
-    # kludge if 'emacs+carbon' is installed
-    if {[regexp carbon [join [registry_installed emacs]]]} {
-        set slime_emacs_binary /Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs
-    }
-
    if {! [file executable ${slime_emacs_binary}]} {
        set slime_byte_compile_p 0
        ui_msg "Couldn't find an executable Emacs image so won't byte compile."