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

[easieste at macports.org]

Revision: 39992
          http://trac.macports.org/changeset/39992
Author:   easieste at macports.org
Date:     2008-09-16 00:01:36 -0700 (Tue, 16 Sep 2008)
Log Message:
-----------
Quick reversion to address breakage if 'emacs' or 'emacs-app' is installed:

>From Ryan (about the top-level set forms):

Ah, but you can't do it this way. This relies on emacs or emacs-app
being installed. But it might not yet be installed at the time the
user runs "port info" or "port variants" or "port fetch" or "port
checksum" or "port deps" or "portindex" which will cause an error,
like it's doing for the PortIndexRegen.sh script now:

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

Modified: trunk/dports/lang/slime/Portfile
===================================================================
--- trunk/dports/lang/slime/Portfile	2008-09-16 05:50:33 UTC (rev 39991)
+++ trunk/dports/lang/slime/Portfile	2008-09-16 07:01:36 UTC (rev 39992)
@@ -6,7 +6,7 @@
 name        slime
 version     20080901
 epoch       20080901
-revision    0
+revision    1
 categories  lang
 platforms   darwin
 maintainers evenson at panix.com
@@ -53,47 +53,55 @@
     depends_run-append port:clisp
 }
 
-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"
-     } 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  
-
 post-patch {
     reinplace "s|/usr/local|${prefix}/share|g" \
         ${worksrcpath}/doc/Makefile
 }
 
+set slime_emacs_binary ""
+set slime_site_lisp_dir ""
+set slime_site_lisp_contrib_dir ""
+set slime_byte_compile_p 0
+
 configure {
-#      if {! [file executable ${slime_emacs_binary}]} {
-#          set slime_byte_compile_p 0
+    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"
+        } 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
+    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 the Elisp files."
-#      } else {
-#          set slime_byte_compile_p 1
+      } else {
+          set slime_byte_compile_p 1
 #          ui_msg "Emacs binary used for byte compilation is ${slime_emacs_binary}."
-#      }
-    # Byte compiling doesn't seem to be working
-    set slime_byte_compile_p 0   
+      }
+
+    # Comment next line out to try byte compilation
+    set slime_byte_compile_p 0
 }
 
 build {
     cd ${worksrcpath}
 
-    if {${slime_byte_compile_p}} {
+    if { ${slime_byte_compile_p} } {
         system "${slime_emacs_binary} \
                 --batch  \
                 --directory ${worksrcpath}  \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080916/e76548f3/attachment.html