Ticket #17152: Portfile-slime.diff

File Portfile-slime.diff, 1.5 KB (added by jrhope, 16 years ago)

avoids error during installation in conjunction with emacs-app

  • Portfile

    old new  
    5858}
    5959
    6060set slime_emacs_binary ""
    61 set slime_site_lisp_dir ""
    62 set slime_site_lisp_contrib_dir ""
     61set slime_site_lisp_dir "${destroot}${prefix}/share/emacs/site-lisp/slime"
     62set slime_site_lisp_contrib_dir "${slime_site_lisp_dir}/contrib"
    6363set slime_byte_compile_p 0
    6464
    6565configure {
    6666    set slime_emacs_binary [
    67        if { [regexp carbon [join [registry_installed emacs]]]
    68             || [ variant_isset app ] } {
     67       if { [ variant_isset app ]
     68            || [regexp carbon [join [registry_installed emacs]]] } {
    6969           list "/Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs"
    7070       } else {
    7171           list "${prefix}/bin/emacs"
    7272       }
    7373    ]
    7474
    75     set slime_site_lisp_dir  [
    76         if {[ variant_isset app ]} {
    77             list "${destroot}/Applications/MacPorts/Emacs.app/Contents/Resources/site-lisp/slime"
    78         } else {
    79             list "${destroot}${prefix}/share/emacs/site-lisp/slime"
    80         }
    81     ]
    82 
    83     set slime_site_lisp_contrib_dir ${slime_site_lisp_dir}/contrib
    84 
    8575    set slime_byte_compile_p   0
    8676
    8777    # Byte compiling doesn't seem to be working
     
    139129    ui_msg ""
    140130    ui_msg "Then put the following in your ~/.emacs:"
    141131    ui_msg ""
     132    ui_msg "(setq load-path (cons \"${prefix}/share/emacs/site-lisp/slime\" load-path))"
    142133    ui_msg "(require 'slime-autoloads)"
    143134    ui_msg "(setq slime-lisp-implementations"
    144135    ui_msg "     \`((sbcl (\"${prefix}/bin/sbcl\"))"