Ticket #20904: patch-Portfile20090919

--- Portfile.orig       2009-09-19 16:49:57.000000000 +0900
+++ Portfile    2009-09-19 22:52:05.000000000 +0900
@@ -1,10 +1,10 @@
-# $Id: Portfile 52801 2009-06-23 12:33:35Z gwright@macports.org $
+# $Id: Portfile 52801 2009-09-19 12:33:35Z gwright@macports.org $
 
 PortSystem 1.0
 
 name           sbcl
 version                1.0.29
-revision       1
+revision       2
 set subrevision        "-r2"
 categories     lang
 maintainers    gwright waqar
@@ -52,23 +52,61 @@ platform darwin 9 i386     {
                   set host_lisp        "\"${workpath}/${name}-${bootversion}-x86-darwin/src/runtime/sbcl --core ${workpath}/${name}-${bootversion}-x86-darwin/output/sbcl.core --disable-debugger --sysinit /dev/null --userinit /dev/null\" "
 }
 
+platform darwin 10 {
+    set bootversion 1.0.29
+    set subbootversion "-r2"
+    global host_lisp
+
+    if {${build_arch} == "x86_64"} {
+       patchfiles-append patch-make-config.sh
+       distfiles-append sbcl-${bootversion}-x86_64-darwin-binary${subbootversion}${extract.suffix}
+       checksums-append sbcl-${bootversion}-x86_64-darwin-binary${subbootversion}${extract.suffix} \
+           md5 47c99c60ec44e57070807c0890ba1c90
+       distfiles-delete sbcl-${version}-source${subrevision}${extract.suffix}
+       checksums-delete        ${distname}${extract.suffix}    \
+                    md5     0dd65614533972500bbcd341de17182d           \
+                    sha1    20105ec4edb370d85e8a5e4852b16ddb151d43fd   \
+                    rmd160  54db825840b4e2cd00a9d86fd435df1eacaae61b
+       set host_lisp   "\"${workpath}/sbcl-${bootversion}-x86_64-darwin/src/runtime/sbcl --core ${workpath}/sbcl-${bootversion}-x86_64-darwin/output/sbcl.core --disable-debugger --sysinit /dev/null --userinit /dev/null\" "
+    } else {
+       distfiles-append sbcl-${bootversion}-x86-darwin-binary${subbootversion}${extract.suffix}
+       checksums-append sbcl-${bootversion}-x86-darwin-binary${subbootversion}${extract.suffix} \
+           md5 6e6b027a5fd05ef0c8faee30d89ffe54
+       set host_lisp   "\"${workpath}/sbcl-${bootversion}-x86-darwin/src/runtime/sbcl --core ${workpath}/sbcl-${bootversion}-x86-darwin/output/sbcl.core --disable-debugger --sysinit /dev/null --userinit /dev/null\" "
+    }
+}
+
 patchfiles     patch-use-mach-exception-handler.diff
 
                
-distfiles      ${name}-${version}-source${subrevision}${extract.suffix}
+distfiles      sbcl-${version}-source${subrevision}${extract.suffix}
 
-distname       ${name}-${version}-source${subrevision}
-worksrcdir     ${name}-${version}
+distname       sbcl-${version}-source${subrevision}
+worksrcdir     sbcl-${version}
 
 checksums      ${distname}${extract.suffix}                            \
                     md5     0dd65614533972500bbcd341de17182d           \
                     sha1    20105ec4edb370d85e8a5e4852b16ddb151d43fd   \
                     rmd160  54db825840b4e2cd00a9d86fd435df1eacaae61b
 
+post-fetch      {
+    # For 64-bit SL, use a cvs version.
+    if {${build_arch} == "x86_64"} {
+       set cvsroot ":pserver:anonimous@sbcl.cvs.sourceforge.net:/cvsroot/sbcl"
+       set version  "1.0.31.17cvs"
+       set revision "0"
+       set worksrcdir "sbcl-${version}"
+       system "echo ${distfiles}"
+       system "cd ${workpath} && /usr/bin/env ${cvs.env} cvs -d${cvsroot} login"
+       system "cd ${workpath} && /usr/bin/env ${cvs.env} cvs -z9 -d${cvsroot} co -P sbcl"
+       system "cd ${workpath} && mv sbcl ${worksrcdir}"
+    }
+}
+
 post-patch     {
-       reinplace "s|/usr/local/lib/${name}|${prefix}/lib/${name}|g" \
+       reinplace "s|/usr/local/lib/sbcl|${prefix}/lib/sbcl|g" \
                             ${worksrcpath}/src/runtime/runtime.c
-       reinplace "s|/usr/local/lib/${name}|${prefix}/lib/${name}|g" \
+       reinplace "s|/usr/local/lib/sbcl|${prefix}/lib/sbcl|g" \
                             ${worksrcpath}/doc/sbcl.1
 }