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

easieste at macports.org easieste at macports.org
Sun Sep 14 22:58:14 PDT 2008


Revision: 39976
          http://trac.macports.org/changeset/39976
Author:   easieste at macports.org
Date:     2008-09-14 22:58:14 -0700 (Sun, 14 Sep 2008)
Log Message:
-----------
Updated to known good CVS version 20080901.

Fixed problem where a "port build" and then "port install" wouldn't
work by setting build variables at the top level.

Disabled byte compiling Elisp files, as loading them no longer seems to work.

Reformatted long_description to 72 columns.

Adjust depends_lib for +app variant (reported by JRH).

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

Modified: trunk/dports/lang/slime/Portfile
===================================================================
--- trunk/dports/lang/slime/Portfile	2008-09-14 19:51:55 UTC (rev 39975)
+++ trunk/dports/lang/slime/Portfile	2008-09-15 05:58:14 UTC (rev 39976)
@@ -4,8 +4,9 @@
 PortSystem  1.0
 
 name        slime
-version     20080404
-epoch       20080404
+version     20080901
+epoch       20080901
+revision    0
 categories  lang
 platforms   darwin
 maintainers evenson at panix.com
@@ -13,14 +14,12 @@
 description An Emacs mode for unifying Common Lisp development
 
 long_description    \
-    SLIME extends Emacs with new support for interactive \
-    programming in Common Lisp. The features are \
-    centred around `slime-mode', an Emacs minor-mode \
-    that complements the standard `lisp-mode'. While \
-    `lisp-mode' supports editing Lisp source files, \
-    `slime-mode' adds support for interacting with a \
-    running Common Lisp process for compilation,\
-    debugging, documentation lookup, and so on.
+    SLIME extends Emacs with new support for interactive programming \
+    in Common Lisp. The features are centred around `slime-mode', an \
+    Emacs minor-mode that complements the standard `lisp-mode'. While \
+    `lisp-mode' supports editing Lisp source files, `slime-mode' adds \
+    support for interacting with a running Common Lisp process for \
+    compilation, debugging, documentation lookup, and so on.
 
 homepage        http://common-lisp.net/project/slime/
 master_sites    ${homepage}
@@ -33,14 +32,15 @@
 
 use_configure   no
 depends_lib     port:emacs
+default_variants +sbcl
 
 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
-
 variant sbcl description "Require lang/sbcl for SLIME" {
     depends_run-append port:sbcl
 }
@@ -53,81 +53,59 @@
     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
+        ${worksrcpath}/doc/Makefile
 }
 
 configure {
-    global slime_emacs_binary
-    global slime_site_lisp_dest
-    global slime_site_lisp_contrib
-    global slime_byte_compile_p
-    global slime_site_lisp_dest_contrib
-    if {[ variant_isset app ]} {
-        set slime_emacs_binary /Applications/MacPorts/Emacs.app/Contents/MacOS/Emacs
-        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
-        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."
-   } else {
-       set slime_byte_compile_p 1
-       ui_msg "Emacs binary used for byte compilation is ${slime_emacs_binary}."
-   }
+#      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
+#          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   
 }
 
 build {
     cd ${worksrcpath}
-    upvar #0 slime_emacs_binary emacs_bin
-    if {${slime_byte_compile_p}} {
-        system "${emacs_bin} \
-              --batch  --directory .  --funcall batch-byte-compile \
-              slime.el \
-              slime-autoloads.el \
-              hyperspec.el"
 
-        cd ${worksrcpath}/contrib
-        system "${emacs_bin} \
-              --batch \
-              --directory .  --directory .. \
-              --funcall batch-byte-compile  \
-              bridge.el \
-              inferior-slime.el \
-              slime-asdf.el \
-              slime-parse.el \
-              slime-autodoc.el \
-              slime-banner.el \
-              slime-c-p-c.el \
-              slime-editing-commands.el \
-              slime-fancy-inspector.el \
-              slime-fancy.el \
-              slime-fuzzy.el \
-              slime-highlight-edits.el \
-              slime-indentation.el \
-              slime-motd.el \
-              slime-parse.el \
-              slime-presentation-streams.el \
-              slime-presentations.el \
-              slime-references.el \
-              slime-scheme.el \
-              slime-scratch.el \
-              slime-tramp.el \
-              slime-typeout-frame.el \
-              slime-xref-browser.el"
+    if {${slime_byte_compile_p}} {
+        system "${slime_emacs_binary} \
+                --batch  \
+                --directory ${worksrcpath}  \
+                --directory ${worksrcpath}/contrib \
+                --funcall batch-byte-compile \
+                contrib/*.el"
+        system "${slime_emacs_binary} \
+                --batch  \
+                --directory ${worksrcpath}  \
+                --directory ${worksrcpath}/contrib \
+                --funcall batch-byte-compile \
+                *.el"
     }
 
     cd ${worksrcpath}/doc
@@ -136,16 +114,16 @@
 
 destroot    {
     cd ${worksrcpath}
-    xinstall -m 755 -d ${slime_site_lisp_dest}
+    xinstall -m 755 -d ${slime_site_lisp_dir}
 
     foreach file [glob *.el *.elc *.lisp ChangeLog] {
-        xinstall -m 644 ${file} ${slime_site_lisp_dest}
+        xinstall -m 644 ${file} ${slime_site_lisp_dir}
     }
 
     cd ${worksrcpath}/contrib
-    xinstall -m 755 -d ${slime_site_lisp_dest_contrib}
+    xinstall -m 755 -d ${slime_site_lisp_contrib_dir}
     foreach file [glob *.el *.elc *.lisp ChangeLog] {
-        xinstall -m 644 ${file} ${slime_site_lisp_dest_contrib}
+        xinstall -m 644 ${file} ${slime_site_lisp_contrib_dir}
     }
 
     xinstall -m 644 ${worksrcpath}/doc/slime.info ${destroot}${prefix}/share/info
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080914/51f295e2/attachment.html 


More information about the macports-changes mailing list