<pre style='margin:0'>
Jackson Isaac (JacksonIsaac) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dde0adcf298d6d31e881e073e41d6523490d7568">https://github.com/macports/macports-ports/commit/dde0adcf298d6d31e881e073e41d6523490d7568</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dde0adcf298d6d31e881e073e41d6523490d7568
</span>Author: ijackson <ijackson@macports.org>
AuthorDate: Mon Apr 16 11:24:19 2018 +0530
<span style='display:block; white-space:pre;color:#404040;'> acl2: Update to 8.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update to version 8.0
</span><span style='display:block; white-space:pre;color:#404040;'> - Use PortGroup GitHub
</span><span style='display:block; white-space:pre;color:#404040;'> - Add License
</span><span style='display:block; white-space:pre;color:#404040;'> - extracted directory is ${name}-devel-${version} instead of
</span><span style='display:block; white-space:pre;color:#404040;'> ${name}-${version}
</span><span style='display:block; white-space:pre;color:#404040;'> - /books is included in tarball for versions 7.0 and above
</span><span style='display:block; white-space:pre;color:#404040;'> - Add notes for +nonstd variant when run without +ccl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/46257
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52667
</span>---
math/acl2/Portfile | 136 ++++++++++++++++++++---------------------------------
1 file changed, 51 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/acl2/Portfile b/math/acl2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae471ca..532ef34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/acl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/acl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name acl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set shortversion v3-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set shortversion v8-0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup acl2-devel ${name}-devel ${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span> categories math
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,69 +37,17 @@ long_description \
</span> # which will certify (i.e., prove all of the theorems)
# in the included examples. This can take several hours.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.cs.utexas.edu/users/moore/acl2/${shortversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${name}-${version}${extract.suffix}:sources
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${name}-${version}${extract.suffix}:sources \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- workshops-${version}${extract.suffix}:workshops \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nonstd-${version}${extract.suffix}:nonstd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.cs.utexas.edu/users/moore/acl2/older-releases/${shortversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/distrib/:sources \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${homepage}/distrib/acl2-sources/books:workshops \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${homepage}/distrib/acl2-sources/books:nonstd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums acl2-${version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 a2738f4582d14f74664c93dad93ac055 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 d4052a49a3c2112eeb04cf97570e2caea8df38dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 167b61cd8a812de804225096f4f3f04b87ba84cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- workshops-${version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 5ae8123cadfe323c3088a3666112ce07 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b3a10d4cd876cb6ccde96920f0103ec0d89f7e2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 63401f257b8b61564ed660681f82776c762d43da \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nonstd-${version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 7de68f04ee468e25b24a230507cdb663 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 71e1da0cf417ef85f1002279b67227d729822a6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 caa90d4a742fb1df8ddeb24686bc49a2d79754ab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ACL2 is distributed without a version number attached to the files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# So we can't tell if we have the latest version of a file by looking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# at the name. (This breaks also MacPorts checksum handling.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Here, the files are manually fetched and renamed with a version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts should always checksum the distribution files, instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# of assuming that if a file's name is unchanged, the previously computed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# checksum is valid.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "starting special fetch procedure for acl2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${distpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${distpath}/acl2-${version}.tar.gz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl fetch http://www.cs.utexas.edu/users/moore/acl2/older-releases/v3-5/distrib/acl2.tar.gz ${distpath}/acl2.tar.gz.TMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force "${distpath}/acl2.tar.gz.TMP" "${distpath}/acl2-${version}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${distpath}/workshops-${version}.tar.gz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl fetch http://www.cs.utexas.edu/users/moore/acl2/older-releases/v3-5/distrib/acl2-sources/books/workshops.tar.gz ${distpath}/workshops.tar.gz.TMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force "${distpath}/workshops.tar.gz.TMP" "${distpath}/workshops-${version}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${distpath}/nonstd-${version}.tar.gz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl fetch http://www.cs.utexas.edu/users/moore/acl2/older-releases/v3-5/distrib/acl2-sources/books/nonstd.tar.gz ${distpath}/nonstd.tar.gz.TMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force "${distpath}/nonstd.tar.gz.TMP" "${distpath}/nonstd-${version}.tar.gz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "completed special fetch procedure for acl2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/${name}-sources ${workpath}/${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/workshops ${workpath}/${name}-${version}/books
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/nonstd ${workpath}/${name}-${version}/books
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 d343b03e94f1f15368355dd9309cf9a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 9e94663075aa5d87913a4129979f176316a83c8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a013826458b0004b980283ad9b43d65748c87bc1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e44bc2f6bcd605b2f7b766f2112ef178c325cf2e6b438bcc77d7e2deb8195756 \
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:sbcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:sbcl
</span>
set heap_image "saved_acl2.core"
set heap_image_nonstd "saved_acl2r.core"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,30 +67,34 @@ universal_variant no
</span> #
set ccl_script ccl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_ext dx86cl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_ext dx86cl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform x86_64 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_ext dx86cl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_ext dx86cl64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_script ccl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_script ccl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_ext dppccl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "powerpc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_ext dppccl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform ppc64 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_ext dppccl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_ext dppccl64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global ccl_script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ccl_script ccl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global ccl_script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ccl_script ccl64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# The emacs variant does not require that we use emacs from MacPorts,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,8 +104,8 @@ platform ppc64 {
</span> variant emacs description {Include support for using acl2 under emacs} { }
variant ccl description {Use ccl as the underlying lisp} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-delete port:sbcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:ccl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:sbcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ccl
</span>
global heap_image
global heap_image_nonstd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,12 +121,12 @@ variant nonstd description {Build the nonstandard analysis books for handling re
</span>
build {
if {[variant_isset ccl]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make large LISP=${prefix}/bin/ccl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && make LISP=${prefix}/bin/${ccl_script}"
</span> if {[variant_isset nonstd]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make large-acl2r LISP=${prefix}/bin/ccl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && make large-acl2r LISP=${prefix}/bin/${ccl_script}"
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && make large LISP=${prefix}/bin/sbcl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && make LISP=${prefix}/bin/sbcl"
</span> if {[variant_isset nonstd]} {
system "cd ${worksrcpath} && make large-acl2r LISP=${prefix}/bin/sbcl"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +135,7 @@ build {
</span>
destroot {
file mkdir ${destroot}/${target_path}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${workpath}/${name}-${version} *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob -directory ${workpath}/${name}-devel-${version} *] {
</span> file copy $f ${destroot}/${target_path}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,3 +264,14 @@ post-destroot {
</span> file rename ${cert_file}.final ${cert_file}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset nonstd] && ![variant_isset ccl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # acl2r raises error when build against sbcl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Even upstream uses ccl by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The following note will intimate the user to pass +ccl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variant along with +nonstd if they face errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "acl2r might raise heap memory errors for some users when using sbcl backend.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Please install +nonstd with +ccl variant to use acl2r, if you face any errors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>