<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1314e8ae4dccb871ab4c9a29fffbfd9cdc761f68">https://github.com/macports/macports-ports/commit/1314e8ae4dccb871ab4c9a29fffbfd9cdc761f68</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 1314e8ae4dc libxc{5,6}: use autotools, to fix rpath issue - Use major ver for bin suffix - Also create bin symlinks Fixes: https://trac.macports.org/ticket/67715
</span>1314e8ae4dc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1314e8ae4dccb871ab4c9a29fffbfd9cdc761f68
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jul 4 08:40:41 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libxc{5,6}: use autotools, to fix rpath issue
</span><span style='display:block; white-space:pre;color:#404040;'> - Use major ver for bin suffix
</span><span style='display:block; white-space:pre;color:#404040;'> - Also create bin symlinks
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67715
</span>---
science/libxc5/Portfile | 60 +++++++++++++++++++++++--------------------------
science/libxc6/Portfile | 60 +++++++++++++++++++++++--------------------------
2 files changed, 56 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libxc5/Portfile b/science/libxc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e16140c3f4a..ecb7d115d13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libxc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libxc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</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:#ffe0e0;'>-PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup compilers 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +9,7 @@ PortGroup muniversal 1.0
</span> name libxc5
set my_name libxc
version 5.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science
license {MPL-2 LGPL-2.1+}
maintainers {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,36 +40,38 @@ compiler.c_standard 1999
</span> compiler.blacklist-append \
*gcc-4.* {clang < 421}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_path ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_bin ${port_path}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_include ${port_path}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_lib ${port_path}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_ver_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_prefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_bin ${port_prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${port_prefix}
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GENERIC=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_BINDIR=${port_bin} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_INCLUDEDIR=${port_include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_LIBDIR=${port_lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clear optflags; controlled by project, via cmake build type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type RelWithDebInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-suffix=-${port_ver_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create bin symlinks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_bin_list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [glob -type f -directory ${destroot}${port_bin} *]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${port_bin_list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Symlinking bin: ${prefix}/bin/${fname} -> ${port_bin}/${fname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${port_bin}/${fname} ${destroot}${prefix}/bin/${fname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant fortran description {Enable Fortran 2003} {
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-fortran
</span> }
variant tests description {Enable Tests} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,15 +79,10 @@ variant tests description {Enable Tests} {
</span> port:bash \
port:bzip2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd-prepend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYLD_LIBRARY_PATH=${cmake.build_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target check
</span> }
livecheck.type regex
livecheck.url http://www.tddft.org/programs/libxc/download/previous
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(5\.\[0-9\.\]+).tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(${port_ver_major}\.\[0-9\.\]+)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libxc6/Portfile b/science/libxc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a2e16bfd1a..e48500eb3c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libxc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libxc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</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:#ffe0e0;'>-PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup compilers 1.0
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +9,7 @@ PortGroup muniversal 1.0
</span> name libxc6
set my_name libxc
version 6.2.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
license {MPL-2 LGPL-2.1+}
maintainers {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,36 +40,38 @@ compiler.c_standard 1999
</span> compiler.blacklist-append \
*gcc-4.* {clang < 421}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_path ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_bin ${port_path}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_include ${port_path}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_lib ${port_path}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_ver_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_prefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_bin ${port_prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${port_prefix}
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GENERIC=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_BINDIR=${port_bin} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_INCLUDEDIR=${port_include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_LIBDIR=${port_lib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clear optflags; controlled by project, via cmake build type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake.build_type RelWithDebInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-suffix=-${port_ver_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create bin symlinks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_bin_list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [glob -type f -directory ${destroot}${port_bin} *]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${port_bin_list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Symlinking bin: ${prefix}/bin/${fname} -> ${port_bin}/${fname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${port_bin}/${fname} ${destroot}${prefix}/bin/${fname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant fortran description {Enable Fortran 2003} {
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FORTRAN=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-fortran
</span> }
variant tests description {Enable Tests} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,15 +79,10 @@ variant tests description {Enable Tests} {
</span> port:bash \
port:bzip2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_TESTING=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.cmd-prepend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYLD_LIBRARY_PATH=${cmake.build_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target check
</span> }
livecheck.type regex
livecheck.url http://www.tddft.org/programs/libxc/download/previous
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(6\.\[0-9\.\]+).tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(${port_ver_major}\.\[0-9\.\]+)${extract.suffix}"
</span></pre><pre style='margin:0'>
</pre>