<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19e21a2b391d5cb9ade1b31e4d3a84584f61b882">https://github.com/macports/macports-ports/commit/19e21a2b391d5cb9ade1b31e4d3a84584f61b882</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 19e21a2b391 cdf: use makefile PG; allow build with GCC 10
</span>19e21a2b391 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19e21a2b391d5cb9ade1b31e4d3a84584f61b882
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 14 06:20:13 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> cdf: use makefile PG; allow build with GCC 10
</span>---
science/cdf/Portfile | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdf/Portfile b/science/cdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 393fa39fb63..a8febbe55b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name cdf
epoch 1
version 3.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 45cd54e3080d79df684a0af3a5f2150f92e5d0b6 \
sha256 5478a403007c58b1c05b5a4127318018c2e152f2087b8da392948c15ce2979ad \
size 2274627
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +41,10 @@ post-patch {
</span> reinplace "s|\\\$(INSTALLDIR)/bin/definitions\\.\\(\[BCK\]\\)|${prefix}/bin/definitions.\\1|" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span> compilers.choose cc fc
compilers.setup
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.allow_arguments_mismatch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span>
pre-build {
set cdf_os macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +56,7 @@ pre-build {
</span> CURSESLIB_${cdf_os}_${cdf_env}=${prefix}/lib/libncurses.dylib \
LDOPTIONS_${cdf_os}_${cdf_env}="-dynamiclib -install_name ${prefix}/lib/libcdf.dylib" \
MACOSxFopt= \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOSxlink="-lc -lm" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSxlink="\$LDFLAGS -lc -lm" \
</span> MACOSxmin= \
MACVERSION=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,17 +68,16 @@ pre-build {
</span>
# When upgrading, verify COPTIONS still approximately reflects what’s in the Makefile.
# Using ${configure.cc_archflags} in LD because ${configure.ld_archflags} doesn’t use -m32 / -m64 flags when they’re needed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append COPTIONS_${cdf_os}_${cdf_env}="-D${endian_flag} -D__APPLE__ -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE ${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTIONS_${cdf_os}_${cdf_env}="-D${endian_flag} -D__APPLE__ -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE \$CFLAGS" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_${cdf_os}_${cdf_env}="\$CC"
</span>
if {![fortran_variant_isset]} {
build.args-append \
FORTRAN=no
} else {
build.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FC="${configure.fc} ${configure.fc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FORTRAN=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FORTRAN=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOPTIONS_${cdf_os}_${cdf_env}="\$FCFLAGS" \
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +90,7 @@ destroot.destdir INSTALLDIR=${destroot}${prefix}
</span>
post-destroot {
reinplace "s|${destroot}||g" {*}[glob ${destroot}${prefix}/bin/definitions.*]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set docdir ${destroot}${prefix}/share/doc/${name}
xinstall -d ${docdir}
xinstall -W ${worksrcpath} CDF_copyright.txt CHANGES.txt \
</pre><pre style='margin:0'>
</pre>