Ticket #16518: Portfile-slime.2.diff

Portfile

@@ -59 +59 @@
 }
 
 set slime_emacs_binary ""
-set slime_site_lisp_dir ""
-set slime_site_lisp_contrib_dir ""
+set slime_site_lisp_dir "${destroot}${prefix}/share/emacs/site-lisp/slime"
+set slime_site_lisp_contrib_dir ${slime_site_lisp_dir}/contrib
 set slime_byte_compile_p 0
 
 configure {
     set slime_emacs_binary [
-       if { [regexp carbon [join [registry_installed emacs]]]
-            || [ variant_isset app ] } {
-           list "/Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs"
-       } else {
-           list "${prefix}/bin/emacs"
-       }
-    ]
-
-    set slime_site_lisp_dir  [
-        if {[ variant_isset app ]} {
-            list "${destroot}/Applications/MacPorts/Emacs.app/Contents/Resources/site-lisp/slime"
+        if { [ variant_isset app ]
+             || [regexp carbon [join [registry_installed emacs]]] } {
+            list "/Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs"
         } else {
-            list "${destroot}${prefix}/share/emacs/site-lisp/slime"
+            list "${prefix}/bin/emacs"
         }
     ]
 
-    set slime_site_lisp_contrib_dir ${slime_site_lisp_dir}/contrib
-
-    set slime_byte_compile_p   0
-
     # Byte compiling doesn't seem to be working
     if {! [file executable ${slime_emacs_binary}]} {
           set slime_byte_compile_p 0
@@ -140 +128 @@
     ui_msg ""
     ui_msg "Then put the following in your ~/.emacs:"
     ui_msg ""
+    ui_msg "(setq load-path (cons \"${prefix}/share/emacs/site-lisp/slime\" load-path))"
     ui_msg "(require 'slime-autoloads)"
     ui_msg "(setq slime-lisp-implementations"
     ui_msg "     \`((sbcl (\"${prefix}/bin/sbcl\"))"