<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0d72e0b9be14e863bba93c3ad6e4b5a51fc0d5ae">https://github.com/macports/macports-ports/commit/0d72e0b9be14e863bba93c3ad6e4b5a51fc0d5ae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0d72e0b9be14e863bba93c3ad6e4b5a51fc0d5ae
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Oct 25 06:51:06 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> lal: update to 7.6.0
</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/68388
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67515
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67513
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67514
</span>---
science/lal/Portfile | 36 ++++++++-----------------------
science/lal/files/dynamic_lookup-11.patch | 25 ---------------------
2 files changed, 9 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lal/Portfile b/science/lal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba550b3aa2e..46cb39854c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,16 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description LSC Algorithm Library
long_description LIGO Scientific Collaboration Algorithm Library containing core \
routines for gravitational wave data analysis.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f5d23c4d2171ffa533af204b5cdcd3d12068c43 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 83a92377285ca0a2e6e48ae5ef8ad96a15dde62dc919f85ae93512dc942f860f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1713536
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a65ca9b893870c3f3f6303d9021ba99fecd5a47e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c173ff3112065706dc0ad1cc5062b32ae72a25de1a079bad9d198f657b82e463 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2384632
</span>
depends_lib-append port:gsl \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,6 @@ if {[string match "py*" ${subport}]} {
</span> # python, C-library port, and numpy are automatically added below
depends_lib port:py${v}-dateutil \
port:py${v}-scipy \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${v}-six \
</span> port:py${v}-ligo-segments \
port:py${v}-lscsoft-glue
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,24 +44,14 @@ categories science
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# The GPL and OpenSSL licenses conflict with each other, and our build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependency on Python results in an indirect dependency on OpenSSL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# However, there is no real conflict in the case of LALSuite because Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is used (1) as an interpreter to run part of the build and (2) as a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# separately installed interpreter that is invoked when the user runs some of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# our scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://wiki.ligo.org/Computing/DASWG/LALSuite
master_sites https://software.igwn.org/lscsoft/source/lalsuite
use_xz yes
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:swig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Choose a compiler that supports OpenMP.
compiler.openmp_version 2.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,13 +72,13 @@ configure.cxxflags-append -std=c++11
</span> compiler.blacklist-append {clang < 700}
# Create subports for each supported Python version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach v {27 38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v {312} {
</span> subport py${v}-${name} {
set pythonversion [string index ${v} 0].[string range ${v} 1 end]
set pythonhome "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-prepend python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append python
</span> description Python ${pythonversion} bindings for ${description}
long_description ${long_description} This package provides Python \
${pythonversion} bindings, modules, and scripts.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,13 +111,6 @@ foreach v {27 38} {
</span> # Remove Python include directory
# (duplicate of SWIG headers in ${prefix}/include)
file delete -force ${destroot}${pythonhome}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create symbolic links in ${prefix}/bin to Python 2.7 scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "py27-${name}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach script [glob -tails -nocomplain -directory ${destroot}${pythonhome}/bin *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file link -symbolic ${destroot}${prefix}/bin/${script} ../Library/Frameworks/Python.framework/Versions/${pythonversion}/bin/${script}
</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:#e0e0e0;'>@@ -138,7 +120,7 @@ subport octave-${name} {
</span> set pythonhome "${frameworks_dir}/Python.framework/Versions/${pythonversion}"
set pythondir "${pythonhome}/lib/python${pythonversion}/site-packages"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- categories-prepend octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ categories-append octave
</span> description Octave ${pythonversion} bindings for ${description}
long_description ${long_description} This package provides Octave \
bindings, modules, and scripts.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lal/files/dynamic_lookup-11.patch b/science/lal/files/dynamic_lookup-11.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c9a93c0cb21..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lal/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-06-24 21:55:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-12-09 00:24:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14025,16 +14025,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case $MACOSX_DEPLOYMENT_TARGET,$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012],*|,*powerpc*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span></pre><pre style='margin:0'>
</pre>