[41759] trunk/dports/lang/slime/Portfile

[easieste at macports.org]

Revision: 41759
          http://trac.macports.org/changeset/41759
Author:   easieste at macports.org
Date:     2008-11-09 23:14:01 -0800 (Sun, 09 Nov 2008)
Log Message:
-----------
Check for variant 'app' before Carbon Emacs to avoid install errors.

Reported and patched by jrh AT theptrgroup.com.

Fixes ticket:17152 and remainin issues for ticket:16158.

Modified Paths:
--------------
    trunk/dports/lang/slime/Portfile

Modified: trunk/dports/lang/slime/Portfile
===================================================================
--- trunk/dports/lang/slime/Portfile	2008-11-10 07:13:48 UTC (rev 41758)
+++ trunk/dports/lang/slime/Portfile	2008-11-10 07:14:01 UTC (rev 41759)
@@ -6,7 +6,7 @@
 name        slime
 version     20080901
 epoch       20080901
-revision    4
+revision    5
 categories  lang
 platforms   darwin
 maintainers easieste at macports.org
@@ -58,30 +58,20 @@
 }
 
 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 ] } {
+       if { [ variant_isset app ]
+            || [regexp carbon [join [registry_installed emacs]]] } {
            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"
-        } else {
-            list "${destroot}${prefix}/share/emacs/site-lisp/slime"
-        }
-    ]
-
-    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
@@ -139,6 +129,7 @@
     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\"))"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081109/95a1e6f9/attachment-0001.html>